Commit 99edea30 authored by Barry Song's avatar Barry Song Committed by Andrew Morton
Browse files

mm: madvise: use walk_page_range_vma() instead of walk_page_range() 

We've already found the VMA within madvise_walk_vmas() before calling
specific madvise behavior functions like madvise_free_single_vma().  So
calling walk_page_range() and doing find_vma() again seems unnecessary. 
It also prevents potential optimizations in those madvise callbacks,
particularly the use of dedicated per-VMA locking.

[v-songbaohua@oppo.com: revert the walk_page_range_vma change for MADV_GUARD_INSTALL]
  Link: https://lkml.kernel.org/r/20250609105513.10901-1-21cnbao@gmail.com
Link: https://lkml.kernel.org/r/20250605083144.43046-1-21cnbao@gmail.com


Signed-off-by: default avatarBarry Song <v-songbaohua@oppo.com>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarOscar Salvador <osalvador@suse.de>
Reviewed-by: default avatarHarry Yoo <harry.yoo@oracle.com>
Reviewed-by: default avatarDev Jain <dev.jain@arm.com>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Reviewed-by: default avatarRyan Roberts <ryan.roberts@arm.com>
Tested-by: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: "Liam R. Howlett" <Liam.Howlett@oracle.com>
Cc: Jann Horn <jannh@google.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Lokesh Gidra <lokeshgidra@google.com>
Cc: Tangquan Zheng <zhengtangquan@oppo.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a8fb49c6

mm/madvise.c

+5 −5
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static long madvise_willneed(struct vm_area_struct *vma, 
	*prev = vma;

#ifdef CONFIG_SWAP

	if (!file) {

		walk_page_range(vma->vm_mm, start, end, &swapin_walk_ops, vma);

		walk_page_range_vma(vma, start, end, &swapin_walk_ops, vma);

		lru_add_drain(); /* Push any new pages onto the LRU now */

		return 0;

	}
@@ -582,7 +582,7 @@ static void madvise_cold_page_range(struct mmu_gather *tlb, 
	};



	tlb_start_vma(tlb, vma);

	walk_page_range(vma->vm_mm, addr, end, &cold_walk_ops, &walk_private);

	walk_page_range_vma(vma, addr, end, &cold_walk_ops, &walk_private);

	tlb_end_vma(tlb, vma);

}
@@ -620,7 +620,7 @@ static void madvise_pageout_page_range(struct mmu_gather *tlb, 
	};



	tlb_start_vma(tlb, vma);

	walk_page_range(vma->vm_mm, addr, end, &cold_walk_ops, &walk_private);

	walk_page_range_vma(vma, addr, end, &cold_walk_ops, &walk_private);

	tlb_end_vma(tlb, vma);

}
@@ -827,7 +827,7 @@ static int madvise_free_single_vma(struct madvise_behavior *madv_behavior, 


	mmu_notifier_invalidate_range_start(&range);

	tlb_start_vma(tlb, vma);

	walk_page_range(vma->vm_mm, range.start, range.end,

	walk_page_range_vma(vma, range.start, range.end,

			&madvise_free_walk_ops, tlb);

	tlb_end_vma(tlb, vma);

	mmu_notifier_invalidate_range_end(&range);
@@ -1246,7 +1246,7 @@ static long madvise_guard_remove(struct vm_area_struct *vma, 
	if (!is_valid_guard_vma(vma, /* allow_locked = */true))

		return -EINVAL;



	return walk_page_range(vma->vm_mm, start, end,

	return walk_page_range_vma(vma, start, end,

			       &guard_remove_walk_ops, NULL);

}