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 65866F0182F for ; Fri, 6 Mar 2026 12:24:49 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4fS5FW6YVzz3bnJ; Fri, 06 Mar 2026 23:24:47 +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=1772798821; cv=none; b=Gih2jWtRMbGVcxc0+cdCpU+xpUnMac0BFf5WbjYmn+unSY4pGmI8aIY0t8d56TZWf1AkgcV31OhDWT9377VNe3pt8mzRdOMkhiwZfU97NqUvG4IznzD9f23Y09t4Q3w9rZ6We6NAw13ihcsVWeajLiBaw/uij1cITwiF+dHDKeuGDBPBGy46c2zY/NT99jBWvRA8fTenJ2lBqyqXUck1LsHuUMpWYfWLKVdsndjdbMshkLcyzKLR6ytmpU3g4/zphtr12mmNkvLgSjFaBa1NoqriIuGnUbJpEJGxuP7wlqfoaTs1InOkusrWbotTiJN3Pw4120p8uKE/I5PGUiwk8w== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1772798821; c=relaxed/relaxed; bh=zziktpr8HktYa7qEDALXh8cUdjlrPh7LBKj9C+z5yBI=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=eTRrLoSsNUG8y4B55AXHrDSeUlQYI5JvKVUqGP/I09VoQ19PA2AC0GtNQyJ3u/CzRtpiT87Vy08AXyGeIH496tbN7P+Wdw8JX4JOJDo+rpr15uJh4tA5ANgD+k7fHri+IA+V0ptmU8ebn8E7EUFKKSh4lbTIdK0ruKqzPiKB1TxbXlksjE4Q4QdIDPSZuJxncT1aR7o4xTmAjHw/splChapUJjwXKMQTZ/ZMgHJcfAAWfrJIzsInTOzF5vP4zTuEoq2CHxFLXkfWDHm5ZXfcgRrPudyHWhZ0qGQwVGfohBeT7EESyz3eTDR9xhYXKlythgcJ6PAjMNKJ418KOzqKXQ== 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=AkmrBFKC; 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=AkmrBFKC; 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 4fS4s01DqVz30T9 for ; Fri, 06 Mar 2026 23:07:00 +1100 (AEDT) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id E508260127; Fri, 6 Mar 2026 12:06:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DFC1EC4CEF7; Fri, 6 Mar 2026 12:06:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772798817; bh=vBj3woozlRPQJAsoS5/IW+klSPAITAbOF218ghzCguY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=AkmrBFKCRbCHZUTyW9ICY4wBEh7Pe2S+YM/wqEXDcxFbGGnByiHHlbb3EYKuqNZO0 q2Usn/TeECRhZl/rRCEONLCagepvAgIirItP2eC3qQ8ChVybtdQP4cnbuxMspCqW2l NuRTEQcZ4fNf0tnEm2Vt9rwza2i3hBvcHJoaSIUIev91gK+ZQxbmGNyuTbfBNfDzL8 uczsg8/HVlnzzRmWjuPHT7rnXFdsVjPMqku8Ani2QkPzrZQ1tx0APw0DKJ47bqWkCl F3GWu9zvI/f7ShUPFDiLOLuo7Nr5RGLGYycyCEDy+H2U/X6/mJjX+zGqmWubbpWaHm 6cB2ohevQ1byA== Date: Fri, 6 Mar 2026 12:06:54 +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 02/16] mm/memory: remove "zap_details" parameter from zap_page_range_single() Message-ID: <6ad209ea-4be2-42f0-94ef-a2da69292dc2@lucifer.local> References: <20260227200848.114019-1-david@kernel.org> <20260227200848.114019-3-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-3-david@kernel.org> On Fri, Feb 27, 2026 at 09:08:33PM +0100, David Hildenbrand (Arm) wrote: > Nobody except memory.c should really set that parameter to non-NULL. So > let's just drop it and make unmap_mapping_range_vma() use > zap_page_range_single_batched() instead. > > Signed-off-by: David Hildenbrand (Arm) This is nice, good cleanup. Assuming rust side is all sorted (seems it from thread)... LGTM, so: Reviewed-by: Lorenzo Stoakes (Oracle) > --- > arch/s390/mm/gmap_helpers.c | 2 +- > drivers/android/binder_alloc.c | 2 +- > include/linux/mm.h | 5 ++--- > kernel/bpf/arena.c | 3 +-- > kernel/events/core.c | 2 +- > mm/madvise.c | 3 +-- > mm/memory.c | 16 ++++++++++------ > net/ipv4/tcp.c | 5 ++--- > rust/kernel/mm/virt.rs | 2 +- > 9 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/arch/s390/mm/gmap_helpers.c b/arch/s390/mm/gmap_helpers.c > index dea83e3103e5..ae2d59a19313 100644 > --- a/arch/s390/mm/gmap_helpers.c > +++ b/arch/s390/mm/gmap_helpers.c > @@ -89,7 +89,7 @@ void gmap_helper_discard(struct mm_struct *mm, unsigned long vmaddr, unsigned lo > if (!vma) > return; > if (!is_vm_hugetlb_page(vma)) > - zap_page_range_single(vma, vmaddr, min(end, vma->vm_end) - vmaddr, NULL); > + zap_page_range_single(vma, vmaddr, min(end, vma->vm_end) - vmaddr); > vmaddr = vma->vm_end; > } > } > diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c > index 241f16a9b63d..dd2046bd5cde 100644 > --- a/drivers/android/binder_alloc.c > +++ b/drivers/android/binder_alloc.c > @@ -1185,7 +1185,7 @@ enum lru_status binder_alloc_free_page(struct list_head *item, > if (vma) { > trace_binder_unmap_user_start(alloc, index); > > - zap_page_range_single(vma, page_addr, PAGE_SIZE, NULL); > + zap_page_range_single(vma, page_addr, PAGE_SIZE); > > trace_binder_unmap_user_end(alloc, index); > } > diff --git a/include/linux/mm.h b/include/linux/mm.h > index ecff8268089b..a8138ff7d1fa 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -2835,11 +2835,10 @@ struct page *vm_normal_page_pud(struct vm_area_struct *vma, unsigned long addr, > void zap_vma_ptes(struct vm_area_struct *vma, unsigned long address, > unsigned long size); > void zap_page_range_single(struct vm_area_struct *vma, unsigned long address, > - unsigned long size, struct zap_details *details); > + unsigned long size); > static inline void zap_vma_pages(struct vm_area_struct *vma) > { > - zap_page_range_single(vma, vma->vm_start, > - vma->vm_end - vma->vm_start, NULL); > + zap_page_range_single(vma, vma->vm_start, vma->vm_end - vma->vm_start); > } > struct mmu_notifier_range; > > diff --git a/kernel/bpf/arena.c b/kernel/bpf/arena.c > index 144f30e740e8..c34510d83b1f 100644 > --- a/kernel/bpf/arena.c > +++ b/kernel/bpf/arena.c > @@ -656,8 +656,7 @@ static void zap_pages(struct bpf_arena *arena, long uaddr, long page_cnt) > guard(mutex)(&arena->lock); > /* iterate link list under lock */ > list_for_each_entry(vml, &arena->vma_list, head) > - zap_page_range_single(vml->vma, uaddr, > - PAGE_SIZE * page_cnt, NULL); > + zap_page_range_single(vml->vma, uaddr, PAGE_SIZE * page_cnt); > } > > static void arena_free_pages(struct bpf_arena *arena, long uaddr, long page_cnt, bool sleepable) > diff --git a/kernel/events/core.c b/kernel/events/core.c > index ac70d68217b6..c94c56c94104 100644 > --- a/kernel/events/core.c > +++ b/kernel/events/core.c > @@ -7215,7 +7215,7 @@ static int map_range(struct perf_buffer *rb, struct vm_area_struct *vma) > #ifdef CONFIG_MMU > /* Clear any partial mappings on error. */ > if (err) > - zap_page_range_single(vma, vma->vm_start, nr_pages * PAGE_SIZE, NULL); > + zap_page_range_single(vma, vma->vm_start, nr_pages * PAGE_SIZE); > #endif > > return err; > diff --git a/mm/madvise.c b/mm/madvise.c > index efc04334a000..557a360f7919 100644 > --- a/mm/madvise.c > +++ b/mm/madvise.c > @@ -1193,8 +1193,7 @@ static long madvise_guard_install(struct madvise_behavior *madv_behavior) > * OK some of the range have non-guard pages mapped, zap > * them. This leaves existing guard pages in place. > */ > - zap_page_range_single(vma, range->start, > - range->end - range->start, NULL); > + zap_page_range_single(vma, range->start, range->end - range->start); > } > > /* > diff --git a/mm/memory.c b/mm/memory.c > index 9385842c3503..19f5f9a60995 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -2203,17 +2203,16 @@ void zap_page_range_single_batched(struct mmu_gather *tlb, > * @vma: vm_area_struct holding the applicable pages > * @address: starting address of pages to zap > * @size: number of bytes to zap > - * @details: details of shared cache invalidation > * > * The range must fit into one VMA. > */ > void zap_page_range_single(struct vm_area_struct *vma, unsigned long address, > - unsigned long size, struct zap_details *details) > + unsigned long size) > { > struct mmu_gather tlb; > > tlb_gather_mmu(&tlb, vma->vm_mm); > - zap_page_range_single_batched(&tlb, vma, address, size, details); > + zap_page_range_single_batched(&tlb, vma, address, size, NULL); > tlb_finish_mmu(&tlb); > } > > @@ -2235,7 +2234,7 @@ void zap_vma_ptes(struct vm_area_struct *vma, unsigned long address, > !(vma->vm_flags & VM_PFNMAP)) > return; > > - zap_page_range_single(vma, address, size, NULL); > + zap_page_range_single(vma, address, size); > } > EXPORT_SYMBOL_GPL(zap_vma_ptes); > > @@ -3003,7 +3002,7 @@ static int remap_pfn_range_notrack(struct vm_area_struct *vma, unsigned long add > * maintain page reference counts, and callers may free > * pages due to the error. So zap it early. > */ > - zap_page_range_single(vma, addr, size, NULL); > + zap_page_range_single(vma, addr, size); > return error; > } > > @@ -4226,7 +4225,12 @@ static void unmap_mapping_range_vma(struct vm_area_struct *vma, > unsigned long start_addr, unsigned long end_addr, > struct zap_details *details) > { > - zap_page_range_single(vma, start_addr, end_addr - start_addr, 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, > diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c > index f84d9a45cc9d..befcde27dee7 100644 > --- a/net/ipv4/tcp.c > +++ b/net/ipv4/tcp.c > @@ -2104,7 +2104,7 @@ static int tcp_zerocopy_vm_insert_batch_error(struct vm_area_struct *vma, > maybe_zap_len = total_bytes_to_map - /* All bytes to map */ > *length + /* Mapped or pending */ > (pages_remaining * PAGE_SIZE); /* Failed map. */ > - zap_page_range_single(vma, *address, maybe_zap_len, NULL); > + zap_page_range_single(vma, *address, maybe_zap_len); > err = 0; > } > > @@ -2269,8 +2269,7 @@ static int tcp_zerocopy_receive(struct sock *sk, > total_bytes_to_map = avail_len & ~(PAGE_SIZE - 1); > if (total_bytes_to_map) { > if (!(zc->flags & TCP_RECEIVE_ZEROCOPY_FLAG_TLB_CLEAN_HINT)) > - zap_page_range_single(vma, address, total_bytes_to_map, > - NULL); > + zap_page_range_single(vma, address, total_bytes_to_map); > zc->length = total_bytes_to_map; > zc->recv_skip_hint = 0; > } else { > diff --git a/rust/kernel/mm/virt.rs b/rust/kernel/mm/virt.rs > index da21d65ccd20..b8e59e4420f3 100644 > --- a/rust/kernel/mm/virt.rs > +++ b/rust/kernel/mm/virt.rs > @@ -124,7 +124,7 @@ pub fn zap_page_range_single(&self, address: usize, size: usize) { > // sufficient for this method call. This method has no requirements on the vma flags. The > // address range is checked to be within the vma. > unsafe { > - bindings::zap_page_range_single(self.as_ptr(), address, size, core::ptr::null_mut()) > + bindings::zap_page_range_single(self.as_ptr(), address, size) > }; > } > > -- > 2.43.0 >