Commit fcb72a58 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

perf: use VMA iterator 

The VMA iterator is faster than the linked list and removing the linked
list will shrink the vm_area_struct.

Link: https://lkml.kernel.org/r/20220906194824.2110408-48-Liam.Howlett@oracle.com


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarLiam R. Howlett <Liam.Howlett@Oracle.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Reviewed-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Tested-by: default avatarYu Zhao <yuzhao@google.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Cc: SeongJae Park <sj@kernel.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 160c8200

kernel/events/core.c

+2 −1
Original line number Diff line number Diff line
@@ -10229,8 +10229,9 @@ static void perf_addr_filter_apply(struct perf_addr_filter *filter, 
				   struct perf_addr_filter_range *fr)

{

	struct vm_area_struct *vma;

	VMA_ITERATOR(vmi, mm, 0);



	for (vma = mm->mmap; vma; vma = vma->vm_next) {

	for_each_vma(vmi, vma) {

		if (!vma->vm_file)

			continue;

kernel/events/uprobes.c

+6 −3
Original line number Diff line number Diff line
@@ -349,9 +349,10 @@ static bool valid_ref_ctr_vma(struct uprobe *uprobe, 
static struct vm_area_struct *

find_ref_ctr_vma(struct uprobe *uprobe, struct mm_struct *mm)

{

	VMA_ITERATOR(vmi, mm, 0);

	struct vm_area_struct *tmp;



	for (tmp = mm->mmap; tmp; tmp = tmp->vm_next)

	for_each_vma(vmi, tmp)

		if (valid_ref_ctr_vma(uprobe, tmp))

			return tmp;
@@ -1231,11 +1232,12 @@ int uprobe_apply(struct inode *inode, loff_t offset, 


static int unapply_uprobe(struct uprobe *uprobe, struct mm_struct *mm)

{

	VMA_ITERATOR(vmi, mm, 0);

	struct vm_area_struct *vma;

	int err = 0;



	mmap_read_lock(mm);

	for (vma = mm->mmap; vma; vma = vma->vm_next) {

	for_each_vma(vmi, vma) {

		unsigned long vaddr;

		loff_t offset;
@@ -1983,9 +1985,10 @@ bool uprobe_deny_signal(void) 


static void mmf_recalc_uprobes(struct mm_struct *mm)

{

	VMA_ITERATOR(vmi, mm, 0);

	struct vm_area_struct *vma;



	for (vma = mm->mmap; vma; vma = vma->vm_next) {

	for_each_vma(vmi, vma) {

		if (!valid_vma(vma, false))

			continue;

		/*