From nobody Sun Apr 12 00:57:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772643439; cv=none; d=zohomail.com; s=zohoarc; b=YAJjfiFkuoOVwzh6L9R4d2zUHlQlWT8WzDSikKak1O6cvt54Bg/pOY9hvFAwHw2Yznki6yECDeweVECvDNmyXXYtBHLqO3uHXbJnY5oYRfcWhYoUyfXUdytQCDqnCCWEp7Qo0EeVq6RfP8WkoMw9htelKA/B68rrAcsvMzGOlRw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772643439; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=AYa+PK5wvAFnxYWm6ahhi41beKm1wBSZREJ0iDEKoMA=; b=jnmPimkfpHiudaLfAxROPEaf8Lu/bt0ohaRtZFsI4FT4mydfBzNp54qHjTmXHxKNYaS9gi5krCGTwvN/EwW+NWWRjj08oLhd4uomUBoOAeIqdXBIGly4N0rOFGovOgWmvngwbg3s7ksZQrsEDVhp0JZMz6QOqaTvO0r9lt7rhFc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772643439140627.984216978479; Wed, 4 Mar 2026 08:57:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxpX6-00075P-LI; Wed, 04 Mar 2026 11:57:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vxpX4-00073x-Qd for qemu-devel@nongnu.org; Wed, 04 Mar 2026 11:57:10 -0500 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vxpX1-0003xg-9L for qemu-devel@nongnu.org; Wed, 04 Mar 2026 11:57:10 -0500 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-660a293515fso4205999a12.1 for ; Wed, 04 Mar 2026 08:57:03 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-660a96af982sm1794099a12.26.2026.03.04.08.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2026 08:57:00 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 6F08E62DA9; Wed, 04 Mar 2026 16:50:45 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772643422; x=1773248222; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AYa+PK5wvAFnxYWm6ahhi41beKm1wBSZREJ0iDEKoMA=; b=XJSPapKA6GY9aeMBqNeZb/c3vlXxbhZL18Gwbtz4Tee8Ni7MX+6DFJGJLsWtNqgyJH 1NoKWobvP88QKxFONHdjIiyNDWkHM+KQQ9+qv4l2cV7SJDAn3EGMi0tkAAeAL1ZFz8/1 55BsrI1rQz+LCpu21IUvHSNfCTMwgsZebvccfbe0+5h4J7Wjx3az28+OU5v6rnGIN3+U +FTVtYt/YWXrFSibrExIXCV/CTjz/7FnGxzdMLEq6YJ/WaQviA5UJCXNsXFFypb2j+zO O8Co2mzjuwlAzwsYhcWRNPGjNAOmfJYyXnPhyTpGQ3Ln2kCaJfGUQbKMCecaDYK/znke wP4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772643422; x=1773248222; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=AYa+PK5wvAFnxYWm6ahhi41beKm1wBSZREJ0iDEKoMA=; b=ripOai+FCuHYK0O+AR8YDlAWCeWH6AsNy9VV7RArnJgnItPF5z7gdFUdZSVLCR/DPr yK6tiGrx5h3MmgpUcSl4lWb+JHJeQmkgvMBY8E5Tfvh7KqB86nvDGWrh+OqspuKfj4bS gqM+ucOomNp336oz8GK90Uqx+yI3TZngQcX4na7m/jVScOURwKj7lCdmyAz//RAepPSC 5c9rAH6Yi/GC8ltcy/pFKdi/8fI8gsTmePUPgtMZR0dZApPDO/Uuq7sE6YLf5UKT3VA6 Gz1KeKvRHFdsqjVUmuNEOPND+d3TfrjOFT0pIV0KmOqeOXC0LJbUdo2lc7Agr3TFwpRQ Pt2g== X-Gm-Message-State: AOJu0YyMb+nUTkJKNqz15cP+nUPVTY8klhmjCRPC8jNGNCL4SDCVr5Xb PR72h6zM9bbGSSIJNM7kXi9AsALKVsL23417OICWSQ2KBGKyNvFl0BlwKEJGP+KBjOc= X-Gm-Gg: ATEYQzwUXcyzls7BdDmJB6hLp65z2IF3bp6FEnQdxPoCmClUqiNc82AXs6hBJ34eBmD BSm5d1XQtV0FWUBF7JIu9nEpvOQ5EuQCEwBXqXHnGpfcuV7c3D9Xw//4t/vzgoxEQYWsSO6LB0v 0jo7m0vwAfsZLfhNasoALGZhSLfDCgBjDzHEOJnRAtLUJawLDOCtQUHweldn0HkwSNCjbJx8O1b y3Wk8yYDZR1DFDLYlH5f2MsfxZMMbKrFQzG3AemfKozjnV1jFn7IxgmSuW7aQg8ZPni9h+YP1Lw HDNj264XJowhWeEbv7d83Q8Pr1Ozx0vguZcDBoqJVrFU48gNCmoFy/UTlIVfcORxu8nAmOnLgEX rjB72ydDf4ufnwtnOcjfsFMkUC3YCZp2yTA6rZxWwkF4oh0/DxyNS1IMue/4EpAuHW5Xp3wcCKd diBIOy2DI/++O8MS3BN/YZtMY= X-Received: by 2002:a05:6402:34d4:b0:659:3ed2:13fe with SMTP id 4fb4d7f45d1cf-660efb94a7fmr1547294a12.6.1772643421854; Wed, 04 Mar 2026 08:57:01 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Peter Xu , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , David Hildenbrand , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster , Akihiko Odaki , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , Eric Blake , "Michael S. Tsirkin" , Dmitry Osipenko , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Akihiko Odaki Subject: [PATCH 19/20] virtio-gpu: Destroy virgl resources on virtio-gpu reset Date: Wed, 4 Mar 2026 16:50:41 +0000 Message-ID: <20260304165043.1437519-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260304165043.1437519-1-alex.bennee@linaro.org> References: <20260304165043.1437519-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52f.google.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1772643442336154100 Content-Type: text/plain; charset="utf-8" From: Dmitry Osipenko Properly destroy virgl resources on virtio-gpu reset to not leak resources on a hot reboot of a VM. Suggested-by: Akihiko Odaki Reviewed-by: Akihiko Odaki Signed-off-by: Dmitry Osipenko Message-ID: <20260303151422.977399-18-dmitry.osipenko@collabora.com> --- include/hw/virtio/virtio-gpu.h | 6 +- hw/display/virtio-gpu-gl.c | 18 +---- hw/display/virtio-gpu-virgl.c | 123 +++++++++++++++++++++++++++------ 3 files changed, 107 insertions(+), 40 deletions(-) diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 1a999887481..ec3db3b4123 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -390,9 +390,11 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd); void virtio_gpu_virgl_fence_poll(VirtIOGPU *g); void virtio_gpu_virgl_reset_scanout(VirtIOGPU *g); -void virtio_gpu_virgl_reset(VirtIOGPU *g); -int virtio_gpu_virgl_init(VirtIOGPU *g); GArray *virtio_gpu_virgl_get_capsets(VirtIOGPU *g); void virtio_gpu_virgl_reset_async_fences(VirtIOGPU *g); +void virtio_gpu_virgl_resource_destroy(VirtIOGPU *g, + struct virtio_gpu_simple_resource *= res, + Error **errp); +bool virtio_gpu_virgl_update_render_state(VirtIOGPU *g); =20 #endif diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c index b941e9a4b78..8b71dd6fc26 100644 --- a/hw/display/virtio-gpu-gl.c +++ b/hw/display/virtio-gpu-gl.c @@ -63,29 +63,14 @@ static void virtio_gpu_gl_flushed(VirtIOGPUBase *b) static void virtio_gpu_gl_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) { VirtIOGPU *g =3D VIRTIO_GPU(vdev); - VirtIOGPUGL *gl =3D VIRTIO_GPU_GL(vdev); struct virtio_gpu_ctrl_command *cmd; =20 if (!virtio_queue_ready(vq)) { return; } =20 - switch (gl->renderer_state) { - case RS_RESET: - virtio_gpu_virgl_reset(g); - /* fallthrough */ - case RS_START: - if (virtio_gpu_virgl_init(g)) { - gl->renderer_state =3D RS_INIT_FAILED; - return; - } - - gl->renderer_state =3D RS_INITED; - break; - case RS_INIT_FAILED: + if (!virtio_gpu_virgl_update_render_state(g)) { return; - case RS_INITED: - break; } =20 cmd =3D virtqueue_pop(vq, sizeof(struct virtio_gpu_ctrl_command)); @@ -201,6 +186,7 @@ static void virtio_gpu_gl_class_init(ObjectClass *klass= , const void *data) vgc->process_cmd =3D virtio_gpu_virgl_process_cmd; vgc->update_cursor_data =3D virtio_gpu_gl_update_cursor_data; =20 + vgc->resource_destroy =3D virtio_gpu_virgl_resource_destroy; vdc->realize =3D virtio_gpu_gl_device_realize; vdc->unrealize =3D virtio_gpu_gl_device_unrealize; vdc->reset =3D virtio_gpu_gl_reset; diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index d1b5162f440..1819f9cb7e9 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -96,6 +96,10 @@ static void virtio_gpu_virgl_resume_cmdq_bh(void *opaque) { VirtIOGPU *g =3D opaque; =20 + if (!virtio_gpu_virgl_update_render_state(g)) { + return; + } + virtio_gpu_process_cmdq(g); } =20 @@ -344,14 +348,46 @@ static void virgl_cmd_create_resource_3d(VirtIOGPU *g, virgl_renderer_resource_create(&args, NULL, 0); } =20 +static int +virtio_gpu_virgl_resource_unref(VirtIOGPU *g, + struct virtio_gpu_virgl_resource *res, + bool *suspended) +{ + struct iovec *res_iovs =3D NULL; + int num_iovs =3D 0; +#if VIRGL_VERSION_MAJOR >=3D 1 + int ret; + + ret =3D virtio_gpu_virgl_unmap_resource_blob(g, res, suspended); + if (ret) { + return ret; + } + if (*suspended) { + return 0; + } +#endif + + virgl_renderer_resource_detach_iov(res->base.resource_id, + &res_iovs, + &num_iovs); + if (res_iovs !=3D NULL && num_iovs !=3D 0) { + virtio_gpu_cleanup_mapping_iov(g, res_iovs, num_iovs); + } + virgl_renderer_resource_unref(res->base.resource_id); + + QTAILQ_REMOVE(&g->reslist, &res->base, next); + + g_free(res); + + return 0; +} + static void virgl_cmd_resource_unref(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd, bool *cmd_suspended) { struct virtio_gpu_resource_unref unref; struct virtio_gpu_virgl_resource *res; - struct iovec *res_iovs =3D NULL; - int num_iovs =3D 0; =20 VIRTIO_GPU_FILL_CMD(unref); trace_virtio_gpu_cmd_res_unref(unref.resource_id); @@ -364,27 +400,21 @@ static void virgl_cmd_resource_unref(VirtIOGPU *g, return; } =20 -#if VIRGL_VERSION_MAJOR >=3D 1 - if (virtio_gpu_virgl_unmap_resource_blob(g, res, cmd_suspended)) { - cmd->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; - return; - } - if (*cmd_suspended) { - return; - } -#endif + virtio_gpu_virgl_resource_unref(g, res, cmd_suspended); +} =20 - virgl_renderer_resource_detach_iov(unref.resource_id, - &res_iovs, - &num_iovs); - if (res_iovs !=3D NULL && num_iovs !=3D 0) { - virtio_gpu_cleanup_mapping_iov(g, res_iovs, num_iovs); - } - virgl_renderer_resource_unref(unref.resource_id); +void virtio_gpu_virgl_resource_destroy(VirtIOGPU *g, + struct virtio_gpu_simple_resource *= base, + Error **errp) +{ + struct virtio_gpu_virgl_resource *res; + bool suspended =3D false; =20 - QTAILQ_REMOVE(&g->reslist, &res->base, next); + res =3D container_of(base, struct virtio_gpu_virgl_resource, base); =20 - g_free(res); + if (virtio_gpu_virgl_resource_unref(g, res, &suspended)) { + error_setg(errp, "failed to destroy virgl resource"); + } } =20 static void virgl_cmd_context_create(VirtIOGPU *g, @@ -1291,6 +1321,10 @@ static void virtio_gpu_fence_poll(void *opaque) VirtIOGPU *g =3D opaque; VirtIOGPUGL *gl =3D VIRTIO_GPU_GL(g); =20 + if (!virtio_gpu_virgl_update_render_state(g)) { + return; + } + virgl_renderer_poll(); virtio_gpu_process_cmdq(g); if (!QTAILQ_EMPTY(&g->cmdq) || !QTAILQ_EMPTY(&g->fenceq)) { @@ -1313,14 +1347,30 @@ void virtio_gpu_virgl_reset_scanout(VirtIOGPU *g) } } =20 -void virtio_gpu_virgl_reset(VirtIOGPU *g) +static bool virtio_gpu_virgl_reset(VirtIOGPU *g) { + struct virtio_gpu_simple_resource *res, *tmp; + + /* + * Virgl blob resource unmapping can be suspended and + * deferred on unref, ensure that destruction is completed. + */ + QTAILQ_FOREACH_SAFE(res, &g->reslist, next, tmp) { + virtio_gpu_virgl_resource_destroy(g, res, NULL); + } + + if (!QTAILQ_EMPTY(&g->reslist)) { + return false; + } + virgl_renderer_reset(); =20 virtio_gpu_virgl_reset_async_fences(g); + + return true; } =20 -int virtio_gpu_virgl_init(VirtIOGPU *g) +static int virtio_gpu_virgl_init(VirtIOGPU *g) { int ret; uint32_t flags =3D 0; @@ -1398,6 +1448,35 @@ int virtio_gpu_virgl_init(VirtIOGPU *g) return 0; } =20 +bool virtio_gpu_virgl_update_render_state(VirtIOGPU *g) +{ + VirtIOGPUGL *gl =3D VIRTIO_GPU_GL(g); + + switch (gl->renderer_state) { + case RS_RESET: + virgl_renderer_force_ctx_0(); + + if (!virtio_gpu_virgl_reset(g)) { + return false; + } + /* fallthrough */ + case RS_START: + if (virtio_gpu_virgl_init(g)) { + gl->renderer_state =3D RS_INIT_FAILED; + return false; + } + + gl->renderer_state =3D RS_INITED; + break; + case RS_INIT_FAILED: + return false; + case RS_INITED: + break; + } + + return true; +} + static void virtio_gpu_virgl_add_capset(GArray *capset_ids, uint32_t capse= t_id) { g_array_append_val(capset_ids, capset_id); --=20 2.47.3