* [PATCH] drm/i915: Don't wait for a spinlock inside error capture @ 2016-09-06 7:38 Chris Wilson 2016-09-06 7:49 ` Joonas Lahtinen 2016-09-06 8:20 ` ✓ Fi.CI.BAT: success for " Patchwork 0 siblings, 2 replies; 3+ messages in thread From: Chris Wilson @ 2016-09-06 7:38 UTC (permalink / raw) To: intel-gfx If we can't grab the breadcrumb's spinlock, possibly due to a driver deadlock inside the waiters, ignore them. Like hangcheck, error capturing must work no matter how the driver/GPU dies. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_gpu_error.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 929db40a3925..14890850ecb1 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -489,7 +489,10 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, } } - if (ee->num_waiters) { + if (IS_ERR(ee->waiters)) { + err_printf(m, "%s --- ? waiters [unable to acquire spinlock]\n", + dev_priv->engine[i].name); + } else if (ee->num_waiters) { err_printf(m, "%s --- %d waiters\n", dev_priv->engine[i].name, ee->num_waiters); @@ -648,7 +651,8 @@ static void i915_error_state_free(struct kref *error_ref) i915_error_object_free(ee->wa_ctx); kfree(ee->requests); - kfree(ee->waiters); + if (!IS_ERR_OR_NULL(ee->waiters)) + kfree(ee->waiters); } i915_error_object_free(error->semaphore); @@ -933,7 +937,14 @@ static void error_record_engine_waiters(struct intel_engine_cs *engine, ee->num_waiters = 0; ee->waiters = NULL; - spin_lock(&b->lock); + if (RB_EMPTY_ROOT(&b->waiters)) + return; + + if (!spin_trylock(&b->lock)) { + ee->waiters = ERR_PTR(-EDEADLK); + return; + } + count = 0; for (rb = rb_first(&b->waiters); rb != NULL; rb = rb_next(rb)) count++; @@ -947,9 +958,13 @@ static void error_record_engine_waiters(struct intel_engine_cs *engine, if (!waiter) return; - ee->waiters = waiter; + if (!spin_trylock(&b->lock)) { + kfree(waiter); + ee->waiters = ERR_PTR(-EDEADLK); + return; + } - spin_lock(&b->lock); + ee->waiters = waiter; for (rb = rb_first(&b->waiters); rb; rb = rb_next(rb)) { struct intel_wait *w = container_of(rb, typeof(*w), node); -- 2.9.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Don't wait for a spinlock inside error capture 2016-09-06 7:38 [PATCH] drm/i915: Don't wait for a spinlock inside error capture Chris Wilson @ 2016-09-06 7:49 ` Joonas Lahtinen 2016-09-06 8:20 ` ✓ Fi.CI.BAT: success for " Patchwork 1 sibling, 0 replies; 3+ messages in thread From: Joonas Lahtinen @ 2016-09-06 7:49 UTC (permalink / raw) To: Chris Wilson, intel-gfx On ti, 2016-09-06 at 08:38 +0100, Chris Wilson wrote: > If we can't grab the breadcrumb's spinlock, possibly due to a driver > deadlock inside the waiters, ignore them. Like hangcheck, error > capturing must work no matter how the driver/GPU dies. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Regards, Joonas -- Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 3+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Don't wait for a spinlock inside error capture 2016-09-06 7:38 [PATCH] drm/i915: Don't wait for a spinlock inside error capture Chris Wilson 2016-09-06 7:49 ` Joonas Lahtinen @ 2016-09-06 8:20 ` Patchwork 1 sibling, 0 replies; 3+ messages in thread From: Patchwork @ 2016-09-06 8:20 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: drm/i915: Don't wait for a spinlock inside error capture URL : https://patchwork.freedesktop.org/series/12033/ State : success == Summary == Series 12033v1 drm/i915: Don't wait for a spinlock inside error capture http://patchwork.freedesktop.org/api/1.0/series/12033/revisions/1/mbox/ Test kms_pipe_crc_basic: Subgroup nonblocking-crc-pipe-b: skip -> PASS (fi-hsw-4770r) Subgroup read-crc-pipe-b: skip -> PASS (fi-skl-6260u) Subgroup read-crc-pipe-c: skip -> PASS (fi-hsw-4770r) fi-bdw-5557u total:252 pass:233 dwarn:2 dfail:1 fail:1 skip:15 fi-bsw-n3050 total:252 pass:203 dwarn:1 dfail:1 fail:1 skip:46 fi-byt-n2820 total:252 pass:206 dwarn:2 dfail:1 fail:2 skip:41 fi-hsw-4770k total:252 pass:226 dwarn:2 dfail:1 fail:1 skip:22 fi-hsw-4770r total:252 pass:222 dwarn:2 dfail:1 fail:1 skip:26 fi-ivb-3520m total:252 pass:217 dwarn:2 dfail:1 fail:1 skip:31 fi-skl-6260u total:252 pass:234 dwarn:2 dfail:1 fail:1 skip:14 fi-skl-6700k total:252 pass:219 dwarn:3 dfail:1 fail:1 skip:28 fi-snb-2520m total:252 pass:204 dwarn:2 dfail:1 fail:2 skip:43 fi-snb-2600 total:252 pass:205 dwarn:2 dfail:1 fail:1 skip:43 Results at /archive/results/CI_IGT_test/Patchwork_2473/ 9baa666b3e48f71b46c5f63541f57d2a95a1b1c0 drm-intel-nightly: 2016y-09m-03d-12h-12m-15s UTC integration manifest 2dc0c55 drm/i915: Don't wait for a spinlock inside error capture _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-06 8:20 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-09-06 7:38 [PATCH] drm/i915: Don't wait for a spinlock inside error capture Chris Wilson 2016-09-06 7:49 ` Joonas Lahtinen 2016-09-06 8:20 ` ✓ Fi.CI.BAT: success for " Patchwork
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox