[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/20] vhost-user-gpu: handle vhost-user-gpu features in a callba
From: |
marcandre . lureau |
Subject: |
[PATCH 02/20] vhost-user-gpu: handle vhost-user-gpu features in a callback |
Date: |
Tue, 2 Feb 2021 18:26:07 +0400 |
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>
---
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 ad664c4df8..86f3ac86aa 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 f445ef28ec..85c16404fb 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.0
- [PATCH 00/20] Various vhost-user-gpu & UI fixes, marcandre . lureau, 2021/02/02
- [PATCH 01/20] vhost-user-gpu: check backend for EDID support, marcandre . lureau, 2021/02/02
- [PATCH 02/20] vhost-user-gpu: handle vhost-user-gpu features in a callback,
marcandre . lureau <=
- [PATCH 03/20] vhost-user-gpu: use an extandable state enum for commands, marcandre . lureau, 2021/02/02
- [PATCH 04/20] vhost-user-gpu: handle display-info in a callback, marcandre . lureau, 2021/02/02
- [PATCH 05/20] ui: remove extra #ifdef CONFIG_OPENGL, marcandre . lureau, 2021/02/02
- [PATCH 06/20] ui: remove gl_ctx_get_current, marcandre . lureau, 2021/02/02
- [PATCH 07/20] ui: add gd_gl_area_scanout_disable, marcandre . lureau, 2021/02/02
- [PATCH 08/20] ui: annotate DCLOps callback requirements, marcandre . lureau, 2021/02/02
- [PATCH 09/20] ui: remove console_has_gl_dmabuf(), marcandre . lureau, 2021/02/02
- [PATCH 10/20] vhost-user-gpu: add a configuration flag for dmabuf usage, marcandre . lureau, 2021/02/02
- [PATCH 11/20] ui: add an optional get_flags callback to GraphicHwOps, marcandre . lureau, 2021/02/02