mm-page_vma_mapped_walk-settle-pagehuge-on-entry.patch removed from -mm tree
The patch titled
Subject: mm: page_vma_mapped_walk(): settle PageHuge on entry
has been removed from the -mm tree. Its filename was
mm-page_vma_mapped_walk-settle-pagehuge-on-entry.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Hugh Dickins <[email protected]>
Subject: mm: page_vma_mapped_walk(): settle PageHuge on entry
page_vma_mapped_walk() cleanup: get the hugetlbfs PageHuge case out of the way at the start, so no need to worry about it later.
Signed-off-by Hugh Dickins <[email protected]>
Reviewed-by Peter Xu <[email protected]>
Cc Alistair Popple <[email protected]>
Cc "Kirill A. Shutemov" <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc Ralph Campbell <[email protected]>
Cc Wang Yugui <[email protected]>
Cc Will Deacon <[email protected]>
Cc Yang Shi <[email protected]>
Cc Zi Yan <[email protected]>
Cc <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/page_vma_mapped.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
mm/page_vma_mapped.c renamed from mm/page_vma_mapped.c~mm-page_vma_mapped_walk-settle-pagehuge-on-entry +8 -4
@@ -153,10 +153,11 @@ bool page_vma_mapped_walk(struct page_vmif (pvmw->pmd && !pvmw->pte)return not_found (pvmw); -if (pvmw->pte) - goto next_pte; -if (unlikely (PageHuge (page))) { +/* The only possible mapping was handled on last iteration */ +if (pvmw->pte) +return not_found (pvmw); +/* when pud is not present, pte will be NULL */ pvmw->pte =huge_pte_offset (mm, pvmw->address,page_size (page));if (!pvmw->pte)
@@ -168,6 +169,9 @@ bool page_vma_mapped_walk(struct page_vmreturn not_found (pvmw);return true; } + +if (pvmw->pte) + goto next_pte; restart: pgd =pgd_offset (mm, pvmw->address);if (!pgd_present (*pgd))
@@ -233,7 +237,7 @@ restart:return true; next_pte:/* Seek to next pte only makes sense for THP */ -if (!PageTransHuge (page) ||PageHuge (page)) +if (!PageTransHuge (page))return not_found (pvmw); end =vma_address_end (page, pvmw->vma); do {
_
Patches currently in -mm which might be from [email protected] are
mm-thp-remap_page-is-only-needed-on-anonymous-thp.patch mm-hwpoison_user_mappings-try_to_unmap-with-ttu_sync.patch