drm/i915/guc: Fix sleep under spinlock during reset
Subsystems (2)
Tvrtko Ursulin
maintainerPATCH 1/2 drm/i915/guc: Fix sleep under spinlock during reset
From: Tvrtko Ursulin <[email protected]>
Looks like intel_guc_reset had the ability to sleep under the uncore spinlock since forever but it wasn't detected until the recent changes annotated the wait for register with might_sleep.
I have fixed it by removing holding of the uncore spinlock over the call to gen6_hw_domain_reset, since I do not see that is really needed. But there is always a possibility I am missing some nasty detail so please double check.
--
A random selection of Cc for people who I though were recently engaged in GuC code.
--- drivers/gpu/drm/i915/intel_uncore.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +1 -6
@@ -1532,7 +1532,7 @@ static int gen6_hw_domain_reset(struct drm_i915_private *dev_priv,*/ __raw_i915_write32 (dev_priv,GEN6_GDRST , hw_domain_mask); -/* Spin waiting for the device to ack the reset requests */ +/* Wait for the device to ack the reset requests */ return intel_wait_for_register_fw (dev_priv,GEN6_GDRST , hw_domain_mask,0 ,500 );
@@ -1779,17 +1779,12 @@ bool intel_has_gpu_reset(struct drm_i915_private *dev_priv)int intel_guc_reset (struct drm_i915_private *dev_priv) {int ret; -unsigned long irqflags;if (!HAS_GUC (dev_priv))return -EINVAL ;intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); - ret =gen6_hw_domain_reset (dev_priv,GEN9_GRDOM_GUC ); - -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags);intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );return ret;
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerPATCH 2/2 guc run
From: Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/i915_params.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_params.c +2 -2
@@ -56,8 +56,8 @@ struct i915_params i915 __read_mostly = { .verbose_state_checks = 1, .nuclear_pageflip = 0, .edp_vswing = 0, - .enable_guc_loading = 0, - .enable_guc_submission = 0, + .enable_guc_loading = -1, + .enable_guc_submission = -1, .guc_log_level = -1, .guc_firmware_path = NULL, .huc_firmware_path = NULL,
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Looks like
intel_guc_resethad the ability to sleep under the uncore spinlock since forever but it wasn't detected until the recent changes annotated the wait for register withmight_sleep.I have fixed it by removing holding of the uncore spinlock over the call to
gen6_hw_domain_reset, since I do not see that is really needed. But there is always a possibility I am missing some nasty detail so please double check.
Afaik, no we are not using the uncore.lock here to serialise resets so yes we should be safe in dropping it.
Will the guc be coming under the same hw semaphore as gen8 per-engine resets?
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 12 lines · Chris Wilson
Quoted 10 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Looks like
intel_guc_resethad the ability to sleep under the uncore spinlock since forever but it wasn't detected until the recent changes annotated the wait for register withmight_sleep.I have fixed it by removing holding of the uncore spinlock over the call to
gen6_hw_domain_reset, since I do not see that is really needed. But there is always a possibility I am missing some nasty detail so please double check.
Quoted 5 lines
Afaik, no we are not using the uncore.lock here to serialise resets so yes we should be safe in dropping it.
Will the guc be coming under the same hw semaphore as gen8 per-engine resets?
A bit unrelated, but should intel_guc_reset be intel_reset_guc instead? Here we're trying to reset the microcontroller, not asking guc to do a reset.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Michel Thierry
Acked-byQuoted 16 lines · Michel Thierry
Quoted 15 lines · Chris Wilson
Quoted 10 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Looks like
intel_guc_resethad the ability to sleep under the uncore spinlock since forever but it wasn't detected until the recent changes annotated the wait for register withmight_sleep.I have fixed it by removing holding of the uncore spinlock over the call to
gen6_hw_domain_reset, since I do not see that is really needed. But there is always a possibility I am missing some nasty detail so please double check.Afaik, no we are not using the uncore.lock here to serialise resets so yes we should be safe in dropping it.
Quoted 6 lines
Quoted 2 lines
Will the guc be coming under the same hw semaphore as gen8 per-engine resets?
A bit unrelated, but should
intel_guc_resetbeintel_reset_gucinstead? Here we're trying to reset the microcontroller, not asking guc to do a reset.
Ping?
Anyone unlucky enough to be using GuC submission should be seeing this warning when the firmware has to be reloaded (for example after any i-g-t hang test).
I still think the function should be renamed to _reset_guc though, since it's the hw reseting the guc, not the other way around.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 26 lines · Michel Thierry
Quoted 16 lines · Michel Thierry
Quoted 15 lines · Chris Wilson
Quoted 10 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Looks like
intel_guc_resethad the ability to sleep under the uncore spinlock since forever but it wasn't detected until the recent changes annotated the wait for register withmight_sleep.I have fixed it by removing holding of the uncore spinlock over the call to
gen6_hw_domain_reset, since I do not see that is really needed. But there is always a possibility I am missing some nasty detail so please double check.Afaik, no we are not using the uncore.lock here to serialise resets so yes we should be safe in dropping it.
Quoted 6 lines
Quoted 2 lines
Will the guc be coming under the same hw semaphore as gen8 per-engine resets?
A bit unrelated, but should
intel_guc_resetbeintel_reset_gucinstead? Here we're trying to reset the microcontroller, not asking guc to do a reset.Ping?
Quoted 8 lines
Anyone unlucky enough to be using GuC submission should be seeing this warning when the firmware has to be reloaded (for example after any i-g-t hang test).
I still think the function should be renamed to
_reset_gucthough, since it's the hw reseting the guc, not the other way around.Acked-by Michel Thierry <[email protected]>
Thanks! Now just exercise restrain in suggesting bikesheds and if someone can provide an r-b we could merge this. ;) (To be read as - lets leave the renaming for a follow up work since this fix is not to blame for the objectionable name.)
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 35 lines · Tvrtko Ursulin
Quoted 33 lines · Michel Thierry
Quoted 16 lines · Michel Thierry
Quoted 15 lines · Chris Wilson
Quoted 10 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Looks like
intel_guc_resethad the ability to sleep under the uncore spinlock since forever but it wasn't detected until the recent changes annotated the wait for register withmight_sleep.I have fixed it by removing holding of the uncore spinlock over the call to
gen6_hw_domain_reset, since I do not see that is really needed. But there is always a possibility I am missing some nasty detail so please double check.Afaik, no we are not using the uncore.lock here to serialise resets so yes we should be safe in dropping it.
Quoted 6 lines
Quoted 2 lines
Will the guc be coming under the same hw semaphore as gen8 per-engine resets?
A bit unrelated, but should
intel_guc_resetbeintel_reset_gucinstead? Here we're trying to reset the microcontroller, not asking guc to do a reset.Ping?
Anyone unlucky enough to be using GuC submission should be seeing this warning when the firmware has to be reloaded (for example after any i-g-t hang test).
I still think the function should be renamed to
_reset_gucthough, since it's the hw reseting the guc, not the other way around.
Quoted 9 lines
Quoted 1 line
Acked-by Michel Thierry <[email protected]>Thanks! Now just exercise restrain in suggesting bikesheds and if someone can provide an r-b we could merge this. ;) (To be read as - lets leave the renaming for a follow up work since this fix is not to blame for the objectionable name.)
Regards,
_Invoking GuC experts_
Agreed, and since I'm the one that will tell the guc to perform a reset, I can include the bikeshed in my patches.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915/guc: Fix sleep under spinlock during reset
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915/guc: Fix sleep under spinlock during reset
URL : https://patchwork.freedesktop.org/series/22937/
State : failure
== Summary ==
Series 22937v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/22937/revisions/1/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
fail -> PASS (fi-snb-2600) fdo#100007
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-a-frame-sequence:
pass -> FAIL (fi-skl-6770hq)fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:430s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:423s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:585s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:487s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time:536s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:481s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:481s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:413s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:407s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:423s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:491s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:461s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:442s fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time:554s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:437s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:570s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:449s fi-skl-6770hq total:278 pass:267 dwarn:0 dfail:0 fail:1 skip:10 time:483s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:412s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:535s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:413s
57188aaf3b96d08e4095755fda0e577b1e0d8c60 drm-tip: 2017y-04m-12d-16h-12m-10s UTC integration manifest 54e2b93 guc run
e066fdc drm/i915/guc: Fix sleep under spinlock during reset
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4496/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915/guc: Fix sleep under spinlock during reset
Quoted 11 lines · Patchwork
== Series Details ==
Series: series starting with [1/2] drm/i915/guc: Fix sleep under spinlock during reset
URL : https://patchwork.freedesktop.org/series/22937/
State : failure== Summary ==
Series 22937v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/22937/revisions/1/mbox/
Quoted 6 lines
Test
gem_exec_flush:Subgroup basic-batch-kernel-default-uc: fail -> PASS (fi-snb-2600) fdo#100007 Test kms_pipe_crc_basic: Subgroup read-crc-pipe-a-frame-sequence: pass -> FAIL (fi-skl-6770hq)
Re-opening:
https://bugs.freedesktop.org/show_bug.cgi?id=99788
kms_pipe_crc_basic/read-crc-pipe-b-frame-sequence:
(kms_pipe_crc_basic:8766) CRITICAL: Failed assertion: crcs[j].frame + 1 == crcs[j + 1].frame (kms_pipe_crc_basic:8766) CRITICAL: error: 20240 != 20241
Quoted 25 lines
fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:430s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:423s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:585s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:487s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time:536s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:481s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:481s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:413s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:407s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:423s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:491s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:461s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:442s fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time:554s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:437s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:570s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:449s fi-skl-6770hq total:278 pass:267 dwarn:0 dfail:0 fail:1 skip:10 time:483s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:412s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:535s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:413s
Quoted 3 lines
57188aaf3b96d08e4095755fda0e577b1e0d8c60drm-tip: 2017y-04m-12d-16h-12m-10s UTC integration manifest 54e2b93 guc run
e066fdc drm/i915/guc: Fix sleep under spinlock during reset
Pushed, thanks for the review!
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915/guc: Fix sleep under spinlock during reset
Hi,
Quoted 15 lines
-----Original Message-----
Quoted 3 lines · Patchwork
== Series Details ==
Series: series starting with [1/2] drm/i915/guc: Fix sleep under spinlock during
reset
Quoted 9 lines
URL : https://patchwork.freedesktop.org/series/22937/
State : failure== Summary ==
Series 22937v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/22937/revisions/1/mbo
x/
Quoted 8 lines
Quoted 6 lines
Test
gem_exec_flush:Subgroup basic-batch-kernel-default-uc: fail -> PASS (fi-snb-2600) fdo#100007 Test kms_pipe_crc_basic: Subgroup read-crc-pipe-a-frame-sequence: pass -> FAIL (fi-skl-6770hq)Re-opening:
Thanks
Re-opened for real now and marked for CI
Quoted 6 lines
https://bugs.freedesktop.org/show_bug.cgi?id=99788
kms_pipe_crc_basic/read-crc-pipe-b-frame-sequence:
(kms_pipe_crc_basic:8766) CRITICAL: Failed assertion: crcs[j].frame + 1 ==crcs[j + 1].frame (kms_pipe_crc_basic:8766) CRITICAL: error: 20240 != 20241
Jani Saarinen
Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Looks like
intel_guc_resethad the ability to sleep under the uncore spinlock since forever but it wasn't detected until the recent changes annotated the wait for register withmight_sleep.I have fixed it by removing holding of the uncore spinlock over the call to
gen6_hw_domain_reset, since I do not see that is really needed. But there is always a possibility I am missing some nasty detail so please double check.
Quoted 6 lines
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Chris Wilson <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Arkadiusz Hiler <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Oscar Mateo <[email protected]>
Name and location of intel_guc_reset is bad, yes.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx