mirror of
https://github.com/torvalds/linux
synced 2024-10-15 15:59:15 +00:00
mm/debug_vm_pgtable: use struct pgtable_debug_args in leaf and savewrite tests
This uses struct pgtable_debug_args in the leaf and savewrite test functions. Link: https://lkml.kernel.org/r/20210809092631.1888748-4-gshan@redhat.com Signed-off-by: Gavin Shan <gshan@redhat.com> Reviewed-by: Anshuman 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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
36b77d1e15
commit
8983d231c7
|
@ -161,9 +161,9 @@ static void __init pte_advanced_tests(struct mm_struct *mm,
|
||||||
WARN_ON(pte_young(pte));
|
WARN_ON(pte_young(pte));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init pte_savedwrite_tests(unsigned long pfn, pgprot_t prot)
|
static void __init pte_savedwrite_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))
|
if (!IS_ENABLED(CONFIG_NUMA_BALANCING))
|
||||||
return;
|
return;
|
||||||
|
@ -262,7 +262,7 @@ static void __init pmd_advanced_tests(struct mm_struct *mm,
|
||||||
pgtable = pgtable_trans_huge_withdraw(mm, pmdp);
|
pgtable = pgtable_trans_huge_withdraw(mm, pmdp);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init pmd_leaf_tests(unsigned long pfn, pgprot_t prot)
|
static void __init pmd_leaf_tests(struct pgtable_debug_args *args)
|
||||||
{
|
{
|
||||||
pmd_t pmd;
|
pmd_t pmd;
|
||||||
|
|
||||||
|
@ -270,7 +270,7 @@ static void __init pmd_leaf_tests(unsigned long pfn, pgprot_t prot)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
pr_debug("Validating PMD leaf\n");
|
pr_debug("Validating PMD leaf\n");
|
||||||
pmd = pfn_pmd(pfn, prot);
|
pmd = pfn_pmd(args->fixed_pmd_pfn, args->page_prot);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* PMD based THP is a leaf entry.
|
* PMD based THP is a leaf entry.
|
||||||
|
@ -279,7 +279,7 @@ static void __init pmd_leaf_tests(unsigned long pfn, pgprot_t prot)
|
||||||
WARN_ON(!pmd_leaf(pmd));
|
WARN_ON(!pmd_leaf(pmd));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init pmd_savedwrite_tests(unsigned long pfn, pgprot_t prot)
|
static void __init pmd_savedwrite_tests(struct pgtable_debug_args *args)
|
||||||
{
|
{
|
||||||
pmd_t pmd;
|
pmd_t pmd;
|
||||||
|
|
||||||
|
@ -290,7 +290,7 @@ static void __init pmd_savedwrite_tests(unsigned long pfn, pgprot_t prot)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
pr_debug("Validating PMD saved write\n");
|
pr_debug("Validating PMD saved write\n");
|
||||||
pmd = pfn_pmd(pfn, prot);
|
pmd = pfn_pmd(args->fixed_pmd_pfn, args->page_prot_none);
|
||||||
WARN_ON(!pmd_savedwrite(pmd_mk_savedwrite(pmd_clear_savedwrite(pmd))));
|
WARN_ON(!pmd_savedwrite(pmd_mk_savedwrite(pmd_clear_savedwrite(pmd))));
|
||||||
WARN_ON(pmd_savedwrite(pmd_clear_savedwrite(pmd_mk_savedwrite(pmd))));
|
WARN_ON(pmd_savedwrite(pmd_clear_savedwrite(pmd_mk_savedwrite(pmd))));
|
||||||
}
|
}
|
||||||
|
@ -388,7 +388,7 @@ static void __init pud_advanced_tests(struct mm_struct *mm,
|
||||||
pudp_huge_get_and_clear(mm, vaddr, pudp);
|
pudp_huge_get_and_clear(mm, vaddr, pudp);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init pud_leaf_tests(unsigned long pfn, pgprot_t prot)
|
static void __init pud_leaf_tests(struct pgtable_debug_args *args)
|
||||||
{
|
{
|
||||||
pud_t pud;
|
pud_t pud;
|
||||||
|
|
||||||
|
@ -396,7 +396,7 @@ static void __init pud_leaf_tests(unsigned long pfn, pgprot_t prot)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
pr_debug("Validating PUD leaf\n");
|
pr_debug("Validating PUD leaf\n");
|
||||||
pud = pfn_pud(pfn, prot);
|
pud = pfn_pud(args->fixed_pud_pfn, args->page_prot);
|
||||||
/*
|
/*
|
||||||
* PUD based THP is a leaf entry.
|
* PUD based THP is a leaf entry.
|
||||||
*/
|
*/
|
||||||
|
@ -411,7 +411,7 @@ static void __init pud_advanced_tests(struct mm_struct *mm,
|
||||||
pgprot_t prot)
|
pgprot_t prot)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
static void __init pud_leaf_tests(unsigned long pfn, pgprot_t prot) { }
|
static void __init pud_leaf_tests(struct pgtable_debug_args *args) { }
|
||||||
#endif /* CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */
|
#endif /* CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */
|
||||||
#else /* !CONFIG_TRANSPARENT_HUGEPAGE */
|
#else /* !CONFIG_TRANSPARENT_HUGEPAGE */
|
||||||
static void __init pmd_basic_tests(struct pgtable_debug_args *args, int idx) { }
|
static void __init pmd_basic_tests(struct pgtable_debug_args *args, int idx) { }
|
||||||
|
@ -428,9 +428,9 @@ static void __init pud_advanced_tests(struct mm_struct *mm,
|
||||||
pgprot_t prot)
|
pgprot_t prot)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
static void __init pmd_leaf_tests(unsigned long pfn, pgprot_t prot) { }
|
static void __init pmd_leaf_tests(struct pgtable_debug_args *args) { }
|
||||||
static void __init pud_leaf_tests(unsigned long pfn, pgprot_t prot) { }
|
static void __init pud_leaf_tests(struct pgtable_debug_args *args) { }
|
||||||
static void __init pmd_savedwrite_tests(unsigned long pfn, pgprot_t prot) { }
|
static void __init pmd_savedwrite_tests(struct pgtable_debug_args *args) { }
|
||||||
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
|
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
|
||||||
|
|
||||||
#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
|
#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
|
||||||
|
@ -1321,11 +1321,11 @@ static int __init debug_vm_pgtable(void)
|
||||||
p4d_basic_tests(&args);
|
p4d_basic_tests(&args);
|
||||||
pgd_basic_tests(&args);
|
pgd_basic_tests(&args);
|
||||||
|
|
||||||
pmd_leaf_tests(pmd_aligned, prot);
|
pmd_leaf_tests(&args);
|
||||||
pud_leaf_tests(pud_aligned, prot);
|
pud_leaf_tests(&args);
|
||||||
|
|
||||||
pte_savedwrite_tests(pte_aligned, protnone);
|
pte_savedwrite_tests(&args);
|
||||||
pmd_savedwrite_tests(pmd_aligned, protnone);
|
pmd_savedwrite_tests(&args);
|
||||||
|
|
||||||
pte_special_tests(pte_aligned, prot);
|
pte_special_tests(pte_aligned, prot);
|
||||||
pte_protnone_tests(pte_aligned, protnone);
|
pte_protnone_tests(pte_aligned, protnone);
|
||||||
|
|
Loading…
Reference in a new issue