From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.4 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57C9CC432BE for ; Thu, 29 Jul 2021 05:06:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DEE7F6052B for ; Thu, 29 Jul 2021 05:06:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DEE7F6052B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 7F9A68D0001; Thu, 29 Jul 2021 01:06:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7A9D76B005D; Thu, 29 Jul 2021 01:06:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 698178D0001; Thu, 29 Jul 2021 01:06:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0166.hostedemail.com [216.40.44.166]) by kanga.kvack.org (Postfix) with ESMTP id 4B2266B0036 for ; Thu, 29 Jul 2021 01:06:45 -0400 (EDT) Received: from smtpin33.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 5BAB322032 for ; Thu, 29 Jul 2021 05:06:43 +0000 (UTC) X-FDA: 78414440286.33.87D0715 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf19.hostedemail.com (Postfix) with ESMTP id C8F7EB00D523 for ; Thu, 29 Jul 2021 05:06:42 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 126096D; Wed, 28 Jul 2021 22:06:42 -0700 (PDT) Received: from [10.163.65.237] (unknown [10.163.65.237]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8460A3F66F; Wed, 28 Jul 2021 22:06:38 -0700 (PDT) Subject: Re: [PATCH v4 05/12] mm/debug_vm_pgtable: Use struct pgtable_debug_args in soft_dirty and swap tests To: Gavin Shan , linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, gerald.schaefer@linux.ibm.com, aneesh.kumar@linux.ibm.com, christophe.leroy@csgroup.eu, cai@lca.pw, catalin.marinas@arm.com, will@kernel.org, akpm@linux-foundation.org, chuhu@redhat.com, shan.gavin@gmail.com References: <20210727061401.592616-1-gshan@redhat.com> <20210727061401.592616-6-gshan@redhat.com> From: Anshuman Khandual Message-ID: <445d4b02-c221-096f-eee0-573503350e44@arm.com> Date: Thu, 29 Jul 2021 10:37:26 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210727061401.592616-6-gshan@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: C8F7EB00D523 Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf19.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com X-Stat-Signature: cy7h4mc178bu9bt9pz3uxhbam49poc4w X-HE-Tag: 1627535202-181354 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 7/27/21 11:43 AM, Gavin Shan wrote: > This uses struct pgtable_debug_args in the soft_dirty and swap test > functions. > > Signed-off-by: Gavin Shan > --- > mm/debug_vm_pgtable.c | 48 +++++++++++++++++++++---------------------- > 1 file changed, 23 insertions(+), 25 deletions(-) > > diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c > index 650e35656660..bc153cad9045 100644 > --- a/mm/debug_vm_pgtable.c > +++ b/mm/debug_vm_pgtable.c > @@ -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) > @@ -1339,13 +1337,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(); > > Reviewed-by: Anshuman Khandual