From nobody Thu Nov 20 12:28:19 2025 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=1763611824; cv=pass; d=zohomail.com; s=zohoarc; b=kKoDAsymQV3L1LolnRU2Ut5wxtOwp5xXSdb3XmFgDz2q4SRfcpG5ZcVwl8jTe1sbhL8fh4L0GrnZmcgm1Ct0Is30rTgg76n2P0eHfQhRgZsLjTzyCLWbCo70BKjXsnUWtLHttlRmPDdzQvehMRt34B+Fq2VLzzpfMI6eKOXDn5s= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763611824; 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=M+QsIdkAhKvVwkgoOhL8/NGlqmlwulOUOE73wzYsFGo=; b=X0FK2JmIYcDkwiRtTFu+fxYOhKcVUUc1X4sGs8VQE+cxwwk7YiXse3i0bPmbcrWiieGBX+8ZCOTINsqjAIgwwxpBhmgN333ffM+B+xKr1LOu9G6IQKSY7EOUvvwwkNGNiPlBgG0fk5ofhXjAM4RxmAJDEWI1mTomytr90ewgDaU= 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 1763611824031766.9914297150976; Wed, 19 Nov 2025 20:10:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLvxx-00015L-2h; Wed, 19 Nov 2025 23:08:17 -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 1vLvxs-00014j-3g for qemu-devel@nongnu.org; Wed, 19 Nov 2025 23:08:12 -0500 Received: from sender3-pp-f112.zoho.com ([136.143.184.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLvxl-0000YS-Qj for qemu-devel@nongnu.org; Wed, 19 Nov 2025 23:08:10 -0500 Received: by mx.zohomail.com with SMTPS id 1763611668848975.2254163695367; Wed, 19 Nov 2025 20:07:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1763611671; cv=none; d=zohomail.com; s=zohoarc; b=nVkOCmH2goPj/IAyMgkq+WyJMtDQpfqqAk0AIQ8VU3M1AGPs3hCuANDOXa4Ex+2289YsZ/pRANdTD84id8tSl3dxFabC1Wc+AFAvYxh4kTfKtZjiE7lwiOTSAV22k1Iu+8YudpWFzrY3hT6rUzRUqehNrg4/aa88IdbdsvJjHww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763611671; 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=M+QsIdkAhKvVwkgoOhL8/NGlqmlwulOUOE73wzYsFGo=; b=gbfPwynb1FQHVRYzbd3It7EL0/MfCtS3f5PpIYFc6pnrbEcCXcv11/XnyWcJBqNMvP+tld25mDOD3EJq8Ek1NdQW8N/CqAN8OooTFm1CWCkL9cClTAKs2JGX89CBfQD2kVJcShgeDV/ql7pilOBylbKiB93TAfbxC2DeRyD7HFU= 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=1763611671; 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=M+QsIdkAhKvVwkgoOhL8/NGlqmlwulOUOE73wzYsFGo=; b=eJDqBgQOhOERjUtTjlqfyJFJArRwNYf+uw4dGq04DcdagnWD+P88olyLLNQ2yzmb eSk58r4lQ+zLbPB6pCfs7AAo2UxuZqrg0KWiRftx40cTbF1kZGm+Pw+W1e1QpzhUjOU NyXVVD+3gT7iD64W72+8aII5I9z5bjujzXdeVATQ= 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: [RFC PATCH v3 1/7] virtio-gpu: Remove superfluous memory_region_set_enabled() Date: Thu, 20 Nov 2025 07:06:26 +0300 Message-ID: <20251120040632.4036204-2-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251120040632.4036204-1-dmitry.osipenko@collabora.com> References: <20251120040632.4036204-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.184.112; envelope-from=dmitry.osipenko@collabora.com; helo=sender3-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_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 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: 1763611827232019101 Content-Type: text/plain; charset="utf-8" There is no need to explicitly enable/disable memory region when it's added or deleted respectively. Remove superfluous set_enabled() calls for consistency. Suggested-by: Akihiko Odaki Reviewed-by: Akihiko Odaki Signed-off-by: Dmitry Osipenko --- hw/display/virtio-gpu-virgl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index 80f71c0b66aa..a6860f63b563 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -139,7 +139,6 @@ virtio_gpu_virgl_map_resource_blob(VirtIOGPU *g, mr =3D &vmr->mr; memory_region_init_ram_ptr(mr, OBJECT(mr), "blob", size, data); memory_region_add_subregion(&b->hostmem, offset, mr); - memory_region_set_enabled(mr, true); =20 /* * MR could outlive the resource if MR's reference is held outside of @@ -201,7 +200,6 @@ virtio_gpu_virgl_unmap_resource_blob(VirtIOGPU *g, b->renderer_blocked++; =20 /* memory region owns self res->mr object and frees it by itself */ - memory_region_set_enabled(mr, false); memory_region_del_subregion(&b->hostmem, mr); object_unparent(OBJECT(mr)); } --=20 2.51.1 From nobody Thu Nov 20 12:28:19 2025 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=1763611792; cv=pass; d=zohomail.com; s=zohoarc; b=AyeURyeGUBLuKEsb7kKh5OCOXNHIzYEeClnkGsf60zPjDn4lEJzbv6RxrxN4ItYAetek+zhAWP9sLXSsoTB+bAF7QCui8fQEPybbm5JNPTQCrkzd3zhXEldZfB1V8tLqf0pDl6RazNDGalSVW7ZBc9aJZ4B9/5h8B54ZRawFYwc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763611792; 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=MsCw4pL/I4VrkMKJmIf5a0YTUSIlnwbBwzBmQLBozHY=; b=crLRQA42JZ29tecyDlJ3+Aigs9GwEpapF8Q0xyYJQub0WpV7TVETuB4IZ5Mi+2vX3WnKnflo3Z82BS2/N34GhWCW4H1MzKmrYC72l9G294deSYjGeVCdHBYt4Ag45DqsBLWYgVk3UCb2f4wEyQq+09hCXJFpFI00j3dReeCiNfs= 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 1763611792936842.9809252684908; Wed, 19 Nov 2025 20:09:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLvxy-00016B-Sd; Wed, 19 Nov 2025 23:08: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 1vLvxu-00014t-5H for qemu-devel@nongnu.org; Wed, 19 Nov 2025 23:08:14 -0500 Received: from sender3-pp-f112.zoho.com ([136.143.184.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLvxs-0000ZE-HO for qemu-devel@nongnu.org; Wed, 19 Nov 2025 23:08:13 -0500 Received: by mx.zohomail.com with SMTPS id 1763611674595891.8933152133826; Wed, 19 Nov 2025 20:07:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1763611677; cv=none; d=zohomail.com; s=zohoarc; b=Knu0nXwXP6ucbwVjLhG3pbcVEJP83gMPayRfqq9DL4RlIMdRGeKhcT0FCGjZNYc4eRHH8H4yuq+bbOuoKsRlUy1l5T4rXrRqWG2VC8WZljhw1hrl7jHHDlJwCrTetIX3QbUY5kOlX+KfpMaKBMsmjg1HXcaPiZXFz2egs6ADOY4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763611677; 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=MsCw4pL/I4VrkMKJmIf5a0YTUSIlnwbBwzBmQLBozHY=; b=TEPIEuVLIDKE7G6aqsBJFlgXB6iM0wfkicvjbA3hUEyeXX6lSoTb3zMqlEonSZz1RxN1ijVTE5RkZJ0kd4PX8zWvwyZfsZys2PdHPjlWTpNlILzAjapIZrlWrrLIpG3BVccxZEvc2CHI+0bObfryx/tV88RzWWEZDRvw89X+dMA= 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=1763611677; 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=MsCw4pL/I4VrkMKJmIf5a0YTUSIlnwbBwzBmQLBozHY=; b=GuNDRgWP6WB/TKRHZ7DJMt+ayCr+tvuteMEvzRjKAFc2xYv4eppOBylhiOYrb6P2 74m2IWCl0B6isdu6BsMK3EZgBaDb1pyVh6MOZRU7L2VGwpF1jRamM0yaGmIOietXHEr p4YS/DYnhwbBjJV2pKw5DB8P94a5ksJR845Olvz0= 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: [RFC PATCH v3 2/7] virtio-gpu: Validate hostmem mapping offset Date: Thu, 20 Nov 2025 07:06:27 +0300 Message-ID: <20251120040632.4036204-3-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251120040632.4036204-1-dmitry.osipenko@collabora.com> References: <20251120040632.4036204-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.184.112; envelope-from=dmitry.osipenko@collabora.com; helo=sender3-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_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 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: 1763611795278019100 Content-Type: text/plain; charset="utf-8" Check hostmem mapping boundaries originated from guest. Suggested-by: Akihiko Odaki Signed-off-by: Dmitry Osipenko --- hw/display/virtio-gpu-virgl.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index a6860f63b563..cf1da4b79626 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -126,6 +126,14 @@ virtio_gpu_virgl_map_resource_blob(VirtIOGPU *g, return -EOPNOTSUPP; } =20 + if (offset + res->base.blob_size > b->conf.hostmem || + offset + res->base.blob_size < offset) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: failed to map virgl resource: invalid offset\n", + __func__); + return -1; + } + ret =3D virgl_renderer_resource_map(res->base.resource_id, &data, &siz= e); if (ret) { qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to map virgl resource: = %s\n", --=20 2.51.1 From nobody Thu Nov 20 12:28:19 2025 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=1763611745; cv=pass; d=zohomail.com; s=zohoarc; b=krWpRQ515Vq9hhitzXACcFORsc+oRSn9pKMKc7OAfh2jSGXP2SwYA8YkIpL/cvDnLM17dLuI/DOxu/oFdYSIJLcC1uhNVUfXXM89kEJMq+CtnW6TVsVBDCN6EE6HtR7Y/2uvCtVWxLQV1vVpC86Tjanqw9kQnQh7t5yUj7Oz/8s= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763611745; 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=7C8gRUa8Zzst2hT4+buIpUk9rJ1iYU0M/DjnShh2d/Y=; b=bOvG5Rx4VUKqgzjeNEiCZuFiCP9rle/FU4MurxbB/plULiz6YhEynDX0OmWXVcHDQrny9cc4Ji89hZCWS4IxJxN3Yj3Ucwpovb4pVcZd9uhDRVkRfCLmmk5g3TDkbhyNCF5SZ8uKn39/z4L8LiMqAhxpQi7hwqnGeacOq/iML04= 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 1763611745906195.43042021125393; Wed, 19 Nov 2025 20:09:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLvy2-00016X-Oq; Wed, 19 Nov 2025 23:08:22 -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 1vLvy0-00016G-G8 for qemu-devel@nongnu.org; Wed, 19 Nov 2025 23:08:20 -0500 Received: from sender3-pp-f112.zoho.com ([136.143.184.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLvxy-0000Zg-70 for qemu-devel@nongnu.org; Wed, 19 Nov 2025 23:08:19 -0500 Received: by mx.zohomail.com with SMTPS id 1763611680130558.3001669036181; Wed, 19 Nov 2025 20:08:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1763611681; cv=none; d=zohomail.com; s=zohoarc; b=NItcsnjtu9U6/+0fF75VJTVj8qjzjkMYjk8tAdsjnEGYjg7yIt/rnTX9q3uxgtcHAbKYJr0mEWUQ8OBhKom5vGjQwL5SXgpYSAGgW4Mha6b9EtLtubrL9wH8BUzXVDVhIByxHlQu8EYW+9vd0HxA+LPYrLJOMVeCIy6K1nUbiWo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763611681; 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=7C8gRUa8Zzst2hT4+buIpUk9rJ1iYU0M/DjnShh2d/Y=; b=NedcQK/4/A2YqmXRAlAQ8X9s4Y6K0cGa6Gibd2iS12PgfS484kBWoYcvuwnLzLGum76HIYYOFG3Vgfz9yT0/tgOC0LpAnT8CWrUC/w48hfRMuoSyNM3nhuFUwxk5OXGRe/g/enKIX6RFFDJDsFT+w2U+2m4ooFWiuvgJ8JOA13I= 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=1763611681; 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=7C8gRUa8Zzst2hT4+buIpUk9rJ1iYU0M/DjnShh2d/Y=; b=P1w+mmfSrNSemd3SRd0/NUIOxyfflzXs17ie3DfUqYGOP3OSOKrDIIFYD3wRILnu ERIwasxzZPWi7RzaUEQ7E2bcChBqhI1/y+u3wmv1gWnX/mVdJgWowLP5CKXFuFSDypS eczbJQfTLKKquUyt0KwCdc8P8+dq6QPSXbqIGrsU= 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: [RFC PATCH v3 3/7] virtio-gpu: Make virtio_gpu_virgl_unmap_resource_blob() return -1 on error Date: Thu, 20 Nov 2025 07:06:28 +0300 Message-ID: <20251120040632.4036204-4-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251120040632.4036204-1-dmitry.osipenko@collabora.com> References: <20251120040632.4036204-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.184.112; envelope-from=dmitry.osipenko@collabora.com; helo=sender3-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_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 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: 1763611747666018900 Content-Type: text/plain; charset="utf-8" Make virtio_gpu_virgl_unmap_resource_blob() return -1 for more consistency of error propagation style in the code, adhering to QEMU's devel/style recommendations and preparing code for further code changes utilizing this function. Signed-off-by: Dmitry Osipenko --- hw/display/virtio-gpu-virgl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index cf1da4b79626..bc22763cc931 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -199,7 +199,7 @@ virtio_gpu_virgl_unmap_resource_blob(VirtIOGPU *g, qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to unmap virgl resource: %s\n", __func__, strerror(-ret)); - return ret; + return -1; } } else { *cmd_suspended =3D true; @@ -333,7 +333,7 @@ static void virgl_cmd_resource_unref(VirtIOGPU *g, } =20 #if VIRGL_VERSION_MAJOR >=3D 1 - if (virtio_gpu_virgl_unmap_resource_blob(g, res, cmd_suspended)) { + if (virtio_gpu_virgl_unmap_resource_blob(g, res, cmd_suspended) < 0) { cmd->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; return; } @@ -820,7 +820,7 @@ static void virgl_cmd_resource_unmap_blob(VirtIOGPU *g, } =20 ret =3D virtio_gpu_virgl_unmap_resource_blob(g, res, cmd_suspended); - if (ret) { + if (ret < 0) { cmd->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; return; } --=20 2.51.1 From nobody Thu Nov 20 12:28:19 2025 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=1763611746; cv=pass; d=zohomail.com; s=zohoarc; b=Mf3sD7QJ8dE7/UZfwh2SVV8rowrq/PwquZOSaldK/Iuy7h3sy01ck0IfMPtA8ayeAEfNa18mLiP59pujeh4Xpmn94OF/5SvTd+BvygBwI33Ze7ZoEl+0wX0jOiyg/xmFalfIZmAX6wYO8NPmE1V8EVRNr5NwXdKAQQJTrqpfF2k= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763611746; 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=SW3Ft54ALzk9biZyXlX+iKJFh+Sj4LN47eLPJopqxEI=; b=RM/1DfJUj0zUXxNw1cDOy5jA39Gga50eUy9ETNCXR5IfRWp7xf6OP2DwNRfpAfEmexSvDwr+fuctloBzFgKhSXk8+QCiGYrEr08PPJoSbw1BQJhnzIpBcYzCiuw/qxyubYGG80dbQapiqjXnWIel2HffxvexfHTNt90ESB2XpoE= 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 1763611746925524.085535081716; Wed, 19 Nov 2025 20:09:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLvy9-00018B-Im; Wed, 19 Nov 2025 23:08:29 -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 1vLvy6-00017P-73 for qemu-devel@nongnu.org; Wed, 19 Nov 2025 23:08:26 -0500 Received: from sender3-pp-f112.zoho.com ([136.143.184.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLvy2-0000Zx-Ax for qemu-devel@nongnu.org; Wed, 19 Nov 2025 23:08:25 -0500 Received: by mx.zohomail.com with SMTPS id 1763611685663446.8817565845742; Wed, 19 Nov 2025 20:08:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1763611687; cv=none; d=zohomail.com; s=zohoarc; b=V1lhuL5lm/ELGsyhNkSxJGBcPImP2McMUPYry0QnuNLvF+OV9gyqiswgzt7wRcjhDiQ+/wYJ60fmSxJxWIb6jyOKAKD3EAOCURlGBooa7m1ptyD4rfW/jVqglc9MRUvugZpMaPi8jEFpHsj8zH5OVEtcLZZvljLKxaaN5Wbec3Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763611687; 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=SW3Ft54ALzk9biZyXlX+iKJFh+Sj4LN47eLPJopqxEI=; b=fZ5fJzJ+llkpCFNRLJqdNttpP3ItSP/4JG67aey8kVRShj81IPxjTU+gCi+o8Spkv37DuN+sPmYifgx+vnK6D1WVBUHsqFamy9rikujXIE6424q1DrMeEeV7ovvfDn1D+i3OrZ4+RBeTtCitpFGw5wLf6xEeoLhnuJUJM9FJpBI= 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=1763611687; 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=SW3Ft54ALzk9biZyXlX+iKJFh+Sj4LN47eLPJopqxEI=; b=ggSHMNqsACB1SbroKT+z9ICWCt+ocFuEVbgwf25MZiGZ3UCCUMrDVLSNVpDDsuA8 jJ/SZt+6xKeY1VkE5ndA/Qi+mJIJsEx7p2Sch300+dOhx/fIT+xLzPPkof7eSQT0Lds g49epiSzn+O2nBVSuUB+fbiHSoyj2N1rh5N/fspU= 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: [RFC PATCH v3 4/7] virtio-gpu: Blame host for virgl blob resource unmapping error Date: Thu, 20 Nov 2025 07:06:29 +0300 Message-ID: <20251120040632.4036204-5-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251120040632.4036204-1-dmitry.osipenko@collabora.com> References: <20251120040632.4036204-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.184.112; envelope-from=dmitry.osipenko@collabora.com; helo=sender3-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_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 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: 1763611749197019100 Content-Type: text/plain; charset="utf-8" Report virgl blob resource unmapping error as a host error since it's host's fault. Signed-off-by: Dmitry Osipenko --- hw/display/virtio-gpu-virgl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index bc22763cc931..ae8de8ee47da 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -196,9 +196,8 @@ virtio_gpu_virgl_unmap_resource_blob(VirtIOGPU *g, =20 ret =3D virgl_renderer_resource_unmap(res->base.resource_id); if (ret) { - qemu_log_mask(LOG_GUEST_ERROR, - "%s: failed to unmap virgl resource: %s\n", - __func__, strerror(-ret)); + error_report("%s: failed to unmap virgl resource: %s", + __func__, strerror(-ret)); return -1; } } else { --=20 2.51.1 From nobody Thu Nov 20 12:28:19 2025 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=1763611746; cv=pass; d=zohomail.com; s=zohoarc; b=lGlOI5OO5iKmEkKqYDwzsrKPnqaPmAw/Qlz8EnLt33vSTiZxeTMzWs74HghhxGdq0jw9ea56m50f/WaPkuMDQY5c9DFaVj8godbA9VCa49ue1xNdHtKUaDTdolvJorj+swz0pi1ZTcQGtd4Kr0PTxdbNbTlLUfBcr2fnv/9QhHY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763611746; 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=34/rI6ayV66+i8J7+YXq/OWo+uOrrIkWLj9aObPDzLo=; b=LTMb9gDnzSeQt6sjiDXgEtoPumakHbj6jG9FOSsadJ6Gh+Bhis12feoM4V+kC9AAuKmZBLYS3AzDWCi/LDyoKyHy7+QKzhAyLKoNRoHHEarp9NG8cbYjGfrBPNsDuHr1JEi/FF6iI3lokLs8WT8LK0cfrPH6G0N0DXKqCDDNPHc= 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 1763611746427742.4058656707049; Wed, 19 Nov 2025 20:09:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLvyG-0001BK-M7; Wed, 19 Nov 2025 23:08:36 -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 1vLvyC-0001Ae-Mo for qemu-devel@nongnu.org; Wed, 19 Nov 2025 23:08:32 -0500 Received: from sender3-pp-f112.zoho.com ([136.143.184.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLvy8-0000ap-4D for qemu-devel@nongnu.org; Wed, 19 Nov 2025 23:08:30 -0500 Received: by mx.zohomail.com with SMTPS id 1763611691208788.0479786596771; Wed, 19 Nov 2025 20:08:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1763611693; cv=none; d=zohomail.com; s=zohoarc; b=J1ZhZUxjZR3RxayYI67GLTx1g5ZZWB2X9nfZV1mkod4+nYFFn3eWWxGNJZVd0gUqPMpLwJGhRhrMMj6tS2PyGKtwmJ+BVUlFxxPUE0MAC90qchiOpprUz98uvrvxIY+Xz0UZM0KztN9lfSUsdBEFNll6Jl0csU/SycvoE75Erzw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763611693; 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=34/rI6ayV66+i8J7+YXq/OWo+uOrrIkWLj9aObPDzLo=; b=bUxYdXXJFEM6HtUYttuLt/mmhktNj2tffGk8+gmQIVoA5DnHi45nVb2XI4qrRGDQUOdhw7T27lT4RedfDktL79GW8kBdqSPokfJP6Vf41JNj2PwzYnYXsjPPukXwugo7esnUPvP2t5bbw7CRqUtGlv9SLboKk0A0DOt+cysVtTA= 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=1763611693; 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=34/rI6ayV66+i8J7+YXq/OWo+uOrrIkWLj9aObPDzLo=; b=U2SXDhH5C0MO1JAo5v03aOiR9RY/l10voG05G1b3VrekVeU4iShkO1amH0TmPl/a Z4cMay4C50FCWSrkpYBQUktSHJ1pkqgLOFh55WU+LP8D9fxw0fRzNKLo6svTrjLm1jB Of5eH3JGglNbUR+kSWPuRJ1HkvbUjvZi0P0QgxWA= 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: [RFC PATCH v3 5/7] virtio-gpu: Destroy virgl resources on virtio-gpu reset Date: Thu, 20 Nov 2025 07:06:30 +0300 Message-ID: <20251120040632.4036204-6-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251120040632.4036204-1-dmitry.osipenko@collabora.com> References: <20251120040632.4036204-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.184.112; envelope-from=dmitry.osipenko@collabora.com; helo=sender3-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_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 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: 1763611747669018900 Content-Type: text/plain; charset="utf-8" Properly destroy virgl resources on virtio-gpu reset to not leak resources on a hot reboot of a VM. Suggested-by: Akihiko Odaki Signed-off-by: Dmitry Osipenko --- hw/display/virtio-gpu-gl.c | 6 ++- hw/display/virtio-gpu-virgl.c | 79 +++++++++++++++++++++++++--------- include/hw/virtio/virtio-gpu.h | 5 ++- 3 files changed, 67 insertions(+), 23 deletions(-) diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c index b640900fc6f1..bca7d489c1e3 100644 --- a/hw/display/virtio-gpu-gl.c +++ b/hw/display/virtio-gpu-gl.c @@ -72,7 +72,10 @@ static void virtio_gpu_gl_handle_ctrl(VirtIODevice *vdev= , VirtQueue *vq) =20 switch (gl->renderer_state) { case RS_RESET: - virtio_gpu_virgl_reset(g); + if (virtio_gpu_virgl_reset(g) < 0) { + gl->renderer_state =3D RS_INIT_FAILED; + return; + } /* fallthrough */ case RS_START: if (virtio_gpu_virgl_init(g)) { @@ -201,6 +204,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 ae8de8ee47da..24d329022da9 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -311,14 +311,44 @@ 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 *cmd_suspended) +{ + struct iovec *res_iovs =3D NULL; + int num_iovs =3D 0; + +#if VIRGL_VERSION_MAJOR >=3D 1 + if (virtio_gpu_virgl_unmap_resource_blob(g, res, cmd_suspended) < 0) { + return -1; + } + if (*cmd_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); @@ -331,27 +361,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) < 0) { - 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) < 0) { + error_setg(errp, "failed to destroy virgl resource"); + } } =20 static void virgl_cmd_context_create(VirtIOGPU *g, @@ -1270,11 +1294,24 @@ void virtio_gpu_virgl_reset_scanout(VirtIOGPU *g) } } =20 -void virtio_gpu_virgl_reset(VirtIOGPU *g) +int virtio_gpu_virgl_reset(VirtIOGPU *g) { + struct virtio_gpu_simple_resource *res, *tmp; + + QTAILQ_FOREACH_SAFE(res, &g->reslist, next, tmp) { + virtio_gpu_virgl_resource_destroy(g, res, NULL); + } + + if (!QTAILQ_EMPTY(&g->reslist)) { + error_report("failed to reset virgl resources"); + return -1; + } + virgl_renderer_reset(); =20 virtio_gpu_virgl_reset_async_fences(g); + + return 0; } =20 int virtio_gpu_virgl_init(VirtIOGPU *g) diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 718332284305..9e1473d1bb66 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -389,9 +389,12 @@ 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_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); =20 #endif --=20 2.51.1 From nobody Thu Nov 20 12:28:19 2025 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=1763611784; cv=pass; d=zohomail.com; s=zohoarc; b=Eu0y/ui65++8R/M6L23uQfWqRNnDT4Sfght+rFKAAHsOhPljNkcZ9QuU/cz821LnqSJTafpCr3LZQGi6JwZbTIWrqmzTKRWZ4MRJPkumwar9mDSoeO4GeCdyFkAOajmtmF18wkgPRihNGMXqK7oVOzeXyNCHyIGRLMu4jR4DU88= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763611784; 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=US5J9PMAuacGziC2eTcGcipp4ALDzubHRnffxqoY5NI=; b=OzMOompY0gboETGBx1wSwItwUxJtd9gLfAQD3f4T0p2LLcdka1+maECER/BIEFZGiKM6EFJE+rjj2xpAK9NLV0/yK/QmYzG3ZafdO3qMGTUt52g8szhpcwUGFR5sNqXVOEbVmG4tuoCwQuEY8q+Gx7RAu1rFIq0agBTWM/qroi8= 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 1763611784477991.6793969591228; Wed, 19 Nov 2025 20:09:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLvyP-0001EI-9V; Wed, 19 Nov 2025 23:08:45 -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 1vLvyD-0001Ap-UC for qemu-devel@nongnu.org; Wed, 19 Nov 2025 23:08:34 -0500 Received: from sender3-pp-f112.zoho.com ([136.143.184.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLvyC-0000bI-Ga for qemu-devel@nongnu.org; Wed, 19 Nov 2025 23:08:33 -0500 Received: by mx.zohomail.com with SMTPS id 1763611696677510.8601168824182; Wed, 19 Nov 2025 20:08:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1763611697; cv=none; d=zohomail.com; s=zohoarc; b=Yb40tO17SMvpgqkv8l9or6OaRYcgCIR4jkzrPO17k0A6T2lvfT0glNti+KSg74LbHOtJTSAwzHoB3KgTk8D3kicv/9nfWocGezy8D1Tz48HBQxRE/v9WrjeiMiAjSoGu+f17Q2oedwlHNPXswzvKVvB+f2HCWkckYFTzE1svHPE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763611697; 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=US5J9PMAuacGziC2eTcGcipp4ALDzubHRnffxqoY5NI=; b=OScS6yOA0cKG9mB+KYTvjQ0U7NO7cUOa3d9SlWPkzGbe0OxsBMsqNSknJKjGlYiDU6gOBlIbI6tSrV0nZGKVHcK+C1d85PttYemTlh/aH9iJamMYR2ecqBc0gdm91FWLIRhBkcfjAPvfJx6cmugWtkaVrh4245uIXkuIikIpqek= 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=1763611697; 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=US5J9PMAuacGziC2eTcGcipp4ALDzubHRnffxqoY5NI=; b=SVWWwNzrjnM69Vvhe37CGkeD7dh2hNOraNgx+mVQNqzY06ya+KOqprZpkhYwfPOk LHvPzNvGnPTCasT9zTrx9+ZRyniw31/jhacaNBoLRdJD60I1IGvGWmnltOaQUo3tXTT jKBnzip28Ik3Jm4p3pXnlExh1csHBP2+2C0SiQ6o= 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: [RFC PATCH v3 6/7] virtio-gpu: Make virtio_gpu_virgl_init() return -1 on error Date: Thu, 20 Nov 2025 07:06:31 +0300 Message-ID: <20251120040632.4036204-7-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251120040632.4036204-1-dmitry.osipenko@collabora.com> References: <20251120040632.4036204-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.184.112; envelope-from=dmitry.osipenko@collabora.com; helo=sender3-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_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 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: 1763611786057018901 Content-Type: text/plain; charset="utf-8" Make virtio_gpu_virgl_init() return -1 on error to make it consistent with virtio_gpu_virgl_reset() in regards to error handling codding style, adhering to QEMU's devel/style recommendations. Signed-off-by: Dmitry Osipenko --- hw/display/virtio-gpu-gl.c | 2 +- hw/display/virtio-gpu-virgl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c index bca7d489c1e3..d65da4863923 100644 --- a/hw/display/virtio-gpu-gl.c +++ b/hw/display/virtio-gpu-gl.c @@ -78,7 +78,7 @@ static void virtio_gpu_gl_handle_ctrl(VirtIODevice *vdev,= VirtQueue *vq) } /* fallthrough */ case RS_START: - if (virtio_gpu_virgl_init(g)) { + if (virtio_gpu_virgl_init(g) < 0) { gl->renderer_state =3D RS_INIT_FAILED; return; } diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index 24d329022da9..35201d629b9c 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -1357,7 +1357,7 @@ int virtio_gpu_virgl_init(VirtIOGPU *g) * Async-fence was bugged in virglrenderer versions <=3D 1.1.1. */ error_report("drm requires egl display and virglrenderer >=3D = 1.2.0"); - return -EINVAL; + return -1; } } #endif @@ -1365,7 +1365,7 @@ int virtio_gpu_virgl_init(VirtIOGPU *g) ret =3D virgl_renderer_init(g, flags, &virtio_gpu_3d_cbs); if (ret !=3D 0) { error_report("virgl could not be initialized: %d", ret); - return ret; + return -1; } =20 gl->fence_poll =3D timer_new_ms(QEMU_CLOCK_VIRTUAL, --=20 2.51.1 From nobody Thu Nov 20 12:28:19 2025 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=1763611763; cv=pass; d=zohomail.com; s=zohoarc; b=AyK8SdNkHFmLpxLwRS3w5uyzErzV58u3YCV5JY937vSE1QH1AhfvRZSv4sggBYLzUN0F1HgTDdId9gfVpW+U8HUCV22vXDA98xXybmMXECRMgIfoimK5arD1KkqGhj0HN70kiLVApaX8+xi2DnkPJT4WQacleOsLS2Yhtd26x3M= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763611763; 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=7ayfiy9LydKTCa3kEjOcl7Pb3ZXqwPgxKsDpQtKvAFg=; b=KojZ0TBIE2sQuMaxT/NCN7DuYF73pSUhZd8OQEvnPDNDacyncdZPR+Yz1vsFoQmL6BJ/E/Hki3xknCl17d8NaMcuIbtomUhdDvd2yh4lQdqR5VPLlvlFv9KsSzqv0B66kvSW7bAgTob8FvjJomh+Puo9RBeAi9XzPcoDJwoLnL0= 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 1763611763472360.7462071510357; Wed, 19 Nov 2025 20:09:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLvyQ-0001El-E4; Wed, 19 Nov 2025 23:08:47 -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 1vLvyK-0001E2-Oc for qemu-devel@nongnu.org; Wed, 19 Nov 2025 23:08:40 -0500 Received: from sender3-pp-f112.zoho.com ([136.143.184.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLvyG-0000cC-Kj for qemu-devel@nongnu.org; Wed, 19 Nov 2025 23:08:38 -0500 Received: by mx.zohomail.com with SMTPS id 1763611702175959.1348004987663; Wed, 19 Nov 2025 20:08:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1763611703; cv=none; d=zohomail.com; s=zohoarc; b=kwV37Y+P4oxCOo1NXjd4tJlmUG56M/h22h24kZX+quxVFm0aAsae2bTowra9Jr+UnbZlOjYJ5uDlSuSh/F/2wuFhbyqj7GYh8zbzOoRDWUD1kqPMUxiWsU402iFKAZpB2MPPnLJYTKdLPnBph7+aj9y7ITAyJAvzLz3wm8SYmY4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763611703; 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=7ayfiy9LydKTCa3kEjOcl7Pb3ZXqwPgxKsDpQtKvAFg=; b=hOe4HQ8RleJEqJBMyIgESQ0Rd2DqblEAt+yuVpPFDBzKoVLtF/yi+gvRiv6An4PK37gs/sgzhUV34DAoR+Xm/ez9o/Z9jWbEtq934ZZMUKeg5X8l1aFpAmoJV9uF8zdef5JbjSoDeZAMJfI/Ev2dzIWEdMEM4l+n7gu5yl3brSU= 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=1763611703; 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=7ayfiy9LydKTCa3kEjOcl7Pb3ZXqwPgxKsDpQtKvAFg=; b=gFv0UJ5KC5DndLW/RQRI1UE31U/pTCtt3htt6G4xsYyGHSF7NIwOxf6JK2BIfk4j Ka0uYBbnVftZd997BNbFbKaJSXc3yGCQY5xC5N7id4OyCatDT7Ac+PnFr70C6tE1iQs MhxwxjJbSfHVJB0WjCiQdaT1d1RJWIPNGev1mzKg= 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: [RFC PATCH v3 7/7] virtio-gpu: Support mapping hostmem blobs with map_fixed Date: Thu, 20 Nov 2025 07:06:32 +0300 Message-ID: <20251120040632.4036204-8-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251120040632.4036204-1-dmitry.osipenko@collabora.com> References: <20251120040632.4036204-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.184.112; envelope-from=dmitry.osipenko@collabora.com; helo=sender3-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_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 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: 1763611766596018900 Content-Type: text/plain; charset="utf-8" Support mapping virgl blobs to a fixed location of a hostmem memory region using new virglrenderer MAP_FIXED API. This new feature closes multiple problems for virtio-gpu on QEMU: - Having dedicated memory region for each mapped blob works notoriously slow due to QEMU's memory region software design built around RCU that isn't optimized for frequent removal of the regions - KVM isn't optimized for a frequent slot changes too - QEMU/KVM has a limit for a total number of created memory regions, crashing QEMU when limit is reached This patch makes virtio-gpu-gl to pre-create a single anonymous memory region covering whole hostmem area to which blobs will be mapped using the MAP_FIXED API. Not all virgl resources will support mapping at a fixed memory address. For them, we will continue to create individual nested memory sub-regions. In particular, vrend resources may not have MAP_FIXED capability. Venus and DRM native contexts will largely benefit from the MAP_FIXED feature in terms of performance and stability improvement. Tested-by: Yiwei Zhang Signed-off-by: Dmitry Osipenko --- hw/display/virtio-gpu-gl.c | 43 ++++++++++++++++++++++++- hw/display/virtio-gpu-virgl.c | 57 +++++++++++++++++++++++++++++++++- include/hw/virtio/virtio-gpu.h | 3 ++ 3 files changed, 101 insertions(+), 2 deletions(-) diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c index d65da4863923..097f3ce4cb71 100644 --- a/hw/display/virtio-gpu-gl.c +++ b/hw/display/virtio-gpu-gl.c @@ -13,6 +13,7 @@ =20 #include "qemu/osdep.h" #include "qemu/iov.h" +#include "qemu/mmap-alloc.h" #include "qemu/module.h" #include "qemu/error-report.h" #include "qapi/error.h" @@ -124,7 +125,12 @@ static void virtio_gpu_gl_reset(VirtIODevice *vdev) static void virtio_gpu_gl_device_realize(DeviceState *qdev, Error **errp) { ERRP_GUARD(); - VirtIOGPU *g =3D VIRTIO_GPU(qdev); + VirtIOGPUBase *b =3D VIRTIO_GPU_BASE(qdev); + VirtIOGPU *g =3D VIRTIO_GPU(b); +#if !defined(CONFIG_WIN32) + VirtIOGPUGL *gl =3D VIRTIO_GPU_GL(g); + void *map; +#endif =20 #if HOST_BIG_ENDIAN error_setg(errp, "virgl is not supported on bigendian platforms"); @@ -155,6 +161,30 @@ static void virtio_gpu_gl_device_realize(DeviceState *= qdev, Error **errp) #endif =20 virtio_gpu_device_realize(qdev, errp); + + /* + * Check whether virtio_gpu_device_realize() failed. + */ + if (*errp) { + return; + } + + if (virtio_gpu_hostmem_enabled(b->conf)) { + map =3D qemu_ram_mmap(-1, b->conf.hostmem, qemu_real_host_page_siz= e(), + 0, 0); + if (map =3D=3D MAP_FAILED) { + error_setg(errp, + "virgl hostmem region could not be initialized: %s", + strerror(errno)); + return; + } + + gl->hostmem_mmap =3D map; + memory_region_init_ram_ptr(&gl->hostmem_background, NULL, + "hostmem-background", b->conf.hostmem, + gl->hostmem_mmap); + memory_region_add_subregion(&b->hostmem, 0, &gl->hostmem_backgroun= d); + } } =20 static const Property virtio_gpu_gl_properties[] =3D { @@ -190,6 +220,17 @@ static void virtio_gpu_gl_device_unrealize(DeviceState= *qdev) gl->renderer_state =3D RS_START; =20 g_array_unref(g->capset_ids); + + /* + * It is not guaranteed that the memory region will be finalized + * immediately with memory_region_del_subregion(), there can be + * a remaining reference to gl->hostmem_mmap. VirtIO-GPU is not + * hotpluggable, hence no need to worry about the leaked mapping. + * + * The memory_region_del_subregion(gl->hostmem_background) is unnecess= ary + * because b->hostmem and gl->hostmem_background belong to the same + * device and will be gone at the same time. + */ } =20 static void virtio_gpu_gl_class_init(ObjectClass *klass, const void *data) diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index 35201d629b9c..2bd0ed6227cf 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -41,9 +41,12 @@ VIRGL_VERSION_MICRO >=3D (micro)) #endif =20 +#define VIRGL_HAS_MAP_FIXED VIRGL_CHECK_VERSION(1, 2, 1) + struct virtio_gpu_virgl_resource { struct virtio_gpu_simple_resource base; MemoryRegion *mr; + void *map_fixed; }; =20 static struct virtio_gpu_virgl_resource * @@ -116,6 +119,9 @@ virtio_gpu_virgl_map_resource_blob(VirtIOGPU *g, { struct virtio_gpu_virgl_hostmem_region *vmr; VirtIOGPUBase *b =3D VIRTIO_GPU_BASE(g); +#if VIRGL_HAS_MAP_FIXED + VirtIOGPUGL *gl =3D VIRTIO_GPU_GL(g); +#endif MemoryRegion *mr; uint64_t size; void *data; @@ -134,6 +140,41 @@ virtio_gpu_virgl_map_resource_blob(VirtIOGPU *g, return -1; } =20 +#if VIRGL_HAS_MAP_FIXED + /* + * virgl_renderer_resource_map_fixed() allows to create multiple + * mappings of the same resource, while virgl_renderer_resource_map() + * not. Don't allow mapping same resource twice. + */ + if (res->map_fixed || res->mr) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: failed to map(fixed) virgl resource: already ma= pped\n", + __func__); + return -1; + } + + ret =3D virgl_renderer_resource_map_fixed(res->base.resource_id, + gl->hostmem_mmap + offset); + switch (ret) { + case 0: + res->map_fixed =3D gl->hostmem_mmap + offset; + return 0; + + case -EOPNOTSUPP: + /* + * MAP_FIXED is unsupported by this resource. + * Mapping falls back to a blob subregion method in that case. + */ + break; + + default: + qemu_log_mask(LOG_GUEST_ERROR, + "%s: failed to map(fixed) virgl resource: %s\n", + __func__, strerror(-ret)); + return -1; + } +#endif + ret =3D virgl_renderer_resource_map(res->base.resource_id, &data, &siz= e); if (ret) { qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to map virgl resource: = %s\n", @@ -146,7 +187,7 @@ virtio_gpu_virgl_map_resource_blob(VirtIOGPU *g, =20 mr =3D &vmr->mr; memory_region_init_ram_ptr(mr, OBJECT(mr), "blob", size, data); - memory_region_add_subregion(&b->hostmem, offset, mr); + memory_region_add_subregion_overlap(&b->hostmem, offset, mr, 1); =20 /* * MR could outlive the resource if MR's reference is held outside of @@ -173,6 +214,20 @@ virtio_gpu_virgl_unmap_resource_blob(VirtIOGPU *g, MemoryRegion *mr =3D res->mr; int ret; =20 +#if VIRGL_HAS_MAP_FIXED + if (res->map_fixed) { + if (mmap(res->map_fixed, res->base.blob_size, PROT_READ | PROT_WRI= TE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, + -1, 0) =3D=3D MAP_FAILED) { + error_report("%s: failed to unmap(fixed) virgl resource: %s", + __func__, strerror(errno)); + return -1; + } + + res->map_fixed =3D NULL; + } +#endif + if (!mr) { return 0; } diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 9e1473d1bb66..420c6e2a2515 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -263,6 +263,9 @@ struct VirtIOGPUGL { =20 QEMUBH *async_fence_bh; QSLIST_HEAD(, virtio_gpu_virgl_context_fence) async_fenceq; + + MemoryRegion hostmem_background; + void *hostmem_mmap; }; =20 struct VhostUserGPU { --=20 2.51.1