mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio-gpu: Handle virtio_gpu_virgl_init() failure

Browse Source 
virtio_gpu_virgl_init() may fail, leading to a further Qemu crash
because Qemu assumes it never fails. Check virtio_gpu_virgl_init()
return code and don't execute virtio commands on error. Failed
virtio_gpu_virgl_init() will result in a timed out virtio commands
for a guest OS.

Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Message-Id: <20241024210311.118220-5-dmitry.osipenko@collabora.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
Dmitry Osipenko 2024-10-25 00:03:02 +03:00 committed by Alex Bennée
parent a0a8f47fd0
commit 7e688d1bf5
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/display/virtio-gpu-gl.c
View File

@ -29,9 +29,14 @@ static void virtio_gpu_gl_update_cursor_data(VirtIOGPU *g,
struct virtio_gpu_scanout *s, struct virtio_gpu_scanout *s,
uint32_t resource_id) uint32_t resource_id)
{ {
VirtIOGPUGL *gl = VIRTIO_GPU_GL(g);
uint32_t width, height; uint32_t width, height;
uint32_t pixels, *data; uint32_t pixels, *data;
if (gl->renderer_state != RS_INITED) {
return;
}
data = virgl_renderer_get_cursor_data(resource_id, &width, &height); data = virgl_renderer_get_cursor_data(resource_id, &width, &height);
if (!data) { if (!data) {
return; return;
@ -65,13 +70,22 @@ static void virtio_gpu_gl_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
return; return;
} }
if (!gl->renderer_inited) { switch (gl->renderer_state) {
virtio_gpu_virgl_init(g); case RS_RESET:
gl->renderer_inited = true;
}
if (gl->renderer_reset) {
gl->renderer_reset = false;
virtio_gpu_virgl_reset(g); virtio_gpu_virgl_reset(g);
/* fallthrough */
case RS_START:
if (virtio_gpu_virgl_init(g)) {
gl->renderer_state = RS_INIT_FAILED;
return;
}
gl->renderer_state = RS_INITED;
break;
case RS_INIT_FAILED:
return;
case RS_INITED:
break;
} }
cmd = virtqueue_pop(vq, sizeof(struct virtio_gpu_ctrl_command)); cmd = virtqueue_pop(vq, sizeof(struct virtio_gpu_ctrl_command));
@ -98,9 +112,9 @@ static void virtio_gpu_gl_reset(VirtIODevice *vdev)
* GL functions must be called with the associated GL context in main * GL functions must be called with the associated GL context in main
* thread, and when the renderer is unblocked. * thread, and when the renderer is unblocked.
*/ */
if (gl->renderer_inited && !gl->renderer_reset) { if (gl->renderer_state == RS_INITED) {
virtio_gpu_virgl_reset_scanout(g); virtio_gpu_virgl_reset_scanout(g);
gl->renderer_reset = true; gl->renderer_state = RS_RESET;
} }
} }

11
include/hw/virtio/virtio-gpu.h
View File

@ -222,11 +222,18 @@ struct VirtIOGPUClass {
Error **errp); Error **errp);
}; };
/* VirtIOGPUGL renderer states */
typedef enum {
RS_START, /* starting state */
RS_INIT_FAILED, /* failed initialisation */
RS_INITED, /* initialised and working */
RS_RESET, /* inited and reset pending, moves to start after reset */
} RenderState;
struct VirtIOGPUGL { struct VirtIOGPUGL {
struct VirtIOGPU parent_obj; struct VirtIOGPU parent_obj;
bool renderer_inited; RenderState renderer_state;
bool renderer_reset;
QEMUTimer *fence_poll; QEMUTimer *fence_poll;
QEMUTimer *print_stats; QEMUTimer *print_stats;