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 8716BC369D5 for ; Mon, 28 Apr 2025 13:23:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D38D26B0083; Mon, 28 Apr 2025 09:23:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CE8EF6B008C; Mon, 28 Apr 2025 09:23:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B6BF56B0083; Mon, 28 Apr 2025 09:23:36 -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 8E9AA6B0083 for ; Mon, 28 Apr 2025 09:23:36 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6F254C044A for ; Mon, 28 Apr 2025 13:23:36 +0000 (UTC) X-FDA: 83383519632.05.9F644F2 Received: from out-177.mta0.migadu.com (out-177.mta0.migadu.com [91.218.175.177]) by imf16.hostedemail.com (Postfix) with ESMTP id 82BA7180009 for ; Mon, 28 Apr 2025 13:23:34 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=VU8VOs8X; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf16.hostedemail.com: domain of lance.yang@linux.dev designates 91.218.175.177 as permitted sender) smtp.mailfrom=lance.yang@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745846614; a=rsa-sha256; cv=none; b=FZL6nn4naiZ8hBsI8M7xmrWLxoj5nFr8ZlY7v295/pvcNXtVPR5DzckIDZB0cWjDMBpArg TQrcXzUz/3yWtxUZIAWxDdp9KEScQsDJmIYX/+5uvsd9l1Jf8aejEIGvI7QKgxMQeEh4IT 2V1Lj7evRKp+dv2G/gFHXpYIy9SiFBk= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=VU8VOs8X; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf16.hostedemail.com: domain of lance.yang@linux.dev designates 91.218.175.177 as permitted sender) smtp.mailfrom=lance.yang@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745846614; 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=Z6OvVULSMnVqxjIcXe5c/gS9iiRSrJXCtK4Gv9I6sXU=; b=UzPKOX9qOsMsfiVj5b1WRtbilTyA5jSDu2lUGR/XVV51ZWfyNFg8BHypcSKInBcwLBUNf6 hfs3XfxRu/WVU7wRHpBqhDvvhvZ3gxnmpHQ2lUhb8kwHqxI6AMReebaF91AUDQjjJsR2D9 aS9zCQkFPDzx75+taH6mEOkpH1BrSuw= Message-ID: <12dd5cdf-6255-4645-b132-b79a3a01f492@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1745846612; 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=Z6OvVULSMnVqxjIcXe5c/gS9iiRSrJXCtK4Gv9I6sXU=; b=VU8VOs8XYESOTAi+d224zLezIQx56aTpzXhqKHFzvCP7BZLvUX7R9EZd0wKIKdkuiEWrBz 7PNE3WkzyXJYQfgEK4C1ymaX/K+BtlizgOz0whaBeB4C+klL4UrQCH1zH0zwyNFnq8VOVm guSrINGnNA/HB6lOBUKc/baftPh8bFA= Date: Mon, 28 Apr 2025 21:23:20 +0800 MIME-Version: 1.0 Subject: Re: [PATCH 6/7] mm: Batch around can_change_pte_writable() Content-Language: en-US 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> <083865e8-572b-41b2-9221-3cee01349fab@arm.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Lance Yang In-Reply-To: <083865e8-572b-41b2-9221-3cee01349fab@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 82BA7180009 X-Stat-Signature: 59mwubsx5o5a6ucg9oqzzcpn4ezg5rng X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1745846614-166467 X-HE-Meta: U2FsdGVkX1+RqwvgLcLczTD/jTEGn2m0Fn7xyTym5GRNDgChnv9txt87HfsHGzbw2P4WcPtJhf2WmQXfiNbvKAW/FZBWYOgfrvv2con77mCDAeadDzPvvC2wk8mNw11gjAFAENOZQ/UY+Lap2YzNeCIHS1z3EsowYa6nnC8vysOnctm4CXh6LcEjGBKyah7kPRTSGVG43z3nNr0n2Ry5c7sQq+waY/uWIIIWkOKlVWz7+kooYaQ3JpYRf3mo84GklswCUD4D0y380a4Rr4R/+I9cFXRwHLHXV8p+sLjM8TYe/IuOmX20Vh/Zt+JGTVNIukmGzyZG//Bu8MjSv8inRSZXT915eygaDFSc2CBWfH/NLE5W0hDIytHJzZ+7iQ4ZWaiU6XnkqsSSen5GWmSIleeEdF83rRJrJlxbHmoDuR7zxNSYKS19ZYLm1fPeDttA3M2e2qbD8rEew5nyzT34/i0Hfd3viRvCfeNeR7njGKtaMcqXZse4Egw/+p68NVx8uKBGQyS7cIAbb+qgndwbDLMFO3G9FeK/4DxixJuuc3OSpu5i02S5/qF2hS9E/aiVxRPTAviJkt+PRjxjSEm/v0OCczZGp0bsJ3h8FmuA0RyYcqmHiG2ev+w06wm98Buaxg5co7jYBwPWAj7gjQSHJvXKviA8Kj3RfQcwzNP2OnOBKIdfDTPeWR7Sr4pynsJJI279huLnTKI+F7Czme5yGUjswaxu5HdFbTuVS3k2E37PIgrPOEJQTPHi3iHsbj4tO8NGNPiQZSC/ITCVni/Yg4LcSG8ZKXmOq9Lqpn5lQwuhqtoODuVb6Xhd6Vel672w4PpgSiOThiMaTTvroNsvHAUNYwnLt6xwGKqm3J2Dh0RDLIU1l4vvlvKDjbzVB03tu6RQWe1gU1htgCKvmGmsSnOLWMjejuyNHb2cEvCkHt6GaAjUZN76l+LDwsd8dxvudrbhlQ8A8EdYk4FDGiO G/QRKak/ OzTMDUQk6tKGpFKIS2IYtgAyuacYR6K7o7/grJAbB8P+5DWpUNGhK34i/zBujQuNWrcygWa+14Cq6CzythjOk6g/0MOPT5DCWfr++ryWkoerRlZT2i7GPUvYGo/xQ7loUMcfwj/sNjocoe9COXVGgrlBu9KQ//VVnLVGxUSBH0YraM2L953whh3fiUIzWCoLJGcEMGqwEhdmHLbz3UqxO8PucsJH53/BuK5YcA7DXYO9rvqadWczyviavqzEaJD5IqEtLLl6iemnrW+yH0vWszIhamav9Dnp4LGD80cs3JDTCDlB6lnwJpuqSOOWhmRPtgvNs 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:59, Dev Jain wrote: > > > On 28/04/25 6:20 pm, 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: > > Thanks. Although we will have to call vm_normal_folio() in case of ! > folio, since we may not have the folio already for nr == 1 case. Ah, I see. Should we still check folio_test_anon() when nr != 1? 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); >> >> >