Commit 49611602 authored Jun 24, 2021 by Hugh Dickins Committed by Sasha Levin Jun 30, 2021

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.

Link: https://lkml.kernel.org/r/e31a483c-6d73-a6bb-26c5-43c3b880a2@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: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.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>

parent 52e2b20f

mm/page_vma_mapped.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -148,10 +148,11 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
		if (pvmw->pmd && !pvmw->pte)
		return not_found(pvmw);

		if (unlikely(PageHuge(page))) {
		/* The only possible mapping was handled on last iteration */
		if (pvmw->pte)
		goto next_pte;
		return not_found(pvmw);

		if (unlikely(PageHuge(page))) {
		/* when pud is not present, pte will be NULL */
		pvmw->pte = huge_pte_offset(mm, pvmw->address, page_size(page));
		if (!pvmw->pte)
		@@ -163,6 +164,9 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
		return not_found(pvmw);
		return true;
		}

		if (pvmw->pte)
		goto next_pte;
		restart:
		pgd = pgd_offset(mm, pvmw->address);
		if (!pgd_present(*pgd))
		@@ -228,7 +232,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
		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 {