Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 10:45:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

i915: use the VMA iterator

Browse Source 
Replace the linked list in probe_range() with the VMA iterator.

Link: https://lkml.kernel.org/r/20220906194824.2110408-65-Liam.Howlett@oracle.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Tested-by: Yu 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: SeongJae Park <sj@kernel.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-09-06 19:49:04 +00:00 committed by Andrew Morton
parent 208c09db6d
commit f683b9d613
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/i915/gem/i915_gem_userptr.c
View File

@ -426,12 +426,11 @@ static const struct drm_i915_gem_object_ops i915_gem_userptr_ops = {
static int static int
probe_range(struct mm_struct *mm, unsigned long addr, unsigned long len) probe_range(struct mm_struct *mm, unsigned long addr, unsigned long len)
{ {
const unsigned long end = addr + len; VMA_ITERATOR(vmi, mm, addr);
struct vm_area_struct *vma; struct vm_area_struct *vma;
int ret = -EFAULT;
mmap_read_lock(mm); mmap_read_lock(mm);
for (vma = find_vma(mm, addr); vma; vma = vma->vm_next) { for_each_vma_range(vmi, vma, addr + len) {
/* Check for holes, note that we also update the addr below */ /* Check for holes, note that we also update the addr below */
if (vma->vm_start > addr) if (vma->vm_start > addr)
break; break;
@ -439,16 +438,13 @@ probe_range(struct mm_struct *mm, unsigned long addr, unsigned long len)
if (vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP)) if (vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP))
break; break;
if (vma->vm_end >= end) {
ret = 0;
break;
}
addr = vma->vm_end; addr = vma->vm_end;
} }
mmap_read_unlock(mm); mmap_read_unlock(mm);
return ret; if (vma)
return -EFAULT;
return 0;
} }
/* /*