From: John Harrison <John.C.Harrison@Intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 25/42] drm/i915: Use lockless object free
Date: Tue, 11 Oct 2016 10:56:49 +0100 [thread overview]
Message-ID: <8b30bbca-db42-abf8-f884-5cf7b1fa353f@Intel.com> (raw)
In-Reply-To: <20161007094635.28319-26-chris@chris-wilson.co.uk>
Needs a description?
On 07/10/2016 10:46, Chris Wilson wrote:
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/i915_drv.c | 2 +-
> drivers/gpu/drm/i915/i915_drv.h | 10 +---------
> drivers/gpu/drm/i915/i915_gem.c | 20 ++++++++++----------
> drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +-
> drivers/gpu/drm/i915/i915_gem_userptr.c | 4 ++--
> drivers/gpu/drm/i915/intel_display.c | 6 +++---
> drivers/gpu/drm/i915/intel_overlay.c | 4 ++--
> drivers/gpu/drm/i915/intel_pm.c | 2 +-
> 8 files changed, 21 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index f7d48f97993d..2e29eedd21b2 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -2606,7 +2606,7 @@ static struct drm_driver driver = {
> .set_busid = drm_pci_set_busid,
>
> .gem_close_object = i915_gem_close_object,
> - .gem_free_object = i915_gem_free_object,
> + .gem_free_object_unlocked = i915_gem_free_object,
> .gem_vm_ops = &i915_gem_vm_ops,
>
> .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index e79a5cb78b5d..89d3b5a16826 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2396,19 +2396,12 @@ __attribute__((nonnull))
> static inline void
> i915_gem_object_put(struct drm_i915_gem_object *obj)
> {
> - drm_gem_object_unreference(&obj->base);
> + __drm_gem_object_unreference(&obj->base);
> }
>
> __deprecated
> extern void drm_gem_object_unreference(struct drm_gem_object *);
>
> -__attribute__((nonnull))
> -static inline void
> -i915_gem_object_put_unlocked(struct drm_i915_gem_object *obj)
> -{
> - drm_gem_object_unreference_unlocked(&obj->base);
> -}
> -
> __deprecated
> extern void drm_gem_object_unreference_unlocked(struct drm_gem_object *);
>
> @@ -2510,7 +2503,6 @@ static inline struct i915_vma *i915_vma_get(struct i915_vma *vma)
>
> static inline void i915_vma_put(struct i915_vma *vma)
> {
> - lockdep_assert_held(&vma->vm->dev->struct_mutex);
> i915_gem_object_put(vma->obj);
> }
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 7cd49dd1d3f8..28e1064baad5 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -616,7 +616,7 @@ i915_gem_create(struct drm_file *file,
>
> ret = drm_gem_handle_create(file, &obj->base, &handle);
> /* drop reference from allocate - handle holds it now */
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
> if (ret)
> return ret;
>
> @@ -1115,7 +1115,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
>
> i915_gem_object_unpin_pages(obj);
> out:
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
> return ret;
> }
>
> @@ -1450,7 +1450,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
>
> i915_gem_object_unpin_pages(obj);
> err:
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
> return ret;
> }
>
> @@ -1560,7 +1560,7 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
> err_pages:
> i915_gem_object_unpin_pages(obj);
> err_unlocked:
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
> return ret;
> }
>
> @@ -1591,7 +1591,7 @@ i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
> }
> }
>
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
> return err;
> }
>
> @@ -1637,7 +1637,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
> * pages from.
> */
> if (!obj->base.filp) {
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
> return -EINVAL;
> }
>
> @@ -1649,7 +1649,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
> struct vm_area_struct *vma;
>
> if (down_write_killable(&mm->mmap_sem)) {
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
> return -EINTR;
> }
> vma = find_vma(mm, addr);
> @@ -1663,7 +1663,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
> /* This may race, but that's ok, it only gets set */
> WRITE_ONCE(obj->frontbuffer_ggtt_origin, ORIGIN_CPU);
> }
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
> if (IS_ERR((void *)addr))
> return addr;
>
> @@ -2073,7 +2073,7 @@ i915_gem_mmap_gtt(struct drm_file *file,
> if (ret == 0)
> *offset = drm_vma_node_offset_addr(&obj->base.vma_node);
>
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
> return ret;
> }
>
> @@ -2881,7 +2881,7 @@ i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
> args->timeout_ns = 0;
> }
>
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
> return ret;
> }
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
> index ec48e403adfe..d8fc4782b8db 100644
> --- a/drivers/gpu/drm/i915/i915_gem_tiling.c
> +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
> @@ -200,7 +200,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
>
> if (!i915_tiling_ok(dev,
> args->stride, obj->base.size, args->tiling_mode)) {
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
> return -EINVAL;
> }
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
> index 136c493b15b2..6f7ac0e783ec 100644
> --- a/drivers/gpu/drm/i915/i915_gem_userptr.c
> +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
> @@ -542,7 +542,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work)
> release_pages(pvec, pinned, 0);
> drm_free_large(pvec);
>
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
> put_task_struct(work->task);
> kfree(work);
> }
> @@ -802,7 +802,7 @@ i915_gem_userptr_ioctl(struct drm_device *dev, void *data, struct drm_file *file
> ret = drm_gem_handle_create(file, &obj->base, &handle);
>
> /* drop reference from allocate - handle holds it now */
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 5ee7bab6e560..8beec0b651cd 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -11026,7 +11026,7 @@ intel_framebuffer_create_for_mode(struct drm_device *dev,
>
> fb = intel_framebuffer_create(dev, &mode_cmd, obj);
> if (IS_ERR(fb))
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
>
> return fb;
> }
> @@ -12330,7 +12330,7 @@ cleanup:
> crtc->primary->fb = old_fb;
> update_state_fb(crtc->primary);
>
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
> drm_framebuffer_unreference(work->old_fb);
>
> spin_lock_irq(&dev->event_lock);
> @@ -15837,7 +15837,7 @@ intel_user_framebuffer_create(struct drm_device *dev,
>
> fb = intel_framebuffer_create(dev, &mode_cmd, obj);
> if (IS_ERR(fb))
> - i915_gem_object_put_unlocked(obj);
> + i915_gem_object_put(obj);
>
> return fb;
> }
> diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
> index 7c392547711f..58d5c5eed487 100644
> --- a/drivers/gpu/drm/i915/intel_overlay.c
> +++ b/drivers/gpu/drm/i915/intel_overlay.c
> @@ -1222,7 +1222,7 @@ int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data,
> out_unlock:
> mutex_unlock(&dev->struct_mutex);
> drm_modeset_unlock_all(dev);
> - i915_gem_object_put_unlocked(new_bo);
> + i915_gem_object_put(new_bo);
> out_free:
> kfree(params);
>
> @@ -1466,7 +1466,7 @@ void intel_cleanup_overlay(struct drm_i915_private *dev_priv)
> * hardware should be off already */
> WARN_ON(dev_priv->overlay->active);
>
> - i915_gem_object_put_unlocked(dev_priv->overlay->reg_bo);
> + i915_gem_object_put(dev_priv->overlay->reg_bo);
> kfree(dev_priv->overlay);
> }
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 7f1748a1e614..27fc4c9c8cd0 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -5864,7 +5864,7 @@ static void valleyview_cleanup_pctx(struct drm_i915_private *dev_priv)
> if (WARN_ON(!dev_priv->vlv_pctx))
> return;
>
> - i915_gem_object_put_unlocked(dev_priv->vlv_pctx);
> + i915_gem_object_put(dev_priv->vlv_pctx);
> dev_priv->vlv_pctx = NULL;
> }
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-10-11 9:56 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-07 9:45 Explicit fencing on multiple timelines, again Chris Wilson
2016-10-07 9:45 ` [PATCH 01/42] drm/i915: Allow disabling error capture Chris Wilson
2016-10-07 9:45 ` [PATCH 02/42] drm/i915: Stop the machine whilst capturing the GPU crash dump Chris Wilson
2016-10-07 10:11 ` Joonas Lahtinen
2016-10-07 9:45 ` [PATCH 03/42] drm/i915: Always use the GTT for error capture Chris Wilson
2016-10-07 9:45 ` [PATCH 04/42] drm/i915: Consolidate error object printing Chris Wilson
2016-10-07 9:45 ` [PATCH 05/42] drm/i915: Compress GPU objects in error state Chris Wilson
2016-10-07 9:45 ` [PATCH 06/42] drm/i915: Support asynchronous waits on struct fence from i915_gem_request Chris Wilson
2016-10-07 9:56 ` Joonas Lahtinen
2016-10-07 15:51 ` Tvrtko Ursulin
2016-10-07 16:12 ` Chris Wilson
2016-10-07 16:16 ` Tvrtko Ursulin
2016-10-07 16:37 ` Chris Wilson
2016-10-08 8:23 ` Tvrtko Ursulin
2016-10-08 8:58 ` Chris Wilson
2016-10-07 9:46 ` [PATCH 07/42] drm/i915: Allow i915_sw_fence_await_sw_fence() to allocate Chris Wilson
2016-10-07 16:10 ` Tvrtko Ursulin
2016-10-07 16:22 ` Chris Wilson
2016-10-08 8:21 ` Tvrtko Ursulin
2016-10-07 9:46 ` [PATCH 08/42] drm/i915: Rearrange i915_wait_request() accounting with callers Chris Wilson
2016-10-07 9:58 ` Joonas Lahtinen
2016-10-07 9:46 ` [PATCH 09/42] drm/i915: Remove unused i915_gem_active_wait() in favour of _unlocked() Chris Wilson
2016-10-07 9:46 ` [PATCH 10/42] drm/i915: Defer active reference until required Chris Wilson
2016-10-07 16:35 ` Tvrtko Ursulin
2016-10-07 16:58 ` Chris Wilson
2016-10-08 8:18 ` Tvrtko Ursulin
2016-10-07 9:46 ` [PATCH 11/42] drm/i915: Introduce an internal allocator for disposable private objects Chris Wilson
2016-10-07 10:01 ` Joonas Lahtinen
2016-10-07 16:52 ` Tvrtko Ursulin
2016-10-07 17:08 ` Chris Wilson
2016-10-08 8:12 ` Tvrtko Ursulin
2016-10-08 8:32 ` Chris Wilson
2016-10-08 8:34 ` [PATCH v2] " Chris Wilson
2016-10-10 7:01 ` Joonas Lahtinen
2016-10-10 8:11 ` Tvrtko Ursulin
2016-10-10 8:19 ` Chris Wilson
2016-10-10 8:25 ` Tvrtko Ursulin
2016-10-07 9:46 ` [PATCH 12/42] drm/i915: Reuse the active golden render state batch Chris Wilson
2016-10-07 9:46 ` [PATCH 13/42] drm/i915: Markup GEM API with lockdep asserts Chris Wilson
2016-10-07 9:46 ` [PATCH 14/42] drm/i915: Use a radixtree for random access to the object's backing storage Chris Wilson
2016-10-07 10:12 ` Joonas Lahtinen
2016-10-07 11:05 ` Chris Wilson
2016-10-07 11:33 ` Joonas Lahtinen
2016-10-07 13:36 ` John Harrison
2016-10-11 9:32 ` Tvrtko Ursulin
2016-10-11 10:15 ` John Harrison
2016-10-07 9:46 ` [PATCH 15/42] drm/i915: Use radixtree to jump start intel_partial_pages() Chris Wilson
2016-10-07 13:46 ` John Harrison
2016-10-07 9:46 ` [PATCH 16/42] drm/i915: Refactor object page API Chris Wilson
2016-10-10 10:54 ` John Harrison
2016-10-11 11:23 ` Tvrtko Ursulin
2016-10-13 11:04 ` Joonas Lahtinen
2016-10-13 11:10 ` Chris Wilson
2016-10-07 9:46 ` [PATCH 17/42] drm/i915: Pass around sg_table to get_pages/put_pages backend Chris Wilson
2016-10-14 9:12 ` Joonas Lahtinen
2016-10-14 9:24 ` Chris Wilson
2016-10-14 9:28 ` Tvrtko Ursulin
2016-10-14 9:43 ` Chris Wilson
2016-10-17 10:52 ` Tvrtko Ursulin
2016-10-17 11:08 ` Chris Wilson
2016-10-07 9:46 ` [PATCH 18/42] drm/i915: Move object backing storage manipulation to its own locking Chris Wilson
2016-10-13 12:46 ` Joonas Lahtinen
2016-10-13 12:56 ` Chris Wilson
2016-10-07 9:46 ` [PATCH 19/42] drm/i915/dmabuf: Acquire the backing storage outside of struct_mutex Chris Wilson
2016-10-13 11:54 ` Joonas Lahtinen
2016-10-07 9:46 ` [PATCH 20/42] drm/i915: Implement pread without struct-mutex Chris Wilson
2016-10-12 12:53 ` Joonas Lahtinen
2016-10-07 9:46 ` [PATCH 21/42] drm/i915: Implement pwrite " Chris Wilson
2016-10-13 11:17 ` Joonas Lahtinen
2016-10-13 11:54 ` Chris Wilson
2016-10-14 7:08 ` Joonas Lahtinen
2016-10-07 9:46 ` [PATCH 22/42] drm/i915: Acquire the backing storage outside of struct_mutex in set-domain Chris Wilson
2016-10-13 11:47 ` Joonas Lahtinen
2016-10-07 9:46 ` [PATCH 23/42] drm/i915: Move object release to a freelist + worker Chris Wilson
2016-10-11 9:52 ` John Harrison
2016-10-07 9:46 ` [PATCH 24/42] drm/i915: Treat a framebuffer reference as an active reference whilst shrinking Chris Wilson
2016-10-11 9:54 ` John Harrison
2016-10-07 9:46 ` [PATCH 25/42] drm/i915: Use lockless object free Chris Wilson
2016-10-11 9:56 ` John Harrison [this message]
2016-10-07 9:46 ` [PATCH 26/42] drm/i915: Move GEM activity tracking into a common struct reservation_object Chris Wilson
2016-10-07 10:10 ` Joonas Lahtinen
2016-10-07 9:46 ` [PATCH 27/42] drm: Add reference counting to drm_atomic_state Chris Wilson
2016-10-07 9:46 ` [PATCH 28/42] drm/i915: Restore nonblocking awaits for modesetting Chris Wilson
2016-10-07 9:46 ` [PATCH 29/42] drm/i915: Combine seqno + tracking into a global timeline struct Chris Wilson
2016-10-07 9:46 ` [PATCH 30/42] drm/i915: Queue the idling context switch after all other timelines Chris Wilson
2016-10-07 9:46 ` [PATCH 31/42] drm/i915: Wait first for submission, before waiting for request completion Chris Wilson
2016-10-07 9:46 ` [PATCH 32/42] drm/i915: Introduce a global_seqno for each request Chris Wilson
2016-10-07 9:46 ` [PATCH 33/42] drm/i915: Rename ->emit_request to ->emit_breadcrumb Chris Wilson
2016-10-07 9:46 ` [PATCH 34/42] drm/i915: Record space required for breadcrumb emission Chris Wilson
2016-10-07 9:46 ` [PATCH 35/42] drm/i915: Defer " Chris Wilson
2016-10-07 9:46 ` [PATCH 36/42] drm/i915: Move the global sync optimisation to the timeline Chris Wilson
2016-10-07 9:46 ` [PATCH 37/42] drm/i915: Create a unique name for the context Chris Wilson
2016-10-07 9:46 ` [PATCH 38/42] drm/i915: Reserve space in the global seqno during request allocation Chris Wilson
2016-10-07 9:46 ` [PATCH 39/42] drm/i915: Defer setting of global seqno on request to submission Chris Wilson
2016-10-07 10:25 ` Joonas Lahtinen
2016-10-07 10:27 ` Joonas Lahtinen
2016-10-07 11:03 ` Chris Wilson
2016-10-07 11:10 ` Joonas Lahtinen
2016-10-07 9:46 ` [PATCH 40/42] drm/i915: Enable multiple timelines Chris Wilson
2016-10-07 10:29 ` Joonas Lahtinen
2016-10-07 11:00 ` Chris Wilson
2016-10-07 11:07 ` Joonas Lahtinen
2016-10-07 9:46 ` [PATCH 41/42] drm/i915: Enable userspace to opt-out of implicit fencing Chris Wilson
2016-10-07 9:46 ` [PATCH 42/42] drm/i915: Support explicit fencing for execbuf Chris Wilson
2016-10-07 10:19 ` ✗ Fi.CI.BAT: warning for series starting with [01/42] drm/i915: Allow disabling error capture Patchwork
2016-10-10 7:23 ` Patchwork
2016-10-10 15:31 ` ✗ Fi.CI.BAT: failure for series starting with [01/42] drm/i915: Allow disabling error capture (rev2) Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8b30bbca-db42-abf8-f884-5cf7b1fa353f@Intel.com \
--to=john.c.harrison@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.