moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mm: page_vma_mapped_walk(): prettify PVMW_MIGRATION block

Browse Source 
commit e2e1d4076c upstream.

page_vma_mapped_walk() cleanup: rearrange the !pmd_present() block to
follow the same "return not_found, return not_found, return true"
pattern as the block above it (note: returning not_found there is never
premature, since existence or prior existence of huge pmd guarantees
good alignment).

Link: https://lkml.kernel.org/r/378c8650-1488-2edf-9647-32a53cf2e21@google.com
Signed-off-by: Hugh Dickins <hughd@google.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Ralph Campbell <rcampbell@nvidia.com>
Cc: Wang Yugui <wangyugui@e16-tech.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yang Shi <shy828301@gmail.com>
Cc: Zi Yan <ziy@nvidia.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hugh Dickins
2021-06-24 18:39:10 -07:00
committed by Sasha Levin
parent 7b55a4bcfc
commit 8dc191ed9c
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mm/page_vma_mapped.c
View File

@@ -197,24 +197,22 @@ restart:
if (pmd_page(pmde) != page) if (pmd_page(pmde) != page)
return not_found(pvmw); return not_found(pvmw);
return true; return true;
} else if (!pmd_present(pmde)) { }
if (thp_migration_supported()) { if (!pmd_present(pmde)) {
if (!(pvmw->flags & PVMW_MIGRATION)) swp_entry_t entry;
return not_found(pvmw);
if (is_migration_entry(pmd_to_swp_entry(pmde))) {
swp_entry_t entry = pmd_to_swp_entry(pmde);
if (migration_entry_to_page(entry) != page) if (!thp_migration_supported() ||
!(pvmw->flags & PVMW_MIGRATION))
return not_found(pvmw);
entry = pmd_to_swp_entry(pmde);
if (!is_migration_entry(entry) ||
migration_entry_to_page(entry) != page)
return not_found(pvmw); return not_found(pvmw);
return true; return true;
} }
}
return not_found(pvmw);
} else {
/* THP pmd was split under us: handle on pte level */ /* THP pmd was split under us: handle on pte level */
spin_unlock(pvmw->ptl); spin_unlock(pvmw->ptl);
pvmw->ptl = NULL; pvmw->ptl = NULL;
}
} else if (!pmd_present(pmde)) { } else if (!pmd_present(pmde)) {
/* /*
* If PVMW_SYNC, take and drop THP pmd lock so that we * If PVMW_SYNC, take and drop THP pmd lock so that we