Christian König
2022-Jul-05 11:33 UTC
[PATCH v8 1/2] drm/gem: Properly annotate WW context on drm_gem_lock_reservations() error
Am 01.07.22 um 11:02 schrieb Dmitry Osipenko:> 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 at vger.kernel.org > Fixes: 7edc3e3b975b5 ("drm: Add helpers for locking an array of BO reservations.") > Reviewed-by: Thomas Hellstr?m <thomas.hellstrom at linux.intel.com> > Signed-off-by: Dmitry Osipenko <dmitry.osipenko at collabora.com>Reviewed-by: Christian K?nig <christian.koenig at amd.com>> --- > drivers/gpu/drm/drm_gem.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c > index eb0c2d041f13..86d670c71286 100644 > --- a/drivers/gpu/drm/drm_gem.c > +++ b/drivers/gpu/drm/drm_gem.c > @@ -1226,7 +1226,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count, > ret = dma_resv_lock_slow_interruptible(obj->resv, > acquire_ctx); > if (ret) { > - ww_acquire_done(acquire_ctx); > + ww_acquire_fini(acquire_ctx); > return ret; > } > } > @@ -1251,7 +1251,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count, > goto retry; > } > > - ww_acquire_done(acquire_ctx); > + ww_acquire_fini(acquire_ctx); > return ret; > } > }
Daniel Vetter
2022-Aug-09 16:44 UTC
[PATCH v8 1/2] drm/gem: Properly annotate WW context on drm_gem_lock_reservations() error
On Tue, Jul 05, 2022 at 01:33:51PM +0200, Christian K?nig wrote:> Am 01.07.22 um 11:02 schrieb Dmitry Osipenko: > > 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 at vger.kernel.org > > Fixes: 7edc3e3b975b5 ("drm: Add helpers for locking an array of BO reservations.") > > Reviewed-by: Thomas Hellstr?m <thomas.hellstrom at linux.intel.com> > > Signed-off-by: Dmitry Osipenko <dmitry.osipenko at collabora.com> > > Reviewed-by: Christian K?nig <christian.koenig at amd.com>Also added this r-b tag when merging to drm-misc-next-fixes. -Daniel> > > --- > > drivers/gpu/drm/drm_gem.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c > > index eb0c2d041f13..86d670c71286 100644 > > --- a/drivers/gpu/drm/drm_gem.c > > +++ b/drivers/gpu/drm/drm_gem.c > > @@ -1226,7 +1226,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count, > > ret = dma_resv_lock_slow_interruptible(obj->resv, > > acquire_ctx); > > if (ret) { > > - ww_acquire_done(acquire_ctx); > > + ww_acquire_fini(acquire_ctx); > > return ret; > > } > > } > > @@ -1251,7 +1251,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count, > > goto retry; > > } > > - ww_acquire_done(acquire_ctx); > > + ww_acquire_fini(acquire_ctx); > > return ret; > > } > > } >-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch