Skip to content

Commit 2939dea

Browse files
digetxdanvet
authored andcommitted
drm/gem: Properly annotate WW context on drm_gem_lock_reservations() error
Use ww_acquire_fini() in the error code paths. Otherwise lockdep thinks that lock is held when lock's memory is freed after the drm_gem_lock_reservations() error. The ww_acquire_context needs to be annotated as "released", which fixes the noisy "WARNING: held lock freed!" splat of VirtIO-GPU driver with CONFIG_DEBUG_MUTEXES=y and enabled lockdep. Cc: stable@vger.kernel.org Fixes: 7edc3e3 ("drm: Add helpers for locking an array of BO reservations.") Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20220630200405.1883897-2-dmitry.osipenko@collabora.com
1 parent df4aaf0 commit 2939dea

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/drm_gem.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count,
12261226
ret = dma_resv_lock_slow_interruptible(obj->resv,
12271227
acquire_ctx);
12281228
if (ret) {
1229-
ww_acquire_done(acquire_ctx);
1229+
ww_acquire_fini(acquire_ctx);
12301230
return ret;
12311231
}
12321232
}
@@ -1251,7 +1251,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count,
12511251
goto retry;
12521252
}
12531253

1254-
ww_acquire_done(acquire_ctx);
1254+
ww_acquire_fini(acquire_ctx);
12551255
return ret;
12561256
}
12571257
}

0 commit comments

Comments
 (0)