From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 147B41B4257; Fri, 6 Mar 2026 12:26:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772799995; cv=none; b=u/N3s5P/7qRg6mdAvp/8A6nkDZfJc1MyhhgPYRCoQpru61uXXcd1tqRG+fgmergN8n1D8xRKJLq4JKbsGiF3qg6pmuW+YM47+WaWhNFwTZ//8T2P2SBOr6f3WnTQCJCswZjmj3QTPyPmtSSFoMIjSAmT8MY+L7PRR243+q1M+Xs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772799995; c=relaxed/simple; bh=2P0FvPHpjsAhaxOTJ42bBLcCaRl4aaXZ5kIUOMNVWG4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=uTreZUeKxD9IxpjwSJ8UI8Hf5deY1rEG5jWqewQ8vgyrIzpfk7Q6BmqzODcmVFKhAOIb0ZyetyScle9FKJHbzreHbRrSnnk8Tn/3l1gXA2xXUPIo/oDC3OyDY4afzqw024UV5VxiyxJRRbq5XI1OLsTg1EilO7yl/MNYWkZeMWk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TpY6K6f3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TpY6K6f3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3469DC4CEF7; Fri, 6 Mar 2026 12:26:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772799994; bh=2P0FvPHpjsAhaxOTJ42bBLcCaRl4aaXZ5kIUOMNVWG4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=TpY6K6f3dvGsTTghQkD02tTChA2EwqMp/TpQHYfK66zjyTbZ8MiJAmvnb4buPO2Ol ASVRmYPmWBmFSlqURChzwTNJTonaTuZGs5/EHFxAeEK+JJM37rDxeHbP+7uPAPbDNB ZJH6y/sj2SwJrkrFUmj4U4BCckhgnUnVgGUpwh2dSE34XG3Ns9Rv8SqsanNsG90lqE qDOiPmqQr5aqOlEJ3hzzDS0y2SX/ydi84zZQWgo/w3iX/S4bMLqQGcMFP6NoojCwMK m9eF4QgqmVkNoXqv/RAre6ur7cbDQLHMeE6WwwrH+FV41xx9ytsuDVQOKxlgtAVRGn vdR8q0SNanDlA== Date: Fri, 6 Mar 2026 12:26:31 +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 10/16] mm/memory: use __zap_vma_range() in zap_vma_for_reaping() Message-ID: References: <20260227200848.114019-1-david@kernel.org> <20260227200848.114019-11-david@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260227200848.114019-11-david@kernel.org> On Fri, Feb 27, 2026 at 09:08:41PM +0100, David Hildenbrand (Arm) wrote: > Let's call __zap_vma_range() instead of unmap_page_range() to prepare > for further cleanups. > > To keep the existing behavior, whereby we do not call uprobe_munmap() > which could block, add a new "reaping" member to zap_details and use it. I am always in favour of making further use of helper structs :) > > Likely we should handle the possible blocking in uprobe_munmap() > differently, but for now keep it unchanged. > > Signed-off-by: David Hildenbrand (Arm) OK this looks like it's doing the equivalent of what was there before, so: Reviewed-by: Lorenzo Stoakes (Oracle) > --- > include/linux/mm.h | 1 + > mm/memory.c | 13 +++++++++---- > 2 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 21b67c203e62..4710f7c7495a 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -2800,6 +2800,7 @@ struct zap_details { > struct folio *single_folio; /* Locked folio to be unmapped */ > bool skip_cows; /* Do not zap COWed private pages */ > bool reclaim_pt; /* Need reclaim page tables? */ > + bool reaping; /* Reaping, do not block. */ > zap_flags_t zap_flags; /* Extra flags for zapping */ > }; > > diff --git a/mm/memory.c b/mm/memory.c > index 7d7c24c6917c..394b2e931974 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -2079,14 +2079,18 @@ static void __zap_vma_range(struct mmu_gather *tlb, struct vm_area_struct *vma, > unsigned long start, unsigned long end, > struct zap_details *details) > { > + const bool reaping = details && details->reaping; > + > VM_WARN_ON_ONCE(start >= end || !range_in_vma(vma, start, end)); > > - if (vma->vm_file) > + /* uprobe_munmap() might sleep, so skip it when reaping. */ > + if (vma->vm_file && !reaping) > uprobe_munmap(vma, start, end); > > if (unlikely(is_vm_hugetlb_page(vma))) { > zap_flags_t zap_flags = details ? details->zap_flags : 0; > > + VM_WARN_ON_ONCE(reaping); > /* > * vm_file will be NULL when we fail early while instantiating > * a new mapping. In this case, no pages were mapped yet and > @@ -2111,11 +2115,12 @@ static void __zap_vma_range(struct mmu_gather *tlb, struct vm_area_struct *vma, > */ > int zap_vma_for_reaping(struct vm_area_struct *vma) > { > + struct zap_details details = { > + .reaping = true, > + }; > struct mmu_notifier_range range; > struct mmu_gather tlb; > > - VM_WARN_ON_ONCE(is_vm_hugetlb_page(vma)); > - I guess because you've moved this safety check into __zap_vma_range()? > mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma->vm_mm, > vma->vm_start, vma->vm_end); > tlb_gather_mmu(&tlb, vma->vm_mm); > @@ -2123,7 +2128,7 @@ int zap_vma_for_reaping(struct vm_area_struct *vma) > tlb_finish_mmu(&tlb); > return -EBUSY; > } > - unmap_page_range(&tlb, vma, range.start, range.end, NULL); > + __zap_vma_range(&tlb, vma, range.start, range.end, &details); > mmu_notifier_invalidate_range_end(&range); > tlb_finish_mmu(&tlb); > return 0; > -- > 2.43.0 >