Commit 85a14463 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Linus Torvalds
Browse files

mm/debug_vm_pgtables/hugevmap: use the arch helper to identify huge vmap support. 



ppc64 supports huge vmap only with radix translation.  Hence use arch
helper to determine the huge vmap support.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lkml.kernel.org/r/20200902114222.181353-5-aneesh.kumar@linux.ibm.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cfc5bbc4

mm/debug_vm_pgtable.c

+12 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/swapops.h>

#include <linux/start_kernel.h>

#include <linux/sched/mm.h>

#include <linux/io.h>

#include <asm/pgalloc.h>

#include <asm/tlbflush.h>
@@ -206,11 +207,12 @@ 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 (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMAP))

	if (!arch_ioremap_pmd_supported())

		return;



	pr_debug("Validating PMD huge\n");
@@ -224,6 +226,9 @@ static void __init pmd_huge_tests(pmd_t *pmdp, unsigned long pfn, pgprot_t prot) 
	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)

{
@@ -320,11 +325,12 @@ static void __init pud_leaf_tests(unsigned long pfn, pgprot_t prot) 
	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 (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMAP))

	if (!arch_ioremap_pud_supported())

		return;



	pr_debug("Validating PUD huge\n");
@@ -338,6 +344,10 @@ static void __init pud_huge_tests(pud_t *pudp, unsigned long pfn, pgprot_t prot) 
	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(unsigned long pfn, pgprot_t prot) { }

static void __init pud_advanced_tests(struct mm_struct *mm,