[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/24] vhost-user-gpu: handle vhost-user-gpu features in a callbac
From: |
Gerd Hoffmann |
Subject: |
[PULL 06/24] vhost-user-gpu: handle vhost-user-gpu features in a callback |
Date: |
Fri, 5 Feb 2021 07:56:02 +0100 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Fixes a deadlock where the backend calls QEMU, while QEMU also calls the
backend simultaneously, both ends waiting for each other.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20210204105232.834642-3-marcandre.lureau@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
contrib/vhost-user-gpu/vugpu.h | 2 +-
contrib/vhost-user-gpu/vhost-user-gpu.c | 37 ++++++++++++++++++-------
2 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/contrib/vhost-user-gpu/vugpu.h b/contrib/vhost-user-gpu/vugpu.h
index ad664c4df853..86f3ac86aa33 100644
--- a/contrib/vhost-user-gpu/vugpu.h
+++ b/contrib/vhost-user-gpu/vugpu.h
@@ -118,7 +118,7 @@ typedef struct VuGpu {
int sock_fd;
int drm_rnode_fd;
GSource *renderer_source;
- guint wait_ok;
+ guint wait_in;
bool virgl;
bool virgl_inited;
diff --git a/contrib/vhost-user-gpu/vhost-user-gpu.c
b/contrib/vhost-user-gpu/vhost-user-gpu.c
index f445ef28ec06..85c16404fb38 100644
--- a/contrib/vhost-user-gpu/vhost-user-gpu.c
+++ b/contrib/vhost-user-gpu/vhost-user-gpu.c
@@ -124,7 +124,7 @@ source_wait_cb(gint fd, GIOCondition condition, gpointer
user_data)
}
/* resume */
- g->wait_ok = 0;
+ g->wait_in = 0;
vg_handle_ctrl(&g->dev.parent, 0);
return G_SOURCE_REMOVE;
@@ -133,8 +133,8 @@ source_wait_cb(gint fd, GIOCondition condition, gpointer
user_data)
void
vg_wait_ok(VuGpu *g)
{
- assert(g->wait_ok == 0);
- g->wait_ok = g_unix_fd_add(g->sock_fd, G_IO_IN | G_IO_HUP,
+ assert(g->wait_in == 0);
+ g->wait_in = g_unix_fd_add(g->sock_fd, G_IO_IN | G_IO_HUP,
source_wait_cb, g);
}
@@ -270,7 +270,7 @@ vg_get_display_info(VuGpu *vg, struct
virtio_gpu_ctrl_command *cmd)
.size = 0,
};
- assert(vg->wait_ok == 0);
+ assert(vg->wait_in == 0);
vg_send_msg(vg, &msg, -1);
if (!vg_recv_msg(vg, msg.request, sizeof(dpy_info), &dpy_info)) {
@@ -815,7 +815,7 @@ vg_handle_ctrl(VuDev *dev, int qidx)
size_t len;
for (;;) {
- if (vg->wait_ok != 0) {
+ if (vg->wait_in != 0) {
return;
}
@@ -969,18 +969,17 @@ vg_queue_set_started(VuDev *dev, int qidx, bool started)
}
}
-static void
-set_gpu_protocol_features(VuGpu *g)
+static gboolean
+protocol_features_cb(gint fd, GIOCondition condition, gpointer user_data)
{
+ VuGpu *g = user_data;
uint64_t u64;
VhostUserGpuMsg msg = {
.request = VHOST_USER_GPU_GET_PROTOCOL_FEATURES
};
- assert(g->wait_ok == 0);
- vg_send_msg(g, &msg, -1);
if (!vg_recv_msg(g, msg.request, sizeof(u64), &u64)) {
- return;
+ return G_SOURCE_CONTINUE;
}
msg = (VhostUserGpuMsg) {
@@ -989,6 +988,24 @@ set_gpu_protocol_features(VuGpu *g)
.payload.u64 = 0
};
vg_send_msg(g, &msg, -1);
+
+ g->wait_in = 0;
+ vg_handle_ctrl(&g->dev.parent, 0);
+
+ return G_SOURCE_REMOVE;
+}
+
+static void
+set_gpu_protocol_features(VuGpu *g)
+{
+ VhostUserGpuMsg msg = {
+ .request = VHOST_USER_GPU_GET_PROTOCOL_FEATURES
+ };
+
+ vg_send_msg(g, &msg, -1);
+ assert(g->wait_in == 0);
+ g->wait_in = g_unix_fd_add(g->sock_fd, G_IO_IN | G_IO_HUP,
+ protocol_features_cb, g);
}
static int
--
2.29.2
- [PULL 08/24] vhost-user-gpu: handle display-info in a callback, (continued)
- [PULL 08/24] vhost-user-gpu: handle display-info in a callback, Gerd Hoffmann, 2021/02/05
- [PULL 15/24] ui: add an optional get_flags callback to GraphicHwOps, Gerd Hoffmann, 2021/02/05
- [PULL 07/24] vhost-user-gpu: use an extandable state enum for commands, Gerd Hoffmann, 2021/02/05
- [PULL 11/24] ui: add gd_gl_area_scanout_disable, Gerd Hoffmann, 2021/02/05
- [PULL 17/24] ui: check hw requirements during DCL registration, Gerd Hoffmann, 2021/02/05
- [PULL 23/24] chardev: check if the chardev is registered for yanking, Gerd Hoffmann, 2021/02/05
- [PULL 10/24] ui: remove gl_ctx_get_current, Gerd Hoffmann, 2021/02/05
- [PULL 24/24] tests: add some virtio-gpu & vhost-user-gpu acceptance test, Gerd Hoffmann, 2021/02/05
- [PULL 18/24] ui: add qemu_egl_has_dmabuf helper, Gerd Hoffmann, 2021/02/05
- [PULL 16/24] ui: add a DCLOps callback to check dmabuf support, Gerd Hoffmann, 2021/02/05
- [PULL 06/24] vhost-user-gpu: handle vhost-user-gpu features in a callback,
Gerd Hoffmann <=
- [PULL 21/24] virtio-gpu: avoid re-entering cmdq processing, Gerd Hoffmann, 2021/02/05
- [PULL 22/24] display/ui: add a callback to indicate GL state is flushed, Gerd Hoffmann, 2021/02/05
- [PULL 05/24] vhost-user-gpu: check backend for EDID support, Gerd Hoffmann, 2021/02/05
- [PULL 19/24] ui: check gtk-egl dmabuf support, Gerd Hoffmann, 2021/02/05
- [PULL 20/24] ui: add egl dmabuf import to gtkglarea, Gerd Hoffmann, 2021/02/05
- Re: [PULL 00/24] Vga ui 20210205 patches, Peter Maydell, 2021/02/05