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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 95FA8F0182F for ; Fri, 6 Mar 2026 12:24:56 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4fS5Ff6dlZz3c5f; Fri, 06 Mar 2026 23:24:54 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=172.105.4.254 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1772798879; cv=none; b=Nf/NZKLIdftOJVEKCimfxbMBYvOXk1bAE4WngvW4+GDkQIHocUXY9iCBuU6MnMk9Sy/qVlUlRijpwzV8iuqsHTp2RPYmIAvvRNURDM1wnTOA05tP0jY0RqjoC0bkgi4VWczzuZgNWpbe/Qv6Kd4+LKH+JAqm/LowsAkep4Cfqz+HMeJ5CF9l1tII4p+KQNRkGlQ3nNyD7vvRRikHujvKb0jdFTa3H9F0So1KZUiuOUwvWSjeP/hepZU5KCtN1mok6nS2GvdWY7TUycHmG1teJPMSObJmrzQXP+5s5UGLkdM8z3yBt2q7nmzpoG5wGzVzsunblS0CGz5Kl09tuSTlzw== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1772798879; c=relaxed/relaxed; bh=bR8aYhstrfCuuS3764yFUqV6v0ASA2Glapx1jZlr/O8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=M7uZ1P/FATl/LJTWXZul/Z9+64FYAI1SxbqFxys52HFGxiOfiRkRkG54xDoLeVwYhmb3PfEKl0QzkJfhlJEEaMPinXZ8ZE+XVI1oIqlUNCdi4rPY8+UgF/bDsTJGl8Oe9vvhsA0YE1ol5bSiHJTq+rnmgxx6Yf2157u0ly87JvC4j/L4aMgv3fH1IOV7WrGJY3ZIvOprv7pYjiPdGn2RK9fK330rk0As9fj3lN8pi0cz2FXn+jAqYAcsPu5L+opFZrgZ0P7TEuK6UU5/Rdn4Qgy7dF6xWuj4xJYrzW3Lo/RquGlbnD42pA+EiPAalXvKT5LxlElfLbHbyNetnqZIyg== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=roeMH8Kf; dkim-atps=neutral; spf=pass (client-ip=172.105.4.254; helo=tor.source.kernel.org; envelope-from=ljs@kernel.org; receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=roeMH8Kf; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=172.105.4.254; helo=tor.source.kernel.org; envelope-from=ljs@kernel.org; receiver=lists.ozlabs.org) Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4fS4t60jJwz30T9 for ; Fri, 06 Mar 2026 23:07:58 +1100 (AEDT) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 2472160127; Fri, 6 Mar 2026 12:07:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3635AC4CEF7; Fri, 6 Mar 2026 12:07:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772798875; bh=IJiEATCx3KH7Ih3WoWiyfikf1eOEPdfJ9CNxxKLM5Eg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=roeMH8Kftj8MRsWE1Hp/mVV1SwsBtfCWiiiXCPi7krCUZ4blCgdJGU7GHSUjbZok1 b73rFiWJzPYENmWhMs2aF/Ex4R+V0J1o1W+enrxeRzpCIUyx6/yReiQuRarpkX8LG+ lLQ62drq0d7kYS1tzFLC8NKIKLnFKQew0+t1HYPjU6XFudRqQeosg1NEfXqsGR+VD3 193HJwTkEwoGPyOPSn7wL613KKTFkEp68XT5pmvDSb59G+kLrWQaIBAfxgMjWA5VLL Cy6eEN2sjc6AIdqSynsvJHCNfmRINyoRwDhEZU54uFvMBCB89U3pcRIfzj/49ti+/9 2RO128kVNT5lQ== Date: Fri, 6 Mar 2026 12:07:52 +0000 From: "Lorenzo Stoakes (Oracle)" To: "David Hildenbrand (Arm)" Cc: linux-kernel@vger.kernel.org, "linux-mm @ kvack . org" , Andrew Morton , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Jann Horn , Pedro Falcato , David Rientjes , Shakeel Butt , "Matthew Wilcox (Oracle)" , Alice Ryhl , Madhavan Srinivasan , Michael Ellerman , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Alexander Gordeev , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Jarkko Sakkinen , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Greg Kroah-Hartman , Arve =?utf-8?B?SGrDuG5uZXbDpWc=?= , Todd Kjos , Christian Brauner , Carlos Llamas , Ian Abbott , H Hartley Sweeten , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Simona Vetter , Jason Gunthorpe , Leon Romanovsky , Dimitri Sivanich , Arnd Bergmann , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Peter Zijlstra , Arnaldo Carvalho de Melo , Namhyung Kim , Andy Lutomirski , Vincenzo Frascino , Eric Dumazet , Neal Cardwell , "David S. Miller" , David Ahern , Jakub Kicinski , Paolo Abeni , Miguel Ojeda , linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-sgx@vger.kernel.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-rdma@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, rust-for-linux@vger.kernel.org, x86@kernel.org Subject: Re: [PATCH v1 03/16] mm/memory: inline unmap_mapping_range_vma() into unmap_mapping_range_tree() Message-ID: <60b136c3-883c-41fc-ab9a-8ca5977d4456@lucifer.local> References: <20260227200848.114019-1-david@kernel.org> <20260227200848.114019-4-david@kernel.org> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260227200848.114019-4-david@kernel.org> On Fri, Feb 27, 2026 at 09:08:34PM +0100, David Hildenbrand (Arm) wrote: > Let's remove the number of unmap-related functions that cause confusion > by inlining unmap_mapping_range_vma() into its single caller. The end > result looks pretty readable. > > Signed-off-by: David Hildenbrand (Arm) Yeah that's fine, and while I usually like having lots of smaller functions to break up logic, I always felt when reading it that the zap logic had _too many_ so this is welcome. LGTM, so: Reviewed-by: Lorenzo Stoakes (Oracle) > --- > mm/memory.c | 23 +++++++---------------- > 1 file changed, 7 insertions(+), 16 deletions(-) > > diff --git a/mm/memory.c b/mm/memory.c > index 19f5f9a60995..5c47309331f5 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -4221,18 +4221,6 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf) > return wp_page_copy(vmf); > } > > -static void unmap_mapping_range_vma(struct vm_area_struct *vma, > - unsigned long start_addr, unsigned long end_addr, > - struct zap_details *details) > -{ > - struct mmu_gather tlb; > - > - tlb_gather_mmu(&tlb, vma->vm_mm); > - zap_page_range_single_batched(&tlb, vma, start_addr, > - end_addr - start_addr, details); > - tlb_finish_mmu(&tlb); > -} > - > static inline void unmap_mapping_range_tree(struct rb_root_cached *root, > pgoff_t first_index, > pgoff_t last_index, > @@ -4240,17 +4228,20 @@ static inline void unmap_mapping_range_tree(struct rb_root_cached *root, > { > struct vm_area_struct *vma; > pgoff_t vba, vea, zba, zea; > + unsigned long start, size; > + struct mmu_gather tlb; > > vma_interval_tree_foreach(vma, root, first_index, last_index) { > vba = vma->vm_pgoff; > vea = vba + vma_pages(vma) - 1; > zba = max(first_index, vba); > zea = min(last_index, vea); > + start = ((zba - vba) << PAGE_SHIFT) + vma->vm_start; > + size = (zea - zba + 1) << PAGE_SHIFT; > > - unmap_mapping_range_vma(vma, > - ((zba - vba) << PAGE_SHIFT) + vma->vm_start, > - ((zea - vba + 1) << PAGE_SHIFT) + vma->vm_start, > - details); > + tlb_gather_mmu(&tlb, vma->vm_mm); > + zap_page_range_single_batched(&tlb, vma, start, size, details); > + tlb_finish_mmu(&tlb); > } > } > > -- > 2.43.0 >