{"id":2197454,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2197454/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260217214928.2970885-19-dmitry.osipenko@collabora.com>","date":"2026-02-17T21:49:27","name":"[v18,18/19] virtio-gpu: Destroy virgl resources on virtio-gpu reset","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a2f89503b40c88f129c5dd3eab18157c80cc5f98","submitter":{"id":83453,"url":"http://patchwork.ozlabs.org/api/1.0/people/83453/?format=json","name":"Dmitry Osipenko","email":"dmitry.osipenko@collabora.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260217214928.2970885-19-dmitry.osipenko@collabora.com/mbox/","series":[{"id":492488,"url":"http://patchwork.ozlabs.org/api/1.0/series/492488/?format=json","date":"2026-02-17T21:49:09","name":"Support virtio-gpu DRM native context and MAP_FIXED API","version":18,"mbox":"http://patchwork.ozlabs.org/series/492488/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2197454/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=collabora.com header.i=dmitry.osipenko@collabora.com\n header.a=rsa-sha256 header.s=zohomail header.b=i1LH42vI;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fFtgQ5tsbz1xwC\n\tfor ; Wed, 18 Feb 2026 08:53:22 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1vsT0R-0002uH-PI; Tue, 17 Feb 2026 16:53:19 -0500","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1vsT0Q-0002do-K2\n for qemu-devel@nongnu.org; Tue, 17 Feb 2026 16:53:18 -0500","from sender4-pp-f112.zoho.com ([136.143.188.112])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1vsT0O-0001me-Nt\n for qemu-devel@nongnu.org; Tue, 17 Feb 2026 16:53:18 -0500","by mx.zohomail.com with SMTPS id 1771365181458112.25496983983214;\n Tue, 17 Feb 2026 13:53:01 -0800 (PST)"],"ARC-Seal":"i=1; a=rsa-sha256; t=1771365182; cv=none;\n d=zohomail.com; s=zohoarc;\n b=FFEYN3+weoDnzuH3YB3BTUURHHwJTzpAZa1kvZR+1x8Q/ZGgpZutXO3/1EC+jWmuSEIrAt+rrawIyYWhUhV2d2vQMRH4/8xxKIZAxdUaDB1VW+pn9lj7xH2tk9OczB5aNA35QCdeTRuIetRpt7UcxCZXDVSsWg6k1HJIlwZHAWo=","ARC-Message-Signature":"i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;\n s=zohoarc; t=1771365182;\n h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To;\n bh=7oFd8GvwoYK0Q9kvM4T5G54GMzT8vsBrFX08OYyTJrc=;\n b=TX64+kNztapwxsvjtK0JaqwrXyiGzGopXEzpTDkiiNlwKnza3gBWorhhMPdFQwVWmyBpeW3j0vSg1i/HPj7URwsx/0iIbDVA/Ya+LuLeNfvaZOyVmdk/Ih+Ya2DgVMH9V6Ppo0QgQphRYSVVRra7Pq9lSj9/KY/HW/1blm3opCk=","ARC-Authentication-Results":"i=1; mx.zohomail.com;\n dkim=pass header.i=collabora.com;\n spf=pass smtp.mailfrom=dmitry.osipenko@collabora.com;\n dmarc=pass header.from=","DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1771365182;\n s=zohomail; d=collabora.com; i=dmitry.osipenko@collabora.com;\n h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To;\n bh=7oFd8GvwoYK0Q9kvM4T5G54GMzT8vsBrFX08OYyTJrc=;\n b=i1LH42vIGchw11bbLXJA3dFlBXSw+AlWc/VkRv1Ed7mWeiD3CWPMycoqSOAanUFj\n SZLSqy6i+ztwVOa8/Pi+2CpCfwsitqYUnBV9XPeLSLCstggjznROLG3OVXoBGpEFxg2\n a8lB4wFw9S3fgTyuOexDETg5Sh2NyoiJdKMCz8cU=","From":"Dmitry Osipenko ","To":"Akihiko Odaki ,\n Huang Rui ,\n =?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n\t=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ,\n Gerd Hoffmann ,\n =?utf-8?q?Alex_Benn=C3=A9e?= ,\n Pierre-Eric Pelloux-Prayer ,\n \"Michael S . Tsirkin\" , Paolo Bonzini ,\n Yiwei Zhang , Sergio Lopez Pascual ","Cc":"Gert Wollny , qemu-devel@nongnu.org,\n Gurchetan Singh , Alyssa Ross ,\n\t=?utf-8?q?Roger_Pau_Monn=C3=A9?= ,\n Alex Deucher ,\n Stefano Stabellini , =?utf-8?q?Christian_K?=\n\t=?utf-8?q?=C3=B6nig?= ,\n Xenia Ragiadakou ,\n Honglei Huang , Julia Zhang ,\n Chen Jiqian , Rob Clark ,\n Robert Beckett ","Subject":"[PATCH v18 18/19] virtio-gpu: Destroy virgl resources on virtio-gpu\n reset","Date":"Wed, 18 Feb 2026 00:49:27 +0300","Message-ID":"<20260217214928.2970885-19-dmitry.osipenko@collabora.com>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20260217214928.2970885-1-dmitry.osipenko@collabora.com>","References":"<20260217214928.2970885-1-dmitry.osipenko@collabora.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-ZohoMailClient":"External","Received-SPF":"pass client-ip=136.143.188.112;\n envelope-from=dmitry.osipenko@collabora.com; helo=sender4-pp-f112.zoho.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Properly destroy virgl resources on virtio-gpu reset to not leak resources\non a hot reboot of a VM.\n\nSuggested-by: Akihiko Odaki \nSigned-off-by: Dmitry Osipenko \n---\n hw/display/virtio-gpu-gl.c | 18 +----\n hw/display/virtio-gpu-virgl.c | 121 +++++++++++++++++++++++++++------\n include/hw/virtio/virtio-gpu.h | 6 +-\n 3 files changed, 105 insertions(+), 40 deletions(-)","diff":"diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c\nindex b941e9a4b789..8b71dd6fc26f 100644\n--- a/hw/display/virtio-gpu-gl.c\n+++ b/hw/display/virtio-gpu-gl.c\n@@ -63,29 +63,14 @@ static void virtio_gpu_gl_flushed(VirtIOGPUBase *b)\n static void virtio_gpu_gl_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)\n {\n VirtIOGPU *g = VIRTIO_GPU(vdev);\n- VirtIOGPUGL *gl = VIRTIO_GPU_GL(vdev);\n struct virtio_gpu_ctrl_command *cmd;\n \n if (!virtio_queue_ready(vq)) {\n return;\n }\n \n- switch (gl->renderer_state) {\n- case RS_RESET:\n- virtio_gpu_virgl_reset(g);\n- /* fallthrough */\n- case RS_START:\n- if (virtio_gpu_virgl_init(g)) {\n- gl->renderer_state = RS_INIT_FAILED;\n- return;\n- }\n-\n- gl->renderer_state = RS_INITED;\n- break;\n- case RS_INIT_FAILED:\n+ if (!virtio_gpu_virgl_update_render_state(g)) {\n return;\n- case RS_INITED:\n- break;\n }\n \n cmd = virtqueue_pop(vq, sizeof(struct virtio_gpu_ctrl_command));\n@@ -201,6 +186,7 @@ static void virtio_gpu_gl_class_init(ObjectClass *klass, const void *data)\n vgc->process_cmd = virtio_gpu_virgl_process_cmd;\n vgc->update_cursor_data = virtio_gpu_gl_update_cursor_data;\n \n+ vgc->resource_destroy = virtio_gpu_virgl_resource_destroy;\n vdc->realize = virtio_gpu_gl_device_realize;\n vdc->unrealize = virtio_gpu_gl_device_unrealize;\n vdc->reset = virtio_gpu_gl_reset;\ndiff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c\nindex 8cbbe890d282..a99c08382b1c 100644\n--- a/hw/display/virtio-gpu-virgl.c\n+++ b/hw/display/virtio-gpu-virgl.c\n@@ -96,6 +96,10 @@ static void virtio_gpu_virgl_resume_cmdq_bh(void *opaque)\n {\n VirtIOGPU *g = opaque;\n \n+ if (!virtio_gpu_virgl_update_render_state(g)) {\n+ return;\n+ }\n+\n virtio_gpu_process_cmdq(g);\n }\n \n@@ -344,14 +348,46 @@ static void virgl_cmd_create_resource_3d(VirtIOGPU *g,\n virgl_renderer_resource_create(&args, NULL, 0);\n }\n \n+static int\n+virtio_gpu_virgl_resource_unref(VirtIOGPU *g,\n+ struct virtio_gpu_virgl_resource *res,\n+ bool *suspended)\n+{\n+ struct iovec *res_iovs = NULL;\n+ int num_iovs = 0;\n+#if VIRGL_VERSION_MAJOR >= 1\n+ int ret;\n+\n+ ret = virtio_gpu_virgl_unmap_resource_blob(g, res, suspended);\n+ if (ret) {\n+ return ret;\n+ }\n+ if (*suspended) {\n+ return 0;\n+ }\n+#endif\n+\n+ virgl_renderer_resource_detach_iov(res->base.resource_id,\n+ &res_iovs,\n+ &num_iovs);\n+ if (res_iovs != NULL && num_iovs != 0) {\n+ virtio_gpu_cleanup_mapping_iov(g, res_iovs, num_iovs);\n+ }\n+ virgl_renderer_resource_unref(res->base.resource_id);\n+\n+ QTAILQ_REMOVE(&g->reslist, &res->base, next);\n+\n+ g_free(res);\n+\n+ return 0;\n+}\n+\n static void virgl_cmd_resource_unref(VirtIOGPU *g,\n struct virtio_gpu_ctrl_command *cmd,\n bool *cmd_suspended)\n {\n struct virtio_gpu_resource_unref unref;\n struct virtio_gpu_virgl_resource *res;\n- struct iovec *res_iovs = NULL;\n- int num_iovs = 0;\n \n VIRTIO_GPU_FILL_CMD(unref);\n trace_virtio_gpu_cmd_res_unref(unref.resource_id);\n@@ -364,27 +400,21 @@ static void virgl_cmd_resource_unref(VirtIOGPU *g,\n return;\n }\n \n-#if VIRGL_VERSION_MAJOR >= 1\n- if (virtio_gpu_virgl_unmap_resource_blob(g, res, cmd_suspended)) {\n- cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC;\n- return;\n- }\n- if (*cmd_suspended) {\n- return;\n- }\n-#endif\n+ virtio_gpu_virgl_resource_unref(g, res, cmd_suspended);\n+}\n \n- virgl_renderer_resource_detach_iov(unref.resource_id,\n- &res_iovs,\n- &num_iovs);\n- if (res_iovs != NULL && num_iovs != 0) {\n- virtio_gpu_cleanup_mapping_iov(g, res_iovs, num_iovs);\n- }\n- virgl_renderer_resource_unref(unref.resource_id);\n+void virtio_gpu_virgl_resource_destroy(VirtIOGPU *g,\n+ struct virtio_gpu_simple_resource *base,\n+ Error **errp)\n+{\n+ struct virtio_gpu_virgl_resource *res;\n+ bool suspended = false;\n \n- QTAILQ_REMOVE(&g->reslist, &res->base, next);\n+ res = container_of(base, struct virtio_gpu_virgl_resource, base);\n \n- g_free(res);\n+ if (virtio_gpu_virgl_resource_unref(g, res, &suspended)) {\n+ error_setg(errp, \"failed to destroy virgl resource\");\n+ }\n }\n \n static void virgl_cmd_context_create(VirtIOGPU *g,\n@@ -1305,6 +1335,10 @@ static void virtio_gpu_fence_poll(void *opaque)\n VirtIOGPU *g = opaque;\n VirtIOGPUGL *gl = VIRTIO_GPU_GL(g);\n \n+ if (!virtio_gpu_virgl_update_render_state(g)) {\n+ return;\n+ }\n+\n virgl_renderer_force_ctx_0();\n virgl_renderer_poll();\n virtio_gpu_process_cmdq(g);\n@@ -1329,14 +1363,30 @@ void virtio_gpu_virgl_reset_scanout(VirtIOGPU *g)\n }\n }\n \n-void virtio_gpu_virgl_reset(VirtIOGPU *g)\n+static bool virtio_gpu_virgl_reset(VirtIOGPU *g)\n {\n+ struct virtio_gpu_simple_resource *res, *tmp;\n+\n+ /*\n+ * Virgl blob resource unmapping can be suspended and\n+ * deferred on unref, ensure that destruction is completed.\n+ */\n+ QTAILQ_FOREACH_SAFE(res, &g->reslist, next, tmp) {\n+ virtio_gpu_virgl_resource_destroy(g, res, NULL);\n+ }\n+\n+ if (!QTAILQ_EMPTY(&g->reslist)) {\n+ return false;\n+ }\n+\n virgl_renderer_reset();\n \n virtio_gpu_virgl_reset_async_fences(g);\n+\n+ return true;\n }\n \n-int virtio_gpu_virgl_init(VirtIOGPU *g)\n+static int virtio_gpu_virgl_init(VirtIOGPU *g)\n {\n int ret;\n uint32_t flags = 0;\n@@ -1414,6 +1464,33 @@ int virtio_gpu_virgl_init(VirtIOGPU *g)\n return 0;\n }\n \n+bool virtio_gpu_virgl_update_render_state(VirtIOGPU *g)\n+{\n+ VirtIOGPUGL *gl = VIRTIO_GPU_GL(g);\n+\n+ switch (gl->renderer_state) {\n+ case RS_RESET:\n+ if (!virtio_gpu_virgl_reset(g)) {\n+ return false;\n+ }\n+ /* fallthrough */\n+ case RS_START:\n+ if (virtio_gpu_virgl_init(g)) {\n+ gl->renderer_state = RS_INIT_FAILED;\n+ return false;\n+ }\n+\n+ gl->renderer_state = RS_INITED;\n+ break;\n+ case RS_INIT_FAILED:\n+ return false;\n+ case RS_INITED:\n+ break;\n+ }\n+\n+ return true;\n+}\n+\n static void virtio_gpu_virgl_add_capset(GArray *capset_ids, uint32_t capset_id)\n {\n g_array_append_val(capset_ids, capset_id);\ndiff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h\nindex 718332284305..1f509d0d5beb 100644\n--- a/include/hw/virtio/virtio-gpu.h\n+++ b/include/hw/virtio/virtio-gpu.h\n@@ -389,9 +389,11 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,\n struct virtio_gpu_ctrl_command *cmd);\n void virtio_gpu_virgl_fence_poll(VirtIOGPU *g);\n void virtio_gpu_virgl_reset_scanout(VirtIOGPU *g);\n-void virtio_gpu_virgl_reset(VirtIOGPU *g);\n-int virtio_gpu_virgl_init(VirtIOGPU *g);\n GArray *virtio_gpu_virgl_get_capsets(VirtIOGPU *g);\n void virtio_gpu_virgl_reset_async_fences(VirtIOGPU *g);\n+void virtio_gpu_virgl_resource_destroy(VirtIOGPU *g,\n+ struct virtio_gpu_simple_resource *res,\n+ Error **errp);\n+bool virtio_gpu_virgl_update_render_state(VirtIOGPU *g);\n \n #endif\n","prefixes":["v18","18/19"]}