From nobody Mon Apr 13 12:34:36 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=1772827090; cv=none; d=zohomail.com; s=zohoarc; b=DMRQyVpIL+HN22ISnbJug+bo/EAxjE0TNigQWLoG/hjJMdZk0klOKBfrHq2NTEfvkRbzcMwK+DGEhWz0YXJOXcQGxbHiXwLCTypzx9RGjy/PJ5ZNFJevwOhNvh7QgDcBt95Gh76o9QZKm1Nzz/+nTffE6LcwG1J8yHzXtDkH5AY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772827090; h=Content-Type: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=G/UXjFf9Bz2RP8j5199U69kamuhlHWXflthUc5X+lt0=; b=EYvAnPoojtmNKK0VUnR5K9ogdMlHsLp5tR0c2LBiXns7xwQqeAiuVHP1h9o6k4kd/JdKO5U+RSZGJVgF5//CMIK8V73X3JW9UAJ+FLQPZ9sWfR6cg3GSV2dPK/lmikMziFuedvNFp3YX/L6AEUSiptOI/vfF0oIgONkLrZkRNik= 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 1772827089957778.4721018661014; Fri, 6 Mar 2026 11:58:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vybIl-0004sZ-JO; Fri, 06 Mar 2026 14:57:35 -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 1vybId-0004rI-Bm for qemu-devel@nongnu.org; Fri, 06 Mar 2026 14:57:28 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vybIa-0001Wr-J6 for qemu-devel@nongnu.org; Fri, 06 Mar 2026 14:57:26 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-439c4a93841so2772002f8f.1 for ; Fri, 06 Mar 2026 11:57:22 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae4b860sm6284687f8f.36.2026.03.06.11.57.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 11:57:20 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B0350689E1; Fri, 06 Mar 2026 19:50:50 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772827041; x=1773431841; 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=G/UXjFf9Bz2RP8j5199U69kamuhlHWXflthUc5X+lt0=; b=OCJnQaJ5ViR3bt7gsbwh+ywJW/KFPdraSrKkYoqlKsY5T1PmZZTidy+pj0vGjK+di+ VM+Gc59BNlm9o47+Ebj8GJwsQjQnVHUOSxXdbR5/M1b3OE9wTn6NKA14JG5H8vI5Uvx9 K/cK2BcW49KbHUkdoV6jO46w9flP8K+H+EbQ8GOknbBOapT0xQV1/g3xfbgQx3eDW/kn M+kbufW5Ddo9gm00AwNSsIZ3BkMd1vylQlPLQIRdO71K3Kv1na8xB5xbs8vDlJiXttGI ReOwO977cxKG7H8s5o5aTtKJuG11C+9nuJMmEVHjvgHPt6UucihYwduPRt/9N7fkxCjM be4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772827041; x=1773431841; 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=G/UXjFf9Bz2RP8j5199U69kamuhlHWXflthUc5X+lt0=; b=GyovMym3YhmKdc1X98pMlnzNR+iBb5/y4MWLMTnAOZrqea5lAFCnahZH+Hck/sKSWA UV3UTmEXImhUwqwMiouBcUByEkpmqqfZgTz6ymZkGqjeMX4ckbSn9UljBdpv53buNz8D Q769TeeLyyQ92HtESodYWtRGWR1wlgYtuY2PjHUjq5hZiDR1NwpFFljERppZfuncnQOy s+9xWknvRr4xxk+6K8HeG3fAlpqGWaH4wHGgaZfBKsqRXjluROj6DGy/UJw+3SnJP8AE 9sKCjVqJa/6lWFPMIneYE8wHfxbHoSvpGPAuld4m4EeYCb1SaR65WYH6M0Vb+da167IT 7fmQ== X-Gm-Message-State: AOJu0YzoCWW18o4OeVo+eGPPxGHWSq4/7rnWXQ3U/Am7Vxy5KvJ994u8 0ODr6ZnN4/rUbusHENuiYqBUssvPlNB0simijycwBFAj8r6qEu2/O0lE9yprgsUjpdA= X-Gm-Gg: ATEYQzyajWzi3NgmMZH/caEcPy878BKZet1EM+/3XKBLLquV2p8df2O95+lQaqVDqGV G9css8WMrUycBzOx+jMvHWFm48r0rZejrN/bTqGLNmcft9hMoY4yb7178VX6lcMLJcVm5d7EPbs ZPdmd0HUSKQP/EXGgEzlTd4WPnFcN+8FwgAOf+aHiiTPMs/JLcN0S2NbTHbzOHV9BjJTjmazYhX k+JDY3e9wQtkYVT0O3lCAR4CF+IIeYiPRuU/gT9SiIEhah1hWujqumngF6bLVPqclXa5OSVFnzD 2Lpa9AKl/23FfksS7ALaXdCQtzf4Q954zc5qW4xla3mjqAQ3CXmqXZy3cdutTGYb9uANY0ZQe8F vParfi6Rd1f1GAhCTMh8V2JMrRgoX5H4QSNOyRm3bUisy8LTV0h0BjlHgzN1V2wUf+rq6EG+pOd KuQWEvU8FKc72SU9QvsPWSj0M= X-Received: by 2002:a05:6000:400e:b0:439:b0ed:2afe with SMTP id ffacd0b85a97d-439da348192mr5251923f8f.11.1772827041166; Fri, 06 Mar 2026 11:57:21 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Dmitry Osipenko , Akihiko Odaki , Akihiko Odaki , =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Michael S. Tsirkin" Subject: [PULL 18/20] virtio-gpu: Replace finish_unmapping with mapping_state Date: Fri, 6 Mar 2026 19:50:45 +0000 Message-ID: <20260306195048.2869788-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260306195048.2869788-1-alex.bennee@linaro.org> References: <20260306195048.2869788-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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: 1772827092247158500 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> Message-ID: <20260304165043.1437519-19-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e 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