From: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
To: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>,
<intel-gfx@lists.freedesktop.org>
Cc: dri-devel@lists.freedesktop.org, Daniel Vetter <daniel@ffwll.ch>,
Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [Intel-gfx] [PATCH v3 1/2] drm/i915/gem: Flush contexts on driver release
Date: Fri, 16 Sep 2022 15:03:06 +0300 [thread overview]
Message-ID: <b097de87-ab68-2d3d-e0bf-420549eb10d4@intel.com> (raw)
In-Reply-To: <20220916092403.201355-2-janusz.krzysztofik@linux.intel.com>
Reviewed-by: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
On 9/16/22 12:24 PM, Janusz Krzysztofik wrote:
> Due to i915_perf assuming that it can use the i915_gem_context reference
> to protect its i915->gem.contexts.list iteration, we need to defer removal
> of the context from the list until last reference to the context is put.
> However, there is a risk of triggering kernel warning on contexts list not
> empty at driver release time if we deleagate that task to a worker for
> i915_gem_context_release_work(), unless that work is flushed first.
> Unfortunately, it is not flushed on driver release. Fix it.
>
> Instead of additionally calling flush_workqueue(), either directly or via
> a new dedicated wrapper around it, replace last call to
> i915_gem_drain_freed_objects() with existing i915_gem_drain_workqueue()
> that performs both tasks.
>
> Fixes: 75eefd82581f ("drm/i915: Release i915_gem_context from a worker")
> Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
> Cc: stable@kernel.org # v5.16+
> ---
> drivers/gpu/drm/i915/i915_gem.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index c8e14ed9c2a96..172c29a15f118 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -1195,7 +1195,8 @@ void i915_gem_driver_release(struct drm_i915_private *dev_priv)
>
> intel_uc_cleanup_firmwares(&to_gt(dev_priv)->uc);
>
> - i915_gem_drain_freed_objects(dev_priv);
> + /* Flush any outstanding work, including i915_gem_context.release_work. */
> + i915_gem_drain_workqueue(dev_priv);
>
> drm_WARN_ON(&dev_priv->drm, !list_empty(&dev_priv->gem.contexts.list));
> }
next prev parent reply other threads:[~2022-09-16 12:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-16 9:24 [Intel-gfx] [PATCH v3 0/2] drm/i915/gem: Really move i915_gem_context.link under ref protection Janusz Krzysztofik
2022-09-16 9:24 ` [Intel-gfx] [PATCH v3 1/2] drm/i915/gem: Flush contexts on driver release Janusz Krzysztofik
2022-09-16 12:03 ` Gwan-gyeong Mun [this message]
2022-09-16 9:24 ` [Intel-gfx] [PATCH v3 2/2] drm/i915/gem: Really move i915_gem_context.link under ref protection Janusz Krzysztofik
2022-09-16 12:07 ` Gwan-gyeong Mun
2022-09-16 10:25 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/gem: Really move i915_gem_context.link under ref protection (rev4) Patchwork
2022-09-16 10:46 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-09-16 15:12 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-09-16 16:52 ` Janusz Krzysztofik
2022-09-16 17:32 ` [Intel-gfx] ✓ Fi.CI.IGT: success " Patchwork
2022-09-19 16:08 ` [Intel-gfx] [PATCH v3 0/2] drm/i915/gem: Really move i915_gem_context.link under ref protection Andi Shyti
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=b097de87-ab68-2d3d-e0bf-420549eb10d4@intel.com \
--to=gwan-gyeong.mun@intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=janusz.krzysztofik@linux.intel.com \
/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