Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2196983/?format=api
{ "id": 2196983, "url": "http://patchwork.ozlabs.org/api/patches/2196983/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260216191213.2556073-18-dmitry.osipenko@collabora.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260216191213.2556073-18-dmitry.osipenko@collabora.com>", "list_archive_url": null, "date": "2026-02-16T19:12:12", "name": "[v17,17/18] 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/people/83453/?format=api", "name": "Dmitry Osipenko", "email": "dmitry.osipenko@collabora.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260216191213.2556073-18-dmitry.osipenko@collabora.com/mbox/", "series": [ { "id": 492344, "url": "http://patchwork.ozlabs.org/api/series/492344/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=492344", "date": "2026-02-16T19:11:55", "name": "Support virtio-gpu DRM native context and MAP_FIXED API", "version": 17, "mbox": "http://patchwork.ozlabs.org/series/492344/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2196983/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2196983/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=Pf0cm7At;\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 4fFCF90SsZz1xxp\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 17 Feb 2026 06:16:45 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1vs44h-0002SB-61; Mon, 16 Feb 2026 14:16:08 -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 <dmitry.osipenko@collabora.com>)\n id 1vs43U-0001P8-Jr\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 14:14:51 -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 <dmitry.osipenko@collabora.com>)\n id 1vs43S-0003dd-Ij\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 14:14:48 -0500", "by mx.zohomail.com with SMTPS id 1771269270347175.20981562029635;\n Mon, 16 Feb 2026 11:14:30 -0800 (PST)" ], "ARC-Seal": "i=1; a=rsa-sha256; t=1771269272; cv=none;\n d=zohomail.com; s=zohoarc;\n b=Ak2Zvz6+tBzQaizRcLTK9+mxdTuiQ8ajsKl9DDqt3ucwRDCVLaP7VQuFLdy3o8Sxq36WTdyvLkO2eLe2/9MsLM50O8jLBQJh7Y5kCOpm6qgphpvmOFliEM1h+9/ZLGynMzGF0ERCAXGw+3owEw6yEtClW8+/oC7ClorJVPocgok=", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;\n s=zohoarc; t=1771269272;\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=2BkcHvuo/3eJScoEGBI3qWZiVEyCaTerkX48Ls6XLzE=;\n b=nT9+Eyyzn349wZqo5vcM+lOvJMHybFAZzqsuY4rWIBxHG2WBR7zywrsfVhm3jupBBW42FOfXx+cfxQ6YLXiGjiHHw+HRgs+I/NprbwF5dC78iaPHdndqiia1gDwIOblfgyw34gi9z051tShjYRnfDGaXZtLn6ZLdSQnQOrPZIo0=", "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=<dmitry.osipenko@collabora.com>", "DKIM-Signature": "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1771269272;\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=2BkcHvuo/3eJScoEGBI3qWZiVEyCaTerkX48Ls6XLzE=;\n b=Pf0cm7AtRoT+vGUzj9wU2ha27YenX0It8BNyvjFChO0byJWvQMqz+1p4o0sl8yDr\n YYOqc27iNfXoV+isEuAmpNGsxcacmGCUmgaogGKCkgKVJac4LLzEdOHsx2mX6OG3b1O\n U0FzJPsJ3clSV1Q/JSEIX0tgDPJbC+eClLMnXVFc=", "From": "Dmitry Osipenko <dmitry.osipenko@collabora.com>", "To": "Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>,\n Huang Rui <ray.huang@amd.com>,\n =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>,\n\t=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>,\n Gerd Hoffmann <kraxel@redhat.com>,\n =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>,\n Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>,\n \"Michael S . Tsirkin\" <mst@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>,\n Yiwei Zhang <zzyiwei@gmail.com>, Sergio Lopez Pascual <slp@redhat.com>", "Cc": "Gert Wollny <gert.wollny@collabora.com>, qemu-devel@nongnu.org,\n Gurchetan Singh <gurchetansingh@chromium.org>, Alyssa Ross <hi@alyssa.is>,\n\t=?utf-8?q?Roger_Pau_Monn=C3=A9?= <roger.pau@citrix.com>,\n Alex Deucher <alexander.deucher@amd.com>,\n Stefano Stabellini <stefano.stabellini@amd.com>, =?utf-8?q?Christian_K?=\n\t=?utf-8?q?=C3=B6nig?= <christian.koenig@amd.com>,\n Xenia Ragiadakou <xenia.ragiadakou@amd.com>,\n Honglei Huang <honglei1.huang@amd.com>, Julia Zhang <julia.zhang@amd.com>,\n Chen Jiqian <Jiqian.Chen@amd.com>, Rob Clark <robdclark@gmail.com>,\n Robert Beckett <bob.beckett@collabora.com>", "Subject": "[PATCH v17 17/18] virtio-gpu: Destroy virgl resources on virtio-gpu\n reset", "Date": "Mon, 16 Feb 2026 22:12:12 +0300", "Message-ID": "<20260216191213.2556073-18-dmitry.osipenko@collabora.com>", "X-Mailer": "git-send-email 2.52.0", "In-Reply-To": "<20260216191213.2556073-1-dmitry.osipenko@collabora.com>", "References": "<20260216191213.2556073-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 <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "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 <odaki@rsg.ci.i.u-tokyo.ac.jp>\nSigned-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>\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 b1c323f4f539..3f77946c7a3a 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@@ -1304,6 +1334,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@@ -1328,14 +1362,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@@ -1413,6 +1463,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": [ "v17", "17/18" ] }