From nobody Wed Feb 18 20:12:06 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=dmitry.osipenko@collabora.com; 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; arc=pass (i=1 dmarc=pass fromdomain=collabora.com); dmarc=pass(p=none dis=none) header.from=collabora.com ARC-Seal: i=2; a=rsa-sha256; t=1771365205; cv=pass; d=zohomail.com; s=zohoarc; b=C04jps/q1hYfi2KijHIaJbTTW+PVv38CiGQzdctSyBm0eI7WTUgJ6NhiHjQBH1arGdp/zyr+DyVBKzGxmaqLpsoAiSCKNNNxnyg29vWWdoMfT2VPAFHIenhBRxaXNFTpuhcJnkoDlw1YOtH4zp0r0jJ7hRRKrAVx6g0zacj9pxQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771365205; 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=b2Pgzfrzo1PqN2tXCDt8RGeml0pRrj4thfov8N29dxY=; b=L4Z5FMuJ7QymjrAb2pk8ZYmAHGSgzh4v39IdySAKaHqT1/zN/1QklsOja/Kw15eMN6phIdAhxiv0P7BbLmBPz6SPnUCsEoWNV/oc1Z4tMROosaXh5y0ov6xxZSsX2uzX4CuVvfFJKk54FHTQ396pzkzKrxFWXsYAVVaUNWhkrYk= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=dmitry.osipenko@collabora.com; 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; arc=pass (i=1 dmarc=pass fromdomain=collabora.com); 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 1771365205014925.0444468794792; Tue, 17 Feb 2026 13:53:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsT0P-0002Vd-U6; Tue, 17 Feb 2026 16:53:18 -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 1vsT0N-0001yt-0S for qemu-devel@nongnu.org; Tue, 17 Feb 2026 16:53:15 -0500 Received: from sender4-pp-f112.zoho.com ([136.143.188.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vsT0L-0001ja-6J for qemu-devel@nongnu.org; Tue, 17 Feb 2026 16:53:14 -0500 Received: by mx.zohomail.com with SMTPS id 1771365175884339.04789913936406; Tue, 17 Feb 2026 13:52:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1771365178; cv=none; d=zohomail.com; s=zohoarc; b=hk1Iln0aQprJuGtIvW9k0YTCwwI0hXhgW7uqcHeX+YbayVFzAunc/IjSjHfyEFyACbh44JEiRk017WSZl8yr8hiA74B4kxB3l/0QARg1VQ75glpZjzV26QT56Jrsf18AOWP5fiA9ym38zhHZDOJEm13nvGVj4KeDsoE6GYUvZtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771365178; 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; bh=b2Pgzfrzo1PqN2tXCDt8RGeml0pRrj4thfov8N29dxY=; b=IkDuddipniW4bnX/tcSMzDbsMUujKejEqKBToKh4UV3CsTmWgLAxbYA2C8ZHnRIGFxurrGOJVx/6pdKWUvEh7wIm0S6xV3TtZ1FkQ/w3pWUeLuKmqXyN0RvxFZyN/fgVCsL5j4Ffmll5zwY0xj6T927QAeJg86VKEaFHWye1Kdo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=dmitry.osipenko@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1771365178; s=zohomail; d=collabora.com; i=dmitry.osipenko@collabora.com; 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; bh=b2Pgzfrzo1PqN2tXCDt8RGeml0pRrj4thfov8N29dxY=; b=ZJCEYpdp/yjwRsZnxsaBcDV21Q41x7SoK/MuxnAvuWuRtvn92J72LHreMbl2Y/6k 3MWkcIlwg9Xw0l5YczByU2yQ5vUMCKjX8wvZLsOHhPnt0mnV/KeI32Oq346Ctcdt2cD Xsc25qQtBSm+KFVR+J/QlQ1aHNGxWlst1/zSTMkc= From: Dmitry Osipenko To: Akihiko Odaki , Huang Rui , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierre-Eric Pelloux-Prayer , "Michael S . Tsirkin" , Paolo Bonzini , Yiwei Zhang , Sergio Lopez Pascual Cc: Gert Wollny , qemu-devel@nongnu.org, Gurchetan Singh , Alyssa Ross , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Alex Deucher , Stefano Stabellini , =?UTF-8?q?Christian=20K=C3=B6nig?= , Xenia Ragiadakou , Honglei Huang , Julia Zhang , Chen Jiqian , Rob Clark , Robert Beckett Subject: [PATCH v18 17/19] virtio-gpu: Replace finish_unmapping with mapping_state Date: Wed, 18 Feb 2026 00:49:26 +0300 Message-ID: <20260217214928.2970885-18-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: quoted-printable X-ZohoMailClient: External 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=136.143.188.112; 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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 dmitry.osipenko@collabora.com) X-ZM-MESSAGEID: 1771365207505154100 Content-Type: text/plain; charset="utf-8" Allow virtio_gpu_virgl_unmap_resource_blob() to be invoked while async unmapping is in progress. Do it in preparation to improvement of virtio-gpu resetting that will require this change. Suggested-by: Akihiko Odaki Signed-off-by: Dmitry Osipenko --- hw/display/trace-events | 2 +- hw/display/virtio-gpu-virgl.c | 28 ++++++++++++++++++++++------ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/hw/display/trace-events b/hw/display/trace-events index e323a82cff24..4bfc457fbac1 100644 --- a/hw/display/trace-events +++ b/hw/display/trace-events @@ -39,7 +39,7 @@ virtio_gpu_cmd_res_create_2d(uint32_t res, uint32_t fmt, = uint32_t w, uint32_t h) virtio_gpu_cmd_res_create_3d(uint32_t res, uint32_t fmt, uint32_t w, uint3= 2_t h, uint32_t d) "res 0x%x, fmt 0x%x, w %d, h %d, d %d" virtio_gpu_cmd_res_create_blob(uint32_t res, uint64_t size) "res 0x%x, siz= e %" PRId64 virtio_gpu_cmd_res_map_blob(uint32_t res, void *vmr, void *mr) "res 0x%x, = vmr %p, mr %p" -virtio_gpu_cmd_res_unmap_blob(uint32_t res, void *mr, bool finish_unmappin= g) "res 0x%x, mr %p, finish_unmapping %d" +virtio_gpu_cmd_res_unmap_blob(uint32_t res, void *mr, int mapping_state) "= res 0x%x, mr %p, mapping_state %d" virtio_gpu_cmd_res_unref(uint32_t res) "res 0x%x" virtio_gpu_cmd_res_back_attach(uint32_t res) "res 0x%x" virtio_gpu_cmd_res_back_detach(uint32_t res) "res 0x%x" diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index 77fe5cd4ecd8..8cbbe890d282 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -68,11 +68,17 @@ virgl_get_egl_display(G_GNUC_UNUSED void *cookie) #endif =20 #if VIRGL_VERSION_MAJOR >=3D 1 +enum virtio_gpu_virgl_hostmem_region_mapping_state { + VIRTIO_GPU_MR_MAPPED, + VIRTIO_GPU_MR_UNMAP_STARTED, + VIRTIO_GPU_MR_UNMAP_COMPLETED, +}; + struct virtio_gpu_virgl_hostmem_region { Object parent_obj; MemoryRegion mr; struct VirtIOGPU *g; - bool finish_unmapping; + enum virtio_gpu_virgl_hostmem_region_mapping_state mapping_state; }; =20 #define TYPE_VIRTIO_GPU_VIRGL_HOSTMEM_REGION "virtio-gpu-virgl-hostmem-reg= ion" @@ -109,7 +115,7 @@ static void virtio_gpu_virgl_hostmem_region_finalize(Ob= ject *obj) return; } =20 - vmr->finish_unmapping =3D true; + vmr->mapping_state =3D VIRTIO_GPU_MR_UNMAP_COMPLETED; =20 b =3D VIRTIO_GPU_BASE(vmr->g); b->renderer_blocked--; @@ -167,6 +173,7 @@ virtio_gpu_virgl_map_resource_blob(VirtIOGPU *g, object_initialize_child(OBJECT(g), name, vmr, TYPE_VIRTIO_GPU_VIRGL_HOSTMEM_REGION); vmr->g =3D g; + vmr->mapping_state =3D VIRTIO_GPU_MR_MAPPED; =20 mr =3D &vmr->mr; memory_region_init_ram_ptr(mr, OBJECT(vmr), "mr", size, data); @@ -195,7 +202,8 @@ virtio_gpu_virgl_unmap_resource_blob(VirtIOGPU *g, =20 vmr =3D to_hostmem_region(res->mr); =20 - trace_virtio_gpu_cmd_res_unmap_blob(res->base.resource_id, mr, vmr->fi= nish_unmapping); + trace_virtio_gpu_cmd_res_unmap_blob(res->base.resource_id, mr, + vmr->mapping_state); =20 /* * Perform async unmapping in 3 steps: @@ -206,7 +214,8 @@ virtio_gpu_virgl_unmap_resource_blob(VirtIOGPU *g, * asynchronously by virtio_gpu_virgl_hostmem_region_finalize(). * 3. Finish the unmapping with final virgl_renderer_resource_unmap(). */ - if (vmr->finish_unmapping) { + switch (vmr->mapping_state) { + case VIRTIO_GPU_MR_UNMAP_COMPLETED: res->mr =3D NULL; g_free(vmr); =20 @@ -217,15 +226,22 @@ virtio_gpu_virgl_unmap_resource_blob(VirtIOGPU *g, __func__, strerror(-ret)); return ret; } - } else { - *cmd_suspended =3D true; + break; =20 + case VIRTIO_GPU_MR_MAPPED: /* render will be unblocked once MR is freed */ b->renderer_blocked++; =20 + vmr->mapping_state =3D VIRTIO_GPU_MR_UNMAP_STARTED; + /* memory region owns self res->mr object and frees it by itself */ memory_region_del_subregion(&b->hostmem, mr); object_unparent(OBJECT(vmr)); + + /* Fallthrough */ + case VIRTIO_GPU_MR_UNMAP_STARTED: + *cmd_suspended =3D true; + break; } =20 return 0; --=20 2.52.0