From: Gerd Hoffmann <kraxel@redhat.com>
To: dri-devel@lists.freedesktop.org
Cc: Gerd Hoffmann <kraxel@redhat.com>,
Dave Airlie <airlied@redhat.com>, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel@ffwll.ch>,
Thomas Zimmermann <tzimmermann@suse.de>,
virtualization@lists.linux-foundation.org (open list:DRM DRIVER
FOR QXL VIRTUAL GPU),
spice-devel@lists.freedesktop.org (open list:DRM DRIVER FOR QXL
VIRTUAL GPU), linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v2 04/11] drm/qxl: fix lockdep issue in qxl_alloc_release_reserved
Date: Wed, 17 Feb 2021 13:32:06 +0100 [thread overview]
Message-ID: <20210217123213.2199186-5-kraxel@redhat.com> (raw)
In-Reply-To: <20210217123213.2199186-1-kraxel@redhat.com>
Call qxl_bo_unpin (which does a reservation) without holding the
release_mutex lock. Fixes lockdep (correctly) warning on a possible
deadlock.
Fixes: 65ffea3c6e73 ("drm/qxl: unpin release objects")
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
drivers/gpu/drm/qxl/qxl_release.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
index 716d706ca7f0..f5845c96d414 100644
--- a/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@ -283,7 +283,7 @@ int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size,
int type, struct qxl_release **release,
struct qxl_bo **rbo)
{
- struct qxl_bo *bo;
+ struct qxl_bo *bo, *free_bo = NULL;
int idr_ret;
int ret = 0;
union qxl_release_info *info;
@@ -315,8 +315,7 @@ int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size,
mutex_lock(&qdev->release_mutex);
if (qdev->current_release_bo_offset[cur_idx] + 1 >= releases_per_bo[cur_idx]) {
- qxl_bo_unpin(qdev->current_release_bo[cur_idx]);
- qxl_bo_unref(&qdev->current_release_bo[cur_idx]);
+ free_bo = qdev->current_release_bo[cur_idx];
qdev->current_release_bo_offset[cur_idx] = 0;
qdev->current_release_bo[cur_idx] = NULL;
}
@@ -324,6 +323,10 @@ int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size,
ret = qxl_release_bo_alloc(qdev, &qdev->current_release_bo[cur_idx], priority);
if (ret) {
mutex_unlock(&qdev->release_mutex);
+ if (free_bo) {
+ qxl_bo_unpin(free_bo);
+ qxl_bo_unref(&free_bo);
+ }
qxl_release_free(qdev, *release);
return ret;
}
@@ -339,6 +342,10 @@ int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size,
*rbo = bo;
mutex_unlock(&qdev->release_mutex);
+ if (free_bo) {
+ qxl_bo_unpin(free_bo);
+ qxl_bo_unref(&free_bo);
+ }
ret = qxl_release_list_add(*release, bo);
qxl_bo_unref(&bo);
--
2.29.2
next prev parent reply other threads:[~2021-02-17 12:34 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210217123213.2199186-1-kraxel@redhat.com>
2021-02-17 12:32 ` [PATCH v2 01/11] drm/qxl: properly handle device init failures Gerd Hoffmann
2021-02-17 12:32 ` [PATCH v2 02/11] drm/qxl: more fence wait rework Gerd Hoffmann
2021-02-17 19:21 ` Thomas Zimmermann
2021-02-17 12:32 ` [PATCH v2 03/11] drm/qxl: use ttm bo priorities Gerd Hoffmann
2021-02-17 19:22 ` Thomas Zimmermann
2021-02-17 12:32 ` Gerd Hoffmann [this message]
2021-02-17 19:23 ` [PATCH v2 04/11] drm/qxl: fix lockdep issue in qxl_alloc_release_reserved Thomas Zimmermann
2021-02-17 12:32 ` [PATCH v2 05/11] drm/qxl: rename qxl_bo_kmap -> qxl_bo_vmap_locked Gerd Hoffmann
2021-02-17 19:24 ` Thomas Zimmermann
2021-02-17 12:32 ` [PATCH v2 06/11] drm/qxl: add qxl_bo_vmap/qxl_bo_vunmap Gerd Hoffmann
2021-02-17 19:24 ` Thomas Zimmermann
2021-02-17 12:32 ` [PATCH v2 07/11] drm/qxl: fix prime vmap Gerd Hoffmann
2021-02-17 12:32 ` [PATCH v2 08/11] drm/qxl: fix monitors object vmap Gerd Hoffmann
2021-02-18 14:42 ` Thomas Zimmermann
2021-02-17 12:32 ` [PATCH v2 09/11] drm/qxl: move shadow handling to new qxl_prepare_shadow() Gerd Hoffmann
2021-02-17 12:32 ` [PATCH v2 10/11] drm/qxl: rework cursor plane Gerd Hoffmann
2021-02-18 8:02 ` Thomas Zimmermann
2021-02-18 11:50 ` Gerd Hoffmann
2021-02-18 13:33 ` Thomas Zimmermann
2021-02-18 14:23 ` Gerd Hoffmann
2021-02-17 12:32 ` [PATCH v2 11/11] drm/qxl: add lock asserts to qxl_bo_vmap_locked + qxl_bo_vunmap_locked Gerd Hoffmann
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=20210217123213.2199186-5-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=spice-devel@lists.freedesktop.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).