* [PATCH] drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs
@ 2021-01-19 16:20 ` Chris Wilson
0 siblings, 0 replies; 7+ messages in thread
From: Chris Wilson @ 2021-01-19 16:20 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson, Tvrtko Ursulin, Andi Shyti, stable
If we enable_breadcrumbs for a request while that request is being
removed from HW; we may see that the request is active as we take the
ce->signal_lock and proceed to attach the request to ce->signals.
However, during unsubmission after marking the request as inactive, we
see that the request has not yet been added to ce->signals and so skip
the removal. Pull the check during cancel_breadcrumbs under the same
spinlock as enabling so that we the two tests are consistent in
enable/cancel.
Otherwise, we may insert a request onto ce->signal that we expect should
not be there:
intel_context_remove_breadcrumbs:488 GEM_BUG_ON(!__i915_request_is_complete(rq))
While updating, we can note that we are always called with
irqs-disabled, due to the engine->active.lock being held at the single
caller, and so remove the irqsave/restore.
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2931
Fixes: c18636f76344 ("drm/i915: Remove requirement for holding i915_request.lock for breadcrumbs")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
Cc: <stable@vger.kernel.org> # v5.10+
---
drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
index d098fc0c14ec..34a645d6babd 100644
--- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
@@ -453,16 +453,17 @@ void i915_request_cancel_breadcrumb(struct i915_request *rq)
{
struct intel_breadcrumbs *b = READ_ONCE(rq->engine)->breadcrumbs;
struct intel_context *ce = rq->context;
- unsigned long flags;
bool release;
- if (!test_and_clear_bit(I915_FENCE_FLAG_SIGNAL, &rq->fence.flags))
+ spin_lock(&ce->signal_lock);
+ if (!test_and_clear_bit(I915_FENCE_FLAG_SIGNAL, &rq->fence.flags)) {
+ spin_unlock(&ce->signal_lock);
return;
+ }
- spin_lock_irqsave(&ce->signal_lock, flags);
list_del_rcu(&rq->signal_link);
release = remove_signaling_context(b, ce);
- spin_unlock_irqrestore(&ce->signal_lock, flags);
+ spin_unlock(&ce->signal_lock);
if (release)
intel_context_put(ce);
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Intel-gfx] [PATCH] drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs
@ 2021-01-19 16:20 ` Chris Wilson
0 siblings, 0 replies; 7+ messages in thread
From: Chris Wilson @ 2021-01-19 16:20 UTC (permalink / raw)
To: intel-gfx; +Cc: stable, Chris Wilson
If we enable_breadcrumbs for a request while that request is being
removed from HW; we may see that the request is active as we take the
ce->signal_lock and proceed to attach the request to ce->signals.
However, during unsubmission after marking the request as inactive, we
see that the request has not yet been added to ce->signals and so skip
the removal. Pull the check during cancel_breadcrumbs under the same
spinlock as enabling so that we the two tests are consistent in
enable/cancel.
Otherwise, we may insert a request onto ce->signal that we expect should
not be there:
intel_context_remove_breadcrumbs:488 GEM_BUG_ON(!__i915_request_is_complete(rq))
While updating, we can note that we are always called with
irqs-disabled, due to the engine->active.lock being held at the single
caller, and so remove the irqsave/restore.
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2931
Fixes: c18636f76344 ("drm/i915: Remove requirement for holding i915_request.lock for breadcrumbs")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
Cc: <stable@vger.kernel.org> # v5.10+
---
drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
index d098fc0c14ec..34a645d6babd 100644
--- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
@@ -453,16 +453,17 @@ void i915_request_cancel_breadcrumb(struct i915_request *rq)
{
struct intel_breadcrumbs *b = READ_ONCE(rq->engine)->breadcrumbs;
struct intel_context *ce = rq->context;
- unsigned long flags;
bool release;
- if (!test_and_clear_bit(I915_FENCE_FLAG_SIGNAL, &rq->fence.flags))
+ spin_lock(&ce->signal_lock);
+ if (!test_and_clear_bit(I915_FENCE_FLAG_SIGNAL, &rq->fence.flags)) {
+ spin_unlock(&ce->signal_lock);
return;
+ }
- spin_lock_irqsave(&ce->signal_lock, flags);
list_del_rcu(&rq->signal_link);
release = remove_signaling_context(b, ce);
- spin_unlock_irqrestore(&ce->signal_lock, flags);
+ spin_unlock(&ce->signal_lock);
if (release)
intel_context_put(ce);
--
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] 7+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs
2021-01-19 16:20 ` [Intel-gfx] " Chris Wilson
(?)
@ 2021-01-19 20:42 ` Patchwork
-1 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2021-01-19 20:42 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs
URL : https://patchwork.freedesktop.org/series/86049/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
fea4ba0eedd9 drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs
-:19: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#19:
intel_context_remove_breadcrumbs:488 GEM_BUG_ON(!__i915_request_is_complete(rq))
total: 0 errors, 1 warnings, 0 checks, 21 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs
2021-01-19 16:20 ` [Intel-gfx] " Chris Wilson
(?)
(?)
@ 2021-01-19 21:11 ` Patchwork
-1 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2021-01-19 21:11 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 5042 bytes --]
== Series Details ==
Series: drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs
URL : https://patchwork.freedesktop.org/series/86049/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9645 -> Patchwork_19412
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/index.html
Known issues
------------
Here are the changes found in Patchwork_19412 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@memory-alloc:
- fi-cml-u2: NOTRUN -> [SKIP][1] ([fdo#109315]) +17 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/fi-cml-u2/igt@amdgpu/amd_basic@memory-alloc.html
* igt@amdgpu/amd_basic@query-info:
- fi-tgl-y: NOTRUN -> [SKIP][2] ([fdo#109315] / [i915#2575])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/fi-tgl-y/igt@amdgpu/amd_basic@query-info.html
* igt@gem_exec_fence@basic-busy@bcs0:
- fi-cml-u2: NOTRUN -> [SKIP][3] ([i915#1208]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/fi-cml-u2/igt@gem_exec_fence@basic-busy@bcs0.html
* igt@gem_huc_copy@huc-copy:
- fi-cml-u2: NOTRUN -> [SKIP][4] ([i915#2190])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/fi-cml-u2/igt@gem_huc_copy@huc-copy.html
* igt@kms_chamelium@hdmi-crc-fast:
- fi-kbl-7500u: [PASS][5] -> [DMESG-WARN][6] ([i915#2868])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/fi-kbl-7500u/igt@kms_chamelium@hdmi-crc-fast.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/fi-kbl-7500u/igt@kms_chamelium@hdmi-crc-fast.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-cml-u2: NOTRUN -> [SKIP][7] ([i915#1004]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/fi-cml-u2/igt@kms_chamelium@hdmi-hpd-fast.html
* igt@kms_chamelium@vga-edid-read:
- fi-cml-u2: NOTRUN -> [SKIP][8] ([fdo#109309]) +1 similar issue
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/fi-cml-u2/igt@kms_chamelium@vga-edid-read.html
* igt@kms_force_connector_basic@force-load-detect:
- fi-cml-u2: NOTRUN -> [SKIP][9] ([fdo#109285])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/fi-cml-u2/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-cml-u2: NOTRUN -> [SKIP][10] ([fdo#109278] / [i915#533])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/fi-cml-u2/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
* igt@prime_vgem@basic-read:
- fi-tgl-y: [PASS][11] -> [DMESG-WARN][12] ([i915#402]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/fi-tgl-y/igt@prime_vgem@basic-read.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/fi-tgl-y/igt@prime_vgem@basic-read.html
#### Possible fixes ####
* igt@debugfs_test@read_all_entries:
- fi-tgl-y: [DMESG-WARN][13] ([i915#402]) -> [PASS][14] +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/fi-tgl-y/igt@debugfs_test@read_all_entries.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/fi-tgl-y/igt@debugfs_test@read_all_entries.html
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[i915#1004]: https://gitlab.freedesktop.org/drm/intel/issues/1004
[i915#1208]: https://gitlab.freedesktop.org/drm/intel/issues/1208
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2868]: https://gitlab.freedesktop.org/drm/intel/issues/2868
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
Participating hosts (42 -> 38)
------------------------------
Additional (1): fi-cml-u2
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9645 -> Patchwork_19412
CI-20190529: 20190529
CI_DRM_9645: 2b30fa2b1bf370ec286135a95b58fd5c26f81785 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5960: ace82fcd5f3623f8dde7c220a825873dc53dfae4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19412: fea4ba0eedd9062c94790cda1892e75910f04bc3 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
fea4ba0eedd9 drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/index.html
[-- Attachment #1.2: Type: text/html, Size: 6044 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs
2021-01-19 16:20 ` [Intel-gfx] " Chris Wilson
` (2 preceding siblings ...)
(?)
@ 2021-01-20 0:18 ` Patchwork
-1 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2021-01-20 0:18 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 22150 bytes --]
== Series Details ==
Series: drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs
URL : https://patchwork.freedesktop.org/series/86049/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9645_full -> Patchwork_19412_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_19412_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_19412_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_19412_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
- shard-tglb: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-tglb5/igt@kms_plane_multiple@atomic-pipe-a-tiling-y.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-tglb7/igt@kms_plane_multiple@atomic-pipe-a-tiling-y.html
Known issues
------------
Here are the changes found in Patchwork_19412_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@engines-hostile:
- shard-hsw: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#1099]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-hsw2/igt@gem_ctx_persistence@engines-hostile.html
* igt@gem_exec_fair@basic-deadline:
- shard-kbl: [PASS][4] -> [FAIL][5] ([i915#2846])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-kbl2/igt@gem_exec_fair@basic-deadline.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-kbl3/igt@gem_exec_fair@basic-deadline.html
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-tglb: [PASS][6] -> [FAIL][7] ([i915#2842])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-tglb3/igt@gem_exec_fair@basic-flow@rcs0.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-tglb6/igt@gem_exec_fair@basic-flow@rcs0.html
* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [PASS][8] -> [FAIL][9] ([i915#2842])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-kbl2/igt@gem_exec_fair@basic-none@vcs0.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-kbl7/igt@gem_exec_fair@basic-none@vcs0.html
* igt@gem_exec_fair@basic-pace@vcs1:
- shard-iclb: NOTRUN -> [FAIL][10] ([i915#2842])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-iclb4/igt@gem_exec_fair@basic-pace@vcs1.html
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [PASS][11] -> [FAIL][12] ([i915#2849])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-iclb5/igt@gem_exec_fair@basic-throttle@rcs0.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-iclb8/igt@gem_exec_fair@basic-throttle@rcs0.html
* igt@gem_exec_schedule@u-fairslice-all:
- shard-glk: [PASS][13] -> [DMESG-WARN][14] ([i915#1610])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-glk8/igt@gem_exec_schedule@u-fairslice-all.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-glk9/igt@gem_exec_schedule@u-fairslice-all.html
* igt@gem_pread@exhaustion:
- shard-hsw: NOTRUN -> [WARN][15] ([i915#2658])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-hsw2/igt@gem_pread@exhaustion.html
* igt@gem_pwrite@basic-exhaustion:
- shard-skl: NOTRUN -> [WARN][16] ([i915#2658]) +1 similar issue
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl4/igt@gem_pwrite@basic-exhaustion.html
* igt@gem_userptr_blits@vma-merge:
- shard-hsw: NOTRUN -> [FAIL][17] ([i915#2724])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-hsw2/igt@gem_userptr_blits@vma-merge.html
* igt@kms_ccs@pipe-c-bad-rotation-90:
- shard-skl: NOTRUN -> [SKIP][18] ([fdo#109271] / [fdo#111304]) +1 similar issue
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl4/igt@kms_ccs@pipe-c-bad-rotation-90.html
* igt@kms_chamelium@vga-hpd-for-each-pipe:
- shard-skl: NOTRUN -> [SKIP][19] ([fdo#109271] / [fdo#111827]) +5 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl4/igt@kms_chamelium@vga-hpd-for-each-pipe.html
* igt@kms_color_chamelium@pipe-d-ctm-max:
- shard-hsw: NOTRUN -> [SKIP][20] ([fdo#109271] / [fdo#111827]) +12 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-hsw2/igt@kms_color_chamelium@pipe-d-ctm-max.html
* igt@kms_cursor_crc@pipe-b-cursor-64x21-sliding:
- shard-skl: [PASS][21] -> [FAIL][22] ([i915#54]) +6 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-skl8/igt@kms_cursor_crc@pipe-b-cursor-64x21-sliding.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl5/igt@kms_cursor_crc@pipe-b-cursor-64x21-sliding.html
* igt@kms_cursor_crc@pipe-b-cursor-64x64-sliding:
- shard-skl: NOTRUN -> [FAIL][23] ([i915#54])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl2/igt@kms_cursor_crc@pipe-b-cursor-64x64-sliding.html
* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
- shard-skl: NOTRUN -> [FAIL][24] ([i915#2346])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl7/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-msflip-blt:
- shard-skl: NOTRUN -> [SKIP][25] ([fdo#109271]) +56 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-msflip-blt.html
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence:
- shard-skl: NOTRUN -> [SKIP][26] ([fdo#109271] / [i915#533])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl4/igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence.html
* igt@kms_plane_alpha_blend@pipe-a-alpha-7efc:
- shard-skl: NOTRUN -> [FAIL][27] ([fdo#108145] / [i915#265])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl2/igt@kms_plane_alpha_blend@pipe-a-alpha-7efc.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][28] -> [FAIL][29] ([fdo#108145] / [i915#265])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-skl2/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl3/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
* igt@kms_plane_scaling@scaler-with-clipping-clamping:
- shard-snb: NOTRUN -> [SKIP][30] ([fdo#109271])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-snb2/igt@kms_plane_scaling@scaler-with-clipping-clamping.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-2:
- shard-skl: NOTRUN -> [SKIP][31] ([fdo#109271] / [i915#658])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl4/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-2.html
* igt@kms_psr@primary_page_flip:
- shard-hsw: NOTRUN -> [SKIP][32] ([fdo#109271]) +172 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-hsw4/igt@kms_psr@primary_page_flip.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [PASS][33] -> [SKIP][34] ([fdo#109441]) +2 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-iclb6/igt@kms_psr@psr2_cursor_render.html
#### Possible fixes ####
* igt@gem_ctx_persistence@close-replace-race:
- shard-glk: [TIMEOUT][35] ([i915#2918]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-glk3/igt@gem_ctx_persistence@close-replace-race.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-glk7/igt@gem_ctx_persistence@close-replace-race.html
* igt@gem_exec_capture@pi@vecs0:
- shard-skl: [INCOMPLETE][37] ([i915#198] / [i915#2624]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-skl10/igt@gem_exec_capture@pi@vecs0.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl6/igt@gem_exec_capture@pi@vecs0.html
* igt@gem_exec_fair@basic-none@vecs0:
- shard-kbl: [FAIL][39] ([i915#2842]) -> [PASS][40] +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-kbl2/igt@gem_exec_fair@basic-none@vecs0.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-kbl7/igt@gem_exec_fair@basic-none@vecs0.html
* igt@gem_exec_fair@basic-pace@bcs0:
- shard-tglb: [FAIL][41] ([i915#2842]) -> [PASS][42] +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-tglb2/igt@gem_exec_fair@basic-pace@bcs0.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-tglb1/igt@gem_exec_fair@basic-pace@bcs0.html
* igt@gem_exec_reloc@basic-many-active@rcs0:
- shard-hsw: [FAIL][43] ([i915#2389]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-hsw2/igt@gem_exec_reloc@basic-many-active@rcs0.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-hsw6/igt@gem_exec_reloc@basic-many-active@rcs0.html
* igt@gem_exec_schedule@u-fairslice@rcs0:
- shard-skl: [DMESG-WARN][45] ([i915#1610] / [i915#2803]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-skl1/igt@gem_exec_schedule@u-fairslice@rcs0.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl2/igt@gem_exec_schedule@u-fairslice@rcs0.html
* igt@gem_partial_pwrite_pread@writes-after-reads-snoop:
- shard-hsw: [INCOMPLETE][47] -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-hsw7/igt@gem_partial_pwrite_pread@writes-after-reads-snoop.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-hsw2/igt@gem_partial_pwrite_pread@writes-after-reads-snoop.html
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-glk: [FAIL][49] ([i915#644]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-glk5/igt@gem_ppgtt@flink-and-close-vma-leak.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-glk2/igt@gem_ppgtt@flink-and-close-vma-leak.html
* igt@kms_async_flips@test-time-stamp:
- shard-tglb: [FAIL][51] ([i915#2597]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-tglb3/igt@kms_async_flips@test-time-stamp.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-tglb7/igt@kms_async_flips@test-time-stamp.html
* igt@kms_cursor_crc@pipe-c-cursor-256x85-sliding:
- shard-skl: [FAIL][53] ([i915#54]) -> [PASS][54] +4 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-skl7/igt@kms_cursor_crc@pipe-c-cursor-256x85-sliding.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl8/igt@kms_cursor_crc@pipe-c-cursor-256x85-sliding.html
* igt@kms_cursor_edge_walk@pipe-a-64x64-top-edge:
- shard-glk: [DMESG-WARN][55] ([i915#118] / [i915#95]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-glk5/igt@kms_cursor_edge_walk@pipe-a-64x64-top-edge.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-glk2/igt@kms_cursor_edge_walk@pipe-a-64x64-top-edge.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: [FAIL][57] ([i915#2346] / [i915#533]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-skl7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_flip@flip-vs-expired-vblank@a-edp1:
- shard-tglb: [FAIL][59] ([i915#2598]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-tglb1/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-tglb6/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html
* igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1:
- shard-skl: [FAIL][61] ([i915#2122]) -> [PASS][62] +2 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-skl3/igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl10/igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1.html
* igt@kms_hdr@bpc-switch:
- shard-skl: [FAIL][63] ([i915#1188]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-skl6/igt@kms_hdr@bpc-switch.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl7/igt@kms_hdr@bpc-switch.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [FAIL][65] ([fdo#108145] / [i915#265]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-skl1/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl7/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [SKIP][67] ([fdo#109441]) -> [PASS][68] +2 similar issues
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-iclb4/igt@kms_psr@psr2_cursor_mmap_cpu.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
* igt@kms_vblank@pipe-c-accuracy-idle:
- shard-glk: [FAIL][69] ([i915#43]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-glk1/igt@kms_vblank@pipe-c-accuracy-idle.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-glk1/igt@kms_vblank@pipe-c-accuracy-idle.html
* igt@sysfs_heartbeat_interval@mixed@bcs0:
- shard-kbl: [INCOMPLETE][71] ([i915#1731]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-kbl4/igt@sysfs_heartbeat_interval@mixed@bcs0.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-kbl6/igt@sysfs_heartbeat_interval@mixed@bcs0.html
#### Warnings ####
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][73] ([i915#2681] / [i915#2684]) -> [WARN][74] ([i915#2684])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-iclb1/igt@i915_pm_rc6_residency@rc6-fence.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-iclb2/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][75] ([i915#1804] / [i915#2684]) -> [WARN][76] ([i915#2684])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-iclb3/igt@i915_pm_rc6_residency@rc6-idle.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-iclb5/igt@i915_pm_rc6_residency@rc6-idle.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-2:
- shard-iclb: [SKIP][77] ([i915#658]) -> [SKIP][78] ([i915#2920]) +1 similar issue
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-iclb4/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-2.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-iclb2/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-2.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-2:
- shard-iclb: [SKIP][79] ([i915#2920]) -> [SKIP][80] ([i915#658]) +1 similar issue
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-2.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-iclb3/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-2.html
* igt@runner@aborted:
- shard-kbl: [FAIL][81] ([i915#2295] / [i915#2505]) -> [FAIL][82] ([i915#2295])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-kbl6/igt@runner@aborted.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-kbl3/igt@runner@aborted.html
- shard-glk: [FAIL][83] ([i915#2295] / [k.org#202321]) -> ([FAIL][84], [FAIL][85]) ([i915#2295] / [i915#2426] / [k.org#202321])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-glk9/igt@runner@aborted.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-glk9/igt@runner@aborted.html
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-glk3/igt@runner@aborted.html
- shard-tglb: [FAIL][86] ([i915#2295] / [i915#2667]) -> ([FAIL][87], [FAIL][88]) ([i915#1814] / [i915#2295] / [i915#2426] / [i915#2667])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-tglb7/igt@runner@aborted.html
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-tglb3/igt@runner@aborted.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-tglb7/igt@runner@aborted.html
- shard-skl: ([FAIL][89], [FAIL][90], [FAIL][91]) ([i915#1814] / [i915#2029] / [i915#2295] / [i915#2426]) -> [FAIL][92] ([i915#2295])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-skl2/igt@runner@aborted.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-skl1/igt@runner@aborted.html
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9645/shard-skl3/igt@runner@aborted.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19412/shard-skl3/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#111304]: https://bugs.freedesktop.org/show_bug.cgi?id=111304
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1099]: https://gitlab.freedesktop.org/drm/intel/issues/1099
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#1731]: https://gitlab.freedesktop.org/drm/intel/issues/1731
[i915#1804]: https://gitlab.freedesktop.org/drm/intel/issues/1804
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#2029]: https://gitlab.freedesktop.org/drm/intel/issues/2029
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2505]: https://gitlab.freedesktop.org/drm/intel/issues/2505
[i915#2597]: https://gitlab.freedesktop.org/drm/intel/issues/2597
[i915#2598]: https://gitlab.freedesktop.org/drm/intel/issues/2598
[i915#2624]: https://gitlab.freedesktop.org/drm/intel/issues/2624
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2667]: https://gitlab.freedesktop.org/drm/intel/issues/2667
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684
[i915#2724]: https://gitlab.freedesktop.org/drm/intel/issues/2724
[i915#2803]: https://gitlab.freedesktop.org/drm/intel/issues/2803
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#2849]: https://gitlab.freedesktop.org/drm/intel/issues/2849
[i915#2918]: https://gitlab.freedesktop.org/drm/intel/issues/2918
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#43]: https://gitlab.freedesktop.org/drm/intel/issues/43
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_9645 -> Patchwork_19412
CI-20190529: 20190529
CI_DRM_9645: 2b30fa2b1bf370ec286135a95b58fd5c26f81785 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5960: ace82fcd5f3623f8dde7c220a825873dc53dfae4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19412: fea4ba0eedd9062c94790cda1892e75910f04bc3 @ 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_19412/index.html
[-- Attachment #1.2: Type: text/html, Size: 26775 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs
2021-01-19 16:20 ` [Intel-gfx] " Chris Wilson
@ 2021-01-20 8:24 ` Tvrtko Ursulin
-1 siblings, 0 replies; 7+ messages in thread
From: Tvrtko Ursulin @ 2021-01-20 8:24 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: stable
On 19/01/2021 16:20, Chris Wilson wrote:
> If we enable_breadcrumbs for a request while that request is being
> removed from HW; we may see that the request is active as we take the
> ce->signal_lock and proceed to attach the request to ce->signals.
> However, during unsubmission after marking the request as inactive, we
> see that the request has not yet been added to ce->signals and so skip
> the removal. Pull the check during cancel_breadcrumbs under the same
> spinlock as enabling so that we the two tests are consistent in
> enable/cancel.
>
> Otherwise, we may insert a request onto ce->signal that we expect should
> not be there:
>
> intel_context_remove_breadcrumbs:488 GEM_BUG_ON(!__i915_request_is_complete(rq))
>
> While updating, we can note that we are always called with
> irqs-disabled, due to the engine->active.lock being held at the single
> caller, and so remove the irqsave/restore.
>
> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2931
> Fixes: c18636f76344 ("drm/i915: Remove requirement for holding i915_request.lock for breadcrumbs")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Andi Shyti <andi.shyti@intel.com>
> Cc: <stable@vger.kernel.org> # v5.10+
> ---
> drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
> index d098fc0c14ec..34a645d6babd 100644
> --- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
> +++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
> @@ -453,16 +453,17 @@ void i915_request_cancel_breadcrumb(struct i915_request *rq)
> {
> struct intel_breadcrumbs *b = READ_ONCE(rq->engine)->breadcrumbs;
> struct intel_context *ce = rq->context;
> - unsigned long flags;
> bool release;
>
> - if (!test_and_clear_bit(I915_FENCE_FLAG_SIGNAL, &rq->fence.flags))
> + spin_lock(&ce->signal_lock);
> + if (!test_and_clear_bit(I915_FENCE_FLAG_SIGNAL, &rq->fence.flags)) {
> + spin_unlock(&ce->signal_lock);
> return;
> + }
>
> - spin_lock_irqsave(&ce->signal_lock, flags);
> list_del_rcu(&rq->signal_link);
> release = remove_signaling_context(b, ce);
> - spin_unlock_irqrestore(&ce->signal_lock, flags);
> + spin_unlock(&ce->signal_lock);
> if (release)
> intel_context_put(ce);
>
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs
@ 2021-01-20 8:24 ` Tvrtko Ursulin
0 siblings, 0 replies; 7+ messages in thread
From: Tvrtko Ursulin @ 2021-01-20 8:24 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: stable
On 19/01/2021 16:20, Chris Wilson wrote:
> If we enable_breadcrumbs for a request while that request is being
> removed from HW; we may see that the request is active as we take the
> ce->signal_lock and proceed to attach the request to ce->signals.
> However, during unsubmission after marking the request as inactive, we
> see that the request has not yet been added to ce->signals and so skip
> the removal. Pull the check during cancel_breadcrumbs under the same
> spinlock as enabling so that we the two tests are consistent in
> enable/cancel.
>
> Otherwise, we may insert a request onto ce->signal that we expect should
> not be there:
>
> intel_context_remove_breadcrumbs:488 GEM_BUG_ON(!__i915_request_is_complete(rq))
>
> While updating, we can note that we are always called with
> irqs-disabled, due to the engine->active.lock being held at the single
> caller, and so remove the irqsave/restore.
>
> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2931
> Fixes: c18636f76344 ("drm/i915: Remove requirement for holding i915_request.lock for breadcrumbs")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Andi Shyti <andi.shyti@intel.com>
> Cc: <stable@vger.kernel.org> # v5.10+
> ---
> drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
> index d098fc0c14ec..34a645d6babd 100644
> --- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
> +++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
> @@ -453,16 +453,17 @@ void i915_request_cancel_breadcrumb(struct i915_request *rq)
> {
> struct intel_breadcrumbs *b = READ_ONCE(rq->engine)->breadcrumbs;
> struct intel_context *ce = rq->context;
> - unsigned long flags;
> bool release;
>
> - if (!test_and_clear_bit(I915_FENCE_FLAG_SIGNAL, &rq->fence.flags))
> + spin_lock(&ce->signal_lock);
> + if (!test_and_clear_bit(I915_FENCE_FLAG_SIGNAL, &rq->fence.flags)) {
> + spin_unlock(&ce->signal_lock);
> return;
> + }
>
> - spin_lock_irqsave(&ce->signal_lock, flags);
> list_del_rcu(&rq->signal_link);
> release = remove_signaling_context(b, ce);
> - spin_unlock_irqrestore(&ce->signal_lock, flags);
> + spin_unlock(&ce->signal_lock);
> if (release)
> intel_context_put(ce);
>
>
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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-01-20 8:27 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-19 16:20 [PATCH] drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs Chris Wilson
2021-01-19 16:20 ` [Intel-gfx] " Chris Wilson
2021-01-19 20:42 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2021-01-19 21:11 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-01-20 0:18 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-01-20 8:24 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
2021-01-20 8:24 ` Tvrtko Ursulin
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.