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=1772643473; cv=none; d=zohomail.com; s=zohoarc; b=lEG2y2TfZWLT03819ykLuqOvaT5FiDuNi3Ou5z7Qs9cGxy9mvezxal9TVKCjklHbpomE/ghdm46+MJ3ybyXpNOU0kyH7nB2c2Uvt8rRT8zVOaBmZZddXHpfwOZRFlv2N/lNDQMolUViAkAEF9ppfOXTcxU6iEGyL0ZUcArPsWD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772643473; 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=+8JBFWACv1j8RnRNzU3WVG0i9zfzm4NzlWXfncEOBU0=; b=CVgAoRuF3dMATyd/XhqjRIaHNm/d4zZ8BwnwVN+lGmxWnvPufVnnQVvVQUTxpx7MRwzrEnqpells0UdbBbCO+mJyQa0jL75IjmFCAXqMqIcXEen5bFSc3+C8AqmwHnmUXZxD10PG2cYNrhHziwty7qn3fla8rJGfOMVhtt9gyzw= 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 1772643473096414.11792112975183; Wed, 4 Mar 2026 08:57:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxpX7-000760-95; Wed, 04 Mar 2026 11:57:13 -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-00073w-Nn for qemu-devel@nongnu.org; Wed, 04 Mar 2026 11:57:10 -0500 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vxpX1-0003xY-9H for qemu-devel@nongnu.org; Wed, 04 Mar 2026 11:57:10 -0500 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-65b9d8d6b7dso11658598a12.2 for ; Wed, 04 Mar 2026 08:57:02 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b935ae6132asm773379966b.32.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 5683062D9E; 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=1772643421; x=1773248221; 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=+8JBFWACv1j8RnRNzU3WVG0i9zfzm4NzlWXfncEOBU0=; b=FqPHkR52C45AR0KXKYV9yOYNTH7Teb+T1xHjfHP8DPGLO+8qquYR8A2V2wtUVxbfjs +PDd+YU+PPDuZQV+kkEHdrMybUNcFw8fy3BugF2a6/NVs9chN/7nVaQVmodjYYIgEI2l K6KSYHAxqC1XcUfX0vIIpDwLErRivFZyl9Dgjd6M7SvIedJp+XquCnVTU8SGlpfhzbq1 J5gTjci1hbph9vgytWpdIuPaApz0UVIHuhQnbpRp/zZ1+ywN8Rf8pkZS94ON6lbVugIV 27ob4z3EwOa/Gkv3wvfKt6s4fNk8GIXDZuB8lMOYSVqjqZBumV8KniMYrBTvBkNkdlZK F1Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772643421; x=1773248221; 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=+8JBFWACv1j8RnRNzU3WVG0i9zfzm4NzlWXfncEOBU0=; b=esSPfuE5HZqTldDx4kBCeC99UFHjGnd8ubj8U/Irvh06wi/AXDSnxBILM1pownHQ33 QHBYBp6nqYO+RKwzj++fvclAL/yGIiapqL1PgRszxNN3YaJZjdmPMqqrvogsDnaOg2Dz LGztGu9ZBezeUqoaUnK/oYpWfUZwn0qtSrleDyLK+zUFTDR34CBGPzPyePKZiUaKZaWw 9X4f1/7RBQwTP5TCGKAxFsTnlmJzFqEwRCgLl2sSejQ+cVWout2X/f5fdjf7c4nPjdiN aFj9b8R4gx3zuis7hSjO/PwfBecIGdC2wgifYWMbiuEbA3DWP/sOtfuapCoV3ZzhgK5p fHkA== X-Gm-Message-State: AOJu0YxFXeCiATB2pOkFi4wFpbfOcz7+wq85VapMQb1rVj0iVYzj2jvu w+wYfdWV+1Q2T6Yij0Rp7ywNST3Hg8HSgaGlOqQr99C5k7WV5bd1ENFmJxYiZ9PaIvwmNh5EFAB nNN7v X-Gm-Gg: ATEYQzxhA0I3Zcq+jMrwphhyVAtavvHObYptviB9bH3or1V2lfjbPc0EGkWWcijakje FkJWvY+bb0NIsronlyFta5wmqLq7tSkHVIcTpbPyzqf+CKEGDehE10u3DHZns+gjqD762+LDsJJ 8q2z0P4MiPkZ8YboNQnFxrAUOPl91G6pZN/JBQzJWn1PbirCuPQo98Vi4Fw7Y7puo+g3vSzkuVm i4YoBDgXiGAUaVVpiCgiX8SX5wZkFmPHPPwE9yBE+JtrEki8ZF+g5yCls4rvHfGcNQE8x/xnkbQ tZ6OyS8X46FKbFqgiJ8+YY3vobWimoFJoFZi5yXIGL6W3vsi5eiz7mpVPNVPg6TS8lnA+qpAkkz IUZJ2qbA9DJSQf6YIl6n1hYyQ5bdPlpIuQucu35uN2KJn7eKATLVLwJjXmg26zVNozbZIUnO9na UUr7DFH6L6GXVOXVreAKUEAMg= X-Received: by 2002:a17:907:6d2a:b0:b8a:f9d7:1afe with SMTP id a640c23a62f3a-b93f159304bmr147707566b.57.1772643421094; 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 18/20] virtio-gpu: Replace finish_unmapping with mapping_state Date: Wed, 4 Mar 2026 16:50:40 +0000 Message-ID: <20260304165043.1437519-19-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::536; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x536.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: 1772643474599154100 Content-Type: text/plain; charset="utf-8" From: Dmitry Osipenko 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 Reviewed-by: Akihiko Odaki Signed-off-by: Dmitry Osipenko Message-ID: <20260303151422.977399-17-dmitry.osipenko@collabora.com> --- hw/display/virtio-gpu-virgl.c | 28 ++++++++++++++++++++++------ hw/display/trace-events | 2 +- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index f4d1113827e..d1b5162f440 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; diff --git a/hw/display/trace-events b/hw/display/trace-events index e323a82cff2..4bfc457fbac 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" --=20 2.47.3