From: Dmitry Osipenko <dmitry.osipenko@collabora.com>
To: "David Airlie" <airlied@linux.ie>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Gurchetan Singh" <gurchetansingh@chromium.org>,
"Chia-I Wu" <olvaffe@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"Emil Velikov" <emil.l.velikov@gmail.com>,
"Christian König" <christian.koenig@amd.com>,
"Thomas Hellström" <thomas_os@shipmail.org>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Dmitry Osipenko <digetx@gmail.com>,
linux-tegra@vger.kernel.org, kernel@collabora.com,
virtualization@lists.linux-foundation.org
Subject: [PATCH v8 1/2] drm/gem: Properly annotate WW context on drm_gem_lock_reservations() error
Date: Fri, 1 Jul 2022 12:02:39 +0300 [thread overview]
Message-ID: <20220701090240.1896131-2-dmitry.osipenko@collabora.com> (raw)
In-Reply-To: <20220701090240.1896131-1-dmitry.osipenko@collabora.com>
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: 7edc3e3b975b5 ("drm: Add helpers for locking an array of BO reservations.")
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.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;
}
}
--
2.36.1
next prev parent reply other threads:[~2022-07-01 9:04 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-01 9:02 [PATCH v8 0/2] DRM GEM fixes Dmitry Osipenko
2022-07-01 9:02 ` Dmitry Osipenko [this message]
2022-07-05 11:33 ` [PATCH v8 1/2] drm/gem: Properly annotate WW context on drm_gem_lock_reservations() error Christian König
2022-08-09 16:44 ` Daniel Vetter
2022-08-10 6:52 ` Christian König
2022-08-10 8:33 ` Daniel Vetter
2022-08-10 9:04 ` Christian König
2022-07-01 9:02 ` [PATCH v8 2/2] drm/gem: Don't map imported GEMs Dmitry Osipenko
2022-07-05 11:39 ` Christian König
2022-07-05 21:48 ` Rob Clark
2022-07-06 7:02 ` Dmitry Osipenko
2022-08-10 11:47 ` Daniel Vetter
2022-08-10 15:08 ` Rob Clark
2022-08-10 19:26 ` Dmitry Osipenko
2022-08-10 22:03 ` Rob Clark
2022-08-10 22:23 ` Dmitry Osipenko
2022-08-10 23:19 ` Rob Clark
2022-08-12 11:26 ` Dmitry Osipenko
2022-08-12 14:57 ` Rob Clark
2022-08-12 15:01 ` Rob Clark
2022-08-16 11:44 ` Dmitry Osipenko
2022-08-16 11:52 ` Dmitry Osipenko
2022-08-16 12:03 ` Christian König
2022-08-16 19:55 ` Dmitry Osipenko
2022-08-22 17:26 ` Dmitry Osipenko
2022-08-23 10:01 ` Christian König
2022-08-23 16:47 ` Rob Clark
2022-09-07 10:25 ` Dmitry Osipenko
2022-09-11 18:00 ` Rob Clark
2022-08-16 22:18 ` Rob Clark
2022-08-10 19:27 ` Dmitry Osipenko
2022-07-22 11:49 ` [PATCH v8 0/2] DRM GEM fixes Dmitry Osipenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220701090240.1896131-2-dmitry.osipenko@collabora.com \
--to=dmitry.osipenko@collabora.com \
--cc=airlied@linux.ie \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=digetx@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.l.velikov@gmail.com \
--cc=gurchetansingh@chromium.org \
--cc=kernel@collabora.com \
--cc=kraxel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=olvaffe@gmail.com \
--cc=thomas_os@shipmail.org \
--cc=tzimmermann@suse.de \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).