Commit 5fe77be6 authored by Shixin Liu's avatar Shixin Liu Committed by Linus Torvalds
Browse files

mm/debug_vm_pgtable: move {pmd/pud}_huge_tests out of CONFIG_TRANSPARENT_HUGEPAGE 

The functions {pmd/pud}_set_huge and {pmd/pud}_clear_huge are not
dependent on THP.  Hence move {pmd/pud}_huge_tests out of
CONFIG_TRANSPARENT_HUGEPAGE.

Link: https://lkml.kernel.org/r/20210419071820.750217-1-liushixin2@huawei.com


Signed-off-by: default avatarShixin Liu <liushixin2@huawei.com>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 77490587

mm/debug_vm_pgtable.c

+39 −52
Original line number Diff line number Diff line
@@ -248,29 +248,6 @@ static void __init pmd_leaf_tests(unsigned long pfn, pgprot_t prot) 
	WARN_ON(!pmd_leaf(pmd));

}



#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP

static void __init pmd_huge_tests(pmd_t *pmdp, unsigned long pfn, pgprot_t prot)

{

	pmd_t pmd;



	if (!arch_vmap_pmd_supported(prot))

		return;



	pr_debug("Validating PMD huge\n");

	/*

	 * X86 defined pmd_set_huge() verifies that the given

	 * PMD is not a populated non-leaf entry.

	 */

	WRITE_ONCE(*pmdp, __pmd(0));

	WARN_ON(!pmd_set_huge(pmdp, __pfn_to_phys(pfn), prot));

	WARN_ON(!pmd_clear_huge(pmdp));

	pmd = READ_ONCE(*pmdp);

	WARN_ON(!pmd_none(pmd));

}

#else /* CONFIG_HAVE_ARCH_HUGE_VMAP */

static void __init pmd_huge_tests(pmd_t *pmdp, unsigned long pfn, pgprot_t prot) { }

#endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */



static void __init pmd_savedwrite_tests(unsigned long pfn, pgprot_t prot)

{

	pmd_t pmd;
@@ -395,30 +372,6 @@ static void __init pud_leaf_tests(unsigned long pfn, pgprot_t prot) 
	pud = pud_mkhuge(pud);

	WARN_ON(!pud_leaf(pud));

}



#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP

static void __init pud_huge_tests(pud_t *pudp, unsigned long pfn, pgprot_t prot)

{

	pud_t pud;



	if (!arch_vmap_pud_supported(prot))

		return;



	pr_debug("Validating PUD huge\n");

	/*

	 * X86 defined pud_set_huge() verifies that the given

	 * PUD is not a populated non-leaf entry.

	 */

	WRITE_ONCE(*pudp, __pud(0));

	WARN_ON(!pud_set_huge(pudp, __pfn_to_phys(pfn), prot));

	WARN_ON(!pud_clear_huge(pudp));

	pud = READ_ONCE(*pudp);

	WARN_ON(!pud_none(pud));

}

#else /* !CONFIG_HAVE_ARCH_HUGE_VMAP */

static void __init pud_huge_tests(pud_t *pudp, unsigned long pfn, pgprot_t prot) { }

#endif /* !CONFIG_HAVE_ARCH_HUGE_VMAP */



#else  /* !CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */

static void __init pud_basic_tests(struct mm_struct *mm, unsigned long pfn, int idx) { }

static void __init pud_advanced_tests(struct mm_struct *mm,
@@ -428,9 +381,6 @@ static void __init pud_advanced_tests(struct mm_struct *mm, 
{

}

static void __init pud_leaf_tests(unsigned long pfn, pgprot_t prot) { }

static void __init pud_huge_tests(pud_t *pudp, unsigned long pfn, pgprot_t prot)

{

}

#endif /* CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */

#else  /* !CONFIG_TRANSPARENT_HUGEPAGE */

static void __init pmd_basic_tests(unsigned long pfn, int idx) { }
@@ -449,14 +399,51 @@ static void __init pud_advanced_tests(struct mm_struct *mm, 
}

static void __init pmd_leaf_tests(unsigned long pfn, pgprot_t prot) { }

static void __init pud_leaf_tests(unsigned long pfn, pgprot_t prot) { }

static void __init pmd_savedwrite_tests(unsigned long pfn, pgprot_t prot) { }

#endif /* CONFIG_TRANSPARENT_HUGEPAGE */



#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP

static void __init pmd_huge_tests(pmd_t *pmdp, unsigned long pfn, pgprot_t prot)

{

	pmd_t pmd;



	if (!arch_vmap_pmd_supported(prot))

		return;



	pr_debug("Validating PMD huge\n");

	/*

	 * X86 defined pmd_set_huge() verifies that the given

	 * PMD is not a populated non-leaf entry.

	 */

	WRITE_ONCE(*pmdp, __pmd(0));

	WARN_ON(!pmd_set_huge(pmdp, __pfn_to_phys(pfn), prot));

	WARN_ON(!pmd_clear_huge(pmdp));

	pmd = READ_ONCE(*pmdp);

	WARN_ON(!pmd_none(pmd));

}



static void __init pud_huge_tests(pud_t *pudp, unsigned long pfn, pgprot_t prot)

{

	pud_t pud;



	if (!arch_vmap_pud_supported(prot))

		return;



	pr_debug("Validating PUD huge\n");

	/*

	 * X86 defined pud_set_huge() verifies that the given

	 * PUD is not a populated non-leaf entry.

	 */

	WRITE_ONCE(*pudp, __pud(0));

	WARN_ON(!pud_set_huge(pudp, __pfn_to_phys(pfn), prot));

	WARN_ON(!pud_clear_huge(pudp));

	pud = READ_ONCE(*pudp);

	WARN_ON(!pud_none(pud));

}

static void __init pmd_savedwrite_tests(unsigned long pfn, pgprot_t prot) { }

#endif /* CONFIG_TRANSPARENT_HUGEPAGE */

#else /* !CONFIG_HAVE_ARCH_HUGE_VMAP */

static void __init pmd_huge_tests(pmd_t *pmdp, unsigned long pfn, pgprot_t prot) { }

static void __init pud_huge_tests(pud_t *pudp, unsigned long pfn, pgprot_t prot) { }

#endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */



static void __init p4d_basic_tests(unsigned long pfn, pgprot_t prot)

{