Commit 8cb183f2 authored by Gavin Shan's avatar Gavin Shan Committed by Linus Torvalds
Browse files

mm/debug_vm_pgtable: use struct pgtable_debug_args in protnone and devmap tests 

This uses struct pgtable_debug_args in protnone and devmap test functions.
After that, the unused variable @protnone in debug_vm_pgtable() is
dropped.

Link: https://lkml.kernel.org/r/20210809092631.1888748-5-gshan@redhat.com


Signed-off-by: default avatarGavin Shan <gshan@redhat.com>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Tested-by: Christophe Leroy <christophe.leroy@csgroup.eu>	[powerpc 8xx]
Tested-by: Gerald Schaefer <gerald.schaefer@linux.ibm.com>	[s390]
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chunyu Hu <chuhu@redhat.com>
Cc: Qian Cai <cai@lca.pw>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8983d231

mm/debug_vm_pgtable.c

+26 −32
Original line number Diff line number Diff line
@@ -662,9 +662,9 @@ static void __init pmd_populate_tests(struct mm_struct *mm, pmd_t *pmdp, 
	WARN_ON(pmd_bad(pmd));

}



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

static void __init pte_special_tests(struct pgtable_debug_args *args)

{

	pte_t pte = pfn_pte(pfn, prot);

	pte_t pte = pfn_pte(args->fixed_pte_pfn, args->page_prot);



	if (!IS_ENABLED(CONFIG_ARCH_HAS_PTE_SPECIAL))

		return;
@@ -673,9 +673,9 @@ static void __init pte_special_tests(unsigned long pfn, pgprot_t prot) 
	WARN_ON(!pte_special(pte_mkspecial(pte)));

}



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

static void __init pte_protnone_tests(struct pgtable_debug_args *args)

{

	pte_t pte = pfn_pte(pfn, prot);

	pte_t pte = pfn_pte(args->fixed_pte_pfn, args->page_prot_none);



	if (!IS_ENABLED(CONFIG_NUMA_BALANCING))

		return;
@@ -686,7 +686,7 @@ static void __init pte_protnone_tests(unsigned long pfn, pgprot_t prot) 
}



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

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

static void __init pmd_protnone_tests(struct pgtable_debug_args *args)

{

	pmd_t pmd;
@@ -697,25 +697,25 @@ static void __init pmd_protnone_tests(unsigned long pfn, pgprot_t prot) 
		return;



	pr_debug("Validating PMD protnone\n");

	pmd = pmd_mkhuge(pfn_pmd(pfn, prot));

	pmd = pmd_mkhuge(pfn_pmd(args->fixed_pmd_pfn, args->page_prot_none));

	WARN_ON(!pmd_protnone(pmd));

	WARN_ON(!pmd_present(pmd));

}

#else  /* !CONFIG_TRANSPARENT_HUGEPAGE */

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

static void __init pmd_protnone_tests(struct pgtable_debug_args *args) { }

#endif /* CONFIG_TRANSPARENT_HUGEPAGE */



#ifdef CONFIG_ARCH_HAS_PTE_DEVMAP

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

static void __init pte_devmap_tests(struct pgtable_debug_args *args)

{

	pte_t pte = pfn_pte(pfn, prot);

	pte_t pte = pfn_pte(args->fixed_pte_pfn, args->page_prot);



	pr_debug("Validating PTE devmap\n");

	WARN_ON(!pte_devmap(pte_mkdevmap(pte)));

}



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

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

static void __init pmd_devmap_tests(struct pgtable_debug_args *args)

{

	pmd_t pmd;
@@ -723,12 +723,12 @@ static void __init pmd_devmap_tests(unsigned long pfn, pgprot_t prot) 
		return;



	pr_debug("Validating PMD devmap\n");

	pmd = pfn_pmd(pfn, prot);

	pmd = pfn_pmd(args->fixed_pmd_pfn, args->page_prot);

	WARN_ON(!pmd_devmap(pmd_mkdevmap(pmd)));

}



#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD

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

static void __init pud_devmap_tests(struct pgtable_debug_args *args)

{

	pud_t pud;
@@ -736,20 +736,20 @@ static void __init pud_devmap_tests(unsigned long pfn, pgprot_t prot) 
		return;



	pr_debug("Validating PUD devmap\n");

	pud = pfn_pud(pfn, prot);

	pud = pfn_pud(args->fixed_pud_pfn, args->page_prot);

	WARN_ON(!pud_devmap(pud_mkdevmap(pud)));

}

#else  /* !CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */

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

static void __init pud_devmap_tests(struct pgtable_debug_args *args) { }

#endif /* CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */

#else  /* CONFIG_TRANSPARENT_HUGEPAGE */

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

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

static void __init pmd_devmap_tests(struct pgtable_debug_args *args) { }

static void __init pud_devmap_tests(struct pgtable_debug_args *args) { }

#endif /* CONFIG_TRANSPARENT_HUGEPAGE */

#else

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

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

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

static void __init pte_devmap_tests(struct pgtable_debug_args *args) { }

static void __init pmd_devmap_tests(struct pgtable_debug_args *args) { }

static void __init pud_devmap_tests(struct pgtable_debug_args *args) { }

#endif /* CONFIG_ARCH_HAS_PTE_DEVMAP */



static void __init pte_soft_dirty_tests(unsigned long pfn, pgprot_t prot)
@@ -1227,7 +1227,7 @@ static int __init debug_vm_pgtable(void) 
	pmd_t *pmdp, *saved_pmdp, pmd;

	pte_t *ptep;

	pgtable_t saved_ptep;

	pgprot_t prot, protnone;

	pgprot_t prot;

	phys_addr_t paddr;

	unsigned long vaddr, pte_aligned, pmd_aligned;

	unsigned long pud_aligned;
@@ -1247,12 +1247,6 @@ static int __init debug_vm_pgtable(void) 
		return 1;

	}



	/*

	 * __P000 (or even __S000) will help create page table entries with

	 * PROT_NONE permission as required for pxx_protnone_tests().

	 */

	protnone = __P000;



	vma = vm_area_alloc(mm);

	if (!vma) {

		pr_err("vma allocation failed\n");
@@ -1327,13 +1321,13 @@ static int __init debug_vm_pgtable(void) 
	pte_savedwrite_tests(&args);

	pmd_savedwrite_tests(&args);



	pte_special_tests(pte_aligned, prot);

	pte_protnone_tests(pte_aligned, protnone);

	pmd_protnone_tests(pmd_aligned, protnone);

	pte_special_tests(&args);

	pte_protnone_tests(&args);

	pmd_protnone_tests(&args);



	pte_devmap_tests(pte_aligned, prot);

	pmd_devmap_tests(pmd_aligned, prot);

	pud_devmap_tests(pud_aligned, prot);

	pte_devmap_tests(&args);

	pmd_devmap_tests(&args);

	pud_devmap_tests(&args);



	pte_soft_dirty_tests(pte_aligned, prot);

	pmd_soft_dirty_tests(pmd_aligned, prot);