Commit 9dabf6e1 authored Mar 02, 2023 by Anshuman Khandual Committed by Andrew Morton Mar 28, 2023

mm/debug_vm_pgtable: replace pte_mkhuge() with arch_make_huge_pte()

Since the following commit arch_make_huge_pte() should be used directly in
generic memory subsystem as a platform provided page table helper, instead
of pte_mkhuge().  Change hugetlb_basic_tests() to call
arch_make_huge_pte() directly, and update its relevant documentation entry
as required.

'commit 16785bd7 ("mm: merge pte_mkhuge() call into arch_make_huge_pte()")'

Link: https://lkml.kernel.org/r/20230302114845.421674-1-anshuman.khandual@arm.com


Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Reported-by: Christophe Leroy <christophe.leroy@csgroup.eu>
  Link: https://lore.kernel.org/all/1ea45095-0926-a56a-a273-816709e9075e@csgroup.eu/


Cc: Jonathan Corbet <corbet@lwn.net>
Cc: David Hildenbrand <david@redhat.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Mike Rapoport <rppt@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

parent 1da28f1b

Documentation/mm/arch_pgtable_helpers.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -214,7 +214,7 @@ HugeTLB Page Table Helpers
		+---------------------------+--------------------------------------------------+
		\| pte_huge \| Tests a HugeTLB \|
		+---------------------------+--------------------------------------------------+
		\| pte_mkhuge \| Creates a HugeTLB \|
		\| arch_make_huge_pte \| Creates a HugeTLB \|
		+---------------------------+--------------------------------------------------+
		\| huge_pte_dirty \| Tests a dirty HugeTLB \|
		+---------------------------+--------------------------------------------------+

mm/debug_vm_pgtable.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -934,7 +934,7 @@ static void __init hugetlb_basic_tests(struct pgtable_debug_args *args)
		#ifdef CONFIG_ARCH_WANT_GENERAL_HUGETLB
		pte = pfn_pte(args->fixed_pmd_pfn, args->page_prot);

		WARN_ON(!pte_huge(pte_mkhuge(pte)));
		WARN_ON(!pte_huge(arch_make_huge_pte(pte, PMD_SHIFT, VM_ACCESS_FLAGS)));
		#endif /* CONFIG_ARCH_WANT_GENERAL_HUGETLB */
		}
		#else /* !CONFIG_HUGETLB_PAGE */