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 546F6FCC07E for ; Fri, 6 Mar 2026 21:17:36 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4fSK4G38YYz2xjQ; Sat, 07 Mar 2026 08:17:34 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2600:3c04:e001:324:0:1991:8:25" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1772800174; cv=none; b=iYjC1mIbT9v0+ZtRz3KSKFQ1y/D8EGPXW2EXoEGPMtaYVXlCmKDTNq1tbJoYu7ZJ0qw0Bim7fFgJwupyB8P5TXyPDlNBBpGPy3ISDTuDQClbV9ZLBWOvHZbv4geOCh4RDZgMppywlwIOrylMRJp5W+2OowdbaByIoXguvbd2VvGX4/v4UI+TDivWsiAqeLbyuND43eAbUfRoNixcDu3lYc3FV4T5eXgl2lzjDR+JV7f+DluezcBiruf+HkdChhE3xsb+tSM3JuG7/AmzaM+eGd1h9KL53rg0JttjFWZAv8tRn45WiXXNVpYUBvdwCvIglm4XakUpdud1ouynJitgLA== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1772800174; c=relaxed/relaxed; bh=3+N+fmqbvm7Zv37fwU28NwjTpZFVQVbgvTQtiOFltLE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=mO7xctk1ijZWxr51DtNd5ECVyIY6Nn9tH5Z7yghVJWk9yReGPyJpfuQqBBBCwz1xmgroxcPVH4PEVqk5bmvaybC2hV7C+UtoqLX4qfozh12XtOWJ8Gu8zGxcD9xg1+t8VsXCUw+02FLyhmapNud81QKSvE4xRQajTvvbecmZFubP17PsireM3vJK/AYbTNj8GxawLo34MlEU3H8dTPQ5MLiGkk9lu46V2yZgzMRfGyJEq0Rs1R1uC7HxMYNkAxvpDZj6665w52GC5Z4tEFxnj4jNe4fqfE3DbPtGLyf8cjIpUHE+1WCSxGVxGzQLj8u30YOEYR92MBbzyGF8a6ygTQ== 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=LZ2C8YdL; dkim-atps=neutral; spf=pass (client-ip=2600:3c04:e001:324:0:1991:8:25; 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=LZ2C8YdL; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=2600:3c04:e001:324:0:1991:8:25; helo=tor.source.kernel.org; envelope-from=ljs@kernel.org; receiver=lists.ozlabs.org) Received: from tor.source.kernel.org (tor.source.kernel.org [IPv6:2600:3c04:e001:324:0:1991:8:25]) (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 4fS5M14HLPz3bnJ for ; Fri, 06 Mar 2026 23:29:33 +1100 (AEDT) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 519B160018; Fri, 6 Mar 2026 12:29:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6FBA6C4CEF7; Fri, 6 Mar 2026 12:29:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772800171; bh=e/BhLuvVPXdAbTMBHCsfqneVZFKZ17hQIzvo4yPKeoQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LZ2C8YdL87D8RpW/YcqxQXdubcwJYV1mXiNi+UoS9iMH/GZ6tewKR5nE3DeuewPAj FjUGDPllrcWVkaTdK+hHETp1VMwk8al+fULHWHc5ArhEgn636iBiIKwo+030oucnyt R5ip2+oEghEmWWtqUJEOEDUPUzE1JM264O2JI8HG3B2KdY6tnlp6cUREjXfuUUhJqK laEw0eVrwgbM9iqQmt/O5Pd7Dpk3bYJMdu8+pPEen9SGbx9GDjtpxN/Vm1R2vXpdx+ TesD22LJCGx7pZOPjxKfoMlDF8xXvihsNP+Y8Jno2n0Svqw7inQAdc/rgB4H5jjlqp MaOZu6sgtomNA== Date: Fri, 6 Mar 2026 12:29:28 +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 11/16] mm/memory: inline unmap_page_range() into __zap_vma_range() Message-ID: References: <20260227200848.114019-1-david@kernel.org> <20260227200848.114019-12-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-12-david@kernel.org> On Fri, Feb 27, 2026 at 09:08:42PM +0100, David Hildenbrand (Arm) wrote: > Let's inline it into the single caller to reduce the number of confusing > unmap/zap helpers. > > Get rid of the unnecessary BUG_ON(). > > Signed-off-by: David Hildenbrand (Arm) Small nits below, but overall LGTM so: Reviewed-by: Lorenzo Stoakes (Oracle) > --- > mm/memory.c | 32 ++++++++++++-------------------- > 1 file changed, 12 insertions(+), 20 deletions(-) > > diff --git a/mm/memory.c b/mm/memory.c > index 394b2e931974..1c0bcdfc73b7 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -2056,25 +2056,6 @@ static inline unsigned long zap_p4d_range(struct mmu_gather *tlb, > return addr; > } > > -static void unmap_page_range(struct mmu_gather *tlb, struct vm_area_struct *vma, > - unsigned long addr, unsigned long end, > - struct zap_details *details) > -{ > - pgd_t *pgd; > - unsigned long next; > - > - BUG_ON(addr >= end); > - tlb_start_vma(tlb, vma); > - pgd = pgd_offset(vma->vm_mm, addr); > - do { > - next = pgd_addr_end(addr, end); > - if (pgd_none_or_clear_bad(pgd)) > - continue; > - next = zap_p4d_range(tlb, vma, pgd, addr, next, details); > - } while (pgd++, addr = next, addr != end); > - tlb_end_vma(tlb, vma); > -} > - > static void __zap_vma_range(struct mmu_gather *tlb, struct vm_area_struct *vma, > unsigned long start, unsigned long end, > struct zap_details *details) > @@ -2100,7 +2081,18 @@ static void __zap_vma_range(struct mmu_gather *tlb, struct vm_area_struct *vma, > return; > __unmap_hugepage_range(tlb, vma, start, end, NULL, zap_flags); > } else { > - unmap_page_range(tlb, vma, start, end, details); > + unsigned long next, cur = start; VERY nitty, but generally current is abbreviated to curr not cur. It's not a big deal, but why not addr? > + pgd_t *pgd; > + > + tlb_start_vma(tlb, vma); > + pgd = pgd_offset(vma->vm_mm, cur); > + do { > + next = pgd_addr_end(cur, end); > + if (pgd_none_or_clear_bad(pgd)) > + continue; > + next = zap_p4d_range(tlb, vma, pgd, cur, next, details); > + } while (pgd++, cur = next, cur != end); > + tlb_end_vma(tlb, vma); > } > } > > -- > 2.43.0 >