Commit 5f447e80 authored by Gavin Shan's avatar Gavin Shan Committed by Linus Torvalds
Browse files

mm/debug_vm_pgtable: use struct pgtable_debug_args in soft_dirty and swap tests 

This uses struct pgtable_debug_args in the soft_dirty and swap test
functions.

Link: https://lkml.kernel.org/r/20210809092631.1888748-6-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 8cb183f2

mm/debug_vm_pgtable.c

+23 −25
Original line number Diff line number Diff line
@@ -752,9 +752,9 @@ 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)

static void __init pte_soft_dirty_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_MEM_SOFT_DIRTY))

		return;
@@ -764,9 +764,9 @@ static void __init pte_soft_dirty_tests(unsigned long pfn, pgprot_t prot) 
	WARN_ON(pte_soft_dirty(pte_clear_soft_dirty(pte)));

}



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

static void __init pte_swap_soft_dirty_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_MEM_SOFT_DIRTY))

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



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

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

static void __init pmd_soft_dirty_tests(struct pgtable_debug_args *args)

{

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



	pr_debug("Validating PMD soft dirty\n");

	pmd = pfn_pmd(pfn, prot);

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

	WARN_ON(!pmd_soft_dirty(pmd_mksoft_dirty(pmd)));

	WARN_ON(pmd_soft_dirty(pmd_clear_soft_dirty(pmd)));

}



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

static void __init pmd_swap_soft_dirty_tests(struct pgtable_debug_args *args)

{

	pmd_t pmd;
@@ -805,31 +805,29 @@ static void __init pmd_swap_soft_dirty_tests(unsigned long pfn, pgprot_t prot) 
		return;



	pr_debug("Validating PMD swap soft dirty\n");

	pmd = pfn_pmd(pfn, prot);

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

	WARN_ON(!pmd_swp_soft_dirty(pmd_swp_mksoft_dirty(pmd)));

	WARN_ON(pmd_swp_soft_dirty(pmd_swp_clear_soft_dirty(pmd)));

}

#else  /* !CONFIG_TRANSPARENT_HUGEPAGE */

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

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

{

}

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

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

#endif /* CONFIG_TRANSPARENT_HUGEPAGE */



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

static void __init pte_swap_tests(struct pgtable_debug_args *args)

{

	swp_entry_t swp;

	pte_t pte;



	pr_debug("Validating PTE swap\n");

	pte = pfn_pte(pfn, prot);

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

	swp = __pte_to_swp_entry(pte);

	pte = __swp_entry_to_pte(swp);

	WARN_ON(pfn != pte_pfn(pte));

	WARN_ON(args->fixed_pte_pfn != pte_pfn(pte));

}



#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION

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

static void __init pmd_swap_tests(struct pgtable_debug_args *args)

{

	swp_entry_t swp;

	pmd_t pmd;
@@ -838,13 +836,13 @@ static void __init pmd_swap_tests(unsigned long pfn, pgprot_t prot) 
		return;



	pr_debug("Validating PMD swap\n");

	pmd = pfn_pmd(pfn, prot);

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

	swp = __pmd_to_swp_entry(pmd);

	pmd = __swp_entry_to_pmd(swp);

	WARN_ON(pfn != pmd_pfn(pmd));

	WARN_ON(args->fixed_pmd_pfn != pmd_pfn(pmd));

}

#else  /* !CONFIG_ARCH_ENABLE_THP_MIGRATION */

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

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

#endif /* CONFIG_ARCH_ENABLE_THP_MIGRATION */



static void __init swap_migration_tests(void)
@@ -1329,13 +1327,13 @@ static int __init debug_vm_pgtable(void) 
	pmd_devmap_tests(&args);

	pud_devmap_tests(&args);



	pte_soft_dirty_tests(pte_aligned, prot);

	pmd_soft_dirty_tests(pmd_aligned, prot);

	pte_swap_soft_dirty_tests(pte_aligned, prot);

	pmd_swap_soft_dirty_tests(pmd_aligned, prot);

	pte_soft_dirty_tests(&args);

	pmd_soft_dirty_tests(&args);

	pte_swap_soft_dirty_tests(&args);

	pmd_swap_soft_dirty_tests(&args);



	pte_swap_tests(pte_aligned, prot);

	pmd_swap_tests(pmd_aligned, prot);

	pte_swap_tests(&args);

	pmd_swap_tests(&args);



	swap_migration_tests();