From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Extend intel_wakeref to support delayed puts
Date: Mon, 23 Mar 2020 12:24:33 +0000 [thread overview]
Message-ID: <3e57ad5a-80a0-4060-888b-9cdf617daa09@linux.intel.com> (raw)
In-Reply-To: <20200323103221.14444-1-chris@chris-wilson.co.uk>
On 23/03/2020 10:32, Chris Wilson wrote:
> In some cases we want to hold onto the wakeref for a little after the
> last user so that we can avoid having to drop and then immediately
> reacquire it. Allow the last user to specify if they would like to keep
> the wakeref alive for a short hysteresis.
>
> v2: Embrace bitfield.h for adjustable flags.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_engine_pm.h | 6 ++++++
> drivers/gpu/drm/i915/gt/intel_gt_requests.c | 2 +-
> drivers/gpu/drm/i915/intel_wakeref.c | 12 ++++++-----
> drivers/gpu/drm/i915/intel_wakeref.h | 22 ++++++++++++++++++---
> 4 files changed, 33 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.h b/drivers/gpu/drm/i915/gt/intel_engine_pm.h
> index e52c2b0cb245..418df0a13145 100644
> --- a/drivers/gpu/drm/i915/gt/intel_engine_pm.h
> +++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.h
> @@ -37,6 +37,12 @@ static inline void intel_engine_pm_put_async(struct intel_engine_cs *engine)
> intel_wakeref_put_async(&engine->wakeref);
> }
>
> +static inline void intel_engine_pm_put_delay(struct intel_engine_cs *engine,
> + unsigned long delay)
> +{
> + intel_wakeref_put_delay(&engine->wakeref, delay);
> +}
> +
> static inline void intel_engine_pm_flush(struct intel_engine_cs *engine)
> {
> intel_wakeref_unlock_wait(&engine->wakeref);
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_requests.c b/drivers/gpu/drm/i915/gt/intel_gt_requests.c
> index 24c99d0838af..835ec184763e 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt_requests.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt_requests.c
> @@ -38,7 +38,7 @@ static bool flush_submission(struct intel_gt *gt)
> for_each_engine(engine, gt, id) {
> intel_engine_flush_submission(engine);
> active |= flush_work(&engine->retire_work);
> - active |= flush_work(&engine->wakeref.work);
> + active |= flush_delayed_work(&engine->wakeref.work);
> }
>
> return active;
> diff --git a/drivers/gpu/drm/i915/intel_wakeref.c b/drivers/gpu/drm/i915/intel_wakeref.c
> index 8fbf6f4d3f26..dfd87d082218 100644
> --- a/drivers/gpu/drm/i915/intel_wakeref.c
> +++ b/drivers/gpu/drm/i915/intel_wakeref.c
> @@ -70,11 +70,12 @@ static void ____intel_wakeref_put_last(struct intel_wakeref *wf)
>
> void __intel_wakeref_put_last(struct intel_wakeref *wf, unsigned long flags)
> {
> - INTEL_WAKEREF_BUG_ON(work_pending(&wf->work));
> + INTEL_WAKEREF_BUG_ON(delayed_work_pending(&wf->work));
>
> /* Assume we are not in process context and so cannot sleep. */
> if (flags & INTEL_WAKEREF_PUT_ASYNC || !mutex_trylock(&wf->mutex)) {
> - schedule_work(&wf->work);
> + mod_delayed_work(system_wq, &wf->work,
> + FIELD_GET(INTEL_WAKEREF_PUT_DELAY, flags));
> return;
> }
>
> @@ -83,7 +84,7 @@ void __intel_wakeref_put_last(struct intel_wakeref *wf, unsigned long flags)
>
> static void __intel_wakeref_put_work(struct work_struct *wrk)
> {
> - struct intel_wakeref *wf = container_of(wrk, typeof(*wf), work);
> + struct intel_wakeref *wf = container_of(wrk, typeof(*wf), work.work);
>
> if (atomic_add_unless(&wf->count, -1, 1))
> return;
> @@ -104,8 +105,9 @@ void __intel_wakeref_init(struct intel_wakeref *wf,
> atomic_set(&wf->count, 0);
> wf->wakeref = 0;
>
> - INIT_WORK(&wf->work, __intel_wakeref_put_work);
> - lockdep_init_map(&wf->work.lockdep_map, "wakeref.work", &key->work, 0);
> + INIT_DELAYED_WORK(&wf->work, __intel_wakeref_put_work);
> + lockdep_init_map(&wf->work.work.lockdep_map,
> + "wakeref.work", &key->work, 0);
> }
>
> int intel_wakeref_wait_for_idle(struct intel_wakeref *wf)
> diff --git a/drivers/gpu/drm/i915/intel_wakeref.h b/drivers/gpu/drm/i915/intel_wakeref.h
> index 7d1e676b71ef..545c8f277c46 100644
> --- a/drivers/gpu/drm/i915/intel_wakeref.h
> +++ b/drivers/gpu/drm/i915/intel_wakeref.h
> @@ -8,6 +8,7 @@
> #define INTEL_WAKEREF_H
>
> #include <linux/atomic.h>
> +#include <linux/bitfield.h>
> #include <linux/bits.h>
> #include <linux/lockdep.h>
> #include <linux/mutex.h>
> @@ -41,7 +42,7 @@ struct intel_wakeref {
> struct intel_runtime_pm *rpm;
> const struct intel_wakeref_ops *ops;
>
> - struct work_struct work;
> + struct delayed_work work;
> };
>
> struct intel_wakeref_lockclass {
> @@ -117,6 +118,11 @@ intel_wakeref_get_if_active(struct intel_wakeref *wf)
> return atomic_inc_not_zero(&wf->count);
> }
>
> +enum {
> + INTEL_WAKEREF_PUT_ASYNC_BIT = 0,
> + __INTEL_WAKEREF_PUT_LAST_BIT__
> +};
> +
> /**
> * intel_wakeref_put_flags: Release the wakeref
> * @wf: the wakeref
> @@ -134,7 +140,9 @@ intel_wakeref_get_if_active(struct intel_wakeref *wf)
> */
> static inline void
> __intel_wakeref_put(struct intel_wakeref *wf, unsigned long flags)
> -#define INTEL_WAKEREF_PUT_ASYNC BIT(0)
> +#define INTEL_WAKEREF_PUT_ASYNC BIT(INTEL_WAKEREF_PUT_ASYNC_BIT)
> +#define INTEL_WAKEREF_PUT_DELAY \
> + GENMASK(BITS_PER_LONG - 1, __INTEL_WAKEREF_PUT_LAST_BIT__)
> {
> INTEL_WAKEREF_BUG_ON(atomic_read(&wf->count) <= 0);
> if (unlikely(!atomic_add_unless(&wf->count, -1, 1)))
> @@ -154,6 +162,14 @@ intel_wakeref_put_async(struct intel_wakeref *wf)
> __intel_wakeref_put(wf, INTEL_WAKEREF_PUT_ASYNC);
> }
>
> +static inline void
> +intel_wakeref_put_delay(struct intel_wakeref *wf, unsigned long delay)
> +{
> + __intel_wakeref_put(wf,
> + INTEL_WAKEREF_PUT_ASYNC |
> + FIELD_PREP(INTEL_WAKEREF_PUT_DELAY, delay));
> +}
> +
> /**
> * intel_wakeref_lock: Lock the wakeref (mutex)
> * @wf: the wakeref
> @@ -194,7 +210,7 @@ intel_wakeref_unlock_wait(struct intel_wakeref *wf)
> {
> mutex_lock(&wf->mutex);
> mutex_unlock(&wf->mutex);
> - flush_work(&wf->work);
> + flush_delayed_work(&wf->work);
> }
>
> /**
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-03-23 12:24 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 9:28 [Intel-gfx] [PATCH 1/8] drm/i915/gt: Mark timeline->cacheline as destroyed after rcu grace period Chris Wilson
2020-03-23 9:28 ` [Intel-gfx] [PATCH 2/8] drm/i915: Avoid live-lock with i915_vma_parked() Chris Wilson
2020-03-23 10:09 ` Tvrtko Ursulin
2020-03-23 9:28 ` [Intel-gfx] [PATCH 3/8] drm/i915: Extend intel_wakeref to support delayed puts Chris Wilson
2020-03-23 10:13 ` Tvrtko Ursulin
2020-03-23 10:32 ` [Intel-gfx] [PATCH] " Chris Wilson
2020-03-23 12:24 ` Tvrtko Ursulin [this message]
2020-03-23 9:28 ` [Intel-gfx] [PATCH 4/8] drm/i915/gt: Delay release of engine-pm after last retirement Chris Wilson
2020-03-23 10:14 ` Tvrtko Ursulin
2020-03-23 9:28 ` [Intel-gfx] [PATCH 5/8] drm/i915: Rely on direct submission to the queue Chris Wilson
2020-03-23 10:29 ` Tvrtko Ursulin
2020-03-23 9:28 ` [Intel-gfx] [PATCH 6/8] drm/i915/execlists: Pull tasklet interrupt-bh local to direct submission Chris Wilson
2020-03-23 9:28 ` [Intel-gfx] [PATCH 7/8] drm/i915: Immediately execute the fenced work Chris Wilson
2020-03-23 10:37 ` Tvrtko Ursulin
2020-03-23 10:46 ` Chris Wilson
2020-03-24 16:13 ` Tvrtko Ursulin
2020-03-24 16:19 ` Chris Wilson
2020-03-23 11:04 ` [Intel-gfx] [PATCH] " Chris Wilson
2020-03-23 9:28 ` [Intel-gfx] [PATCH 8/8] drm/i915/gem: Avoid gem_context->mutex for simple vma lookup Chris Wilson
2020-03-23 10:38 ` Tvrtko Ursulin
2020-03-23 9:43 ` [Intel-gfx] [PATCH 1/8] drm/i915/gt: Mark timeline->cacheline as destroyed after rcu grace period Matthew Auld
2020-03-23 13:06 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/8] drm/i915/gt: Mark timeline->cacheline as destroyed after rcu grace period (rev3) 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=3e57ad5a-80a0-4060-888b-9cdf617daa09@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox