lkml.org 
[lkml]   [2014]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 121/254] drm/i915: Do not leak pages when freeing userptr objects
    Date
    3.16.7-ckt2 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

    commit c479f4383ea8940dd6f88da61798ad31feb33e51 upstream.

    sg_alloc_table_from_pages() can build us a table with coalesced ranges which
    means we need to iterate over pages and not sg table entries when releasing
    page references.

    Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
    Cc: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: "Barbalho, Rafael" <rafael.barbalho@intel.com>
    Tested-by: Rafael Barbalho <rafael.barbalho@intel.com>
    Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
    [danvet: Remove unused local variable sg.]
    Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/i915/i915_gem_userptr.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
    index 21ea92886a56..7b7a35d71c08 100644
    --- a/drivers/gpu/drm/i915/i915_gem_userptr.c
    +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
    @@ -554,16 +554,15 @@ i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj)
    static void
    i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj)
    {
    - struct scatterlist *sg;
    - int i;
    + struct sg_page_iter sg_iter;

    BUG_ON(obj->userptr.work != NULL);

    if (obj->madv != I915_MADV_WILLNEED)
    obj->dirty = 0;

    - for_each_sg(obj->pages->sgl, sg, obj->pages->nents, i) {
    - struct page *page = sg_page(sg);
    + for_each_sg_page(obj->pages->sgl, &sg_iter, obj->pages->nents, 0) {
    + struct page *page = sg_page_iter_page(&sg_iter);

    if (obj->dirty)
    set_page_dirty(page);
    --
    2.1.0


    \
     
     \ /
      Last update: 2014-11-25 13:01    [W:2.480 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site