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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19233C369D5 for ; Mon, 28 Apr 2025 13:16:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 88ACF6B00A9; Mon, 28 Apr 2025 09:16:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 811D76B00AF; Mon, 28 Apr 2025 09:16:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6B3A76B00B0; Mon, 28 Apr 2025 09:16:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 4D6726B00A9 for ; Mon, 28 Apr 2025 09:16:40 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 17EE2BBF2F for ; Mon, 28 Apr 2025 13:16:41 +0000 (UTC) X-FDA: 83383502202.22.854942A Received: from out-186.mta0.migadu.com (out-186.mta0.migadu.com [91.218.175.186]) by imf14.hostedemail.com (Postfix) with ESMTP id 3E3C1100008 for ; Mon, 28 Apr 2025 13:16:39 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=IRbRJrde; spf=pass (imf14.hostedemail.com: domain of lance.yang@linux.dev designates 91.218.175.186 as permitted sender) smtp.mailfrom=lance.yang@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745846199; h=from:from:sender: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:dkim-signature; bh=ZDpYjstdd/DhgHEufcBds9bwNo3Lzx1GtED2qA5h/CM=; b=7gQI9UCDK39PJDx27xzRt2+IFIhHN4bxexpJcg/blX8OpWRhM3T1qOK8XsRv9WlTQTKfFB HcbgVi7+7k0imSLPoF1jtdry6xVgpC61kbdYKo/a7EA5q6aeXTDyu5idgN4RmLBguffCMx kUgYtJEIcu2c1wkJskQa/usq1SBQ1eI= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=IRbRJrde; spf=pass (imf14.hostedemail.com: domain of lance.yang@linux.dev designates 91.218.175.186 as permitted sender) smtp.mailfrom=lance.yang@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745846199; a=rsa-sha256; cv=none; b=okptdp2ifKB14MiGpPps/SPQ1H08k9yjIjuKQm8GHjjZN2sPUWmOH7+TToXz2Oc8v3EvCH BL0CR6FdgX834OeIOmFZfl3BBAHM02Bn17f+CAT9SIw3jBheTw3irqF+A12SVM/OKvMc+/ cnx+nCCTCFwTn72nkps1ogZp4iMMQj4= Message-ID: <29c70c06-42c2-4bc0-a56e-443a1200fde0@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1745846196; h=from:from: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=ZDpYjstdd/DhgHEufcBds9bwNo3Lzx1GtED2qA5h/CM=; b=IRbRJrdeO0WfMYiAZuGndCEUziv3aIyli9DwyUUonpjfGgCWLCpIDGDqWqQdrOhRbsjA4D t8wNN1hTguxQA+36bugJrqOpBYh1m9X+HQIAQhQMMBjkALjwcztCFD80XfmQUmQ1x3oXSh mYWN98Eim6j2eqABxeIac0bJhrWG8Nk= Date: Mon, 28 Apr 2025 21:16:16 +0800 MIME-Version: 1.0 Subject: Re: [PATCH 6/7] mm: Batch around can_change_pte_writable() Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Lance Yang To: Dev Jain , akpm@linux-foundation.org Cc: ryan.roberts@arm.com, david@redhat.com, willy@infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, will@kernel.org, Liam.Howlett@oracle.com, lorenzo.stoakes@oracle.com, vbabka@suse.cz, jannh@google.com, anshuman.khandual@arm.com, peterx@redhat.com, joey.gouly@arm.com, ioworker0@gmail.com, baohua@kernel.org, kevin.brodsky@arm.com, quic_zhenhuah@quicinc.com, christophe.leroy@csgroup.eu, yangyicong@hisilicon.com, linux-arm-kernel@lists.infradead.org, namit@vmware.com, hughd@google.com, yang@os.amperecomputing.com, ziy@nvidia.com References: <20250428120414.12101-1-dev.jain@arm.com> <20250428120414.12101-7-dev.jain@arm.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Stat-Signature: xjcmsp8u9aaqwrrxno51rbf7rm8jg55z X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 3E3C1100008 X-Rspam-User: X-HE-Tag: 1745846198-138748 X-HE-Meta: U2FsdGVkX1/RCJ5CRnBQc4kqeaZD3aMLMvMP1wY03xrwy9s+HqMULLkzBSrC4vkIk09b3ZbUitiTpkfXfwPsBwmVKkQB2fJOvV0r624TtRtKir0R99Li+usLuG05dBOtgPRwsxxIT4vwBrg92X3yyFH/1ZoOhuLTR8TtH+uun02H5goeCUepuNrbotp7pgvTYgKOVznl85MAuxyVC6YvWlQ9TaxLYiuGtzmqhi1ifGzHVTw90IlrUjsMhzCSMG4prnSOgxgZW5q1uUeDWxGzM0VRDiWSvzaS5Cb+4CuKCIl/YIPEaZxLyfDf+pp1Yu0K7W7OOolj+kGHb4DNjXJtreiwlVM4/mha1sBTPPhGiRHajtLZuYrOvCNyBAlWyNQ+ceHEAUyC22h7TTc+xJpUu10+IRvWCypKBYhkd7NlpaFYB1C19HouRglxq6NfxtN8kcrVIX2tWgg0j/TMpCkmquAiruKlYBP7124l47FtnwKiRDUlo0dGTOQVCuzpe3BhAFSS9cHC45EWttPJkMRB5L+XwOrIGgB+1fMYYQZypyHr60ft2d5Y36kkVDu64qScrMJSSwbtiZ2Y2THQ3XkkmxmjN37SsXFlBagRIrXlmAFSwPOA0WwiEgKkL4WVcm8PoK+eRowryi9wRmghEVK0YkFw7hy78Dlr/6+PnOMpdjQZg4bCsoRn+q6tmSUpFCaU/UOt1EZbier8uggpDVRQt1IHgn43hc7ob7Bfnek1IV3D504r6hPFGvdHOaFwbsHV3IMDfTxXIXk12DRIpjUaArqqfQTgbEt5yJWE8etUzwzwmvHTnfA6FeRWIihe1OEDgmnJKwPayd/UMveUmjf6OuoV3YhGBu85tmtvz8UU3VF7WHhV4opRMidfQHT1FshxOFpX6gR05zbzJEA5YwuvFJhiF0YO275Z2o1rsA9hNzVThDhUaKWNoQQHEQvBsIwOAD5sUGmAU2G1Yoa6SXb hJqqBJ+S DtD9O05iiDe7SNzeENTqsYlcz3kmiC6cpydg2PxfIdpimM6rCz5X074yR6WpT7P/643uHhXy31FJlVu2xLlsonxmquP/mi4ZSc2DtcQ9BF693bQnComXJtqui0OzxVljH9HpY124mpMYXmw+UpfgIausQlTNVZEAYDhsU2aZ2RAc4P3GXUx49dCBHE06ykMQJLOkvq9u2qmlMgEDZ0L9WtJQyorQ0gOr7Xn1An2aPLtQyPx3miKZmocQmE7ZzvNZehuXzhTm8LSOaiYu5Ibw6kc4H7i/CVhvprOjsMUNGKWyCvltCFfbNg2y0i4GTtTKk8sY1 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: List-Subscribe: List-Unsubscribe: On 2025/4/28 20:50, Lance Yang wrote: > Hey Dev, > > On 2025/4/28 20:04, Dev Jain wrote: >> In preparation for patch 7, we need to properly batch around >> can_change_pte_writable(). We batch around pte_needs_soft_dirty_wp() by >> the corresponding fpb flag, we batch around the page-anon exclusive check >> using folio_maybe_mapped_shared(); modify_prot_start_ptes() collects the >> dirty and access bits across the batch, therefore batching across >> pte_dirty(): this is correct since the dirty bit on the PTE really >> is just an indication that the folio got written to, so even if >> the PTE is not actually dirty (but one of the PTEs in the batch is), >> the wp-fault optimization can be made. >> >> Signed-off-by: Dev Jain >> --- >>   include/linux/mm.h | 4 ++-- >>   mm/gup.c           | 2 +- >>   mm/huge_memory.c   | 4 ++-- >>   mm/memory.c        | 6 +++--- >>   mm/mprotect.c      | 9 ++++++--- >>   5 files changed, 14 insertions(+), 11 deletions(-) >> >> diff --git a/include/linux/mm.h b/include/linux/mm.h >> index 5eb0d77c4438..ffa02e15863f 100644 >> --- a/include/linux/mm.h >> +++ b/include/linux/mm.h >> @@ -2710,8 +2710,8 @@ int get_cmdline(struct task_struct *task, char >> *buffer, int buflen); >>   #define  MM_CP_UFFD_WP_ALL                 (MM_CP_UFFD_WP | \ >>                           MM_CP_UFFD_WP_RESOLVE) >> -bool can_change_pte_writable(struct vm_area_struct *vma, unsigned >> long addr, >> -                 pte_t pte); >> +bool can_change_ptes_writable(struct vm_area_struct *vma, unsigned >> long addr, >> +                 pte_t pte, struct folio *folio, unsigned int nr); >>   extern long change_protection(struct mmu_gather *tlb, >>                     struct vm_area_struct *vma, unsigned long start, >>                     unsigned long end, unsigned long cp_flags); >> diff --git a/mm/gup.c b/mm/gup.c >> index 84461d384ae2..6a605fc5f2cb 100644 >> --- a/mm/gup.c >> +++ b/mm/gup.c >> @@ -614,7 +614,7 @@ static inline bool can_follow_write_common(struct >> page *page, >>           return false; >>       /* >> -     * See can_change_pte_writable(): we broke COW and could map the >> page >> +     * See can_change_ptes_writable(): we broke COW and could map the >> page >>        * writable if we have an exclusive anonymous page ... >>        */ >>       return page && PageAnon(page) && PageAnonExclusive(page); >> diff --git a/mm/huge_memory.c b/mm/huge_memory.c >> index 28c87e0e036f..e5496c0d9e7e 100644 >> --- a/mm/huge_memory.c >> +++ b/mm/huge_memory.c >> @@ -2032,12 +2032,12 @@ static inline bool >> can_change_pmd_writable(struct vm_area_struct *vma, >>           return false; >>       if (!(vma->vm_flags & VM_SHARED)) { >> -        /* See can_change_pte_writable(). */ >> +        /* See can_change_ptes_writable(). */ >>           page = vm_normal_page_pmd(vma, addr, pmd); >>           return page && PageAnon(page) && PageAnonExclusive(page); >>       } >> -    /* See can_change_pte_writable(). */ >> +    /* See can_change_ptes_writable(). */ >>       return pmd_dirty(pmd); >>   } >> diff --git a/mm/memory.c b/mm/memory.c >> index b9e8443aaa86..b1fda3de8d27 100644 >> --- a/mm/memory.c >> +++ b/mm/memory.c >> @@ -750,7 +750,7 @@ static void restore_exclusive_pte(struct >> vm_area_struct *vma, >>           pte = pte_mkuffd_wp(pte); >>       if ((vma->vm_flags & VM_WRITE) && >> -        can_change_pte_writable(vma, address, pte)) { >> +        can_change_ptes_writable(vma, address, pte, NULL, 1)) { >>           if (folio_test_dirty(folio)) >>               pte = pte_mkdirty(pte); >>           pte = pte_mkwrite(pte, vma); >> @@ -5767,7 +5767,7 @@ static void numa_rebuild_large_mapping(struct >> vm_fault *vmf, struct vm_area_stru >>               ptent = pte_modify(ptent, vma->vm_page_prot); >>               writable = pte_write(ptent); >>               if (!writable && pte_write_upgrade && >> -                can_change_pte_writable(vma, addr, ptent)) >> +                can_change_ptes_writable(vma, addr, ptent, NULL, 1)) >>                   writable = true; >>           } >> @@ -5808,7 +5808,7 @@ static vm_fault_t do_numa_page(struct vm_fault >> *vmf) >>        */ >>       writable = pte_write(pte); >>       if (!writable && pte_write_upgrade && >> -        can_change_pte_writable(vma, vmf->address, pte)) >> +        can_change_ptes_writable(vma, vmf->address, pte, NULL, 1)) >>           writable = true; >>       folio = vm_normal_folio(vma, vmf->address, pte); >> diff --git a/mm/mprotect.c b/mm/mprotect.c >> index 33eabc995584..362fd7e5457d 100644 >> --- a/mm/mprotect.c >> +++ b/mm/mprotect.c >> @@ -40,8 +40,8 @@ >>   #include "internal.h" >> -bool can_change_pte_writable(struct vm_area_struct *vma, unsigned >> long addr, >> -                 pte_t pte) >> +bool can_change_ptes_writable(struct vm_area_struct *vma, unsigned >> long addr, >> +                  pte_t pte, struct folio *folio, unsigned int nr) >>   { >>       struct page *page; >> @@ -67,6 +67,9 @@ bool can_change_pte_writable(struct vm_area_struct >> *vma, unsigned long addr, >>            * write-fault handler similarly would map them writable >> without >>            * any additional checks while holding the PT lock. >>            */ >> +        if (unlikely(nr != 1)) >> +            return !folio_maybe_mapped_shared(folio); >> + >>           page = vm_normal_page(vma, addr, pte); >>           return page && PageAnon(page) && PageAnonExclusive(page); >>       } > > IIUC, As mentioned in the comment above, we should do the same anonymous > check > to large folios. And folio_maybe_mapped_shared() already handles both > order-0 > and large folios nicely, so we could simplify the logic as follows: Forget to add: Note that the exclusive flag is set only for non-large folios or the head page of large folios during mapping, so PageAnonExclusive() will always return false for tail pages of large folios, IIUC. Thanks, Lance > > diff --git a/mm/mprotect.c b/mm/mprotect.c > index 1605e89349d2..df56a30bb241 100644 > --- a/mm/mprotect.c > +++ b/mm/mprotect.c > @@ -43,8 +43,6 @@ >  bool can_change_ptes_writable(struct vm_area_struct *vma, unsigned > long addr, >                               pte_t pte, struct folio *folio, unsigned > int nr) >  { > -       struct page *page; > - >         if (WARN_ON_ONCE(!(vma->vm_flags & VM_WRITE))) >                 return false; > > @@ -67,11 +65,7 @@ bool can_change_ptes_writable(struct vm_area_struct > *vma, unsigned long addr, >                  * write-fault handler similarly would map them > writable without >                  * any additional checks while holding the PT lock. >                  */ > -               if (unlikely(nr != 1)) > -                       return !folio_maybe_mapped_shared(folio); > - > -               page = vm_normal_page(vma, addr, pte); > -               return page && PageAnon(page) && PageAnonExclusive(page); > +               return folio_test_anon(folio) && ! > folio_maybe_mapped_shared(folio); >         } > >         VM_WARN_ON_ONCE(is_zero_pfn(pte_pfn(pte)) && pte_dirty(pte)); > -- > > Thanks, > Lance > >> @@ -222,7 +225,7 @@ static long change_pte_range(struct mmu_gather *tlb, >>                */ >>               if ((cp_flags & MM_CP_TRY_CHANGE_WRITABLE) && >>                   !pte_write(ptent) && >> -                can_change_pte_writable(vma, addr, ptent)) >> +                can_change_ptes_writable(vma, addr, ptent, folio, 1)) >>                   ptent = pte_mkwrite(ptent, vma); >>               ptep_modify_prot_commit(vma, addr, pte, oldpte, ptent); >