lkml.org 
[lkml]   [2019]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/34] drm/etnaviv: convert release_pages() to put_user_pages()
    Date
    From: John Hubbard <jhubbard@nvidia.com>

    For pages that were retained via get_user_pages*(), release those pages
    via the new put_user_page*() routines, instead of via put_page() or
    release_pages().

    This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
    ("mm: introduce put_user_page*(), placeholder versions").

    Cc: Joerg Roedel <joro@8bytes.org>
    Cc: Paolo Bonzini <pbonzini@redhat.com>
    Cc: "Radim Krčmář" <rkrcmar@redhat.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: x86@kernel.org
    Cc: kvm@vger.kernel.org
    Signed-off-by: John Hubbard <jhubbard@nvidia.com>
    ---
    drivers/gpu/drm/etnaviv/etnaviv_gem.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
    index e8778ebb72e6..a0144a5ee325 100644
    --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
    +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
    @@ -686,7 +686,7 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj)
    ret = get_user_pages_fast(ptr, num_pages,
    !userptr->ro ? FOLL_WRITE : 0, pages);
    if (ret < 0) {
    - release_pages(pvec, pinned);
    + put_user_pages(pvec, pinned);
    kvfree(pvec);
    return ret;
    }
    @@ -710,7 +710,7 @@ static void etnaviv_gem_userptr_release(struct etnaviv_gem_object *etnaviv_obj)
    if (etnaviv_obj->pages) {
    int npages = etnaviv_obj->base.size >> PAGE_SHIFT;

    - release_pages(etnaviv_obj->pages, npages);
    + put_user_pages(etnaviv_obj->pages, npages);
    kvfree(etnaviv_obj->pages);
    }
    }
    --
    2.22.0
    \
     
     \ /
      Last update: 2019-08-02 04:35    [W:3.638 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site