* [PATCH] drm/i915: Prevent lock-cycles between GPU waits and GPU resets
@ 2019-06-12 8:52 Chris Wilson
2019-06-12 9:38 ` ✓ Fi.CI.BAT: success for drm/i915: Prevent lock-cycles between GPU waits and GPU resets (rev2) Patchwork
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Chris Wilson @ 2019-06-12 8:52 UTC (permalink / raw)
To: intel-gfx
We cannot allow ourselves to wait on the GPU while holding any lock we
may need to reset the GPU. While there is not an explicit lock between
the two operations, lockdep cannot detect the dependency. So let's tell
lockdep about the wait/reset dependency with an explicit lockmap.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
This is *annoyingly* good at detecting lock cycles in GPU reset.
-Chris
---
drivers/gpu/drm/i915/gt/intel_reset.c | 5 ++++-
drivers/gpu/drm/i915/i915_drv.h | 8 ++++++++
drivers/gpu/drm/i915/i915_gem.c | 3 +++
drivers/gpu/drm/i915/i915_request.c | 2 ++
drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 ++
5 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
index 60d24110af80..6368b37f26d1 100644
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -978,10 +978,11 @@ void i915_reset(struct drm_i915_private *i915,
might_sleep();
GEM_BUG_ON(!test_bit(I915_RESET_BACKOFF, &error->flags));
+ lock_map_acquire(&i915->gt.reset_lockmap);
/* Clear any previous failed attempts at recovery. Time to try again. */
if (!__i915_gem_unset_wedged(i915))
- return;
+ goto unlock;
if (reason)
dev_notice(i915->drm.dev, "Resetting chip for %s\n", reason);
@@ -1029,6 +1030,8 @@ void i915_reset(struct drm_i915_private *i915,
finish:
reset_finish(i915);
+unlock:
+ lock_map_release(&i915->gt.reset_lockmap);
return;
taint:
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 0ea7f78ae227..9cfa9500fcc4 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1919,6 +1919,14 @@ struct drm_i915_private {
ktime_t last_init_time;
struct i915_vma *scratch;
+
+ /*
+ * We must never wait on the GPU while holding a lock we may
+ * need to perform a GPU reset. So while we don't need to
+ * serialise wait/reset with an explicit lock, we do want
+ * lockdep to detect potential dependency cycles.
+ */
+ struct lockdep_map reset_lockmap;
} gt;
struct {
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index e980c1ee3dcf..24f0f3db1bfb 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1782,6 +1782,7 @@ static void i915_gem_init__mm(struct drm_i915_private *i915)
int i915_gem_init_early(struct drm_i915_private *dev_priv)
{
+ static struct lock_class_key reset_key;
int err;
intel_gt_pm_init(dev_priv);
@@ -1789,6 +1790,8 @@ int i915_gem_init_early(struct drm_i915_private *dev_priv)
INIT_LIST_HEAD(&dev_priv->gt.active_rings);
INIT_LIST_HEAD(&dev_priv->gt.closed_vma);
spin_lock_init(&dev_priv->gt.closed_lock);
+ lockdep_init_map(&dev_priv->gt.reset_lockmap,
+ "i915.reset", &reset_key, 0);
i915_gem_init__mm(dev_priv);
i915_gem_init__pm(dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index 1a948471829d..cd4ce44dc4e5 100644
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -1444,6 +1444,7 @@ long i915_request_wait(struct i915_request *rq,
return -ETIME;
trace_i915_request_wait_begin(rq, flags);
+ lock_map_acquire(&rq->i915->gt.reset_lockmap);
/*
* Optimistic spin before touching IRQs.
@@ -1517,6 +1518,7 @@ long i915_request_wait(struct i915_request *rq,
dma_fence_remove_callback(&rq->fence, &wait.cb);
out:
+ lock_map_release(&rq->i915->gt.reset_lockmap);
trace_i915_request_wait_end(rq);
return timeout;
}
diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index b7f3fbb4ae89..1e9ffced78c1 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -130,6 +130,7 @@ static struct dev_pm_domain pm_domain = {
struct drm_i915_private *mock_gem_device(void)
{
+ static struct lock_class_key reset_key;
struct drm_i915_private *i915;
struct pci_dev *pdev;
int err;
@@ -204,6 +205,7 @@ struct drm_i915_private *mock_gem_device(void)
INIT_LIST_HEAD(&i915->gt.active_rings);
INIT_LIST_HEAD(&i915->gt.closed_vma);
spin_lock_init(&i915->gt.closed_lock);
+ lockdep_init_map(&i915->gt.reset_lockmap, "i915.reset", &reset_key, 0);
mutex_lock(&i915->drm.struct_mutex);
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Prevent lock-cycles between GPU waits and GPU resets (rev2)
2019-06-12 8:52 [PATCH] drm/i915: Prevent lock-cycles between GPU waits and GPU resets Chris Wilson
@ 2019-06-12 9:38 ` Patchwork
2019-06-12 11:00 ` [PATCH] drm/i915: Prevent lock-cycles between GPU waits and GPU resets Mika Kuoppala
2019-06-13 5:21 ` ✗ Fi.CI.IGT: failure for drm/i915: Prevent lock-cycles between GPU waits and GPU resets (rev2) Patchwork
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2019-06-12 9:38 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Prevent lock-cycles between GPU waits and GPU resets (rev2)
URL : https://patchwork.freedesktop.org/series/61901/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6244 -> Patchwork_13249
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/
Known issues
------------
Here are the changes found in Patchwork_13249 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_create@basic-files:
- fi-icl-y: [PASS][1] -> [INCOMPLETE][2] ([fdo#107713] / [fdo#109100])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/fi-icl-y/igt@gem_ctx_create@basic-files.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/fi-icl-y/igt@gem_ctx_create@basic-files.html
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [PASS][3] -> [DMESG-WARN][4] ([fdo#102614])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
#### Possible fixes ####
* igt@core_auth@basic-auth:
- fi-icl-u3: [DMESG-WARN][5] ([fdo#107724]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/fi-icl-u3/igt@core_auth@basic-auth.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/fi-icl-u3/igt@core_auth@basic-auth.html
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
Participating hosts (51 -> 45)
------------------------------
Additional (1): fi-bwr-2160
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-skl-iommu fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6244 -> Patchwork_13249
CI_DRM_6244: d7ce900dafd424be9da576fbf3155b43ce5270ec @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5052: ff711b343c06a25ac4995ab8bd9a8bcb5ce1eb10 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13249: 7fe48e07837bb2a4a53a4b1deb6d4edbf17f4ed5 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
7fe48e07837b drm/i915: Prevent lock-cycles between GPU waits and GPU resets
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Prevent lock-cycles between GPU waits and GPU resets
2019-06-12 8:52 [PATCH] drm/i915: Prevent lock-cycles between GPU waits and GPU resets Chris Wilson
2019-06-12 9:38 ` ✓ Fi.CI.BAT: success for drm/i915: Prevent lock-cycles between GPU waits and GPU resets (rev2) Patchwork
@ 2019-06-12 11:00 ` Mika Kuoppala
2019-06-12 11:04 ` Chris Wilson
2019-06-13 5:21 ` ✗ Fi.CI.IGT: failure for drm/i915: Prevent lock-cycles between GPU waits and GPU resets (rev2) Patchwork
2 siblings, 1 reply; 6+ messages in thread
From: Mika Kuoppala @ 2019-06-12 11:00 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
Chris Wilson <chris@chris-wilson.co.uk> writes:
> We cannot allow ourselves to wait on the GPU while holding any lock we
s/we/as we?
My english parser is not strong.
> may need to reset the GPU. While there is not an explicit lock between
> the two operations, lockdep cannot detect the dependency. So let's tell
> lockdep about the wait/reset dependency with an explicit lockmap.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> This is *annoyingly* good at detecting lock cycles in GPU reset.
> -Chris
> ---
> drivers/gpu/drm/i915/gt/intel_reset.c | 5 ++++-
> drivers/gpu/drm/i915/i915_drv.h | 8 ++++++++
> drivers/gpu/drm/i915/i915_gem.c | 3 +++
> drivers/gpu/drm/i915/i915_request.c | 2 ++
> drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 ++
> 5 files changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
> index 60d24110af80..6368b37f26d1 100644
> --- a/drivers/gpu/drm/i915/gt/intel_reset.c
> +++ b/drivers/gpu/drm/i915/gt/intel_reset.c
> @@ -978,10 +978,11 @@ void i915_reset(struct drm_i915_private *i915,
>
> might_sleep();
> GEM_BUG_ON(!test_bit(I915_RESET_BACKOFF, &error->flags));
> + lock_map_acquire(&i915->gt.reset_lockmap);
>
> /* Clear any previous failed attempts at recovery. Time to try again. */
> if (!__i915_gem_unset_wedged(i915))
> - return;
> + goto unlock;
>
> if (reason)
> dev_notice(i915->drm.dev, "Resetting chip for %s\n", reason);
> @@ -1029,6 +1030,8 @@ void i915_reset(struct drm_i915_private *i915,
>
> finish:
> reset_finish(i915);
> +unlock:
> + lock_map_release(&i915->gt.reset_lockmap);
> return;
The return patter in this function is rather unorthodox. Might be
even that I reviewed it. Very close that I fell into trap of thinking
that you return with lock held.
>
> taint:
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 0ea7f78ae227..9cfa9500fcc4 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1919,6 +1919,14 @@ struct drm_i915_private {
> ktime_t last_init_time;
>
> struct i915_vma *scratch;
> +
> + /*
> + * We must never wait on the GPU while holding a lock we may
My english parser still expected 'as' somewhere in there.
Regardless, a neat way to use lockdep to enforce our expectations.
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> + * need to perform a GPU reset. So while we don't need to
> + * serialise wait/reset with an explicit lock, we do want
> + * lockdep to detect potential dependency cycles.
> + */
> + struct lockdep_map reset_lockmap;
> } gt;
>
> struct {
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index e980c1ee3dcf..24f0f3db1bfb 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -1782,6 +1782,7 @@ static void i915_gem_init__mm(struct drm_i915_private *i915)
>
> int i915_gem_init_early(struct drm_i915_private *dev_priv)
> {
> + static struct lock_class_key reset_key;
> int err;
>
> intel_gt_pm_init(dev_priv);
> @@ -1789,6 +1790,8 @@ int i915_gem_init_early(struct drm_i915_private *dev_priv)
> INIT_LIST_HEAD(&dev_priv->gt.active_rings);
> INIT_LIST_HEAD(&dev_priv->gt.closed_vma);
> spin_lock_init(&dev_priv->gt.closed_lock);
> + lockdep_init_map(&dev_priv->gt.reset_lockmap,
> + "i915.reset", &reset_key, 0);
>
> i915_gem_init__mm(dev_priv);
> i915_gem_init__pm(dev_priv);
> diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
> index 1a948471829d..cd4ce44dc4e5 100644
> --- a/drivers/gpu/drm/i915/i915_request.c
> +++ b/drivers/gpu/drm/i915/i915_request.c
> @@ -1444,6 +1444,7 @@ long i915_request_wait(struct i915_request *rq,
> return -ETIME;
>
> trace_i915_request_wait_begin(rq, flags);
> + lock_map_acquire(&rq->i915->gt.reset_lockmap);
>
> /*
> * Optimistic spin before touching IRQs.
> @@ -1517,6 +1518,7 @@ long i915_request_wait(struct i915_request *rq,
> dma_fence_remove_callback(&rq->fence, &wait.cb);
>
> out:
> + lock_map_release(&rq->i915->gt.reset_lockmap);
> trace_i915_request_wait_end(rq);
> return timeout;
> }
> diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> index b7f3fbb4ae89..1e9ffced78c1 100644
> --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
> @@ -130,6 +130,7 @@ static struct dev_pm_domain pm_domain = {
>
> struct drm_i915_private *mock_gem_device(void)
> {
> + static struct lock_class_key reset_key;
> struct drm_i915_private *i915;
> struct pci_dev *pdev;
> int err;
> @@ -204,6 +205,7 @@ struct drm_i915_private *mock_gem_device(void)
> INIT_LIST_HEAD(&i915->gt.active_rings);
> INIT_LIST_HEAD(&i915->gt.closed_vma);
> spin_lock_init(&i915->gt.closed_lock);
> + lockdep_init_map(&i915->gt.reset_lockmap, "i915.reset", &reset_key, 0);
>
> mutex_lock(&i915->drm.struct_mutex);
>
> --
> 2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Prevent lock-cycles between GPU waits and GPU resets
2019-06-12 11:00 ` [PATCH] drm/i915: Prevent lock-cycles between GPU waits and GPU resets Mika Kuoppala
@ 2019-06-12 11:04 ` Chris Wilson
0 siblings, 0 replies; 6+ messages in thread
From: Chris Wilson @ 2019-06-12 11:04 UTC (permalink / raw)
To: Mika Kuoppala, intel-gfx
Quoting Mika Kuoppala (2019-06-12 12:00:07)
> Chris Wilson <chris@chris-wilson.co.uk> writes:
>
> > We cannot allow ourselves to wait on the GPU while holding any lock we
>
> s/we/as we?
>
> My english parser is not strong.
>
> > may need to reset the GPU. While there is not an explicit lock between
> > the two operations, lockdep cannot detect the dependency. So let's tell
> > lockdep about the wait/reset dependency with an explicit lockmap.
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > ---
> > This is *annoyingly* good at detecting lock cycles in GPU reset.
> > -Chris
> > ---
> > drivers/gpu/drm/i915/gt/intel_reset.c | 5 ++++-
> > drivers/gpu/drm/i915/i915_drv.h | 8 ++++++++
> > drivers/gpu/drm/i915/i915_gem.c | 3 +++
> > drivers/gpu/drm/i915/i915_request.c | 2 ++
> > drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 ++
> > 5 files changed, 19 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
> > index 60d24110af80..6368b37f26d1 100644
> > --- a/drivers/gpu/drm/i915/gt/intel_reset.c
> > +++ b/drivers/gpu/drm/i915/gt/intel_reset.c
> > @@ -978,10 +978,11 @@ void i915_reset(struct drm_i915_private *i915,
> >
> > might_sleep();
> > GEM_BUG_ON(!test_bit(I915_RESET_BACKOFF, &error->flags));
> > + lock_map_acquire(&i915->gt.reset_lockmap);
> >
> > /* Clear any previous failed attempts at recovery. Time to try again. */
> > if (!__i915_gem_unset_wedged(i915))
> > - return;
> > + goto unlock;
> >
> > if (reason)
> > dev_notice(i915->drm.dev, "Resetting chip for %s\n", reason);
> > @@ -1029,6 +1030,8 @@ void i915_reset(struct drm_i915_private *i915,
> >
> > finish:
> > reset_finish(i915);
> > +unlock:
> > + lock_map_release(&i915->gt.reset_lockmap);
> > return;
>
> The return patter in this function is rather unorthodox. Might be
> even that I reviewed it. Very close that I fell into trap of thinking
> that you return with lock held.
Sssh. It's a one-off unorthodoxy. Exception to the rule type of thing.
> > taint:
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index 0ea7f78ae227..9cfa9500fcc4 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -1919,6 +1919,14 @@ struct drm_i915_private {
> > ktime_t last_init_time;
> >
> > struct i915_vma *scratch;
> > +
> > + /*
> > + * We must never wait on the GPU while holding a lock we may
>
> My english parser still expected 'as' somewhere in there.
Both fixes required, thanks.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✗ Fi.CI.IGT: failure for drm/i915: Prevent lock-cycles between GPU waits and GPU resets (rev2)
2019-06-12 8:52 [PATCH] drm/i915: Prevent lock-cycles between GPU waits and GPU resets Chris Wilson
2019-06-12 9:38 ` ✓ Fi.CI.BAT: success for drm/i915: Prevent lock-cycles between GPU waits and GPU resets (rev2) Patchwork
2019-06-12 11:00 ` [PATCH] drm/i915: Prevent lock-cycles between GPU waits and GPU resets Mika Kuoppala
@ 2019-06-13 5:21 ` Patchwork
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2019-06-13 5:21 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Prevent lock-cycles between GPU waits and GPU resets (rev2)
URL : https://patchwork.freedesktop.org/series/61901/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_6244_full -> Patchwork_13249_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_13249_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_13249_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_13249_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrashing:
- shard-skl: [PASS][1] -> [DMESG-WARN][2] +3 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-skl1/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrashing.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-skl7/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrashing.html
- shard-glk: [PASS][3] -> [DMESG-WARN][4] +4 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-glk9/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrashing.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-glk3/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrashing.html
* igt@gem_persistent_relocs@forked-interruptible-thrashing:
- shard-apl: NOTRUN -> [DMESG-WARN][5]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-apl6/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
* igt@gem_userptr_blits@map-fixed-invalidate-busy-gup:
- shard-apl: [PASS][6] -> [DMESG-WARN][7] +3 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-apl7/igt@gem_userptr_blits@map-fixed-invalidate-busy-gup.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-apl7/igt@gem_userptr_blits@map-fixed-invalidate-busy-gup.html
- shard-kbl: [PASS][8] -> [DMESG-WARN][9] +5 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-kbl1/igt@gem_userptr_blits@map-fixed-invalidate-busy-gup.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-kbl4/igt@gem_userptr_blits@map-fixed-invalidate-busy-gup.html
* igt@gem_userptr_blits@sync-unmap-cycles:
- shard-snb: [PASS][10] -> [DMESG-WARN][11] +2 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-snb5/igt@gem_userptr_blits@sync-unmap-cycles.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-snb5/igt@gem_userptr_blits@sync-unmap-cycles.html
- shard-hsw: [PASS][12] -> [DMESG-WARN][13] +3 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-hsw5/igt@gem_userptr_blits@sync-unmap-cycles.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-hsw5/igt@gem_userptr_blits@sync-unmap-cycles.html
- shard-iclb: [PASS][14] -> [DMESG-WARN][15] +3 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-iclb4/igt@gem_userptr_blits@sync-unmap-cycles.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-iclb1/igt@gem_userptr_blits@sync-unmap-cycles.html
Known issues
------------
Here are the changes found in Patchwork_13249_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@vcs0-s3:
- shard-skl: [PASS][16] -> [INCOMPLETE][17] ([fdo#104108]) +1 similar issue
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-skl8/igt@gem_ctx_isolation@vcs0-s3.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-skl6/igt@gem_ctx_isolation@vcs0-s3.html
* igt@gem_persistent_relocs@forked-thrashing:
- shard-snb: [PASS][18] -> [DMESG-WARN][19] ([fdo#110789])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-snb4/igt@gem_persistent_relocs@forked-thrashing.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-snb6/igt@gem_persistent_relocs@forked-thrashing.html
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [PASS][20] -> [DMESG-WARN][21] ([fdo#108566]) +3 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-apl6/igt@i915_suspend@fence-restore-tiled2untiled.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-apl4/igt@i915_suspend@fence-restore-tiled2untiled.html
* igt@i915_suspend@sysfs-reader:
- shard-kbl: [PASS][22] -> [INCOMPLETE][23] ([fdo#103665] / [fdo#108767])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-kbl4/igt@i915_suspend@sysfs-reader.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-kbl3/igt@i915_suspend@sysfs-reader.html
* igt@kms_atomic_transition@plane-all-transition:
- shard-snb: [PASS][24] -> [SKIP][25] ([fdo#109271]) +1 similar issue
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-snb4/igt@kms_atomic_transition@plane-all-transition.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-snb4/igt@kms_atomic_transition@plane-all-transition.html
* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
- shard-iclb: [PASS][26] -> [INCOMPLETE][27] ([fdo#107713])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-iclb1/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-iclb1/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-snb: [PASS][28] -> [INCOMPLETE][29] ([fdo#105411])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-snb5/igt@kms_flip@flip-vs-suspend-interruptible.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-snb1/igt@kms_flip@flip-vs-suspend-interruptible.html
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite:
- shard-iclb: [PASS][30] -> [FAIL][31] ([fdo#103167]) +9 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-pwrite:
- shard-hsw: [PASS][32] -> [SKIP][33] ([fdo#109271]) +11 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-hsw5/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-pwrite.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-hsw1/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-pwrite.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-kbl: [PASS][34] -> [DMESG-WARN][35] ([fdo#108566]) +1 similar issue
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-kbl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-kbl3/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-glk: [PASS][36] -> [FAIL][37] ([fdo#110038])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-glk5/igt@kms_plane@plane-position-covered-pipe-c-planes.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-glk7/igt@kms_plane@plane-position-covered-pipe-c-planes.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][38] -> [FAIL][39] ([fdo#108145] / [fdo#110403])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-skl5/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-skl4/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][40] -> [SKIP][41] ([fdo#109441]) +3 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-iclb8/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_vblank@pipe-b-query-idle-hang:
- shard-hsw: [PASS][42] -> [INCOMPLETE][43] ([fdo#103540])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-hsw7/igt@kms_vblank@pipe-b-query-idle-hang.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-hsw5/igt@kms_vblank@pipe-b-query-idle-hang.html
* igt@kms_vblank@pipe-c-wait-idle-hang:
- shard-hsw: [PASS][44] -> [DMESG-WARN][45] ([fdo#110789]) +1 similar issue
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-hsw5/igt@kms_vblank@pipe-c-wait-idle-hang.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-hsw5/igt@kms_vblank@pipe-c-wait-idle-hang.html
* igt@perf@blocking:
- shard-iclb: [PASS][46] -> [FAIL][47] ([fdo#110728])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-iclb3/igt@perf@blocking.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-iclb1/igt@perf@blocking.html
#### Possible fixes ####
* igt@gem_exec_balancer@smoke:
- shard-iclb: [SKIP][48] ([fdo#110854]) -> [PASS][49]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-iclb5/igt@gem_exec_balancer@smoke.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-iclb2/igt@gem_exec_balancer@smoke.html
* igt@gem_exec_suspend@basic-s3:
- shard-kbl: [DMESG-WARN][50] ([fdo#108566]) -> [PASS][51] +2 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-kbl3/igt@gem_exec_suspend@basic-s3.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-kbl7/igt@gem_exec_suspend@basic-s3.html
* igt@gem_tiled_swapping@non-threaded:
- shard-hsw: [FAIL][52] ([fdo#108686]) -> [PASS][53]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-hsw8/igt@gem_tiled_swapping@non-threaded.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-hsw6/igt@gem_tiled_swapping@non-threaded.html
* igt@i915_suspend@sysfs-reader:
- shard-apl: [DMESG-WARN][54] ([fdo#108566]) -> [PASS][55] +3 similar issues
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-apl8/igt@i915_suspend@sysfs-reader.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-apl3/igt@i915_suspend@sysfs-reader.html
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy:
- shard-hsw: [FAIL][56] ([fdo#105767]) -> [PASS][57]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-hsw6/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-hsw7/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy.html
* igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions:
- shard-hsw: [FAIL][58] ([fdo#103355]) -> [PASS][59]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-hsw5/igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-hsw7/igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions.html
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][60] ([fdo#109349]) -> [PASS][61]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-iclb7/igt@kms_dp_dsc@basic-dsc-enable-edp.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
* igt@kms_flip@2x-flip-vs-expired-vblank:
- shard-glk: [FAIL][62] ([fdo#105363]) -> [PASS][63]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-glk1/igt@kms_flip@2x-flip-vs-expired-vblank.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-glk5/igt@kms_flip@2x-flip-vs-expired-vblank.html
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-kbl: [INCOMPLETE][64] ([fdo#103665]) -> [PASS][65]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-kbl2/igt@kms_flip@flip-vs-suspend-interruptible.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-kbl2/igt@kms_flip@flip-vs-suspend-interruptible.html
* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
- shard-iclb: [FAIL][66] ([fdo#103167]) -> [PASS][67]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite.html
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][68] ([fdo#108145]) -> [PASS][69]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-skl1/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-skl9/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [FAIL][70] ([fdo#103166]) -> [PASS][71]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-iclb1/igt@kms_plane_lowres@pipe-a-tiling-x.html
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-iclb7/igt@kms_plane_lowres@pipe-a-tiling-x.html
* igt@kms_psr@psr2_sprite_mmap_gtt:
- shard-iclb: [SKIP][72] ([fdo#109441]) -> [PASS][73] +2 similar issues
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-iclb4/igt@kms_psr@psr2_sprite_mmap_gtt.html
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html
#### Warnings ####
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-skl: [FAIL][74] ([fdo#103232]) -> [INCOMPLETE][75] ([fdo#110741])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6244/shard-skl3/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/shard-skl4/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103355]: https://bugs.freedesktop.org/show_bug.cgi?id=103355
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#108767]: https://bugs.freedesktop.org/show_bug.cgi?id=108767
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110038]: https://bugs.freedesktop.org/show_bug.cgi?id=110038
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110741]: https://bugs.freedesktop.org/show_bug.cgi?id=110741
[fdo#110789]: https://bugs.freedesktop.org/show_bug.cgi?id=110789
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_6244 -> Patchwork_13249
CI_DRM_6244: d7ce900dafd424be9da576fbf3155b43ce5270ec @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5052: ff711b343c06a25ac4995ab8bd9a8bcb5ce1eb10 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13249: 7fe48e07837bb2a4a53a4b1deb6d4edbf17f4ed5 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13249/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] drm/i915: Prevent lock-cycles between GPU waits and GPU resets
@ 2019-06-11 14:27 Chris Wilson
0 siblings, 0 replies; 6+ messages in thread
From: Chris Wilson @ 2019-06-11 14:27 UTC (permalink / raw)
To: intel-gfx
We cannot allow ourselves to wait on the GPU while holding any lock we
may need to reset the GPU. While there is not an explicit lock between
the two operations, lockdep cannot detect the dependency. So let's tell
lockdep about the wait/reset dependency with an explicit lockmap.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_reset.c | 5 ++++-
drivers/gpu/drm/i915/i915_drv.h | 8 ++++++++
drivers/gpu/drm/i915/i915_gem.c | 3 +++
drivers/gpu/drm/i915/i915_request.c | 2 ++
4 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
index 60d24110af80..6368b37f26d1 100644
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -978,10 +978,11 @@ void i915_reset(struct drm_i915_private *i915,
might_sleep();
GEM_BUG_ON(!test_bit(I915_RESET_BACKOFF, &error->flags));
+ lock_map_acquire(&i915->gt.reset_lockmap);
/* Clear any previous failed attempts at recovery. Time to try again. */
if (!__i915_gem_unset_wedged(i915))
- return;
+ goto unlock;
if (reason)
dev_notice(i915->drm.dev, "Resetting chip for %s\n", reason);
@@ -1029,6 +1030,8 @@ void i915_reset(struct drm_i915_private *i915,
finish:
reset_finish(i915);
+unlock:
+ lock_map_release(&i915->gt.reset_lockmap);
return;
taint:
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 0ea7f78ae227..9cfa9500fcc4 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1919,6 +1919,14 @@ struct drm_i915_private {
ktime_t last_init_time;
struct i915_vma *scratch;
+
+ /*
+ * We must never wait on the GPU while holding a lock we may
+ * need to perform a GPU reset. So while we don't need to
+ * serialise wait/reset with an explicit lock, we do want
+ * lockdep to detect potential dependency cycles.
+ */
+ struct lockdep_map reset_lockmap;
} gt;
struct {
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index e980c1ee3dcf..24f0f3db1bfb 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1782,6 +1782,7 @@ static void i915_gem_init__mm(struct drm_i915_private *i915)
int i915_gem_init_early(struct drm_i915_private *dev_priv)
{
+ static struct lock_class_key reset_key;
int err;
intel_gt_pm_init(dev_priv);
@@ -1789,6 +1790,8 @@ int i915_gem_init_early(struct drm_i915_private *dev_priv)
INIT_LIST_HEAD(&dev_priv->gt.active_rings);
INIT_LIST_HEAD(&dev_priv->gt.closed_vma);
spin_lock_init(&dev_priv->gt.closed_lock);
+ lockdep_init_map(&dev_priv->gt.reset_lockmap,
+ "i915.reset", &reset_key, 0);
i915_gem_init__mm(dev_priv);
i915_gem_init__pm(dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index e9b59eea4f10..1cbc3ef4fc27 100644
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -1444,6 +1444,7 @@ long i915_request_wait(struct i915_request *rq,
return -ETIME;
trace_i915_request_wait_begin(rq, flags);
+ lock_map_acquire(&rq->i915->gt.reset_lockmap);
/*
* Optimistic spin before touching IRQs.
@@ -1517,6 +1518,7 @@ long i915_request_wait(struct i915_request *rq,
dma_fence_remove_callback(&rq->fence, &wait.cb);
out:
+ lock_map_release(&rq->i915->gt.reset_lockmap);
trace_i915_request_wait_end(rq);
return timeout;
}
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-06-13 5:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-12 8:52 [PATCH] drm/i915: Prevent lock-cycles between GPU waits and GPU resets Chris Wilson
2019-06-12 9:38 ` ✓ Fi.CI.BAT: success for drm/i915: Prevent lock-cycles between GPU waits and GPU resets (rev2) Patchwork
2019-06-12 11:00 ` [PATCH] drm/i915: Prevent lock-cycles between GPU waits and GPU resets Mika Kuoppala
2019-06-12 11:04 ` Chris Wilson
2019-06-13 5:21 ` ✗ Fi.CI.IGT: failure for drm/i915: Prevent lock-cycles between GPU waits and GPU resets (rev2) Patchwork
-- strict thread matches above, loose matches on Subject: below --
2019-06-11 14:27 [PATCH] drm/i915: Prevent lock-cycles between GPU waits and GPU resets Chris Wilson
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.