[PATCH v1 12/16] mm: rename zap_vma_pages() to zap_vma()

[Lorenzo Stoakes (Oracle)]

On Fri, Feb 27, 2026 at 09:08:43PM +0100, David Hildenbrand (Arm) wrote:
> Let's rename it to an even simpler name. While at it, add some
> simplistic kernel doc.
>
> Signed-off-by: David Hildenbrand (Arm) <david at kernel.org>

LGTM, so:

Reviewed-by: Lorenzo Stoakes (Oracle) <ljs at kernel.org>

> ---
>  arch/powerpc/platforms/book3s/vas-api.c | 2 +-
>  arch/powerpc/platforms/pseries/vas.c    | 2 +-
>  include/linux/mm.h                      | 6 +++++-
>  lib/vdso/datastore.c                    | 2 +-
>  mm/page-writeback.c                     | 2 +-
>  5 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/arch/powerpc/platforms/book3s/vas-api.c b/arch/powerpc/platforms/book3s/vas-api.c
> index ea4ffa63f043..e96d79db69fe 100644
> --- a/arch/powerpc/platforms/book3s/vas-api.c
> +++ b/arch/powerpc/platforms/book3s/vas-api.c
> @@ -414,7 +414,7 @@ static vm_fault_t vas_mmap_fault(struct vm_fault *vmf)
>  	/*
>  	 * When the LPAR lost credits due to core removal or during
>  	 * migration, invalidate the existing mapping for the current
> -	 * paste addresses and set windows in-active (zap_vma_pages in
> +	 * paste addresses and set windows in-active (zap_vma() in
>  	 * reconfig_close_windows()).
>  	 * New mapping will be done later after migration or new credits
>  	 * available. So continue to receive faults if the user space
> diff --git a/arch/powerpc/platforms/pseries/vas.c b/arch/powerpc/platforms/pseries/vas.c
> index ceb0a8788c0a..fa05f04364fe 100644
> --- a/arch/powerpc/platforms/pseries/vas.c
> +++ b/arch/powerpc/platforms/pseries/vas.c
> @@ -807,7 +807,7 @@ static int reconfig_close_windows(struct vas_caps *vcap, int excess_creds,
>  		 * is done before the original mmap() and after the ioctl.
>  		 */
>  		if (vma)
> -			zap_vma_pages(vma);
> +			zap_vma(vma);
>
>  		mutex_unlock(&task_ref->mmap_mutex);
>  		mmap_write_unlock(task_ref->mm);
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index 4710f7c7495a..4bd1500b9630 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -2837,7 +2837,11 @@ 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);
> -static inline void zap_vma_pages(struct vm_area_struct *vma)
> +/**
> + * zap_vma - zap all page table entries in a vma
> + * @vma: The vma to zap.
> + */
> +static inline void zap_vma(struct vm_area_struct *vma)
>  {
>  	zap_page_range_single(vma, vma->vm_start, vma->vm_end - vma->vm_start);
>  }
> diff --git a/lib/vdso/datastore.c b/lib/vdso/datastore.c
> index a565c30c71a0..222c143aebf7 100644
> --- a/lib/vdso/datastore.c
> +++ b/lib/vdso/datastore.c
> @@ -121,7 +121,7 @@ int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)
>  	mmap_read_lock(mm);
>  	for_each_vma(vmi, vma) {
>  		if (vma_is_special_mapping(vma, &vdso_vvar_mapping))
> -			zap_vma_pages(vma);
> +			zap_vma(vma);
>  	}
>  	mmap_read_unlock(mm);
>
> diff --git a/mm/page-writeback.c b/mm/page-writeback.c
> index 601a5e048d12..29f7567e5a71 100644
> --- a/mm/page-writeback.c
> +++ b/mm/page-writeback.c
> @@ -2645,7 +2645,7 @@ void folio_account_cleaned(struct folio *folio, struct bdi_writeback *wb)
>   * while this function is in progress, although it may have been truncated
>   * before this function is called.  Most callers have the folio locked.
>   * A few have the folio blocked from truncation through other means (e.g.
> - * zap_vma_pages() has it mapped and is holding the page table lock).
> + * zap_vma() has it mapped and is holding the page table lock).
>   * When called from mark_buffer_dirty(), the filesystem should hold a
>   * reference to the buffer_head that is being marked dirty, which causes
>   * try_to_free_buffers() to fail.
> --
> 2.43.0
>