* [Intel-gfx] [PATCH] drm/i915/gt: Move execlists_reset() out of line
@ 2021-01-21 0:32 Chris Wilson
2021-01-21 1:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Chris Wilson @ 2021-01-21 0:32 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
Reduce the bulk of execlists_submission_tasklet by moving the unlikely
reset function out of line.
add/remove: 1/0 grow/shrink: 0/1 up/down: 960/-935 (25)
Function old new delta
execlists_reset - 960 +960
execlists_submission_tasklet 6629 5694 -935
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
.../drm/i915/gt/intel_execlists_submission.c | 36 +++++++++----------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index 740ff05fd692..43cc85241886 100644
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -2299,10 +2299,13 @@ static void execlists_capture(struct intel_engine_cs *engine)
kfree(cap);
}
-static void execlists_reset(struct intel_engine_cs *engine, const char *msg)
+static noinline void execlists_reset(struct intel_engine_cs *engine)
{
+ struct intel_engine_execlists *el = &engine->execlists;
const unsigned int bit = I915_RESET_ENGINE + engine->id;
unsigned long *lock = &engine->gt->reset.flags;
+ unsigned long eir = fetch_and_zero(&el->error_interrupt);
+ const char *msg;
if (!intel_has_reset_engine(engine->gt))
return;
@@ -2310,16 +2313,25 @@ static void execlists_reset(struct intel_engine_cs *engine, const char *msg)
if (test_and_set_bit(bit, lock))
return;
+ /* Generate the error message in priority wrt to the user! */
+ if (eir & GENMASK(15, 0))
+ msg = "CS error"; /* thrown by a user payload */
+ else if (eir & ERROR_CSB)
+ msg = "invalid CSB event";
+ else if (eir & ERROR_PREEMPT)
+ msg = "preemption time out";
+ else
+ msg = "internal error";
ENGINE_TRACE(engine, "reset for %s\n", msg);
/* Mark this tasklet as disabled to avoid waiting for it to complete */
- tasklet_disable_nosync(&engine->execlists.tasklet);
+ tasklet_disable_nosync(&el->tasklet);
ring_set_paused(engine, 1); /* Freeze the current request in place */
execlists_capture(engine);
intel_engine_reset(engine, msg);
- tasklet_enable(&engine->execlists.tasklet);
+ tasklet_enable(&el->tasklet);
clear_and_wake_up_bit(bit, lock);
}
@@ -2355,22 +2367,8 @@ static void execlists_submission_tasklet(unsigned long data)
engine->execlists.error_interrupt |= ERROR_PREEMPT;
}
- if (unlikely(READ_ONCE(engine->execlists.error_interrupt))) {
- const char *msg;
-
- /* Generate the error message in priority wrt to the user! */
- if (engine->execlists.error_interrupt & GENMASK(15, 0))
- msg = "CS error"; /* thrown by a user payload */
- else if (engine->execlists.error_interrupt & ERROR_CSB)
- msg = "invalid CSB event";
- else if (engine->execlists.error_interrupt & ERROR_PREEMPT)
- msg = "preemption time out";
- else
- msg = "internal error";
-
- engine->execlists.error_interrupt = 0;
- execlists_reset(engine, msg);
- }
+ if (unlikely(READ_ONCE(engine->execlists.error_interrupt)))
+ execlists_reset(engine);
if (!engine->execlists.pending[0]) {
execlists_dequeue_irq(engine);
--
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
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Move execlists_reset() out of line
2021-01-21 0:32 [Intel-gfx] [PATCH] drm/i915/gt: Move execlists_reset() out of line Chris Wilson
@ 2021-01-21 1:40 ` Patchwork
2021-01-21 4:15 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-01-21 10:55 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2021-01-21 1:40 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 3420 bytes --]
== Series Details ==
Series: drm/i915/gt: Move execlists_reset() out of line
URL : https://patchwork.freedesktop.org/series/86106/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9650 -> Patchwork_19435
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/index.html
Known issues
------------
Here are the changes found in Patchwork_19435 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_prime@i915-to-amd:
- fi-snb-2520m: NOTRUN -> [SKIP][1] ([fdo#109271]) +17 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/fi-snb-2520m/igt@amdgpu/amd_prime@i915-to-amd.html
* igt@i915_getparams_basic@basic-subslice-total:
- fi-tgl-y: [PASS][2] -> [DMESG-WARN][3] ([i915#402]) +1 similar issue
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/fi-tgl-y/igt@i915_getparams_basic@basic-subslice-total.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/fi-tgl-y/igt@i915_getparams_basic@basic-subslice-total.html
* igt@i915_pm_rpm@module-reload:
- fi-kbl-guc: [PASS][4] -> [SKIP][5] ([fdo#109271])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/fi-kbl-guc/igt@i915_pm_rpm@module-reload.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/fi-kbl-guc/igt@i915_pm_rpm@module-reload.html
#### Possible fixes ####
* igt@i915_selftest@live@hangcheck:
- fi-snb-2520m: [INCOMPLETE][6] -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/fi-snb-2520m/igt@i915_selftest@live@hangcheck.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/fi-snb-2520m/igt@i915_selftest@live@hangcheck.html
* igt@prime_self_import@basic-with_one_bo_two_files:
- fi-tgl-y: [DMESG-WARN][8] ([i915#402]) -> [PASS][9] +1 similar issue
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/fi-tgl-y/igt@prime_self_import@basic-with_one_bo_two_files.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/fi-tgl-y/igt@prime_self_import@basic-with_one_bo_two_files.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
Participating hosts (43 -> 38)
------------------------------
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9650 -> Patchwork_19435
CI-20190529: 20190529
CI_DRM_9650: 3f989d1bb4cfd91e25549f9fd7a750412581dcc4 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5960: ace82fcd5f3623f8dde7c220a825873dc53dfae4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19435: 090d023d9910db877bc24ec559e856e5b1e9aa43 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
090d023d9910 drm/i915/gt: Move execlists_reset() out of line
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/index.html
[-- Attachment #1.2: Type: text/html, Size: 4153 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] 6+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/gt: Move execlists_reset() out of line
2021-01-21 0:32 [Intel-gfx] [PATCH] drm/i915/gt: Move execlists_reset() out of line Chris Wilson
2021-01-21 1:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
@ 2021-01-21 4:15 ` Patchwork
2021-01-21 10:55 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2021-01-21 4:15 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 26260 bytes --]
== Series Details ==
Series: drm/i915/gt: Move execlists_reset() out of line
URL : https://patchwork.freedesktop.org/series/86106/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9650_full -> Patchwork_19435_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_19435_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_19435_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_19435_full:
### IGT changes ###
#### Possible regressions ####
* igt@i915_pm_rps@reset:
- shard-snb: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-snb5/igt@i915_pm_rps@reset.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-snb2/igt@i915_pm_rps@reset.html
* igt@sysfs_timeslice_duration@timeout@vcs0:
- shard-skl: NOTRUN -> [FAIL][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl7/igt@sysfs_timeslice_duration@timeout@vcs0.html
Known issues
------------
Here are the changes found in Patchwork_19435_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@close-replace-race:
- shard-glk: [PASS][4] -> [TIMEOUT][5] ([i915#2918])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-glk6/igt@gem_ctx_persistence@close-replace-race.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-glk4/igt@gem_ctx_persistence@close-replace-race.html
* igt@gem_ctx_persistence@engines-mixed:
- shard-hsw: NOTRUN -> [SKIP][6] ([fdo#109271] / [i915#1099])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-hsw8/igt@gem_ctx_persistence@engines-mixed.html
* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [PASS][7] -> [FAIL][8] ([i915#2842])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-kbl4/igt@gem_exec_fair@basic-none@vcs0.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-kbl4/igt@gem_exec_fair@basic-none@vcs0.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [PASS][9] -> [FAIL][10] ([i915#2842])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-glk8/igt@gem_exec_fair@basic-pace-share@rcs0.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-glk5/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-tglb: [PASS][11] -> [FAIL][12] ([i915#2842]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-tglb8/igt@gem_exec_fair@basic-pace@vecs0.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-tglb6/igt@gem_exec_fair@basic-pace@vecs0.html
* igt@gem_exec_reloc@basic-wide-active@vcs1:
- shard-iclb: NOTRUN -> [FAIL][13] ([i915#2389]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-iclb1/igt@gem_exec_reloc@basic-wide-active@vcs1.html
* igt@gem_exec_schedule@u-fairslice@rcs0:
- shard-apl: [PASS][14] -> [DMESG-WARN][15] ([i915#1610])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-apl2/igt@gem_exec_schedule@u-fairslice@rcs0.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-apl8/igt@gem_exec_schedule@u-fairslice@rcs0.html
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [PASS][16] -> [SKIP][17] ([i915#2190])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-tglb8/igt@gem_huc_copy@huc-copy.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-tglb6/igt@gem_huc_copy@huc-copy.html
* igt@gem_render_copy@y-tiled-to-vebox-linear:
- shard-hsw: NOTRUN -> [SKIP][18] ([fdo#109271]) +114 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-hsw8/igt@gem_render_copy@y-tiled-to-vebox-linear.html
* igt@gen3_mixed_blits:
- shard-kbl: NOTRUN -> [SKIP][19] ([fdo#109271]) +29 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-kbl1/igt@gen3_mixed_blits.html
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-kbl: NOTRUN -> [SKIP][20] ([fdo#109271] / [i915#658])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-kbl1/igt@i915_pm_dc@dc3co-vpb-simulation.html
* igt@i915_selftest@live@hangcheck:
- shard-hsw: NOTRUN -> [INCOMPLETE][21] ([i915#2782])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-hsw4/igt@i915_selftest@live@hangcheck.html
* igt@kms_async_flips@alternate-sync-async-flip:
- shard-skl: [PASS][22] -> [FAIL][23] ([i915#2521])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl3/igt@kms_async_flips@alternate-sync-async-flip.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl3/igt@kms_async_flips@alternate-sync-async-flip.html
* igt@kms_chamelium@hdmi-hpd-with-enabled-mode:
- shard-kbl: NOTRUN -> [SKIP][24] ([fdo#109271] / [fdo#111827]) +3 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-kbl1/igt@kms_chamelium@hdmi-hpd-with-enabled-mode.html
* igt@kms_chamelium@vga-frame-dump:
- shard-snb: NOTRUN -> [SKIP][25] ([fdo#109271] / [fdo#111827])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-snb2/igt@kms_chamelium@vga-frame-dump.html
* igt@kms_color@pipe-b-ctm-0-5:
- shard-skl: [PASS][26] -> [DMESG-WARN][27] ([i915#1982])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl6/igt@kms_color@pipe-b-ctm-0-5.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl2/igt@kms_color@pipe-b-ctm-0-5.html
* igt@kms_color_chamelium@pipe-a-ctm-green-to-red:
- shard-glk: NOTRUN -> [SKIP][28] ([fdo#109271] / [fdo#111827]) +2 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-glk7/igt@kms_color_chamelium@pipe-a-ctm-green-to-red.html
* igt@kms_color_chamelium@pipe-c-ctm-limited-range:
- shard-hsw: NOTRUN -> [SKIP][29] ([fdo#109271] / [fdo#111827]) +8 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-hsw2/igt@kms_color_chamelium@pipe-c-ctm-limited-range.html
* igt@kms_color_chamelium@pipe-d-ctm-green-to-red:
- shard-skl: NOTRUN -> [SKIP][30] ([fdo#109271] / [fdo#111827]) +4 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl7/igt@kms_color_chamelium@pipe-d-ctm-green-to-red.html
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-skl: NOTRUN -> [INCOMPLETE][31] ([i915#2295] / [i915#300])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl6/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
* igt@kms_cursor_crc@pipe-b-cursor-256x85-random:
- shard-skl: [PASS][32] -> [FAIL][33] ([i915#54]) +7 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl2/igt@kms_cursor_crc@pipe-b-cursor-256x85-random.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl10/igt@kms_cursor_crc@pipe-b-cursor-256x85-random.html
* igt@kms_cursor_edge_walk@pipe-a-64x64-top-edge:
- shard-glk: [PASS][34] -> [DMESG-WARN][35] ([i915#118] / [i915#95]) +2 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-glk8/igt@kms_cursor_edge_walk@pipe-a-64x64-top-edge.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-glk5/igt@kms_cursor_edge_walk@pipe-a-64x64-top-edge.html
* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
- shard-skl: NOTRUN -> [FAIL][36] ([i915#2346])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl5/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html
* igt@kms_cursor_legacy@flip-vs-cursor-varying-size:
- shard-skl: [PASS][37] -> [FAIL][38] ([i915#2346])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl6/igt@kms_cursor_legacy@flip-vs-cursor-varying-size.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl2/igt@kms_cursor_legacy@flip-vs-cursor-varying-size.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1:
- shard-skl: [PASS][39] -> [FAIL][40] ([i915#79])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl10/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl2/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html
* igt@kms_flip@plain-flip-fb-recreate@a-edp1:
- shard-skl: [PASS][41] -> [FAIL][42] ([i915#2122])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl10/igt@kms_flip@plain-flip-fb-recreate@a-edp1.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl2/igt@kms_flip@plain-flip-fb-recreate@a-edp1.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-pwrite:
- shard-skl: NOTRUN -> [SKIP][43] ([fdo#109271]) +25 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-shrfb-pgflip-blt:
- shard-glk: NOTRUN -> [SKIP][44] ([fdo#109271]) +11 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-glk7/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-shrfb-pgflip-blt.html
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][45] -> [FAIL][46] ([i915#1188]) +2 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl1/igt@kms_hdr@bpc-switch-dpms.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl5/igt@kms_hdr@bpc-switch-dpms.html
* igt@kms_pipe_crc_basic@read-crc-pipe-a:
- shard-glk: [PASS][47] -> [FAIL][48] ([i915#53])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-glk8/igt@kms_pipe_crc_basic@read-crc-pipe-a.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-glk5/igt@kms_pipe_crc_basic@read-crc-pipe-a.html
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: NOTRUN -> [FAIL][49] ([fdo#108145] / [i915#265])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][50] -> [FAIL][51] ([fdo#108145] / [i915#265])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl2/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][52] -> [SKIP][53] ([fdo#109441]) +1 similar issue
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-iclb5/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_vblank@pipe-d-wait-idle:
- shard-kbl: NOTRUN -> [SKIP][54] ([fdo#109271] / [i915#533])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-kbl1/igt@kms_vblank@pipe-d-wait-idle.html
* igt@perf@polling:
- shard-skl: [PASS][55] -> [FAIL][56] ([i915#1542])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl9/igt@perf@polling.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl4/igt@perf@polling.html
#### Possible fixes ####
* igt@drm_import_export@prime:
- shard-kbl: [INCOMPLETE][57] -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-kbl7/igt@drm_import_export@prime.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-kbl1/igt@drm_import_export@prime.html
* igt@feature_discovery@psr2:
- shard-iclb: [SKIP][59] ([i915#658]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb5/igt@feature_discovery@psr2.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-iclb2/igt@feature_discovery@psr2.html
* igt@gem_exec_capture@pi@vecs0:
- shard-skl: [INCOMPLETE][61] ([i915#198] / [i915#2624]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl3/igt@gem_exec_capture@pi@vecs0.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl3/igt@gem_exec_capture@pi@vecs0.html
* igt@gem_exec_fair@basic-none@vcs0:
- shard-apl: [FAIL][63] ([i915#2842]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-apl2/igt@gem_exec_fair@basic-none@vcs0.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-apl8/igt@gem_exec_fair@basic-none@vcs0.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-tglb: [FAIL][65] ([i915#2842]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-tglb1/igt@gem_exec_fair@basic-pace-share@rcs0.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-tglb2/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_exec_schedule@u-fairslice@rcs0:
- shard-glk: [DMESG-WARN][67] ([i915#1610]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-glk9/igt@gem_exec_schedule@u-fairslice@rcs0.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-glk7/igt@gem_exec_schedule@u-fairslice@rcs0.html
* igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy@gtt:
- shard-hsw: [INCOMPLETE][69] -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-hsw8/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy@gtt.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-hsw6/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy@gtt.html
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [DMESG-WARN][71] ([i915#1436] / [i915#1982] / [i915#716]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl4/igt@gen9_exec_parse@allowed-single.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl6/igt@gen9_exec_parse@allowed-single.html
* igt@i915_module_load@reload-with-fault-injection:
- shard-snb: [INCOMPLETE][73] ([i915#2880]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-snb7/igt@i915_module_load@reload-with-fault-injection.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-snb2/igt@i915_module_load@reload-with-fault-injection.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][75] ([i915#454]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb4/igt@i915_pm_dc@dc6-psr.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-iclb7/igt@i915_pm_dc@dc6-psr.html
* igt@i915_suspend@sysfs-reader:
- shard-skl: [INCOMPLETE][77] ([i915#146] / [i915#198]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl2/igt@i915_suspend@sysfs-reader.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl7/igt@i915_suspend@sysfs-reader.html
* igt@kms_cursor_crc@pipe-b-cursor-256x256-sliding:
- shard-skl: [FAIL][79] ([i915#54]) -> [PASS][80] +6 similar issues
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl9/igt@kms_cursor_crc@pipe-b-cursor-256x256-sliding.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl6/igt@kms_cursor_crc@pipe-b-cursor-256x256-sliding.html
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: [FAIL][81] ([i915#96]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-hsw8/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-hsw4/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: [FAIL][83] ([i915#2346] / [i915#533]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-skl: [FAIL][85] ([i915#2122]) -> [PASS][86] +1 similar issue
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl10/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl2/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1:
- shard-skl: [FAIL][87] ([i915#79]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl10/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl2/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html
* igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-mmap-cpu:
- shard-skl: [DMESG-WARN][89] ([i915#1982]) -> [PASS][90]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl10/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-mmap-cpu.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl2/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-mmap-cpu.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][91] ([fdo#109441]) -> [PASS][92] +1 similar issue
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb6/igt@kms_psr@psr2_primary_mmap_cpu.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
#### Warnings ####
* igt@gem_exec_fair@basic-pace@rcs0:
- shard-kbl: [FAIL][93] ([i915#2842]) -> [SKIP][94] ([fdo#109271])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-kbl6/igt@gem_exec_fair@basic-pace@rcs0.html
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-kbl6/igt@gem_exec_fair@basic-pace@rcs0.html
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][95] ([i915#2684]) -> [WARN][96] ([i915#1804] / [i915#2684])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb2/igt@i915_pm_rc6_residency@rc6-fence.html
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-iclb4/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][97] ([i915#1804] / [i915#2684]) -> [FAIL][98] ([i915#2680] / [i915#2681])
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb4/igt@i915_pm_rc6_residency@rc6-idle.html
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-iclb8/igt@i915_pm_rc6_residency@rc6-idle.html
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4:
- shard-iclb: [SKIP][99] ([i915#658]) -> [SKIP][100] ([i915#2920]) +1 similar issue
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb5/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4.html
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-iclb2/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4:
- shard-iclb: [SKIP][101] ([i915#2920]) -> [SKIP][102] ([i915#658])
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4.html
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-iclb5/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4.html
* igt@runner@aborted:
- shard-kbl: ([FAIL][103], [FAIL][104]) ([i915#2295] / [i915#2505] / [i915#2722]) -> [FAIL][105] ([i915#2295] / [i915#2505])
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-kbl6/igt@runner@aborted.html
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-kbl7/igt@runner@aborted.html
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-kbl6/igt@runner@aborted.html
- shard-apl: [FAIL][106] ([i915#2295]) -> ([FAIL][107], [FAIL][108]) ([i915#1610] / [i915#2295] / [i915#2426])
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-apl2/igt@runner@aborted.html
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-apl3/igt@runner@aborted.html
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-apl8/igt@runner@aborted.html
- shard-glk: ([FAIL][109], [FAIL][110]) ([i915#2295] / [i915#2426] / [k.org#202321]) -> [FAIL][111] ([i915#2295] / [k.org#202321])
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-glk4/igt@runner@aborted.html
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-glk9/igt@runner@aborted.html
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-glk7/igt@runner@aborted.html
- shard-skl: ([FAIL][112], [FAIL][113]) ([i915#1436] / [i915#2295]) -> [FAIL][114] ([i915#2295])
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl9/igt@runner@aborted.html
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9650/shard-skl4/igt@runner@aborted.html
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19435/shard-skl6/igt@runner@aborted.html
[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#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#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#146]: https://gitlab.freedesktop.org/drm/intel/issues/146
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#1804]: https://gitlab.freedesktop.org/drm/intel/issues/1804
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[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#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2624]: https://gitlab.freedesktop.org/drm/intel/issues/2624
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#2680]: https://gitlab.freedesktop.org/drm/intel/issues/2680
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2880]: https://gitlab.freedesktop.org/drm/intel/issues/2880
[i915#2918]: https://gitlab.freedesktop.org/drm/intel/issues/2918
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#53]: https://gitlab.freedesktop.org/drm/intel/issues/53
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[i915#96]: https://gitlab.freedesktop.org/drm/intel/issues/96
[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_9650 -> Patchwork_19435
CI-20190529: 20190529
CI_DRM_9650: 3f989d1bb4cfd91e25549f9fd7a750412581dcc4 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5960: ace82fcd5f3623f8dde7c220a825873dc53dfae4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19435: 090d023d9910db877bc24ec559e856e5b1e9aa43 @ 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_19435/index.html
[-- Attachment #1.2: Type: text/html, Size: 31967 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] 6+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Move execlists_reset() out of line
2021-01-21 0:32 [Intel-gfx] [PATCH] drm/i915/gt: Move execlists_reset() out of line Chris Wilson
2021-01-21 1:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2021-01-21 4:15 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
@ 2021-01-21 10:55 ` Tvrtko Ursulin
2021-01-21 10:58 ` Chris Wilson
2 siblings, 1 reply; 6+ messages in thread
From: Tvrtko Ursulin @ 2021-01-21 10:55 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 21/01/2021 00:32, Chris Wilson wrote:
> Reduce the bulk of execlists_submission_tasklet by moving the unlikely
> reset function out of line.
>
> add/remove: 1/0 grow/shrink: 0/1 up/down: 960/-935 (25)
> Function old new delta
> execlists_reset - 960 +960
> execlists_submission_tasklet 6629 5694 -935
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> .../drm/i915/gt/intel_execlists_submission.c | 36 +++++++++----------
> 1 file changed, 17 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> index 740ff05fd692..43cc85241886 100644
> --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> @@ -2299,10 +2299,13 @@ static void execlists_capture(struct intel_engine_cs *engine)
> kfree(cap);
> }
>
> -static void execlists_reset(struct intel_engine_cs *engine, const char *msg)
> +static noinline void execlists_reset(struct intel_engine_cs *engine)
> {
> + struct intel_engine_execlists *el = &engine->execlists;
> const unsigned int bit = I915_RESET_ENGINE + engine->id;
> unsigned long *lock = &engine->gt->reset.flags;
> + unsigned long eir = fetch_and_zero(&el->error_interrupt);
We got the locking wrong for this one. Irq handler side is under
gt->irq_lock, but there are unlocked rmw cycles in the tasklet. Not
counting this fetch_and_zero which is also unlocked.
If we nest gt->irq_lock under the engine->active.lock here, or the
opposite from the irq_handler, plus short locked sections in the tasklet
and csb handling. I *think* both options could be fine from locking order.
Regards,
Tvrtko
> + const char *msg;
>
> if (!intel_has_reset_engine(engine->gt))
> return;
> @@ -2310,16 +2313,25 @@ static void execlists_reset(struct intel_engine_cs *engine, const char *msg)
> if (test_and_set_bit(bit, lock))
> return;
>
> + /* Generate the error message in priority wrt to the user! */
> + if (eir & GENMASK(15, 0))
> + msg = "CS error"; /* thrown by a user payload */
> + else if (eir & ERROR_CSB)
> + msg = "invalid CSB event";
> + else if (eir & ERROR_PREEMPT)
> + msg = "preemption time out";
> + else
> + msg = "internal error";
> ENGINE_TRACE(engine, "reset for %s\n", msg);
>
> /* Mark this tasklet as disabled to avoid waiting for it to complete */
> - tasklet_disable_nosync(&engine->execlists.tasklet);
> + tasklet_disable_nosync(&el->tasklet);
>
> ring_set_paused(engine, 1); /* Freeze the current request in place */
> execlists_capture(engine);
> intel_engine_reset(engine, msg);
>
> - tasklet_enable(&engine->execlists.tasklet);
> + tasklet_enable(&el->tasklet);
> clear_and_wake_up_bit(bit, lock);
> }
>
> @@ -2355,22 +2367,8 @@ static void execlists_submission_tasklet(unsigned long data)
> engine->execlists.error_interrupt |= ERROR_PREEMPT;
> }
>
> - if (unlikely(READ_ONCE(engine->execlists.error_interrupt))) {
> - const char *msg;
> -
> - /* Generate the error message in priority wrt to the user! */
> - if (engine->execlists.error_interrupt & GENMASK(15, 0))
> - msg = "CS error"; /* thrown by a user payload */
> - else if (engine->execlists.error_interrupt & ERROR_CSB)
> - msg = "invalid CSB event";
> - else if (engine->execlists.error_interrupt & ERROR_PREEMPT)
> - msg = "preemption time out";
> - else
> - msg = "internal error";
> -
> - engine->execlists.error_interrupt = 0;
> - execlists_reset(engine, msg);
> - }
> + if (unlikely(READ_ONCE(engine->execlists.error_interrupt)))
> + execlists_reset(engine);
>
> if (!engine->execlists.pending[0]) {
> execlists_dequeue_irq(engine);
>
_______________________________________________
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: [Intel-gfx] [PATCH] drm/i915/gt: Move execlists_reset() out of line
2021-01-21 10:55 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
@ 2021-01-21 10:58 ` Chris Wilson
2021-01-21 11:17 ` Tvrtko Ursulin
0 siblings, 1 reply; 6+ messages in thread
From: Chris Wilson @ 2021-01-21 10:58 UTC (permalink / raw)
To: Tvrtko Ursulin, intel-gfx
Quoting Tvrtko Ursulin (2021-01-21 10:55:49)
>
> On 21/01/2021 00:32, Chris Wilson wrote:
> > Reduce the bulk of execlists_submission_tasklet by moving the unlikely
> > reset function out of line.
> >
> > add/remove: 1/0 grow/shrink: 0/1 up/down: 960/-935 (25)
> > Function old new delta
> > execlists_reset - 960 +960
> > execlists_submission_tasklet 6629 5694 -935
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > ---
> > .../drm/i915/gt/intel_execlists_submission.c | 36 +++++++++----------
> > 1 file changed, 17 insertions(+), 19 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> > index 740ff05fd692..43cc85241886 100644
> > --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> > +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> > @@ -2299,10 +2299,13 @@ static void execlists_capture(struct intel_engine_cs *engine)
> > kfree(cap);
> > }
> >
> > -static void execlists_reset(struct intel_engine_cs *engine, const char *msg)
> > +static noinline void execlists_reset(struct intel_engine_cs *engine)
> > {
> > + struct intel_engine_execlists *el = &engine->execlists;
> > const unsigned int bit = I915_RESET_ENGINE + engine->id;
> > unsigned long *lock = &engine->gt->reset.flags;
> > + unsigned long eir = fetch_and_zero(&el->error_interrupt);
>
> We got the locking wrong for this one. Irq handler side is under
> gt->irq_lock, but there are unlocked rmw cycles in the tasklet. Not
> counting this fetch_and_zero which is also unlocked.
It doesn't require locking.
-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
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Move execlists_reset() out of line
2021-01-21 10:58 ` Chris Wilson
@ 2021-01-21 11:17 ` Tvrtko Ursulin
0 siblings, 0 replies; 6+ messages in thread
From: Tvrtko Ursulin @ 2021-01-21 11:17 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 21/01/2021 10:58, Chris Wilson wrote:
> Quoting Tvrtko Ursulin (2021-01-21 10:55:49)
>>
>> On 21/01/2021 00:32, Chris Wilson wrote:
>>> Reduce the bulk of execlists_submission_tasklet by moving the unlikely
>>> reset function out of line.
>>>
>>> add/remove: 1/0 grow/shrink: 0/1 up/down: 960/-935 (25)
>>> Function old new delta
>>> execlists_reset - 960 +960
>>> execlists_submission_tasklet 6629 5694 -935
>>>
>>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>>> ---
>>> .../drm/i915/gt/intel_execlists_submission.c | 36 +++++++++----------
>>> 1 file changed, 17 insertions(+), 19 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
>>> index 740ff05fd692..43cc85241886 100644
>>> --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
>>> +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
>>> @@ -2299,10 +2299,13 @@ static void execlists_capture(struct intel_engine_cs *engine)
>>> kfree(cap);
>>> }
>>>
>>> -static void execlists_reset(struct intel_engine_cs *engine, const char *msg)
>>> +static noinline void execlists_reset(struct intel_engine_cs *engine)
>>> {
>>> + struct intel_engine_execlists *el = &engine->execlists;
>>> const unsigned int bit = I915_RESET_ENGINE + engine->id;
>>> unsigned long *lock = &engine->gt->reset.flags;
>>> + unsigned long eir = fetch_and_zero(&el->error_interrupt);
>>
>> We got the locking wrong for this one. Irq handler side is under
>> gt->irq_lock, but there are unlocked rmw cycles in the tasklet. Not
>> counting this fetch_and_zero which is also unlocked.
>
> It doesn't require locking.
/* Disable the error interrupt until after the reset */
if (likely(eir)) {
ENGINE_WRITE(engine, RING_EMR, ~0u);
ENGINE_WRITE(engine, RING_EIR, eir);
WRITE_ONCE(engine->execlists.error_interrupt, eir);
tasklet = true;
}
Okay I did not grep with enough context.
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] 6+ messages in thread
end of thread, other threads:[~2021-01-21 11:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-21 0:32 [Intel-gfx] [PATCH] drm/i915/gt: Move execlists_reset() out of line Chris Wilson
2021-01-21 1:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2021-01-21 4:15 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-01-21 10:55 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
2021-01-21 10:58 ` Chris Wilson
2021-01-21 11:17 ` 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.