From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 06/19] drm/i915/gt: Schedule request retirement when submission idles
Date: Tue, 19 Nov 2019 15:04:46 +0000 [thread overview]
Message-ID: <6c06a4a7-7719-c83b-0fa0-ddc47b4d91c9@linux.intel.com> (raw)
In-Reply-To: <20191118230254.2615942-7-chris@chris-wilson.co.uk>
On 18/11/2019 23:02, Chris Wilson wrote:
> The major drawback of commit 7e34f4e4aad3 ("drm/i915/gen8+: Add RC6 CTX
> corruption WA") is that it disables RC6 while Skylake (and friends) is
> active, and we do not consider the GPU idle until all outstanding
> requests have been retired and the engine switched over to the kernel
> context. If userspace is idle, this task falls onto our background idle
> worker, which only runs roughly once a second, meaning that userspace has
> to have been idle for a couple of seconds before we enable RC6 again.
> Naturally, this causes us to consume considerably more energy than
> before as powersaving is effectively disabled while a display server
> (here's looking at you Xorg) is running.
>
> As execlists will get a completion event as the last context is
> completed and the GPU goes idle, we can use our submission tasklet to
> notice when the GPU is idle and kick the retire worker. Thus during
> light workloads, we will do much more work to idle the GPU faster...
> Hopefully with commensurate power saving!
>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=112315
> References: 7e34f4e4aad3 ("drm/i915/gen8+: Add RC6 CTX corruption WA")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_gt_requests.h | 9 ++++++++-
> drivers/gpu/drm/i915/gt/intel_lrc.c | 13 +++++++++++++
> 2 files changed, 21 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_requests.h b/drivers/gpu/drm/i915/gt/intel_gt_requests.h
> index fde546424c63..94b8758a45d9 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt_requests.h
> +++ b/drivers/gpu/drm/i915/gt/intel_gt_requests.h
> @@ -7,7 +7,9 @@
> #ifndef INTEL_GT_REQUESTS_H
> #define INTEL_GT_REQUESTS_H
>
> -struct intel_gt;
> +#include <linux/workqueue.h>
> +
> +#include "intel_gt_types.h"
>
> long intel_gt_retire_requests_timeout(struct intel_gt *gt, long timeout);
> static inline void intel_gt_retire_requests(struct intel_gt *gt)
> @@ -15,6 +17,11 @@ static inline void intel_gt_retire_requests(struct intel_gt *gt)
> intel_gt_retire_requests_timeout(gt, 0);
> }
>
> +static inline void intel_gt_schedule_retire_requests(struct intel_gt *gt)
> +{
> + mod_delayed_work(system_wq, >->requests.retire_work, 0);
> +}
> +
> int intel_gt_wait_for_idle(struct intel_gt *gt, long timeout);
>
> void intel_gt_init_requests(struct intel_gt *gt);
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> index 33ce258d484f..f7c8fec436a9 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> @@ -142,6 +142,7 @@
> #include "intel_engine_pm.h"
> #include "intel_gt.h"
> #include "intel_gt_pm.h"
> +#include "intel_gt_requests.h"
> #include "intel_lrc_reg.h"
> #include "intel_mocs.h"
> #include "intel_reset.h"
> @@ -2278,6 +2279,18 @@ static void execlists_submission_tasklet(unsigned long data)
> if (timeout && preempt_timeout(engine))
> preempt_reset(engine);
> }
> +
> + /*
> + * If the GPU is currently idle, retire the outstanding completed
> + * requests. This will allow us to enter soft-rc6 as soon as possible,
> + * albeit at the cost of running the retire worker much more frequently
> + * (over the entire GT not just this engine) and emitting more idle
> + * barriers (i.e. kernel context switches unpinning all that went
> + * before) which may add some extra latency.
> + */
> + if (intel_engine_pm_is_awake(engine) &&
> + !execlists_active(&engine->execlists))
> + intel_gt_schedule_retire_requests(engine->gt);
I am still not a fan of doing this for all platforms.
Its not just the cost of retirement but there is
intel_engine_flush_submission on all engines in there as well which we
cannot avoid triggering from this path.
Would it be worth experimenting with additional per-engine retire
workers? Most of the code could be shared, just a little bit of
specialization to filter on engine.
Regards,
Tvrtko
> }
>
> static void __execlists_kick(struct intel_engine_execlists *execlists)
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
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 06/19] drm/i915/gt: Schedule request retirement when submission idles
Date: Tue, 19 Nov 2019 15:04:46 +0000 [thread overview]
Message-ID: <6c06a4a7-7719-c83b-0fa0-ddc47b4d91c9@linux.intel.com> (raw)
Message-ID: <20191119150446.gWpBAm-v2HdHkLkeDrZXKEMPFR478r2TqFkJvMj9WWU@z> (raw)
In-Reply-To: <20191118230254.2615942-7-chris@chris-wilson.co.uk>
On 18/11/2019 23:02, Chris Wilson wrote:
> The major drawback of commit 7e34f4e4aad3 ("drm/i915/gen8+: Add RC6 CTX
> corruption WA") is that it disables RC6 while Skylake (and friends) is
> active, and we do not consider the GPU idle until all outstanding
> requests have been retired and the engine switched over to the kernel
> context. If userspace is idle, this task falls onto our background idle
> worker, which only runs roughly once a second, meaning that userspace has
> to have been idle for a couple of seconds before we enable RC6 again.
> Naturally, this causes us to consume considerably more energy than
> before as powersaving is effectively disabled while a display server
> (here's looking at you Xorg) is running.
>
> As execlists will get a completion event as the last context is
> completed and the GPU goes idle, we can use our submission tasklet to
> notice when the GPU is idle and kick the retire worker. Thus during
> light workloads, we will do much more work to idle the GPU faster...
> Hopefully with commensurate power saving!
>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=112315
> References: 7e34f4e4aad3 ("drm/i915/gen8+: Add RC6 CTX corruption WA")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_gt_requests.h | 9 ++++++++-
> drivers/gpu/drm/i915/gt/intel_lrc.c | 13 +++++++++++++
> 2 files changed, 21 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_requests.h b/drivers/gpu/drm/i915/gt/intel_gt_requests.h
> index fde546424c63..94b8758a45d9 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt_requests.h
> +++ b/drivers/gpu/drm/i915/gt/intel_gt_requests.h
> @@ -7,7 +7,9 @@
> #ifndef INTEL_GT_REQUESTS_H
> #define INTEL_GT_REQUESTS_H
>
> -struct intel_gt;
> +#include <linux/workqueue.h>
> +
> +#include "intel_gt_types.h"
>
> long intel_gt_retire_requests_timeout(struct intel_gt *gt, long timeout);
> static inline void intel_gt_retire_requests(struct intel_gt *gt)
> @@ -15,6 +17,11 @@ static inline void intel_gt_retire_requests(struct intel_gt *gt)
> intel_gt_retire_requests_timeout(gt, 0);
> }
>
> +static inline void intel_gt_schedule_retire_requests(struct intel_gt *gt)
> +{
> + mod_delayed_work(system_wq, >->requests.retire_work, 0);
> +}
> +
> int intel_gt_wait_for_idle(struct intel_gt *gt, long timeout);
>
> void intel_gt_init_requests(struct intel_gt *gt);
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> index 33ce258d484f..f7c8fec436a9 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> @@ -142,6 +142,7 @@
> #include "intel_engine_pm.h"
> #include "intel_gt.h"
> #include "intel_gt_pm.h"
> +#include "intel_gt_requests.h"
> #include "intel_lrc_reg.h"
> #include "intel_mocs.h"
> #include "intel_reset.h"
> @@ -2278,6 +2279,18 @@ static void execlists_submission_tasklet(unsigned long data)
> if (timeout && preempt_timeout(engine))
> preempt_reset(engine);
> }
> +
> + /*
> + * If the GPU is currently idle, retire the outstanding completed
> + * requests. This will allow us to enter soft-rc6 as soon as possible,
> + * albeit at the cost of running the retire worker much more frequently
> + * (over the entire GT not just this engine) and emitting more idle
> + * barriers (i.e. kernel context switches unpinning all that went
> + * before) which may add some extra latency.
> + */
> + if (intel_engine_pm_is_awake(engine) &&
> + !execlists_active(&engine->execlists))
> + intel_gt_schedule_retire_requests(engine->gt);
I am still not a fan of doing this for all platforms.
Its not just the cost of retirement but there is
intel_engine_flush_submission on all engines in there as well which we
cannot avoid triggering from this path.
Would it be worth experimenting with additional per-engine retire
workers? Most of the code could be shared, just a little bit of
specialization to filter on engine.
Regards,
Tvrtko
> }
>
> static void __execlists_kick(struct intel_engine_execlists *execlists)
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-11-19 15:04 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 23:02 Fast soft-rc6 Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 01/19] drm/i915/selftests: Force bonded submission to overlap Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 02/19] drm/i915/gem: Manually dump the debug trace on GEM_BUG_ON Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 03/19] drm/i915/gt: Close race between engine_park and intel_gt_retire_requests Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 14:15 ` Tvrtko Ursulin
2019-11-19 14:15 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-19 14:41 ` Chris Wilson
2019-11-19 14:41 ` [Intel-gfx] " Chris Wilson
2019-11-20 11:39 ` Tvrtko Ursulin
2019-11-20 11:39 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-20 11:51 ` Chris Wilson
2019-11-20 11:51 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 04/19] drm/i915/gt: Unlock engine-pm after queuing the kernel context switch Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 14:35 ` Tvrtko Ursulin
2019-11-19 14:35 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-19 14:50 ` Chris Wilson
2019-11-19 14:50 ` [Intel-gfx] " Chris Wilson
2019-11-19 15:03 ` [PATCH] " Chris Wilson
2019-11-19 15:03 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 05/19] drm/i915/gt: Make intel_ring_unpin() safe for concurrent pint Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 14:54 ` Tvrtko Ursulin
2019-11-19 14:54 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-18 23:02 ` [PATCH 06/19] drm/i915/gt: Schedule request retirement when submission idles Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 15:04 ` Tvrtko Ursulin [this message]
2019-11-19 15:04 ` Tvrtko Ursulin
2019-11-19 16:20 ` Chris Wilson
2019-11-19 16:20 ` [Intel-gfx] " Chris Wilson
2019-11-19 16:33 ` Tvrtko Ursulin
2019-11-19 16:33 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-19 16:42 ` Chris Wilson
2019-11-19 16:42 ` [Intel-gfx] " Chris Wilson
2019-11-19 18:58 ` Chris Wilson
2019-11-19 18:58 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 07/19] drm/i915: Mark up the calling context for intel_wakeref_put() Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 15:57 ` Tvrtko Ursulin
2019-11-19 15:57 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-19 16:12 ` Chris Wilson
2019-11-19 16:12 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 08/19] drm/i915/gem: Merge GGTT vma flush into a single loop Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 09/19] drm/i915/gt: Only wait for register chipset flush if active Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 10/19] drm/i915: Protect the obj->vma.list during iteration Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 11/19] drm/i915: Wait until the intel_wakeref idle callback is complete Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 16:15 ` Tvrtko Ursulin
2019-11-19 16:15 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-18 23:02 ` [PATCH 12/19] drm/i915/gt: Declare timeline.lock to be irq-free Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 15:58 ` Tvrtko Ursulin
2019-11-19 15:58 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-18 23:02 ` [PATCH 13/19] drm/i915/gt: Move new timelines to the end of active_list Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 16:02 ` Tvrtko Ursulin
2019-11-19 16:02 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-18 23:02 ` [PATCH 14/19] drm/i915/gt: Schedule next retirement worker first Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 16:07 ` Tvrtko Ursulin
2019-11-19 16:07 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-18 23:02 ` [PATCH 15/19] drm/i915/gt: Flush the requests after wedging on suspend Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-19 16:12 ` Tvrtko Ursulin
2019-11-19 16:12 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-19 17:22 ` Chris Wilson
2019-11-19 17:22 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 16/19] drm/i915/selftests: Flush the active callbacks Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 17/19] drm/i915/selftests: Be explicit in ERR_PTR handling Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 18/19] drm/i915/selftests: Exercise rc6 handling Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:02 ` [PATCH 19/19] drm/i915/gt: Track engine round-trip times Chris Wilson
2019-11-18 23:02 ` [Intel-gfx] " Chris Wilson
2019-11-18 23:21 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/19] drm/i915/selftests: Force bonded submission to overlap Patchwork
2019-11-18 23:21 ` [Intel-gfx] " Patchwork
2019-11-19 0:04 ` ✓ Fi.CI.BAT: success " Patchwork
2019-11-19 0:04 ` [Intel-gfx] " Patchwork
2019-11-19 9:08 ` ✗ Fi.CI.IGT: failure " Patchwork
2019-11-19 9:08 ` [Intel-gfx] " Patchwork
2019-11-19 19:04 ` ✗ Fi.CI.BUILD: failure for series starting with [01/19] drm/i915/selftests: Force bonded submission to overlap (rev2) Patchwork
2019-11-19 19:04 ` [Intel-gfx] " 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=6c06a4a7-7719-c83b-0fa0-ddc47b4d91c9@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