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.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 016D2C4338F for ; Fri, 23 Jul 2021 01:01:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 220DE60EBD for ; Fri, 23 Jul 2021 01:01:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 220DE60EBD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 8B9476B005D; Thu, 22 Jul 2021 21:01:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 868816B006C; Thu, 22 Jul 2021 21:01:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 730CE6B0070; Thu, 22 Jul 2021 21:01:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0023.hostedemail.com [216.40.44.23]) by kanga.kvack.org (Postfix) with ESMTP id 519436B005D for ; Thu, 22 Jul 2021 21:01:19 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id DD90A19232 for ; Fri, 23 Jul 2021 01:01:18 +0000 (UTC) X-FDA: 78392049036.11.C08C2F6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf02.hostedemail.com (Postfix) with ESMTP id 7DEC170088CD for ; Fri, 23 Jul 2021 01:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627002006; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fgDr0yJetS9zOP53EO5TTRWKZaWog8b4cwZiRW0fLI8=; b=K+BfcJ299LitQ3cyre2Q/JmzI88bAyHHLhMlBl4GMkgeKgNvlVJD9knxWhlcPnCZNSE7f6 2s0JOfe6r3RNqrGKqXZUcNg5RXBDq+ebklQ1G0Ojjk0hpDgiSHPj4Ld0L89SpyiSXfiINu oyfDKAPGyP+dxgDw46y9U35tJ014tkw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627002011; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fgDr0yJetS9zOP53EO5TTRWKZaWog8b4cwZiRW0fLI8=; b=GPFux44bYOnxZlDiS38kTGo4TeZERuq3p91Jtd9VSLeU8CCF8HxpApc9j43xOeLzvQ9pU2 AWWbJx6XpIqIt+swKcj9nxQO7DRioNx9YDGA2bME/Sc/Z5CQ6LKICe6OMjfuhBqqsUp4XZ ZMC19VHpB1vLHDvIOEKhZqexNAOcNvg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-555-b-RF2xeUOuaBWsgWodFhMQ-1; Thu, 22 Jul 2021 21:00:04 -0400 X-MC-Unique: b-RF2xeUOuaBWsgWodFhMQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 535E6800C78; Fri, 23 Jul 2021 01:00:03 +0000 (UTC) Received: from [10.64.54.195] (vpn2-54-195.bne.redhat.com [10.64.54.195]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6EC1C10013D6; Fri, 23 Jul 2021 00:59:58 +0000 (UTC) Reply-To: Gavin Shan Subject: Re: [PATCH v3 08/12] mm/debug_vm_pgtable: Use struct pgtable_debug_args in PMD modifying tests To: Anshuman Khandual , 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> From: Gavin Shan Message-ID: <8d8daf85-0015-4221-aad5-5baa03e3f699@redhat.com> Date: Fri, 23 Jul 2021 11:00:15 +1000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.0 MIME-Version: 1.0 In-Reply-To: <876f9722-c307-560d-5efd-3613c312c7bd@arm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=K+BfcJ29; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GPFux44b; spf=none (imf02.hostedemail.com: domain of gshan@redhat.com has no SPF policy when checking 216.205.24.124) smtp.mailfrom=gshan@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspamd-Server: rspam02 X-Stat-Signature: wkbu76yu44w74pzao6dft9ee1rf1kso8 X-Rspamd-Queue-Id: 7DEC170088CD X-HE-Tag: 1627002012-197006 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: Hi Anshuman, 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 allo= cated >>>> huge page is used when set_pmd_at() is used. The corresponding tests >>>> are skipped if the huge page doesn't exist. Besides, the unused vari= able >>>> @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 mm/debug_vm_pgtable.c | 102 ++++++++++++++++++++------------= ---------- >>>> =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 pgta= ble_debug_args *args, int idx) >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(!pmd_bad(pmd_mkhuge(pmd))); >>>> =C2=A0 } >>>> =C2=A0 -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_area_= 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 long p= fn, 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 prot, = pgtable_t pgtable) >>>> +static void __init pmd_advanced_tests(struct pgtable_debug_args *ar= gs) >>>> =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_PMD= _MASK); >>>> =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (!has_transparent_hugepage= ()) >>>> =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 pr_debug("Validating PMD adva= nced\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() eval= uates >>> negative, it skips the masking operation. As mentioned earlier please= 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 pgtable_trans_huge_deposit(mm, pmdp, pgt= able); >>>> +=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 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 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->p= mdp); >>>> +=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*(args->pmdp)); >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(!pmd_none(pmd)); >>>> =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 pmd =3D pmd_wrprotect(pmd); >>>> =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 pmd =3D pmd_mkwrite(pmd); >>>> =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->pm= dp, pmd, 1); >>>> +=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*(args->pmdp)); >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(!(pmd_write(pmd) && pmd_dirt= y(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, a= rgs->pmdp, 1); >>>> +=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*(args->pmdp)); >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(!pmd_none(pmd)); >>>> =C2=A0 -=C2=A0=C2=A0=C2=A0 pmd =3D pmd_mkhuge(pfn_pmd(pfn, prot)); >>>> +=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 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, args= ->pmdp); >>>> +=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*(args->pmdp)); >>>> =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 Clear the pte entrie= s=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, pmdp= ); >>>> +=C2=A0=C2=A0=C2=A0 pmdp_huge_get_and_clear(args->mm, vaddr, args->p= mdp); >>>> +=C2=A0=C2=A0=C2=A0 pgtable_trans_huge_withdraw(args->mm, args->pmdp= ); >>>> =C2=A0 } >>>> =C2=A0 =C2=A0 static void __init pmd_leaf_tests(struct pgtable_debu= g_args *args) >>>> @@ -417,12 +417,7 @@ static void __init pud_leaf_tests(struct pgtabl= e_debug_args *args) { } >>>> =C2=A0 #else=C2=A0 /* !CONFIG_TRANSPARENT_HUGEPAGE */ >>>> =C2=A0 static void __init pmd_basic_tests(struct pgtable_debug_args= *args, int idx) { } >>>> =C2=A0 static void __init pud_basic_tests(struct pgtable_debug_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_area_= 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 long p= fn, 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 prot, = pgtable_t pgtable) >>>> -{ >>>> -} >>>> +static void __init pmd_advanced_tests(struct pgtable_debug_args *ar= gs) { } >>>> =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 str= uct 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 uns= igned long pfn, unsigned long vaddr, >>>> @@ -435,11 +430,11 @@ static void __init pmd_savedwrite_tests(struct= pgtable_debug_args *args) { } >>>> =C2=A0 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ >>>> =C2=A0 =C2=A0 #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP >>>> -static void __init pmd_huge_tests(pmd_t *pmdp, unsigned long pfn, p= gprot_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 pmd_t pmd; >>>> =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 return; >>>> =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pr_debug("Validating PMD 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 * X86 defined pmd_set_huge() v= erifies that the given >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 * PMD is not a populated non-l= eaf entry. >>>> =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 WARN_ON(!pmd_none(pmd)); >>>> =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 WARN_ON(!pud_none(pud)); >>>> =C2=A0 } >>>> =C2=A0 #else /* !CONFIG_HAVE_ARCH_HUGE_VMAP */ >>>> -static void __init pmd_huge_tests(pmd_t *pmdp, unsigned long pfn, p= gprot_t prot) { } >>>> +static void __init pmd_huge_tests(struct pgtable_debug_args *args) = { } >>>> =C2=A0 static void __init pud_huge_tests(pud_t *pudp, unsigned long= pfn, pgprot_t prot) { } >>>> =C2=A0 #endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ >>>> =C2=A0 @@ -640,20 +636,19 @@ static void __init pte_clear_tests(str= uct pgtable_debug_args *args) >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(!pte_none(pte)); >>>> =C2=A0 } >>>> =C2=A0 -static void __init pmd_clear_tests(struct mm_struct *mm, pm= d_t *pmdp) >>>> +static void __init pmd_clear_tests(struct pgtable_debug_args *args) >>>> =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 pr_debug("Validating PMD clea= r\n"); >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pmd =3D __pmd(pmd_val(pmd) | RANDOM_= 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 WARN_ON(!pmd_none(pmd)); >>>> =C2=A0 } >>>> =C2=A0 -static void __init pmd_populate_tests(struct mm_struct *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 pgtab= le) >>>> +static void __init pmd_populate_tests(struct pgtable_debug_args *ar= gs) >>>> =C2=A0 { >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pmd_t pmd; >>>> =C2=A0 @@ -662,8 +657,8 @@ static void __init pmd_populate_tests(st= ruct mm_struct *mm, pmd_t *pmdp, >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 * This entry points to next le= vel page table page. >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 * Hence this must not qualify = as pmd_bad(). >>>> =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_p= tep); >>>> +=C2=A0=C2=A0=C2=A0 pmd =3D READ_ONCE(*(args->pmdp)); >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 WARN_ON(pmd_bad(pmd)); >>>> =C2=A0 } >>>> =C2=A0 @@ -1159,7 +1154,7 @@ static int __init debug_vm_pgtable(voi= d) >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pgtable_t saved_ptep; >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pgprot_t prot; >>>> =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 unsigned long pud_aligned; >>>> =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 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 paddr =3D __pa_symbol(&start_kernel)= ; >>>> =C2=A0 -=C2=A0=C2=A0=C2=A0 pmd_aligned =3D (paddr & PMD_MASK) >> PA= GE_SHIFT; >>> >>> Please dont drop these just yet and wait until [PATCH 11/12]. >>> >> >> Otherwise, it causes build warning: 'unused variable'. >=20 > 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: 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) pgtable_t saved_ptep; pgprot_t prot; phys_addr_t paddr; - unsigned long vaddr; + unsigned long vaddr, pmd_aligned; unsigned long pud_aligned; spinlock_t *ptl =3D NULL; int idx, ret; @@ -1189,6 +1189,7 @@ static int __init debug_vm_pgtable(void) */ paddr =3D __pa_symbol(&start_kernel); =20 + pmd_aligned =3D (paddr & PMD_MASK) >> PAGE_SHIFT; pud_aligned =3D (paddr & PUD_MASK) >> PAGE_SHIFT; =20 pgdp =3D pgd_offset(mm, vaddr); [gwshan@gshan l]$ make W=3D1 mm/debug_vm_pgtable.o : 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] 1157 | unsigned long vaddr, pmd_aligned; | ^~~~~~~~~~~ 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. Howeve= r, we still need to keep each individual patch complete to make 'git bisect' friendly. Thanks, Gavin