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=-17.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 8C769C4338F for ; Wed, 25 Aug 2021 16:20:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1009561153 for ; Wed, 25 Aug 2021 16:20:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1009561153 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 44CD68D0001; Wed, 25 Aug 2021 12:20:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3FBF66B0072; Wed, 25 Aug 2021 12:20:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C51E8D0001; Wed, 25 Aug 2021 12:20:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0192.hostedemail.com [216.40.44.192]) by kanga.kvack.org (Postfix) with ESMTP id 0FF936B0071 for ; Wed, 25 Aug 2021 12:20:41 -0400 (EDT) Received: from smtpin38.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 9EA75253B2 for ; Wed, 25 Aug 2021 16:20:40 +0000 (UTC) X-FDA: 78514116240.38.DEFF031 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by imf11.hostedemail.com (Postfix) with ESMTP id 8E1F9F00020E for ; Wed, 25 Aug 2021 16:20:39 +0000 (UTC) Received: by mail-pf1-f174.google.com with SMTP id w68so229598pfd.0 for ; Wed, 25 Aug 2021 09:20:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=WfApXgIAJKG8HDMpDxeWIJ0g5a0zCGdRTXnLP/N3w6w=; b=yNWmLg4D3MPNwz3iBAd040R8jR3mwmiT7/OveoBUnx9MNH0mZGUVD5U24u+11fAfKu a91IZ8N7rdaeM0orJk9dy3N0mjCx0Yu0Sfpiog/Q0vvp5SjYBYa+qB5aucbHlPvnFQxg ELDRto3TAI3GsKS4J5a7nQHfFBCd8MS8Em89BuJD8j8ZUk/ROgeXYelhYWzO9Ynho1mq Db15kqUQUWEeBPBAI9ezdNAxXbSzajoKJWmZTScnNGMZvCjyw6jXoE8XpGD3UA0+LVPF B1qo2b1h/VoOZgU61Jjek+nZEIIsBbUB2TYNMi/CBZ7lLCGLRI69QP+7/KPDIMTjF+5X ZxBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=WfApXgIAJKG8HDMpDxeWIJ0g5a0zCGdRTXnLP/N3w6w=; b=I3d1Bne2Wfj0GSruNTFdGtylr4AsEIPbUChnp8bFMhHncHgGkDd6qvX1LB5n8IWhL6 NL3a+jW2nTEhACYu+wFRBJiwgQzOBFN8yoK9Xf3eq+csG4MQJkMRdUCOv4GY2fOABTZl 0HQUxpE15tZKiSMaPRDqPc01D95EuxYeAhwrE441PPXa5/1mR2jHEUi0oC/b0KpgG37S QCY4v/buve7ziUxB2bVZsdXU6C8O4kpjnrBot4s0lQ18PMNB5bhBXIlq+7Ntxjxotnb5 yptg2R/QoeNopURTJDZH4m1ESDEsLAqBuQ0Kif76RDML4jkd0MUtFMCkyxgjYm0gzzl6 niKA== X-Gm-Message-State: AOAM5325mXzfZfZssRgWFeabHAIwhYriO4bv5kGYGLgYbmYPdGD4Bya2 aSifEOIW5oTRmYpz/2+mxD0JRg== X-Google-Smtp-Source: ABdhPJwrAL8hgbvN02uYYKtBnE1DUYV7Xq1vYTj0mWjw2e7+NUaM6k7pyNoflK0khzA8RTUOnBiSQQ== X-Received: by 2002:a63:2242:: with SMTP id t2mr41795283pgm.111.1629908438181; Wed, 25 Aug 2021 09:20:38 -0700 (PDT) Received: from [10.255.189.11] ([139.177.225.249]) by smtp.gmail.com with ESMTPSA id t13sm121019pjg.25.2021.08.25.09.20.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 25 Aug 2021 09:20:37 -0700 (PDT) Subject: Re: [PATCH v2 1/9] mm: introduce pmd_install() helper To: David Hildenbrand , akpm@linux-foundation.org, tglx@linutronix.de, hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com, kirill.shutemov@linux.intel.com, mika.penttila@nextfour.com Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, songmuchun@bytedance.com References: <20210819031858.98043-1-zhengqi.arch@bytedance.com> <20210819031858.98043-2-zhengqi.arch@bytedance.com> From: Qi Zheng Message-ID: Date: Thu, 26 Aug 2021 00:20:31 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=bytedance-com.20150623.gappssmtp.com header.s=20150623 header.b=yNWmLg4D; spf=pass (imf11.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.174 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 8E1F9F00020E X-Stat-Signature: 11eqsyyuz6rnizcwumr4okso7ykjusdf X-HE-Tag: 1629908439-88056 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 2021/8/25 AM12:26, David Hildenbrand wrote: > On 19.08.21 05:18, Qi Zheng wrote: >> Currently we have three times the same few lines repeated in the >> code. Deduplicate them by newly introduced pmd_install() helper. >> >> Signed-off-by: Qi Zheng >> --- >> =C2=A0 include/linux/mm.h |=C2=A0 1 + >> =C2=A0 mm/filemap.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 11 ++-------= -- >> =C2=A0 mm/memory.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 34 ++++= ++++++++++++------------------ >> =C2=A0 3 files changed, 19 insertions(+), 27 deletions(-) >> >> diff --git a/include/linux/mm.h b/include/linux/mm.h >> index ce8fc0fd6d6e..57e48217bd71 100644 >> --- a/include/linux/mm.h >> +++ b/include/linux/mm.h >> @@ -2471,6 +2471,7 @@ static inline spinlock_t *pud_lock(struct=20 >> mm_struct *mm, pud_t *pud) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return ptl; >> =C2=A0 } >> +extern void pmd_install(struct mm_struct *mm, pmd_t *pmd, pgtable_t=20 >> *pte); >> =C2=A0 extern void __init pagecache_init(void); >> =C2=A0 extern void __init free_area_init_memoryless_node(int nid); >> =C2=A0 extern void free_initmem(void); >> diff --git a/mm/filemap.c b/mm/filemap.c >> index 53913fced7ae..9f773059c6dc 100644 >> --- a/mm/filemap.c >> +++ b/mm/filemap.c >> @@ -3210,15 +3210,8 @@ static bool filemap_map_pmd(struct vm_fault=20 >> *vmf, struct page *page) >> =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 if (pmd_none(*vmf->pmd)) { >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 vmf->ptl =3D pmd_lock(mm, = vmf->pmd); >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (likely(pmd_none(*vmf->= pmd))) { >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 mm= _inc_nr_ptes(mm); >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pm= d_populate(mm, vmf->pmd, vmf->prealloc_pte); >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 vm= f->prealloc_pte =3D NULL; >> -=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 spin_unlock(vmf->ptl); >> -=C2=A0=C2=A0=C2=A0 } >> +=C2=A0=C2=A0=C2=A0 if (pmd_none(*vmf->pmd)) >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pmd_install(mm, vmf->pmd, = &vmf->prealloc_pte); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /* See comment in handle_pte_fault() */ >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (pmd_devmap_trans_unstable(vmf->pmd)= ) { >> diff --git a/mm/memory.c b/mm/memory.c >> index 39e7a1495c3c..ef7b1762e996 100644 >> --- a/mm/memory.c >> +++ b/mm/memory.c >> @@ -433,9 +433,20 @@ void free_pgtables(struct mmu_gather *tlb, struct= =20 >> vm_area_struct *vma, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >> =C2=A0 } >> +void pmd_install(struct mm_struct *mm, pmd_t *pmd, pgtable_t *pte) >> +{ >> +=C2=A0=C2=A0=C2=A0 spinlock_t *ptl =3D pmd_lock(mm, pmd); >> + >> +=C2=A0=C2=A0=C2=A0 if (likely(pmd_none(*pmd))) {=C2=A0=C2=A0=C2=A0 /*= Has another populated it ? */ >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 mm_inc_nr_ptes(mm); >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pmd_populate(mm, pmd, *pte= ); >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 *pte =3D NULL; >> +=C2=A0=C2=A0=C2=A0 } >> +=C2=A0=C2=A0=C2=A0 spin_unlock(ptl); >> +} >> + >> =C2=A0 int __pte_alloc(struct mm_struct *mm, pmd_t *pmd) >> =C2=A0 { >> -=C2=A0=C2=A0=C2=A0 spinlock_t *ptl; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pgtable_t new =3D pte_alloc_one(mm); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (!new) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return -ENOMEM; >> @@ -455,13 +466,7 @@ int __pte_alloc(struct mm_struct *mm, pmd_t *pmd) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */ >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 smp_wmb(); /* Could be smp_wmb__xxx(bef= ore|after)_spin_lock */ >> -=C2=A0=C2=A0=C2=A0 ptl =3D pmd_lock(mm, pmd); >> -=C2=A0=C2=A0=C2=A0 if (likely(pmd_none(*pmd))) {=C2=A0=C2=A0=C2=A0 /*= Has another populated it ? */ >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 mm_inc_nr_ptes(mm); >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pmd_populate(mm, pmd, new)= ; >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 new =3D NULL; >> -=C2=A0=C2=A0=C2=A0 } >> -=C2=A0=C2=A0=C2=A0 spin_unlock(ptl); >> +=C2=A0=C2=A0=C2=A0 pmd_install(mm, pmd, &new); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (new) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pte_free(mm, ne= w); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return 0; >> @@ -4027,17 +4032,10 @@ vm_fault_t finish_fault(struct vm_fault *vmf) >> =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 return ret; >> =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 if (vmf->prealloc_pte) { >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 vm= f->ptl =3D pmd_lock(vma->vm_mm, vmf->pmd); >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if= (likely(pmd_none(*vmf->pmd))) { >> -=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 mm_inc_nr_ptes(vma->vm_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 pmd_populate(vma->vm_mm, vmf->pmd, vmf->prealloc_pt= e); >> -=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 vmf->prealloc_pte =3D NULL; >> -=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 sp= in_unlock(vmf->ptl); >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } else if (unlikely(pte_al= loc(vma->vm_mm, vmf->pmd))) { >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (vmf->prealloc_pte) >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pm= d_install(vma->vm_mm, vmf->pmd, &vmf->prealloc_pte); >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 else if (unlikely(pte_allo= c(vma->vm_mm, vmf->pmd))) >> =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 return VM_FAULT_OOM; >> -=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 /* See comment in handle_pte_fault() */ >> >=20 > Reviewed-by: David Hildenbrand Thanks for your review, I will add this to the patch v3. >=20 > That's mostly unrelated to the remaining part of the series and can be=20 > picked up early. The implementation of subsequent patches depends on pmd_install(). So I am worried that if this patch is submitted as a separate patch, subsequent patches will not be updated until this patch is merged. What do you think? >=20