Commit 78ba531f authored by Liam R. Howlett's avatar Liam R. Howlett Committed by Andrew Morton
Browse files

mm/vmscan: use vma iterator instead of vm_next 

Use the vma iterator in in get_next_vma() instead of the linked list.

[yuzhao@google.com: mm/vmscan: use the proper VMA iterator]
  Link: https://lkml.kernel.org/r/Yx+QGOgHg1Wk8tGK@google.com
Link: https://lkml.kernel.org/r/20220906194824.2110408-68-Liam.Howlett@oracle.com


Signed-off-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: default avatarYu Zhao <yuzhao@google.com>
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: Davidlohr Bueso <dave@stgolabs.net>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: SeongJae Park <sj@kernel.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 9b580a1d

mm/vmscan.c

+3 −9
Original line number Diff line number Diff line
@@ -3774,23 +3774,17 @@ static bool get_next_vma(unsigned long mask, unsigned long size, struct mm_walk 
{

	unsigned long start = round_up(*vm_end, size);

	unsigned long end = (start | ~mask) + 1;

	VMA_ITERATOR(vmi, args->mm, start);



	VM_WARN_ON_ONCE(mask & size);

	VM_WARN_ON_ONCE((start & mask) != (*vm_start & mask));



	while (args->vma) {

		if (start >= args->vma->vm_end) {

			args->vma = args->vma->vm_next;

			continue;

		}



	for_each_vma(vmi, args->vma) {

		if (end && end <= args->vma->vm_start)

			return false;



		if (should_skip_vma(args->vma->vm_start, args->vma->vm_end, args)) {

			args->vma = args->vma->vm_next;

		if (should_skip_vma(args->vma->vm_start, args->vma->vm_end, args))

			continue;

		}



		*vm_start = max(start, args->vma->vm_start);

		*vm_end = min(end - 1, args->vma->vm_end - 1) + 1;