openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/selftests: Fix mutex imbalance for igt_render_engine_reset_fallback 

Smatch spots:

drivers/gpu/drm/i915/selftests/intel_hangcheck.c:669 igt_render_engine_reset_fallback() error: double unlock 'mutex:&i915->drm.struct_mutex'

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170623131907.24236-1-chris@chris-wilson.co.uk
Reviewed-by: Michel Thierry <michel.thierry@intel.com>
This commit is contained in:
Chris Wilson 2017-06-23 14:19:07 +01:00
parent e38c2da01f
commit 774eed4a40
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/gpu/drm/i915/selftests/intel_hangcheck.c
View File

@ -597,12 +597,12 @@ static int igt_render_engine_reset_fallback(void *arg)
err = hang_init(&h, i915); err = hang_init(&h, i915);
if (err) if (err)
goto unlock; goto err_unlock;
rq = hang_create_request(&h, engine, i915->kernel_context); rq = hang_create_request(&h, engine, i915->kernel_context);
if (IS_ERR(rq)) { if (IS_ERR(rq)) {
err = PTR_ERR(rq); err = PTR_ERR(rq);
goto fini; goto err_fini;
} }
i915_gem_request_get(rq); i915_gem_request_get(rq);
@ -614,7 +614,7 @@ static int igt_render_engine_reset_fallback(void *arg)
if (!wait_for_hang(&h, rq)) { if (!wait_for_hang(&h, rq)) {
pr_err("Failed to start request %x\n", rq->fence.seqno); pr_err("Failed to start request %x\n", rq->fence.seqno);
err = -EIO; err = -EIO;
goto out_rq; goto err_request;
} }
reset_engine_count = i915_reset_engine_count(&i915->gpu_error, engine); reset_engine_count = i915_reset_engine_count(&i915->gpu_error, engine);
@ -646,13 +646,14 @@ static int igt_render_engine_reset_fallback(void *arg)
*/ */
if (i915_terminally_wedged(&i915->gpu_error)) { if (i915_terminally_wedged(&i915->gpu_error)) {
set_bit(I915_RESET_BACKOFF, &i915->gpu_error.flags); set_bit(I915_RESET_BACKOFF, &i915->gpu_error.flags);
mutex_lock(&i915->drm.struct_mutex);
rq->fence.error = 0; rq->fence.error = 0;
mutex_lock(&i915->drm.struct_mutex);
set_bit(I915_RESET_HANDOFF, &i915->gpu_error.flags); set_bit(I915_RESET_HANDOFF, &i915->gpu_error.flags);
i915_reset(i915); i915_reset(i915);
GEM_BUG_ON(test_bit(I915_RESET_HANDOFF, GEM_BUG_ON(test_bit(I915_RESET_HANDOFF,
&i915->gpu_error.flags)); &i915->gpu_error.flags));
mutex_unlock(&i915->drm.struct_mutex);
if (i915_reset_count(&i915->gpu_error) == reset_count) { if (i915_reset_count(&i915->gpu_error) == reset_count) {
pr_err("No full GPU reset recorded!\n"); pr_err("No full GPU reset recorded!\n");
@ -663,10 +664,8 @@ static int igt_render_engine_reset_fallback(void *arg)
out_rq: out_rq:
i915_gem_request_put(rq); i915_gem_request_put(rq);
fini:
hang_fini(&h); hang_fini(&h);
unlock: out_backoff:
mutex_unlock(&i915->drm.struct_mutex);
clear_bit(I915_RESET_BACKOFF, &i915->gpu_error.flags); clear_bit(I915_RESET_BACKOFF, &i915->gpu_error.flags);
wake_up_all(&i915->gpu_error.reset_queue); wake_up_all(&i915->gpu_error.reset_queue);
@ -674,6 +673,14 @@ static int igt_render_engine_reset_fallback(void *arg)
return -EIO; return -EIO;
return err; return err;
err_request:
i915_gem_request_put(rq);
err_fini:
hang_fini(&h);
err_unlock:
mutex_unlock(&i915->drm.struct_mutex);
goto out_backoff;
} }
int intel_hangcheck_live_selftests(struct drm_i915_private *i915) int intel_hangcheck_live_selftests(struct drm_i915_private *i915)