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 CF72EC46CD2 for ; Tue, 30 Jan 2024 08:47:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6CAB06B0093; Tue, 30 Jan 2024 03:47:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 67A496B00A1; Tue, 30 Jan 2024 03:47:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 542A56B00A2; Tue, 30 Jan 2024 03:47:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 42CFE6B0093 for ; Tue, 30 Jan 2024 03:47:41 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1C86D16025C for ; Tue, 30 Jan 2024 08:47:41 +0000 (UTC) X-FDA: 81735349122.25.296A006 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf14.hostedemail.com (Postfix) with ESMTP id 421F9100009 for ; Tue, 30 Jan 2024 08:47:39 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf14.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706604459; 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; bh=5xUotLVW3we8anIsEYo4JkFes0Xc3edpjtRnWXJ9Peo=; b=11OLjFDu90Drn8am611Zm1fAMnU7eLNnL7fI2StLu/fms6XmGkmPphDI+yIxexJbQeTLSe 2y2rVJM2tx591t/ybkRxF3fHs4+t3Uj6zzZe89fLrsJChrPR+C0TLehR6/abFyXx02DT1i fipx2e4pXTj41dd6fNRFvRIAZiUqDxQ= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf14.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706604459; a=rsa-sha256; cv=none; b=OomC4T74Dsk7Udj/nP5cWYLUj2k+4WZf7SNc+4pFoEP3rNg+M4I1XvOVzeK/ZH4A9nbbWj mnt1Ay2lFGjYsSkL6DgRpU2Be3uQk4ZPXDas0yely+JSlpuE5bD1Sysloh7QcTl3OpTXdx AyjXwbprDM+AUGIWHnWFa8zcUOkBXiw= 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 8E3AA139F; Tue, 30 Jan 2024 00:48:21 -0800 (PST) Received: from [10.57.79.54] (unknown [10.57.79.54]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DF4953F738; Tue, 30 Jan 2024 00:47:34 -0800 (PST) Message-ID: Date: Tue, 30 Jan 2024 08:47:34 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 4/9] mm/memory: factor out zapping folio pte into zap_present_folio_pte() Content-Language: en-GB To: David Hildenbrand , linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, Andrew Morton , Matthew Wilcox , Catalin Marinas , Will Deacon , "Aneesh Kumar K.V" , Nick Piggin , Peter Zijlstra , Michael Ellerman , Christophe Leroy , "Naveen N. Rao" , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Arnd Bergmann , linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org References: <20240129143221.263763-1-david@redhat.com> <20240129143221.263763-5-david@redhat.com> From: Ryan Roberts In-Reply-To: <20240129143221.263763-5-david@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 421F9100009 X-Stat-Signature: i799ewukbqtaajdbcx67nz4qmjqk4f8k X-Rspam-User: X-HE-Tag: 1706604459-306891 X-HE-Meta: U2FsdGVkX1+wjLGpW0jyTpOb/t/GMznDN2RPwMTLoGRGlS14QLlp4sDBzURvMF/Vp+LZPpMFb1MHEEpVy/CytUWtxrH7KbZ/OF2EQuuu8F4LLhqqntDABAuhaVDrp7WRxyzl2MxbSsAJC/1qsBHxOqi/corWgXKjZ+Y1c9Y/P0wGv44msAl5RyxyEdf5RwEYERAZDAXR6PJydnoACyuZYbDoxvyIdcxnZP/E5y50YiLrMBT6/Rk4OJt/0ESDvvfm4LZ2CpMrmC0K4jRWxixFe+gsn+Qmm+mYrEpUPD76nU+565qoejQgYi7asj8qGrPfDBMed+PSz8N6hGMEhLgfX1PV6nRSDNPl0DwYnpjSHL2URAfCYnFsJRRXDcwvSGpSUiHMnnRLtInbmBD04CU1j/87yu9iGGXEHYOcnVnNz7GbSAXlMlFZhbLmmuNJ2YETJMYaYH1xBU4wotRG6Icsnwllgj7cVYNgBXLwP8CAwwAnoKM1XFbzlgs75oBkKhsW+Gi3JP+j2ypMs/sjb2iz1p1Upa5tLFzDrqRLwxklHDZM+QWt/hQxSAV1mxEw6xmHdLtyF9q4vW0Av3l6pOqX8lJzp2qpqqbjyrCxjnPjuCCuqzYoGUwxGk/kbYsCjtjkKisafwjpKZv0rwKKZPFMgYyrmsNvD9PsUBQY+AEDFTfVLO2twWsk8WlVClv+7IEu0xIxNWFQ/VzCV43z3vY3QQS00kHRdQP27JHF40GT9e27zYLOBLxpdW4WcrkAcuoDhYkMsHQQPatkjxE1I+XM28YFcLDnRunRg/1wEkI7wy8s3JvKsWccu8bPX/lajhHhDI/YRUZKHL/ftUk4bQtDAQKq0X75BEPgMiLrIxSUB6sbx6v9G29jKnC9aE8MWF3w72YHosByuKKpXz76QRpDZc8onXHqagRHPZCzEeN0bsaBdS+ogyfyYJbUixDHDOm0eXDPopm+WwEU7B6ljKr RcsBAHnB C+bjMzsbDD33aNWNcQRy9KhzGmsVqyrvjnE7FeEQaBWwo+jPhcbROAP3Dm48Y2/dBZxNMxA+hFlFna7ZpTPA+4+/aeniSY87HZWU16VnkZ96OmHi9ZZz2rmRDLnXrthhRS5Gbu+C7zR3mv93sKet3H1KMIQb3GwLsHxKGrg0nP0HI97rbpcA4Qhi0fY0pyF3aETx4dk2oCdC2AXlds3r0qbCwDGuvcq0wqcAqJKYBTp0Sya+TG1vyajD3IyTEMkUyUWyy2vP2fxTZQVXKDTsCPBgjoA== 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 29/01/2024 14:32, David Hildenbrand wrote: > Let's prepare for further changes by factoring it out into a separate > function. > > Signed-off-by: David Hildenbrand Reviewed-by: Ryan Roberts > --- > mm/memory.c | 53 ++++++++++++++++++++++++++++++++--------------------- > 1 file changed, 32 insertions(+), 21 deletions(-) > > diff --git a/mm/memory.c b/mm/memory.c > index 20bc13ab8db2..a2190d7cfa74 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -1528,30 +1528,14 @@ zap_install_uffd_wp_if_needed(struct vm_area_struct *vma, > pte_install_uffd_wp_if_needed(vma, addr, pte, pteval); > } > > -static inline void zap_present_pte(struct mmu_gather *tlb, > - struct vm_area_struct *vma, pte_t *pte, pte_t ptent, > - unsigned long addr, struct zap_details *details, > - int *rss, bool *force_flush, bool *force_break) > +static inline void zap_present_folio_pte(struct mmu_gather *tlb, > + struct vm_area_struct *vma, struct folio *folio, > + struct page *page, pte_t *pte, pte_t ptent, unsigned long addr, > + struct zap_details *details, int *rss, bool *force_flush, > + bool *force_break) > { > struct mm_struct *mm = tlb->mm; > bool delay_rmap = false; > - struct folio *folio; > - struct page *page; > - > - page = vm_normal_page(vma, addr, ptent); > - if (!page) { > - /* We don't need up-to-date accessed/dirty bits. */ > - ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); > - arch_check_zapped_pte(vma, ptent); > - tlb_remove_tlb_entry(tlb, pte, addr); > - VM_WARN_ON_ONCE(userfaultfd_wp(vma)); > - ksm_might_unmap_zero_page(mm, ptent); > - return; > - } > - > - folio = page_folio(page); > - if (unlikely(!should_zap_folio(details, folio))) > - return; > > if (!folio_test_anon(folio)) { > ptent = ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); > @@ -1586,6 +1570,33 @@ static inline void zap_present_pte(struct mmu_gather *tlb, > } > } > > +static inline void zap_present_pte(struct mmu_gather *tlb, > + struct vm_area_struct *vma, pte_t *pte, pte_t ptent, > + unsigned long addr, struct zap_details *details, > + int *rss, bool *force_flush, bool *force_break) > +{ > + struct mm_struct *mm = tlb->mm; > + struct folio *folio; > + struct page *page; > + > + page = vm_normal_page(vma, addr, ptent); > + if (!page) { > + /* We don't need up-to-date accessed/dirty bits. */ > + ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); > + arch_check_zapped_pte(vma, ptent); > + tlb_remove_tlb_entry(tlb, pte, addr); > + VM_WARN_ON_ONCE(userfaultfd_wp(vma)); > + ksm_might_unmap_zero_page(mm, ptent); > + return; > + } > + > + folio = page_folio(page); > + if (unlikely(!should_zap_folio(details, folio))) > + return; > + zap_present_folio_pte(tlb, vma, folio, page, pte, ptent, addr, details, > + rss, force_flush, force_break); > +} > + > static unsigned long zap_pte_range(struct mmu_gather *tlb, > struct vm_area_struct *vma, pmd_t *pmd, > unsigned long addr, unsigned long end,