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 800F1FCC076 for ; Fri, 6 Mar 2026 21:18:43 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4fSK5Y62r3z2xm5; Sat, 07 Mar 2026 08:18:41 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2600:3c0a:e001:78e:0:1991:8:25" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1772800876; cv=none; b=AB6kiOQQuhtvFyO0UyTxn+Od9KSnPpO+GF+nEWgzKqIMMcDD76Hxew8/B0WeQXHJkAKdCn61tP4vGuoZ+oJGry9uQ1shPMYV35SRZ0BXKvHChZMMZRmEfaXtzCPLWuZHFLl2vA44mz9o8SJxNuuQyxNShpXUt+30ESf+IPgG5q4oEBF3O5gDNwlbNjSc3LK9IwRKk4cMnxKpZxw2CzfFOgUKfhFqe4yw3mUDzcKxBE0JU6WR77mNrmF1sboZyJfpwFwPf3BRzdE08uVQdDsgDk0jVV9SYqdtg3qbfe4ReWUTTyeoCbRJW+4HI9fEz8wI6HuLlIsFI3YZTRLUGwL93A== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1772800876; c=relaxed/relaxed; bh=UR8CfjV1tUrpLDvSF5b3+Dv//Kr4G++1kk561g+r+8A=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=ZG/jVh1dSrsfKmFnfVjFnt/Tv9NK9orZhffnx2PYAIClys48P8udnk/AekUzhwKG+b5vZ20OjPjZmb9l7XkT2xPn6w4/vFXnvYNuOotemAjJlepOshUuEUUKh0ch9GOVNF/KvuQW8L7BJyw6aVY4mQ2J3v6PDXOLiG3P21/3BECSfb0HP4YsoQyJru8d4rKmNdqEEPHQJD/3zOZuj/8LwsxT7fP9qF2lyTqSi+csgRDX2OW2cj/mklYegPc6pub7TNeE3PAveRX/+q3YV/12CMqvluTWg6JoQf2rdTZxpybKT1Ut1P6z2NxTwmv0BCup4I6loMNTon8WBO8n+9C1fA== 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=PpKc6rDA; dkim-atps=neutral; spf=pass (client-ip=2600:3c0a:e001:78e:0:1991:8:25; helo=sea.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=PpKc6rDA; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=2600:3c0a:e001:78e:0:1991:8:25; helo=sea.source.kernel.org; envelope-from=ljs@kernel.org; receiver=lists.ozlabs.org) Received: from sea.source.kernel.org (sea.source.kernel.org [IPv6:2600:3c0a:e001:78e: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 4fS5cX0w7Bz30T9 for ; Fri, 06 Mar 2026 23:41:16 +1100 (AEDT) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 4D83B44204; Fri, 6 Mar 2026 12:41:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 964FFC4CEF7; Fri, 6 Mar 2026 12:41:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772800874; bh=lq+50juxWpZTD6H0V77Zyv6OGyq7pL6MoSFSgCZf0CQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=PpKc6rDA59KGYIRFwtyM9Sadr3C/wX3fkFV3gIPSOjYDFuYBwWa3LLeEUMWZvdUF/ 3G8BuvDsxyOn2WfkGJ83plefNiGw3aWzaX9FsviZQvjodMO4vhRQjPb/3a5QaHhww+ S2tDdIhK/WCnvNQyRu8Yz57kR9mVFrOxIG8qMWl67LGh9WILqiJV1HThKPDwhyxgZD 5N7vrK4zWbwHpmUbYWwGrY8KJ1KlCFzx5cMVqwe83rI13dEt/fd3J3VgWWNyc66R4Y YdYvrCSktLxQzE/goRvNKT5ONqH1zXpLdBdwAe1BCtmd1nNFbiMMpRVKGpP+LFmrGQ kQaNSV2mvY+qA== Date: Fri, 6 Mar 2026 12:41:11 +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 15/16] mm: rename zap_vma_ptes() to zap_special_vma_range() Message-ID: References: <20260227200848.114019-1-david@kernel.org> <20260227200848.114019-16-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-16-david@kernel.org> On Fri, Feb 27, 2026 at 09:08:46PM +0100, David Hildenbrand (Arm) wrote: > zap_vma_ptes() is the only zapping function we export to modules. > > It's essentially a wrapper around zap_vma_range(), however, with some > safety checks: > * That the passed range fits fully into the VMA > * That it's only used for VM_PFNMAP > > We might want to support VM_MIXEDMAP soon as well, so use the I think you should say we _are_ going to since patch 16/16 does that :) > more-generic term "special vma", although "special" is a bit overloaded. > Maybe we'll later just support any VM_SPECIAL flag. Yeah I hate the name, but I guess it's probably the best we can manage because VM_SPECIAL and both VM_PFNMAP and VM_MIXEDMAP _are_ 'special' in this sense so meh I guess it's the best we can do. > > While at it, improve the kerneldoc. > > Signed-off-by: David Hildenbrand (Arm) LGTM, so: Reviewed-by: Lorenzo Stoakes (Oracle) > --- > arch/x86/kernel/cpu/sgx/encl.c | 2 +- > drivers/comedi/comedi_fops.c | 2 +- > drivers/gpu/drm/i915/i915_mm.c | 4 ++-- > drivers/infiniband/core/uverbs_main.c | 6 +++--- > drivers/misc/sgi-gru/grumain.c | 2 +- > include/linux/mm.h | 2 +- > mm/memory.c | 16 +++++++--------- > 7 files changed, 16 insertions(+), 18 deletions(-) > > diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c > index ac60ebde5d9b..3f0222d10f6e 100644 > --- a/arch/x86/kernel/cpu/sgx/encl.c > +++ b/arch/x86/kernel/cpu/sgx/encl.c > @@ -1220,7 +1220,7 @@ void sgx_zap_enclave_ptes(struct sgx_encl *encl, unsigned long addr) > > ret = sgx_encl_find(encl_mm->mm, addr, &vma); > if (!ret && encl == vma->vm_private_data) > - zap_vma_ptes(vma, addr, PAGE_SIZE); > + zap_special_vma_range(vma, addr, PAGE_SIZE); > > mmap_read_unlock(encl_mm->mm); > > diff --git a/drivers/comedi/comedi_fops.c b/drivers/comedi/comedi_fops.c > index 48a8a607a84c..b91e0b5ac394 100644 > --- a/drivers/comedi/comedi_fops.c > +++ b/drivers/comedi/comedi_fops.c > @@ -2588,7 +2588,7 @@ static int comedi_mmap(struct file *file, struct vm_area_struct *vma) > * remap_pfn_range() because we call remap_pfn_range() in a loop. > */ > if (retval) > - zap_vma_ptes(vma, vma->vm_start, size); > + zap_special_vma_range(vma, vma->vm_start, size); > #endif > > if (retval == 0) { > diff --git a/drivers/gpu/drm/i915/i915_mm.c b/drivers/gpu/drm/i915/i915_mm.c > index c33bd3d83069..fd89e7c7d8d6 100644 > --- a/drivers/gpu/drm/i915/i915_mm.c > +++ b/drivers/gpu/drm/i915/i915_mm.c > @@ -108,7 +108,7 @@ int remap_io_mapping(struct vm_area_struct *vma, > > err = apply_to_page_range(r.mm, addr, size, remap_pfn, &r); > if (unlikely(err)) { > - zap_vma_ptes(vma, addr, (r.pfn - pfn) << PAGE_SHIFT); > + zap_special_vma_range(vma, addr, (r.pfn - pfn) << PAGE_SHIFT); > return err; > } > > @@ -156,7 +156,7 @@ int remap_io_sg(struct vm_area_struct *vma, > > err = apply_to_page_range(r.mm, addr, size, remap_sg, &r); > if (unlikely(err)) { > - zap_vma_ptes(vma, addr, r.pfn << PAGE_SHIFT); > + zap_special_vma_range(vma, addr, r.pfn << PAGE_SHIFT); > return err; > } > > diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c > index 7b68967a6301..f5837da47299 100644 > --- a/drivers/infiniband/core/uverbs_main.c > +++ b/drivers/infiniband/core/uverbs_main.c > @@ -756,7 +756,7 @@ static void rdma_umap_open(struct vm_area_struct *vma) > * point, so zap it. > */ > vma->vm_private_data = NULL; > - zap_vma_ptes(vma, vma->vm_start, vma->vm_end - vma->vm_start); > + zap_special_vma_range(vma, vma->vm_start, vma->vm_end - vma->vm_start); > } > > static void rdma_umap_close(struct vm_area_struct *vma) > @@ -782,7 +782,7 @@ static void rdma_umap_close(struct vm_area_struct *vma) > } > > /* > - * Once the zap_vma_ptes has been called touches to the VMA will come here and > + * Once the zap_special_vma_range has been called touches to the VMA will come here and > * we return a dummy writable zero page for all the pfns. > */ > static vm_fault_t rdma_umap_fault(struct vm_fault *vmf) > @@ -878,7 +878,7 @@ void uverbs_user_mmap_disassociate(struct ib_uverbs_file *ufile) > continue; > list_del_init(&priv->list); > > - zap_vma_ptes(vma, vma->vm_start, > + zap_special_vma_range(vma, vma->vm_start, > vma->vm_end - vma->vm_start); > > if (priv->entry) { > diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c > index 8d749f345246..278b76cbd281 100644 > --- a/drivers/misc/sgi-gru/grumain.c > +++ b/drivers/misc/sgi-gru/grumain.c > @@ -542,7 +542,7 @@ void gru_unload_context(struct gru_thread_state *gts, int savestate) > int ctxnum = gts->ts_ctxnum; > > if (!is_kernel_context(gts)) > - zap_vma_ptes(gts->ts_vma, UGRUADDR(gts), GRU_GSEG_PAGESIZE); > + zap_special_vma_range(gts->ts_vma, UGRUADDR(gts), GRU_GSEG_PAGESIZE); > cch = get_cch(gru->gs_gru_base_vaddr, ctxnum); > > gru_dbg(grudev, "gts %p, cbrmap 0x%lx, dsrmap 0x%lx\n", > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 833bedd3f739..07f6819db02d 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -2833,7 +2833,7 @@ struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr, > struct page *vm_normal_page_pud(struct vm_area_struct *vma, unsigned long addr, > pud_t pud); > > -void zap_vma_ptes(struct vm_area_struct *vma, unsigned long address, > +void zap_special_vma_range(struct vm_area_struct *vma, unsigned long address, > unsigned long size); > void zap_vma_range(struct vm_area_struct *vma, unsigned long address, > unsigned long size); > diff --git a/mm/memory.c b/mm/memory.c > index dd737b6d28c0..f3b7b7e16138 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -2233,17 +2233,15 @@ void zap_vma_range(struct vm_area_struct *vma, unsigned long address, > } > > /** > - * zap_vma_ptes - remove ptes mapping the vma > - * @vma: vm_area_struct holding ptes to be zapped > - * @address: starting address of pages to zap > + * zap_special_vma_range - zap all page table entries in a special vma range > + * @vma: the vma covering the range to zap > + * @address: starting address of the range to zap > * @size: number of bytes to zap > * > - * This function only unmaps ptes assigned to VM_PFNMAP vmas. > - * > - * The entire address range must be fully contained within the vma. > - * > + * This function does nothing when the provided address range is not fully > + * contained in @vma, or when the @vma is not VM_PFNMAP. > */ > -void zap_vma_ptes(struct vm_area_struct *vma, unsigned long address, > +void zap_special_vma_range(struct vm_area_struct *vma, unsigned long address, > unsigned long size) > { > if (!range_in_vma(vma, address, address + size) || > @@ -2252,7 +2250,7 @@ void zap_vma_ptes(struct vm_area_struct *vma, unsigned long address, > > zap_vma_range(vma, address, size); > } > -EXPORT_SYMBOL_GPL(zap_vma_ptes); > +EXPORT_SYMBOL_GPL(zap_special_vma_range); > > static pmd_t *walk_to_pmd(struct mm_struct *mm, unsigned long addr) > { > -- > 2.43.0 >