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.5 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,USER_AGENT_SANE_1 autolearn=ham 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 487CBC4338F for ; Fri, 23 Jul 2021 02:33:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B7A2E60EB0 for ; Fri, 23 Jul 2021 02:33:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B7A2E60EB0 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 482226B005D; Thu, 22 Jul 2021 22:33:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4319D6B006C; Thu, 22 Jul 2021 22:33:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2FA416B0070; Thu, 22 Jul 2021 22:33:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0070.hostedemail.com [216.40.44.70]) by kanga.kvack.org (Postfix) with ESMTP id 119446B005D for ; Thu, 22 Jul 2021 22:33:06 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id BB84324397 for ; Fri, 23 Jul 2021 02:33:05 +0000 (UTC) X-FDA: 78392280330.14.078E6D5 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf05.hostedemail.com (Postfix) with ESMTP id 1F312505F588 for ; Fri, 23 Jul 2021 02:33:05 +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 1CDE9113E; Thu, 22 Jul 2021 19:33:04 -0700 (PDT) Received: from [10.163.66.36] (unknown [10.163.66.36]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6A6FD3F694; Thu, 22 Jul 2021 19:33:01 -0700 (PDT) Subject: Re: [PATCH v3 08/12] mm/debug_vm_pgtable: Use struct pgtable_debug_args in PMD modifying tests To: Gavin Shan , linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, catalin.marinas@arm.com, will@kernel.org, akpm@linux-foundation.org, chuhu@redhat.com, shan.gavin@gmail.com References: <20210719130613.334901-1-gshan@redhat.com> <20210719130613.334901-9-gshan@redhat.com> <52a61d4a-f93d-af9e-4a34-d8ea7c476838@arm.com> <876f9722-c307-560d-5efd-3613c312c7bd@arm.com> <8d8daf85-0015-4221-aad5-5baa03e3f699@redhat.com> From: Anshuman Khandual Message-ID: <68b6ab2a-4b6d-a0b8-f753-01fdc165b24a@arm.com> Date: Fri, 23 Jul 2021 08:03:48 +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: <8d8daf85-0015-4221-aad5-5baa03e3f699@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Authentication-Results: imf05.hostedemail.com; dkim=none; spf=pass (imf05.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com; dmarc=pass (policy=none) header.from=arm.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 1F312505F588 X-Stat-Signature: 8eftqmgdnw186prjdi6mrptdwpsimxm7 X-HE-Tag: 1627007585-874368 Content-Transfer-Encoding: quoted-printable 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/23/21 6:30 AM, Gavin Shan wrote: > Hi Anshuman, >=20 > On 7/22/21 5:11 PM, Anshuman Khandual wrote: >> On 7/22/21 12:11 PM, Gavin Shan wrote: >>> On 7/22/21 3:45 PM, Anshuman Khandual wrote: >>>> On 7/19/21 6:36 PM, Gavin Shan wrote: >>>>> This uses struct pgtable_debug_args in PMD modifying tests. The all= ocated >>>>> huge page is used when set_pmd_at() is used. The corresponding test= s >>>>> are skipped if the huge page doesn't exist. Besides, the unused var= iable >>>>> @pmd_aligned in debug_vm_pgtable() is dropped. >>>> >>>> Please dont drop @pmd_aligned just yet. >>>> >>> >>> We need do so. Otherwise, there is build warning to complain >>> something like 'unused variable' after this patch is applied. >>> >>>>> >>>>> Signed-off-by: Gavin Shan >>>>> --- >>>>> =C2=A0=C2=A0 mm/debug_vm_pgtable.c | 102 ++++++++++++++++++++------= ---------------- >>>>> =C2=A0=C2=A0 1 file changed, 48 insertions(+), 54 deletions(-) >>>>> >>>>> diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c >>>>> index eb6dda88e0d9..cec3cbf99a6b 100644 >>>>> --- a/mm/debug_vm_pgtable.c >>>>> +++ b/mm/debug_vm_pgtable.c >>>>> @@ -213,54 +213,54 @@ static void __init pmd_basic_tests(struct pgt= able_debug_args *args, int idx) >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(!pmd_bad(pmd_mkhuge(pm= d))); >>>>> =C2=A0=C2=A0 } >>>>> =C2=A0=C2=A0 -static void __init pmd_advanced_tests(struct mm_struc= t *mm, >>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 struct vm_ar= ea_struct *vma, pmd_t *pmdp, >>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 unsigned lon= g pfn, unsigned long vaddr, >>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pgprot_t pro= t, pgtable_t pgtable) >>>>> +static void __init pmd_advanced_tests(struct pgtable_debug_args *a= rgs) >>>>> =C2=A0=C2=A0 { >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pmd_t pmd; >>>>> +=C2=A0=C2=A0=C2=A0 unsigned long vaddr =3D (args->vaddr & HPAGE_PM= D_MASK); >>>>> =C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (!has_transparent_hu= gepage()) >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return= ; >>>>> =C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pr_debug("Validating PM= D advanced\n"); >>>>> -=C2=A0=C2=A0=C2=A0 /* Align the address wrt HPAGE_PMD_SIZE */ >>>>> -=C2=A0=C2=A0=C2=A0 vaddr &=3D HPAGE_PMD_MASK; >>>> >>>> Please just leave these unchanged. If has_transparent_hugepage() eva= luates >>>> negative, it skips the masking operation. As mentioned earlier pleas= e avoid >>>> changing the test in any manner during these transition patches. >>>> >>> >>> Ok. >>> >>>>> +=C2=A0=C2=A0=C2=A0 if (args->pmd_pfn =3D=3D ULONG_MAX) { >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pr_debug("%s: Skipped\n= ", __func__); >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return; >>>>> +=C2=A0=C2=A0=C2=A0 } >>>> >>>> Just return. Please dont call out "Skipped". >>>> >>> >>> Ok. >>> >>>>> =C2=A0=C2=A0 -=C2=A0=C2=A0=C2=A0 pgtable_trans_huge_deposit(mm, pmd= p, pgtable); >>>>> +=C2=A0=C2=A0=C2=A0 pgtable_trans_huge_deposit(args->mm, args->pmdp= , args->start_ptep); >>>>> =C2=A0=C2=A0 -=C2=A0=C2=A0=C2=A0 pmd =3D pfn_pmd(pfn, prot); >>>>> -=C2=A0=C2=A0=C2=A0 set_pmd_at(mm, vaddr, pmdp, pmd); >>>>> -=C2=A0=C2=A0=C2=A0 pmdp_set_wrprotect(mm, vaddr, pmdp); >>>>> -=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*pmdp); >>>>> +=C2=A0=C2=A0=C2=A0 pmd =3D pfn_pmd(args->pmd_pfn, args->page_prot)= ; >>>>> +=C2=A0=C2=A0=C2=A0 set_pmd_at(args->mm, vaddr, args->pmdp, pmd); >>>>> +=C2=A0=C2=A0=C2=A0 pmdp_set_wrprotect(args->mm, vaddr, args->pmdp)= ; >>>>> +=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*(args->pmdp)); >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(pmd_write(pmd)); >>>>> -=C2=A0=C2=A0=C2=A0 pmdp_huge_get_and_clear(mm, vaddr, pmdp); >>>>> -=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*pmdp); >>>>> +=C2=A0=C2=A0=C2=A0 pmdp_huge_get_and_clear(args->mm, vaddr, args->= pmdp); >>>>> +=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*(args->pmdp)); >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(!pmd_none(pmd)); >>>>> =C2=A0=C2=A0 -=C2=A0=C2=A0=C2=A0 pmd =3D pfn_pmd(pfn, prot); >>>>> +=C2=A0=C2=A0=C2=A0 pmd =3D pfn_pmd(args->pmd_pfn, args->page_prot)= ; >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pmd =3D pmd_wrprotect(pmd); >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pmd =3D pmd_mkclean(pmd); >>>>> -=C2=A0=C2=A0=C2=A0 set_pmd_at(mm, vaddr, pmdp, pmd); >>>>> +=C2=A0=C2=A0=C2=A0 set_pmd_at(args->mm, vaddr, args->pmdp, pmd); >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pmd =3D pmd_mkwrite(pmd); >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pmd =3D pmd_mkdirty(pmd); >>>>> -=C2=A0=C2=A0=C2=A0 pmdp_set_access_flags(vma, vaddr, pmdp, pmd, 1)= ; >>>>> -=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*pmdp); >>>>> +=C2=A0=C2=A0=C2=A0 pmdp_set_access_flags(args->vma, vaddr, args->p= mdp, pmd, 1); >>>>> +=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*(args->pmdp)); >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(!(pmd_write(pmd) && pm= d_dirty(pmd))); >>>>> -=C2=A0=C2=A0=C2=A0 pmdp_huge_get_and_clear_full(vma, vaddr, pmdp, = 1); >>>>> -=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*pmdp); >>>>> +=C2=A0=C2=A0=C2=A0 pmdp_huge_get_and_clear_full(args->vma, vaddr, = args->pmdp, 1); >>>>> +=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*(args->pmdp)); >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(!pmd_none(pmd)); >>>>> =C2=A0=C2=A0 -=C2=A0=C2=A0=C2=A0 pmd =3D pmd_mkhuge(pfn_pmd(pfn, pr= ot)); >>>>> +=C2=A0=C2=A0=C2=A0 pmd =3D pmd_mkhuge(pfn_pmd(args->pmd_pfn, args-= >page_prot)); >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pmd =3D pmd_mkyoung(pmd); >>>>> -=C2=A0=C2=A0=C2=A0 set_pmd_at(mm, vaddr, pmdp, pmd); >>>>> -=C2=A0=C2=A0=C2=A0 pmdp_test_and_clear_young(vma, vaddr, pmdp); >>>>> -=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*pmdp); >>>>> +=C2=A0=C2=A0=C2=A0 set_pmd_at(args->mm, vaddr, args->pmdp, pmd); >>>>> +=C2=A0=C2=A0=C2=A0 pmdp_test_and_clear_young(args->vma, vaddr, arg= s->pmdp); >>>>> +=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*(args->pmdp)); >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(pmd_young(pmd)); >>>>> =C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /*=C2=A0 Clear the pte = entries=C2=A0 */ >>>>> -=C2=A0=C2=A0=C2=A0 pmdp_huge_get_and_clear(mm, vaddr, pmdp); >>>>> -=C2=A0=C2=A0=C2=A0 pgtable =3D pgtable_trans_huge_withdraw(mm, pmd= p); >>>>> +=C2=A0=C2=A0=C2=A0 pmdp_huge_get_and_clear(args->mm, vaddr, args->= pmdp); >>>>> +=C2=A0=C2=A0=C2=A0 pgtable_trans_huge_withdraw(args->mm, args->pmd= p); >>>>> =C2=A0=C2=A0 } >>>>> =C2=A0=C2=A0 =C2=A0 static void __init pmd_leaf_tests(struct pgtabl= e_debug_args *args) >>>>> @@ -417,12 +417,7 @@ static void __init pud_leaf_tests(struct pgtab= le_debug_args *args) { } >>>>> =C2=A0=C2=A0 #else=C2=A0 /* !CONFIG_TRANSPARENT_HUGEPAGE */ >>>>> =C2=A0=C2=A0 static void __init pmd_basic_tests(struct pgtable_debu= g_args *args, int idx) { } >>>>> =C2=A0=C2=A0 static void __init pud_basic_tests(struct pgtable_debu= g_args *args, int idx) { } >>>>> -static void __init pmd_advanced_tests(struct mm_struct *mm, >>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 struct vm_ar= ea_struct *vma, pmd_t *pmdp, >>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 unsigned lon= g pfn, unsigned long vaddr, >>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pgprot_t pro= t, pgtable_t pgtable) >>>>> -{ >>>>> -} >>>>> +static void __init pmd_advanced_tests(struct pgtable_debug_args *a= rgs) { } >>>>> =C2=A0=C2=A0 static void __init pud_advanced_tests(struct mm_struct= *mm, >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= struct vm_area_struct *vma, pud_t *pudp, >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= unsigned long pfn, unsigned long vaddr, >>>>> @@ -435,11 +430,11 @@ static void __init pmd_savedwrite_tests(struc= t pgtable_debug_args *args) { } >>>>> =C2=A0=C2=A0 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ >>>>> =C2=A0=C2=A0 =C2=A0 #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP >>>>> -static void __init pmd_huge_tests(pmd_t *pmdp, unsigned long pfn, = pgprot_t prot) >>>>> +static void __init pmd_huge_tests(struct pgtable_debug_args *args) >>>>> =C2=A0=C2=A0 { >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pmd_t pmd; >>>>> =C2=A0=C2=A0 -=C2=A0=C2=A0=C2=A0 if (!arch_vmap_pmd_supported(prot)= ) >>>>> +=C2=A0=C2=A0=C2=A0 if (!arch_vmap_pmd_supported(args->page_prot)) >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return= ; >>>>> =C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pr_debug("Validating PM= D huge\n"); >>>>> @@ -447,10 +442,11 @@ static void __init pmd_huge_tests(pmd_t *pmdp= , unsigned long pfn, pgprot_t prot) >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 * X86 defined pmd_set_hu= ge() verifies that the given >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 * PMD is not a populated= non-leaf entry. >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */ >>>>> -=C2=A0=C2=A0=C2=A0 WRITE_ONCE(*pmdp, __pmd(0)); >>>>> -=C2=A0=C2=A0=C2=A0 WARN_ON(!pmd_set_huge(pmdp, __pfn_to_phys(pfn),= prot)); >>>>> -=C2=A0=C2=A0=C2=A0 WARN_ON(!pmd_clear_huge(pmdp)); >>>>> -=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*pmdp); >>>>> +=C2=A0=C2=A0=C2=A0 WRITE_ONCE(*(args->pmdp), __pmd(0)); >>>> >>>> Possible extra braces. >>>> >>> >>> Will drop it in v4, thanks! >>> >>>>> +=C2=A0=C2=A0=C2=A0 WARN_ON(!pmd_set_huge(args->pmdp, __pfn_to_phys= (args->fixed_pmd_pfn), >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 args->page_prot)); >>>> >>>> Dont break the line. >>>> >>> >>> Ok. >>> >>>>> +=C2=A0=C2=A0=C2=A0 WARN_ON(!pmd_clear_huge(args->pmdp)); >>>>> +=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*(args->pmdp)); >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(!pmd_none(pmd)); >>>>> =C2=A0=C2=A0 } >>>>> =C2=A0=C2=A0 @@ -473,7 +469,7 @@ static void __init pud_huge_tests(= pud_t *pudp, unsigned long pfn, pgprot_t prot) >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(!pud_none(pud)); >>>>> =C2=A0=C2=A0 } >>>>> =C2=A0=C2=A0 #else /* !CONFIG_HAVE_ARCH_HUGE_VMAP */ >>>>> -static void __init pmd_huge_tests(pmd_t *pmdp, unsigned long pfn, = pgprot_t prot) { } >>>>> +static void __init pmd_huge_tests(struct pgtable_debug_args *args)= { } >>>>> =C2=A0=C2=A0 static void __init pud_huge_tests(pud_t *pudp, unsigne= d long pfn, pgprot_t prot) { } >>>>> =C2=A0=C2=A0 #endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ >>>>> =C2=A0=C2=A0 @@ -640,20 +636,19 @@ static void __init pte_clear_tes= ts(struct pgtable_debug_args *args) >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(!pte_none(pte)); >>>>> =C2=A0=C2=A0 } >>>>> =C2=A0=C2=A0 -static void __init pmd_clear_tests(struct mm_struct *= mm, pmd_t *pmdp) >>>>> +static void __init pmd_clear_tests(struct pgtable_debug_args *args= ) >>>>> =C2=A0=C2=A0 { >>>>> -=C2=A0=C2=A0=C2=A0 pmd_t pmd =3D READ_ONCE(*pmdp); >>>>> +=C2=A0=C2=A0=C2=A0 pmd_t pmd =3D READ_ONCE(*(args->pmdp)); >>>>> =C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pr_debug("Validating PM= D clear\n"); >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pmd =3D __pmd(pmd_val(pmd) | R= ANDOM_ORVALUE); >>>>> -=C2=A0=C2=A0=C2=A0 WRITE_ONCE(*pmdp, pmd); >>>>> -=C2=A0=C2=A0=C2=A0 pmd_clear(pmdp); >>>>> -=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*pmdp); >>>>> +=C2=A0=C2=A0=C2=A0 WRITE_ONCE(*(args->pmdp), pmd); >>>>> +=C2=A0=C2=A0=C2=A0 pmd_clear(args->pmdp); >>>>> +=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*(args->pmdp)); >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(!pmd_none(pmd)); >>>>> =C2=A0=C2=A0 } >>>>> =C2=A0=C2=A0 -static void __init pmd_populate_tests(struct mm_struc= t *mm, pmd_t *pmdp, >>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pgtable_t pg= table) >>>>> +static void __init pmd_populate_tests(struct pgtable_debug_args *a= rgs) >>>>> =C2=A0=C2=A0 { >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pmd_t pmd; >>>>> =C2=A0=C2=A0 @@ -662,8 +657,8 @@ static void __init pmd_populate_te= sts(struct mm_struct *mm, pmd_t *pmdp, >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 * This entry points to n= ext level page table page. >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 * Hence this must not qu= alify as pmd_bad(). >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */ >>>>> -=C2=A0=C2=A0=C2=A0 pmd_populate(mm, pmdp, pgtable); >>>>> -=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*pmdp); >>>>> +=C2=A0=C2=A0=C2=A0 pmd_populate(args->mm, args->pmdp, args->start_= ptep); >>>>> +=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*(args->pmdp)); >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(pmd_bad(pmd)); >>>>> =C2=A0=C2=A0 } >>>>> =C2=A0=C2=A0 @@ -1159,7 +1154,7 @@ static int __init debug_vm_pgtab= le(void) >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pgtable_t saved_ptep; >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pgprot_t prot; >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 phys_addr_t paddr; >>>>> -=C2=A0=C2=A0=C2=A0 unsigned long vaddr, pmd_aligned; >>>>> +=C2=A0=C2=A0=C2=A0 unsigned long vaddr; >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 unsigned long pud_aligned; >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 spinlock_t *ptl =3D NULL; >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 int idx, ret; >>>>> @@ -1194,7 +1189,6 @@ static int __init debug_vm_pgtable(void) >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */ >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 paddr =3D __pa_symbol(&start_k= ernel); >>>>> =C2=A0=C2=A0 -=C2=A0=C2=A0=C2=A0 pmd_aligned =3D (paddr & PMD_MASK)= >> PAGE_SHIFT; >>>> >>>> Please dont drop these just yet and wait until [PATCH 11/12]. >>>> >>> >>> Otherwise, it causes build warning: 'unused variable'. >> >> Why ? Just the evaluation of 'pmd_aligned' from 'paddr' should >> be enough to avoid such warning. 'pmd_aligned' need not be used >> afterwards. >> >=20 > It's not enough to avoid the warning. I apply the patches till > this one (PATCH[v3 08/12]) and have additional code to keep > @pmd_aligned, then I run into build warning as below: >=20 > diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c > index cec3cbf99a6b..961c9bb6fc7c 100644 > --- a/mm/debug_vm_pgtable.c > +++ b/mm/debug_vm_pgtable.c > @@ -1154,7 +1154,7 @@ static int __init debug_vm_pgtable(void) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pgtable_t saved_ptep; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pgprot_t prot; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 phys_addr_t paddr; > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 unsigned long vaddr; > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 unsigned long vaddr, pmd_aligned; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 unsigned long pud_aligned; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 spinlock_t *ptl =3D NULL; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 int idx, ret; > @@ -1189,6 +1189,7 @@ static int __init debug_vm_pgtable(void) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 paddr =3D __pa_symbol(&start= _kernel); > =C2=A0 > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pmd_aligned =3D (paddr & PMD_MASK= ) >> PAGE_SHIFT; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pud_aligned =3D (paddr & PUD= _MASK) >> PAGE_SHIFT; > =C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pgdp =3D pgd_offset(mm, vadd= r); >=20 > [gwshan@gshan l]$ make W=3D1 mm/debug_vm_pgtable.o > =C2=A0=C2=A0=C2=A0=C2=A0 : > mm/debug_vm_pgtable.c: In function =E2=80=98debug_vm_pgtable=E2=80=99: > mm/debug_vm_pgtable.c:1157:23: warning: variable =E2=80=98pmd_aligned=E2= =80=99 set but not used [-Wunused-but-set-variable] > =C2=A01157 |=C2=A0 unsigned long vaddr, pmd_aligned; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 ^~~~~~~~~~~ >=20 >=20 > By the way, 0-day is trying to build kernel with "W=3D1". It means the > build warnings will be reported by 0-day if the unused variables aren't > dropped from individual patches. It makes the review a bit harder. Howe= ver, It is not about keeping the review process simple. But rather the propose= d patch changing as much what is really required and nothing else. > we still need to keep each individual patch complete to make 'git bisec= t' > friendly. With W=3D1 if this throws up a build error, I guess we dont have choice h= ere. We need to keep the build clean for each individual patch applies.