lkml.org 
[lkml]   [2022]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v10 64/69] i915: use the VMA iterator
    Date
    From: "Matthew Wilcox (Oracle)" <willy@infradead.org>

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

    Link: https://lkml.kernel.org/r/20220504011345.662299-49-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>
    Cc: Catalin Marinas <catalin.marinas@arm.com>
    Cc: David Howells <dhowells@redhat.com>
    Cc: SeongJae Park <sj@kernel.org>
    Cc: Will Deacon <will@kernel.org>
    Cc: Davidlohr Bueso <dave@stgolabs.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    ---
    drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 14 +++++---------
    1 file changed, 5 insertions(+), 9 deletions(-)

    diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
    index 094f06b4ce33..a509f7da104b 100644
    --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
    +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
    @@ -426,12 +426,11 @@ static const struct drm_i915_gem_object_ops i915_gem_userptr_ops = {
    static int
    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;
    - int ret = -EFAULT;

    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 */
    if (vma->vm_start > addr)
    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))
    break;

    - if (vma->vm_end >= end) {
    - ret = 0;
    - break;
    - }
    -
    addr = vma->vm_end;
    }
    mmap_read_unlock(mm);

    - return ret;
    + if (vma)
    + return -EFAULT;
    + return 0;
    }

    /*
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-06-21 22:53    [W:3.490 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site