* [PATCH] mm: kill mm_wr_locked from unmap_vmas() and unmap_single_vma()
@ 2025-11-04 8:57 Kefeng Wang
2025-11-04 9:29 ` Lorenzo Stoakes
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Kefeng Wang @ 2025-11-04 8:57 UTC (permalink / raw)
To: Andrew Morton, David Hildenbrand
Cc: Lorenzo Stoakes, Liam.Howlett, linux-mm, Kefeng Wang
Kill mm_wr_locked since commit f8e97613fed2 ("mm: convert VM_PFNMAP
tracking to pfnmap_track() + pfnmap_untrack()") remove the user.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
include/linux/mm.h | 2 +-
mm/memory.c | 12 ++++--------
mm/mmap.c | 2 +-
mm/vma.c | 5 ++---
tools/testing/vma/vma_internal.h | 3 +--
5 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index f27c3687ea43..9909e35ebb8d 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2471,7 +2471,7 @@ static inline void zap_vma_pages(struct vm_area_struct *vma)
}
void unmap_vmas(struct mmu_gather *tlb, struct ma_state *mas,
struct vm_area_struct *start_vma, unsigned long start,
- unsigned long end, unsigned long tree_end, bool mm_wr_locked);
+ unsigned long end, unsigned long tree_end);
struct mmu_notifier_range;
diff --git a/mm/memory.c b/mm/memory.c
index 4c3a7e09a159..1a1626bba55a 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2023,8 +2023,7 @@ void unmap_page_range(struct mmu_gather *tlb,
static void unmap_single_vma(struct mmu_gather *tlb,
struct vm_area_struct *vma, unsigned long start_addr,
- unsigned long end_addr,
- struct zap_details *details, bool mm_wr_locked)
+ unsigned long end_addr, struct zap_details *details)
{
unsigned long start = max(vma->vm_start, start_addr);
unsigned long end;
@@ -2070,7 +2069,6 @@ static void unmap_single_vma(struct mmu_gather *tlb,
* @start_addr: virtual address at which to start unmapping
* @end_addr: virtual address at which to end unmapping
* @tree_end: The maximum index to check
- * @mm_wr_locked: lock flag
*
* Unmap all pages in the vma list.
*
@@ -2085,8 +2083,7 @@ static void unmap_single_vma(struct mmu_gather *tlb,
*/
void unmap_vmas(struct mmu_gather *tlb, struct ma_state *mas,
struct vm_area_struct *vma, unsigned long start_addr,
- unsigned long end_addr, unsigned long tree_end,
- bool mm_wr_locked)
+ unsigned long end_addr, unsigned long tree_end)
{
struct mmu_notifier_range range;
struct zap_details details = {
@@ -2102,8 +2099,7 @@ void unmap_vmas(struct mmu_gather *tlb, struct ma_state *mas,
unsigned long start = start_addr;
unsigned long end = end_addr;
hugetlb_zap_begin(vma, &start, &end);
- unmap_single_vma(tlb, vma, start, end, &details,
- mm_wr_locked);
+ unmap_single_vma(tlb, vma, start, end, &details);
hugetlb_zap_end(vma, &details);
vma = mas_find(mas, tree_end - 1);
} while (vma && likely(!xa_is_zero(vma)));
@@ -2139,7 +2135,7 @@ void zap_page_range_single_batched(struct mmu_gather *tlb,
* unmap 'address-end' not 'range.start-range.end' as range
* could have been expanded for hugetlb pmd sharing.
*/
- unmap_single_vma(tlb, vma, address, end, details, false);
+ unmap_single_vma(tlb, vma, address, end, details);
mmu_notifier_invalidate_range_end(&range);
if (is_vm_hugetlb_page(vma)) {
/*
diff --git a/mm/mmap.c b/mm/mmap.c
index 644f02071a41..4f51ca644903 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1274,7 +1274,7 @@ void exit_mmap(struct mm_struct *mm)
tlb_gather_mmu_fullmm(&tlb, mm);
/* update_hiwater_rss(mm) here? but nobody should be looking */
/* Use ULONG_MAX here to ensure all VMAs in the mm are unmapped */
- unmap_vmas(&tlb, &vmi.mas, vma, 0, ULONG_MAX, ULONG_MAX, false);
+ unmap_vmas(&tlb, &vmi.mas, vma, 0, ULONG_MAX, ULONG_MAX);
mmap_read_unlock(mm);
/*
diff --git a/mm/vma.c b/mm/vma.c
index 919d1fc63a52..0c5e391fe2e2 100644
--- a/mm/vma.c
+++ b/mm/vma.c
@@ -483,8 +483,7 @@ void unmap_region(struct ma_state *mas, struct vm_area_struct *vma,
tlb_gather_mmu(&tlb, mm);
update_hiwater_rss(mm);
- unmap_vmas(&tlb, mas, vma, vma->vm_start, vma->vm_end, vma->vm_end,
- /* mm_wr_locked = */ true);
+ unmap_vmas(&tlb, mas, vma, vma->vm_start, vma->vm_end, vma->vm_end);
mas_set(mas, vma->vm_end);
free_pgtables(&tlb, mas, vma, prev ? prev->vm_end : FIRST_USER_ADDRESS,
next ? next->vm_start : USER_PGTABLES_CEILING,
@@ -1228,7 +1227,7 @@ static inline void vms_clear_ptes(struct vma_munmap_struct *vms,
tlb_gather_mmu(&tlb, vms->vma->vm_mm);
update_hiwater_rss(vms->vma->vm_mm);
unmap_vmas(&tlb, mas_detach, vms->vma, vms->start, vms->end,
- vms->vma_count, mm_wr_locked);
+ vms->vma_count);
mas_set(mas_detach, 1);
/* start and end may be different if there is no prev or next vma. */
diff --git a/tools/testing/vma/vma_internal.h b/tools/testing/vma/vma_internal.h
index d873667704e8..c68d382dac81 100644
--- a/tools/testing/vma/vma_internal.h
+++ b/tools/testing/vma/vma_internal.h
@@ -848,8 +848,7 @@ static inline void update_hiwater_vm(struct mm_struct *mm)
static inline void unmap_vmas(struct mmu_gather *tlb, struct ma_state *mas,
struct vm_area_struct *vma, unsigned long start_addr,
- unsigned long end_addr, unsigned long tree_end,
- bool mm_wr_locked)
+ unsigned long end_addr, unsigned long tree_end)
{
}
--
2.27.0
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] mm: kill mm_wr_locked from unmap_vmas() and unmap_single_vma()
2025-11-04 8:57 [PATCH] mm: kill mm_wr_locked from unmap_vmas() and unmap_single_vma() Kefeng Wang
@ 2025-11-04 9:29 ` Lorenzo Stoakes
2025-11-06 10:12 ` David Hildenbrand (Red Hat)
2025-11-06 16:34 ` Liam R. Howlett
2 siblings, 0 replies; 4+ messages in thread
From: Lorenzo Stoakes @ 2025-11-04 9:29 UTC (permalink / raw)
To: Kefeng Wang; +Cc: Andrew Morton, David Hildenbrand, Liam.Howlett, linux-mm
On Tue, Nov 04, 2025 at 04:57:09PM +0800, Kefeng Wang wrote:
> Kill mm_wr_locked since commit f8e97613fed2 ("mm: convert VM_PFNMAP
> tracking to pfnmap_track() + pfnmap_untrack()") remove the user.
>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Nice spot, thanks for cleaning this up!
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
> ---
> include/linux/mm.h | 2 +-
> mm/memory.c | 12 ++++--------
> mm/mmap.c | 2 +-
> mm/vma.c | 5 ++---
> tools/testing/vma/vma_internal.h | 3 +--
> 5 files changed, 9 insertions(+), 15 deletions(-)
>
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index f27c3687ea43..9909e35ebb8d 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -2471,7 +2471,7 @@ static inline void zap_vma_pages(struct vm_area_struct *vma)
> }
> void unmap_vmas(struct mmu_gather *tlb, struct ma_state *mas,
> struct vm_area_struct *start_vma, unsigned long start,
> - unsigned long end, unsigned long tree_end, bool mm_wr_locked);
> + unsigned long end, unsigned long tree_end);
>
> struct mmu_notifier_range;
>
> diff --git a/mm/memory.c b/mm/memory.c
> index 4c3a7e09a159..1a1626bba55a 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -2023,8 +2023,7 @@ void unmap_page_range(struct mmu_gather *tlb,
>
> static void unmap_single_vma(struct mmu_gather *tlb,
> struct vm_area_struct *vma, unsigned long start_addr,
> - unsigned long end_addr,
> - struct zap_details *details, bool mm_wr_locked)
> + unsigned long end_addr, struct zap_details *details)
> {
> unsigned long start = max(vma->vm_start, start_addr);
> unsigned long end;
> @@ -2070,7 +2069,6 @@ static void unmap_single_vma(struct mmu_gather *tlb,
> * @start_addr: virtual address at which to start unmapping
> * @end_addr: virtual address at which to end unmapping
> * @tree_end: The maximum index to check
> - * @mm_wr_locked: lock flag
> *
> * Unmap all pages in the vma list.
> *
> @@ -2085,8 +2083,7 @@ static void unmap_single_vma(struct mmu_gather *tlb,
> */
> void unmap_vmas(struct mmu_gather *tlb, struct ma_state *mas,
> struct vm_area_struct *vma, unsigned long start_addr,
> - unsigned long end_addr, unsigned long tree_end,
> - bool mm_wr_locked)
> + unsigned long end_addr, unsigned long tree_end)
Yikes, so we set mm_wr_locked but it was ignored since f8e97613fed2...
> {
> struct mmu_notifier_range range;
> struct zap_details details = {
> @@ -2102,8 +2099,7 @@ void unmap_vmas(struct mmu_gather *tlb, struct ma_state *mas,
> unsigned long start = start_addr;
> unsigned long end = end_addr;
> hugetlb_zap_begin(vma, &start, &end);
> - unmap_single_vma(tlb, vma, start, end, &details,
> - mm_wr_locked);
> + unmap_single_vma(tlb, vma, start, end, &details);
> hugetlb_zap_end(vma, &details);
> vma = mas_find(mas, tree_end - 1);
> } while (vma && likely(!xa_is_zero(vma)));
> @@ -2139,7 +2135,7 @@ void zap_page_range_single_batched(struct mmu_gather *tlb,
> * unmap 'address-end' not 'range.start-range.end' as range
> * could have been expanded for hugetlb pmd sharing.
> */
> - unmap_single_vma(tlb, vma, address, end, details, false);
> + unmap_single_vma(tlb, vma, address, end, details);
> mmu_notifier_invalidate_range_end(&range);
> if (is_vm_hugetlb_page(vma)) {
> /*
> diff --git a/mm/mmap.c b/mm/mmap.c
> index 644f02071a41..4f51ca644903 100644
> --- a/mm/mmap.c
> +++ b/mm/mmap.c
> @@ -1274,7 +1274,7 @@ void exit_mmap(struct mm_struct *mm)
> tlb_gather_mmu_fullmm(&tlb, mm);
> /* update_hiwater_rss(mm) here? but nobody should be looking */
> /* Use ULONG_MAX here to ensure all VMAs in the mm are unmapped */
> - unmap_vmas(&tlb, &vmi.mas, vma, 0, ULONG_MAX, ULONG_MAX, false);
> + unmap_vmas(&tlb, &vmi.mas, vma, 0, ULONG_MAX, ULONG_MAX);
> mmap_read_unlock(mm);
>
> /*
> diff --git a/mm/vma.c b/mm/vma.c
> index 919d1fc63a52..0c5e391fe2e2 100644
> --- a/mm/vma.c
> +++ b/mm/vma.c
> @@ -483,8 +483,7 @@ void unmap_region(struct ma_state *mas, struct vm_area_struct *vma,
>
> tlb_gather_mmu(&tlb, mm);
> update_hiwater_rss(mm);
> - unmap_vmas(&tlb, mas, vma, vma->vm_start, vma->vm_end, vma->vm_end,
> - /* mm_wr_locked = */ true);
> + unmap_vmas(&tlb, mas, vma, vma->vm_start, vma->vm_end, vma->vm_end);
> mas_set(mas, vma->vm_end);
> free_pgtables(&tlb, mas, vma, prev ? prev->vm_end : FIRST_USER_ADDRESS,
> next ? next->vm_start : USER_PGTABLES_CEILING,
> @@ -1228,7 +1227,7 @@ static inline void vms_clear_ptes(struct vma_munmap_struct *vms,
> tlb_gather_mmu(&tlb, vms->vma->vm_mm);
> update_hiwater_rss(vms->vma->vm_mm);
> unmap_vmas(&tlb, mas_detach, vms->vma, vms->start, vms->end,
> - vms->vma_count, mm_wr_locked);
> + vms->vma_count);
>
> mas_set(mas_detach, 1);
> /* start and end may be different if there is no prev or next vma. */
> diff --git a/tools/testing/vma/vma_internal.h b/tools/testing/vma/vma_internal.h
> index d873667704e8..c68d382dac81 100644
> --- a/tools/testing/vma/vma_internal.h
> +++ b/tools/testing/vma/vma_internal.h
> @@ -848,8 +848,7 @@ static inline void update_hiwater_vm(struct mm_struct *mm)
>
> static inline void unmap_vmas(struct mmu_gather *tlb, struct ma_state *mas,
> struct vm_area_struct *vma, unsigned long start_addr,
> - unsigned long end_addr, unsigned long tree_end,
> - bool mm_wr_locked)
> + unsigned long end_addr, unsigned long tree_end)
> {
> }
>
> --
> 2.27.0
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] mm: kill mm_wr_locked from unmap_vmas() and unmap_single_vma()
2025-11-04 8:57 [PATCH] mm: kill mm_wr_locked from unmap_vmas() and unmap_single_vma() Kefeng Wang
2025-11-04 9:29 ` Lorenzo Stoakes
@ 2025-11-06 10:12 ` David Hildenbrand (Red Hat)
2025-11-06 16:34 ` Liam R. Howlett
2 siblings, 0 replies; 4+ messages in thread
From: David Hildenbrand (Red Hat) @ 2025-11-06 10:12 UTC (permalink / raw)
To: Kefeng Wang, Andrew Morton; +Cc: Lorenzo Stoakes, Liam.Howlett, linux-mm
On 04.11.25 09:57, Kefeng Wang wrote:
> Kill mm_wr_locked since commit f8e97613fed2 ("mm: convert VM_PFNMAP
> tracking to pfnmap_track() + pfnmap_untrack()") remove the user.
>
Oh, nice!
Acked-by: David Hildenbrand (Red Hat) <david@kernel.org>
--
Cheers
David
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] mm: kill mm_wr_locked from unmap_vmas() and unmap_single_vma()
2025-11-04 8:57 [PATCH] mm: kill mm_wr_locked from unmap_vmas() and unmap_single_vma() Kefeng Wang
2025-11-04 9:29 ` Lorenzo Stoakes
2025-11-06 10:12 ` David Hildenbrand (Red Hat)
@ 2025-11-06 16:34 ` Liam R. Howlett
2 siblings, 0 replies; 4+ messages in thread
From: Liam R. Howlett @ 2025-11-06 16:34 UTC (permalink / raw)
To: Kefeng Wang; +Cc: Andrew Morton, David Hildenbrand, Lorenzo Stoakes, linux-mm
* Kefeng Wang <wangkefeng.wang@huawei.com> [251104 03:57]:
> Kill mm_wr_locked since commit f8e97613fed2 ("mm: convert VM_PFNMAP
> tracking to pfnmap_track() + pfnmap_untrack()") remove the user.
Thanks.
Many of these functions have way too many variables passed through, and
we weren't even using this one.
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
> include/linux/mm.h | 2 +-
> mm/memory.c | 12 ++++--------
> mm/mmap.c | 2 +-
> mm/vma.c | 5 ++---
> tools/testing/vma/vma_internal.h | 3 +--
> 5 files changed, 9 insertions(+), 15 deletions(-)
>
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index f27c3687ea43..9909e35ebb8d 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -2471,7 +2471,7 @@ static inline void zap_vma_pages(struct vm_area_struct *vma)
> }
> void unmap_vmas(struct mmu_gather *tlb, struct ma_state *mas,
> struct vm_area_struct *start_vma, unsigned long start,
> - unsigned long end, unsigned long tree_end, bool mm_wr_locked);
> + unsigned long end, unsigned long tree_end);
>
> struct mmu_notifier_range;
>
> diff --git a/mm/memory.c b/mm/memory.c
> index 4c3a7e09a159..1a1626bba55a 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -2023,8 +2023,7 @@ void unmap_page_range(struct mmu_gather *tlb,
>
> static void unmap_single_vma(struct mmu_gather *tlb,
> struct vm_area_struct *vma, unsigned long start_addr,
> - unsigned long end_addr,
> - struct zap_details *details, bool mm_wr_locked)
> + unsigned long end_addr, struct zap_details *details)
> {
> unsigned long start = max(vma->vm_start, start_addr);
> unsigned long end;
> @@ -2070,7 +2069,6 @@ static void unmap_single_vma(struct mmu_gather *tlb,
> * @start_addr: virtual address at which to start unmapping
> * @end_addr: virtual address at which to end unmapping
> * @tree_end: The maximum index to check
> - * @mm_wr_locked: lock flag
> *
> * Unmap all pages in the vma list.
> *
> @@ -2085,8 +2083,7 @@ static void unmap_single_vma(struct mmu_gather *tlb,
> */
> void unmap_vmas(struct mmu_gather *tlb, struct ma_state *mas,
> struct vm_area_struct *vma, unsigned long start_addr,
> - unsigned long end_addr, unsigned long tree_end,
> - bool mm_wr_locked)
> + unsigned long end_addr, unsigned long tree_end)
> {
> struct mmu_notifier_range range;
> struct zap_details details = {
> @@ -2102,8 +2099,7 @@ void unmap_vmas(struct mmu_gather *tlb, struct ma_state *mas,
> unsigned long start = start_addr;
> unsigned long end = end_addr;
> hugetlb_zap_begin(vma, &start, &end);
> - unmap_single_vma(tlb, vma, start, end, &details,
> - mm_wr_locked);
> + unmap_single_vma(tlb, vma, start, end, &details);
> hugetlb_zap_end(vma, &details);
> vma = mas_find(mas, tree_end - 1);
> } while (vma && likely(!xa_is_zero(vma)));
> @@ -2139,7 +2135,7 @@ void zap_page_range_single_batched(struct mmu_gather *tlb,
> * unmap 'address-end' not 'range.start-range.end' as range
> * could have been expanded for hugetlb pmd sharing.
> */
> - unmap_single_vma(tlb, vma, address, end, details, false);
> + unmap_single_vma(tlb, vma, address, end, details);
> mmu_notifier_invalidate_range_end(&range);
> if (is_vm_hugetlb_page(vma)) {
> /*
> diff --git a/mm/mmap.c b/mm/mmap.c
> index 644f02071a41..4f51ca644903 100644
> --- a/mm/mmap.c
> +++ b/mm/mmap.c
> @@ -1274,7 +1274,7 @@ void exit_mmap(struct mm_struct *mm)
> tlb_gather_mmu_fullmm(&tlb, mm);
> /* update_hiwater_rss(mm) here? but nobody should be looking */
> /* Use ULONG_MAX here to ensure all VMAs in the mm are unmapped */
> - unmap_vmas(&tlb, &vmi.mas, vma, 0, ULONG_MAX, ULONG_MAX, false);
> + unmap_vmas(&tlb, &vmi.mas, vma, 0, ULONG_MAX, ULONG_MAX);
> mmap_read_unlock(mm);
>
> /*
> diff --git a/mm/vma.c b/mm/vma.c
> index 919d1fc63a52..0c5e391fe2e2 100644
> --- a/mm/vma.c
> +++ b/mm/vma.c
> @@ -483,8 +483,7 @@ void unmap_region(struct ma_state *mas, struct vm_area_struct *vma,
>
> tlb_gather_mmu(&tlb, mm);
> update_hiwater_rss(mm);
> - unmap_vmas(&tlb, mas, vma, vma->vm_start, vma->vm_end, vma->vm_end,
> - /* mm_wr_locked = */ true);
> + unmap_vmas(&tlb, mas, vma, vma->vm_start, vma->vm_end, vma->vm_end);
> mas_set(mas, vma->vm_end);
> free_pgtables(&tlb, mas, vma, prev ? prev->vm_end : FIRST_USER_ADDRESS,
> next ? next->vm_start : USER_PGTABLES_CEILING,
> @@ -1228,7 +1227,7 @@ static inline void vms_clear_ptes(struct vma_munmap_struct *vms,
> tlb_gather_mmu(&tlb, vms->vma->vm_mm);
> update_hiwater_rss(vms->vma->vm_mm);
> unmap_vmas(&tlb, mas_detach, vms->vma, vms->start, vms->end,
> - vms->vma_count, mm_wr_locked);
> + vms->vma_count);
>
> mas_set(mas_detach, 1);
> /* start and end may be different if there is no prev or next vma. */
> diff --git a/tools/testing/vma/vma_internal.h b/tools/testing/vma/vma_internal.h
> index d873667704e8..c68d382dac81 100644
> --- a/tools/testing/vma/vma_internal.h
> +++ b/tools/testing/vma/vma_internal.h
> @@ -848,8 +848,7 @@ static inline void update_hiwater_vm(struct mm_struct *mm)
>
> static inline void unmap_vmas(struct mmu_gather *tlb, struct ma_state *mas,
> struct vm_area_struct *vma, unsigned long start_addr,
> - unsigned long end_addr, unsigned long tree_end,
> - bool mm_wr_locked)
> + unsigned long end_addr, unsigned long tree_end)
> {
> }
>
> --
> 2.27.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-11-06 16:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-11-04 8:57 [PATCH] mm: kill mm_wr_locked from unmap_vmas() and unmap_single_vma() Kefeng Wang
2025-11-04 9:29 ` Lorenzo Stoakes
2025-11-06 10:12 ` David Hildenbrand (Red Hat)
2025-11-06 16:34 ` Liam R. Howlett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox