lkml.org 
[lkml]   [2021]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 06/12] mm/debug_vm_pgtable: Use struct pgtable_debug_args in migration and thp tests
    Date
    This uses struct pgtable_debug_args in the migration and thp test
    functions. It's notable that the pre-allocated page is used in
    swap_migration_tests() as set_pte_at() is used there.

    Signed-off-by: Gavin Shan <gshan@redhat.com>
    ---
    mm/debug_vm_pgtable.c | 28 ++++++++++++++--------------
    1 file changed, 14 insertions(+), 14 deletions(-)

    diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c
    index bc153cad9045..9136195efde3 100644
    --- a/mm/debug_vm_pgtable.c
    +++ b/mm/debug_vm_pgtable.c
    @@ -845,7 +845,7 @@ static void __init pmd_swap_tests(struct pgtable_debug_args *args)
    static void __init pmd_swap_tests(struct pgtable_debug_args *args) { }
    #endif /* CONFIG_ARCH_ENABLE_THP_MIGRATION */

    -static void __init swap_migration_tests(void)
    +static void __init swap_migration_tests(struct pgtable_debug_args *args)
    {
    struct page *page;
    swp_entry_t swp;
    @@ -861,9 +861,10 @@ static void __init swap_migration_tests(void)
    * problematic. Lets allocate a dedicated page explicitly for this
    * purpose that will be freed subsequently.
    */
    - page = alloc_page(GFP_KERNEL);
    + page = (args->pte_pfn != ULONG_MAX) ?
    + pfn_to_page(args->pte_pfn) : NULL;
    if (!page) {
    - pr_err("page allocation failed\n");
    + pr_err("no page available\n");
    return;
    }

    @@ -884,7 +885,6 @@ static void __init swap_migration_tests(void)
    WARN_ON(!is_migration_entry(swp));
    WARN_ON(is_writable_migration_entry(swp));
    __ClearPageLocked(page);
    - __free_page(page);
    }

    #ifdef CONFIG_HUGETLB_PAGE
    @@ -916,7 +916,7 @@ static void __init hugetlb_basic_tests(struct pgtable_debug_args *args) { }
    #endif /* CONFIG_HUGETLB_PAGE */

    #ifdef CONFIG_TRANSPARENT_HUGEPAGE
    -static void __init pmd_thp_tests(unsigned long pfn, pgprot_t prot)
    +static void __init pmd_thp_tests(struct pgtable_debug_args *args)
    {
    pmd_t pmd;

    @@ -935,7 +935,7 @@ static void __init pmd_thp_tests(unsigned long pfn, pgprot_t prot)
    * needs to return true. pmd_present() should be true whenever
    * pmd_trans_huge() returns true.
    */
    - pmd = pfn_pmd(pfn, prot);
    + pmd = pfn_pmd(args->fixed_pmd_pfn, args->page_prot);
    WARN_ON(!pmd_trans_huge(pmd_mkhuge(pmd)));

    #ifndef __HAVE_ARCH_PMDP_INVALIDATE
    @@ -945,7 +945,7 @@ static void __init pmd_thp_tests(unsigned long pfn, pgprot_t prot)
    }

    #ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD
    -static void __init pud_thp_tests(unsigned long pfn, pgprot_t prot)
    +static void __init pud_thp_tests(struct pgtable_debug_args *args)
    {
    pud_t pud;

    @@ -953,7 +953,7 @@ static void __init pud_thp_tests(unsigned long pfn, pgprot_t prot)
    return;

    pr_debug("Validating PUD based THP\n");
    - pud = pfn_pud(pfn, prot);
    + pud = pfn_pud(args->fixed_pud_pfn, args->page_prot);
    WARN_ON(!pud_trans_huge(pud_mkhuge(pud)));

    /*
    @@ -965,11 +965,11 @@ static void __init pud_thp_tests(unsigned long pfn, pgprot_t prot)
    */
    }
    #else /* !CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */
    -static void __init pud_thp_tests(unsigned long pfn, pgprot_t prot) { }
    +static void __init pud_thp_tests(struct pgtable_debug_args *args) { }
    #endif /* CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */
    #else /* !CONFIG_TRANSPARENT_HUGEPAGE */
    -static void __init pmd_thp_tests(unsigned long pfn, pgprot_t prot) { }
    -static void __init pud_thp_tests(unsigned long pfn, pgprot_t prot) { }
    +static void __init pmd_thp_tests(struct pgtable_debug_args *args) { }
    +static void __init pud_thp_tests(struct pgtable_debug_args *args) { }
    #endif /* CONFIG_TRANSPARENT_HUGEPAGE */

    static unsigned long __init get_random_vaddr(void)
    @@ -1345,10 +1345,10 @@ static int __init debug_vm_pgtable(void)
    pte_swap_tests(&args);
    pmd_swap_tests(&args);

    - swap_migration_tests();
    + swap_migration_tests(&args);

    - pmd_thp_tests(pmd_aligned, prot);
    - pud_thp_tests(pud_aligned, prot);
    + pmd_thp_tests(&args);
    + pud_thp_tests(&args);

    hugetlb_basic_tests(&args);

    --
    2.23.0
    \
     
     \ /
      Last update: 2021-07-27 08:15    [W:3.710 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site