From nobody Sat Feb 7 08:55:16 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=1764038248; cv=pass; d=zohomail.com; s=zohoarc; b=HE+/MdUovPCKTB6l067MPWL1QgrukGfEtcTRosFHtVaOYS1noQ4ddeCU2SZPjaHCImrOPxRKPaP2oHx7EzVmn23fcukDJQQb7ytLZUKC0bfs+FDCAT+rTQ3HyOvdR57OXSNilHUmD93w4tYH4xeyR53ceuaFWSHzvHfYeACVpB4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764038248; 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=Esy8pMpFpg3LRLHuMrsKK8Uzw5NBTrKCNMG09tPApS3gUcLAbbmra3GkwgSBIw8hZSsNb9f967GPU1VNZFK2ZGi4qvr+n+zyeY/eqWrYusVvG1vq8fNr62bPHU/BvGXtk5aLZ2te/ZaBZ0pKvuB9rFoScdvpBs+GNVBsGJR7rOc= 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 17640382485301006.0860700774226; Mon, 24 Nov 2025 18:37:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNiuy-0003Ss-HO; Mon, 24 Nov 2025 21:36: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 1vNiuw-0003Md-Gt for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36: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 1vNiuv-0001E4-4q for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36:34 -0500 Received: by mx.zohomail.com with SMTPS id 1764038163265791.727273863963; Mon, 24 Nov 2025 18:36:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1764038164; cv=none; d=zohomail.com; s=zohoarc; b=G7ZtT9ZAuZFKKXHD/K436s+MkqAiaWifq0EVqXgzsmhREA5SGWKIkRfGyhtt4YG5vUojqoPhUrPRTGp3bjj+suCDoXCOYv58y+n70j9oh2/M2t0QPMqEdfltlDABOgZVFcDJpIdmFXpf4dSD7Fs6LiopgMtjo0dqprufu6V/6MQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764038164; 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=mpFsujJHWmv4Wev0gokwBysvaxz03Ww0eNYkhUhMPimhkJJhBaPu4h6IBvIadZdBK4/6Yp2tAYCJpxBHLG6JU9HgxKLHdzqE/Lh6K6X64pR06/GT9MULUycAU43heAXWo+kS687H3BUYwvw6UyRt2Wf+CRurGLza7VTI06nL8c4= 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=1764038164; 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=EHfzBDoch4Yq5KHba6YCb32+byoRvVGOXp3Uglvs1i9NvLp867oMozvja6v90aVE kE18zYJVN7a/tZEY5DYj7UBoEFgrj17wuSC5PC2oKhQ8HzV/XOJee1sNnKu6P5Bk2Ad Z+EOYYooSTtpeg+8D/tug/RFN0g7faAGKwQAKw6A= 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 v4 1/7] virtio-gpu: Remove superfluous memory_region_set_enabled() Date: Tue, 25 Nov 2025 05:35:11 +0300 Message-ID: <20251125023517.177714-2-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251125023517.177714-1-dmitry.osipenko@collabora.com> References: <20251125023517.177714-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: 1764038250183019200 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 Reviewed-by: Alex Benn=C3=A9e --- 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 Sat Feb 7 08:55:16 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=1764038192; cv=pass; d=zohomail.com; s=zohoarc; b=Ubb/Qp/UJKEMFSbSPpPyQfhv4+kzL8dhfT8XW6yt7XhJRQcGzMvz5RdqsBNc5UW+YBxcWj33IUDnjQnOecunNkQuP6YG4CObW96a8qT2OCSze1i3hxWpQD8M6/gWbggM9lUg9OJQRDhTxi6aPK82lw9RSUe+FdkIpCe6Ws8jnmY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764038192; 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=0ZGgMxLUXJlaNOeCViQ/9r93O/M1jEqG/QnSJ12Gpas=; b=nSTUPjFdh4euxDOVRtNEfm3jvNY3c0GhnVnuRMWu5PLjiFUFW7Oj59fT//4A+eIxNPGdeM0LpKVJ0s1Q4gHQA5DsN+NGCqy811cjFNKaK1pAdO0SMtVaDyoZsKFmtjkqack0lJxTxpNRj0N/TIetdof9ylZ67CSOsjnmjJurDfA= 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 1764038192045260.9109481927039; Mon, 24 Nov 2025 18:36:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNiup-00036p-Q9; Mon, 24 Nov 2025 21:36:27 -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 1vNiuo-0002wM-4d for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36: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 1vNium-0001DC-Om for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36:25 -0500 Received: by mx.zohomail.com with SMTPS id 1764038168241760.2750337791857; Mon, 24 Nov 2025 18:36:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1764038170; cv=none; d=zohomail.com; s=zohoarc; b=HZ/VXLLptg+RF5AjZv9UeANMqJWKWdcnNch8WdziSuWdT1B54yywTSUh7QOT3mv2qc0qL7S8lUdoyVWb7lvopmdBbaZib8HtJb8tQnvYFn9aDNgaLkr9/7xDWbCTw33zH5ZrLlQr18g4ZB6fEukOvxeBMKGUmz1QaKzE7bB8XK8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764038170; 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=0ZGgMxLUXJlaNOeCViQ/9r93O/M1jEqG/QnSJ12Gpas=; b=ko7glZN1Xw4RXBge+GCTSLfrwoZe/hF86OTtEvg8s40EmQc6fL9JPUFLUdv96sH8NMMRDTNwddSoQ77UfhjNOHAPWZu6e9WoLEG0fSm+I5zAlyNnX4LQnlllsAtmI5LGKCC+q0joVagbfhHxZStQfdQ4XwgEV2mB4hMEHKyQWWo= 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=1764038170; 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=0ZGgMxLUXJlaNOeCViQ/9r93O/M1jEqG/QnSJ12Gpas=; b=E2dGkDveRaO2/JG1NNvawzNbLtXZ7l+12QWUAO1KnyXzvVtaUfsIUto/ex1MVs4r lKAI7DkoVuDIfUbqkXiuWPL7xbwPlC5KB8aruRDulVdtrUSjkUYGJwDIHha3QPqTPHy RBvd2zxFPVOzy8RruSg3hhUPN0AwAr7ArtVDzz6E= 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 v4 2/7] virtio-gpu: Validate hostmem mapping offset Date: Tue, 25 Nov 2025 05:35:12 +0300 Message-ID: <20251125023517.177714-3-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251125023517.177714-1-dmitry.osipenko@collabora.com> References: <20251125023517.177714-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: 1764038194298019200 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..2224f59cf5d7 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 -EINVAL; + } + 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 Sat Feb 7 08:55:16 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=1764038198; cv=pass; d=zohomail.com; s=zohoarc; b=eeWltiS50MI8QK9MyPbxiQavM80qcESbO0GJ11VDeLjFaL+Wjls2+JGu0XjD0fTy5nMh6b3uGX2cW/RcHiUV/spyi56lHJjkMXTQzaj9bxEJ6rh/fHKpEgkkuw86Tm0n5RYIiuRtBJfwqawcIJr6OMDK980mH8NB9L8Fg6kaWjw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764038198; 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=WpzIRgb3JywbC2cNpX4kON74/oST9ex6TcBqARUwepg=; b=ZuP777YLul+MQCaM/ML+lxOZlqHT8j25SW8CPfwSBL6pPgL6kclo0cf3XXX8awC17MNbsEcfeVbWj43zUuagTH0+jOlIcAQzinrcNOQWyY1KfiyC2sSk1CdCljvalpcenUDifU5fr6g0ijiOlA8gnkziCm977PT6ng14aKDU2Yc= 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 1764038198539757.4078405600417; Mon, 24 Nov 2025 18:36:38 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNiur-0003BK-F1; Mon, 24 Nov 2025 21:36: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 1vNiuq-00039I-7U for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36:28 -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 1vNiuo-0001DL-Pj for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36:27 -0500 Received: by mx.zohomail.com with SMTPS id 1764038173075839.3721336161425; Mon, 24 Nov 2025 18:36:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1764038174; cv=none; d=zohomail.com; s=zohoarc; b=RtjI8c5uON6c0Fam+dictYbZ/LtlAbWucAhsGIlVoNgShIdr01dWNNxuFwQrHVYyijAkS1HsrhcoWp5yy3565bwGNrEqTVO5NeM1RG/VR/PAvqyhCcQtlMitRkka6IvwMjQ6Bz7ottzR2ppLv7oTEa6ZOQ3y39JBCJppCozot5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764038174; 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=WpzIRgb3JywbC2cNpX4kON74/oST9ex6TcBqARUwepg=; b=I+i3oB0RSJZPXIWF7q3RB12dM3aUCH7kQNXrcz1HToTre/soY9n/lpCRwyf+oU8hlepAFvS7pRTJDs0UI3ki/GktJDd+VYBv2wEHjDrBnUFvj8Bp/PMkDsm79qG7lW53gT8kqQVJ/g0hStsc5CHDBEA3abTfHETrODME5yEg+7g= 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=1764038174; 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=WpzIRgb3JywbC2cNpX4kON74/oST9ex6TcBqARUwepg=; b=BoZUAbLlENOkqAO0OWUFB7WqUgPNoJVsbvzNscmjisEDndXpumEc1Uh72YVBOHxr TOci8j44Rf/DMZlihWp3mKQUwHECG+zfHt75LzlV62R19bgOACYLJ3o4uc+3KZS/PkV LU5kueVq3Y1kOyM0RDXvR5L91dMYoC08ORXzpx0Q= 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 v4 3/7] virtio-gpu: Improve virgl_cmd_resource_map_blob() error handling Date: Tue, 25 Nov 2025 05:35:13 +0300 Message-ID: <20251125023517.177714-4-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251125023517.177714-1-dmitry.osipenko@collabora.com> References: <20251125023517.177714-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: 1764038199958019200 Content-Type: text/plain; charset="utf-8" Make virgl_cmd_resource_map_blob() return -1 for errors originated from external virglrenderer library and respond to guest with most appropriate error message. Suggested-by: Akihiko Odaki # guest err msg Signed-off-by: Dmitry Osipenko --- hw/display/virtio-gpu-virgl.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index 2224f59cf5d7..edcdad0af232 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -138,7 +138,7 @@ virtio_gpu_virgl_map_resource_blob(VirtIOGPU *g, if (ret) { qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to map virgl resource: = %s\n", __func__, strerror(-ret)); - return ret; + return -1; } =20 vmr =3D g_new0(struct virtio_gpu_virgl_hostmem_region, 1); @@ -789,7 +789,16 @@ static void virgl_cmd_resource_map_blob(VirtIOGPU *g, } =20 ret =3D virtio_gpu_virgl_map_resource_blob(g, res, mblob.offset); - if (ret) { + + switch (ret) { + case 0: + break; + + case -EINVAL: + cmd->error =3D VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; + return; + + default: cmd->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; return; } --=20 2.51.1 From nobody Sat Feb 7 08:55:16 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=1764038210; cv=pass; d=zohomail.com; s=zohoarc; b=npXjA4xwJysocBHirw48UgKLkQN3NebR699BM+nsWWgpmYtJf5CbPQm6BZ05EDlRhlL/iX09uq1nv7yTOq7C2XohQFXzsP3beGyUisvatN6NQw8R2h5YecudEsBQZ8aCSa3O4omi1jE/kPJj45s0eaa/139dzIM3e2F+JB5mvds= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764038210; 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=Qdj+tk0Rsue/yqFxWL1SxJghCWVN4FohXqseYyvW6ug=; b=LHC7ejcxsgqKGMyq+xD382D6Yw2tfI/pM+zxwHL1WIVKOdsyKA8neYskJ3sh8KkccI9SUtOR5aRWs90qcenrWSu/3881P82PIatj39W6ZyX5vSu6hHaSa3ahl7sQuDzPj0IQmX5UUCvOyyH/qEtyZIkvw4kYV1hxSh8wBNUwk1w= 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 1764038210982690.0571642063671; Mon, 24 Nov 2025 18:36:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNiux-0003RB-VE; Mon, 24 Nov 2025 21:36: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 1vNiuw-0003LD-4N for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36: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 1vNiuu-0001Dv-Iu for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36:33 -0500 Received: by mx.zohomail.com with SMTPS id 1764038177942140.1936977372102; Mon, 24 Nov 2025 18:36:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1764038180; cv=none; d=zohomail.com; s=zohoarc; b=fZv5H6vtwnQ++Gtj8HUG1KdQwwc1AWftOfhBXCIqR1F9vC+D7XEWEbhTe3OeNLtRp/xDfFg31A6vwEizUTo/zBCCkgwHzfki4sjLQSxNG+SZlpAZDTb8fnEC1kesApCMHN/e0/F0j/Rjl4aG2kKGpb5bpKsPjoSVqcF3H0Xjoxw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764038180; 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=Qdj+tk0Rsue/yqFxWL1SxJghCWVN4FohXqseYyvW6ug=; b=ZNMP3YlPU90j/6+yxBkfqBhfQkYssnaKhweYK+zTYoZeiSuxietXuXAeg3/2QA4eH5jZPO2RxB3DCvmjD2OXJwhyC4a99xY3ylS9EyuC380Bpz+MoQdOV0DpKQOc6LEiZoz/m4D4d0ALyiJEhXJ6x56BYaePyGubMQHAzufunjs= 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=1764038180; 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=Qdj+tk0Rsue/yqFxWL1SxJghCWVN4FohXqseYyvW6ug=; b=Bb0aLQgn9lx6+/Ef4rMN2Jm6iUg9Pw1NcNXRTQpsMsWAfMSEMc6ynA8NBujqlTYZ zlnbMOsPl6vz8O27yfHp6JVvNAj6T6FbGzhJLzfI+i7xP0ihLIAkBsHEfjeIuwTMqGK UsSSsgxX35mzXfs+E+S05/LKb5PiNSnaERWTb47E= 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 v4 4/7] virtio-gpu: Make virtio_gpu_virgl_unmap_resource_blob() return -1 on error Date: Tue, 25 Nov 2025 05:35:14 +0300 Message-ID: <20251125023517.177714-5-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251125023517.177714-1-dmitry.osipenko@collabora.com> References: <20251125023517.177714-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: 1764038212247019200 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 edcdad0af232..a7b14a312c83 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; } @@ -829,7 +829,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 Sat Feb 7 08:55:16 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=1764038230; cv=pass; d=zohomail.com; s=zohoarc; b=QI/XrU0Tolgwr5GkLAA2ctySozgMm3mKZHzS34sQ3dXyMhCUIpEVXhgh7ecxJVPhLPTYzuYE9gAgh9jvj1tDtZvwhstTF3HyaVlZbIUpLWRvJ8iaFxMW0OpJcBiopfxy8aNzoBKnxcWRNshP2WxH3yMFuha0z8ylRjm9kUSiTbA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764038230; 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=cDNXHnbtY9yI01egH6tjEmQVh2KX8lY2w3Frq2el83A=; b=D3Xw3EMEeGji/Z5tMmCgTeVsh98ZkfZ+s+hJ2a93bNcZRSIUiKyRuSfXxR+9F/zJOWHrKuSP4aUVw2U60rePhpzZv3RYSNvfW29N27Ny5YvofC/AT4OoGolNBLlUFyK0lcF79AiewAlH3TeWI88DYXgwvSyOzo4GX8KsDGFMfuQ= 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 17640382301601006.6379876437264; Mon, 24 Nov 2025 18:37:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNiv3-0003lq-00; Mon, 24 Nov 2025 21:36:41 -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 1vNiv1-0003jM-RK for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36:39 -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 1vNiv0-0001ES-3g for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36:39 -0500 Received: by mx.zohomail.com with SMTPS id 1764038182971691.2159403805961; Mon, 24 Nov 2025 18:36:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1764038186; cv=none; d=zohomail.com; s=zohoarc; b=LliPtyuoxB20SPeWI+RSJfQ74llnkJANpfs3RF1XNTLdyEQLl8GsBArwIZS+Jw9b1qK9QaHQ5zTsSHGwL+R21+Yk73B7VKFAaJW8yRj+sIHu+9cBYgaN/683xHk04nKiBl+8xru4K7y+L3l1j+PvbSscMET1NcJ++sqw+QbhjTY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764038186; 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=cDNXHnbtY9yI01egH6tjEmQVh2KX8lY2w3Frq2el83A=; b=OuoRHEM5iWR+K7PXtFjQHrA+N2WcE5nnT4CJi+ST1Pd+rYo2wVEPFCGWJQwIEC/NeVIvUCywhXeq3EtF6IIaQSFuFIqJu2GbabQniSfctrtZGTdS1IHQQtjhOeGgmOb6M4e+pWvtQrVnJedfbMIh3GbBuvZm+taJ4+x0lhvj/TY= 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=1764038186; 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=cDNXHnbtY9yI01egH6tjEmQVh2KX8lY2w3Frq2el83A=; b=XrY/0emu+IedOJvLe2c6FA1r3E5mmKcz9LNvPMIsJWFMKJhSFn/CjuvECVPqzFCG 9cnkIhn7DYAUdC++oWOy05pBFMzVkuAFhfzzLErsPQ6V9XdxIhCueYCOAXCkOMZhBPE jE6ODAVaOXbL1Ax/EFG9w2zQx/0PVGxlh9GnSqXU= 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 v4 5/7] virtio-gpu: Destroy virgl resources on virtio-gpu reset Date: Tue, 25 Nov 2025 05:35:15 +0300 Message-ID: <20251125023517.177714-6-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251125023517.177714-1-dmitry.osipenko@collabora.com> References: <20251125023517.177714-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: 1764038232160019200 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 | 83 +++++++++++++++++++++++++--------- include/hw/virtio/virtio-gpu.h | 5 +- 3 files changed, 71 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 a7b14a312c83..91951c3ffb0a 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -312,14 +312,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); @@ -332,27 +362,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, @@ -1280,11 +1304,28 @@ 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; + + /* + * Virglrender doesn't support context restoring. VirtIO-GPU + * state shall not be reset at runtime. + */ + QTAILQ_FOREACH_SAFE(res, &g->reslist, next, tmp) { + virtio_gpu_virgl_resource_destroy(g, res, NULL); + } + + if (!QTAILQ_EMPTY(&g->reslist)) { + error_report("%s: failed to reset virgl resources", __func__); + 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 Sat Feb 7 08:55:16 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=1764038232; cv=pass; d=zohomail.com; s=zohoarc; b=CB/mfzA57Br37lw+pIoXMSDHRgyoG10Z1LZtrJvOruJqsjav27A3bUa2pX5jZwavz0lbqZYuwoH74eJ0dpFHKucLZCZKfdvqHWh1vSUnPaV+bmdwFa98JC1hnAlKyWz6HlVwW56ulzOdggQ4N/uhsCxgq9B8flMaE9uXqYrX6JE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764038232; 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=p/ZNWLrKtd35wllldKwD3newHkQzWDosziXuoHDiTy4=; b=CuZRg+lO88V7NpIiqKbWT+/YYKm/hQSefgc7rWF20gA+8e28Cif6+IAxKC2MnwzT3fbOE/GNhTJizukPKmsojCfgb3LeVfZ03TUxVd7uatDannewgVNy3Y2VAebOg+2mghNknCax+AMJv0q/5HRREl9K2oDXwFmU/79DTZ0NKWE= 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 17640382322501015.8132977155067; Mon, 24 Nov 2025 18:37:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNiv8-0003qJ-EE; Mon, 24 Nov 2025 21:36:46 -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 1vNiv6-0003pB-SL for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36:44 -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 1vNiv4-0001En-Ut for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36:44 -0500 Received: by mx.zohomail.com with SMTPS id 1764038189061382.10479374188844; Mon, 24 Nov 2025 18:36:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1764038190; cv=none; d=zohomail.com; s=zohoarc; b=UQZxUUMeeJNGHYtpslAtNJdJP+sM3dYkf0Ic/iIfJzcjs3nIaq4s5q6t1OVN3SoAItVWWA8UqA4CV+1+6Q10hO22eDwpzPc/7F31ukA2U1+j5rJP+r0JlZJO9wsKl26ntPbBfuZfnWiVHn4u215KNlx7L5qk1qcKRtkk1BnO4bo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764038190; 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=p/ZNWLrKtd35wllldKwD3newHkQzWDosziXuoHDiTy4=; b=bqizJ6gkvkX3/nsv+IuIsTr0feWdyIFp5wDQRvppXOxF4+Vyp1khBUoxnqrW0aT93zyp3uLNYgxpkVLhvaFUjgikzuj5JLe/QICaZmYRhMosYrSSJuLb4CEmnedbLQgZX4i+D1BTr6Zb0mXN5cNUug36CWC8FldBWygSo02lXZg= 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=1764038190; 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=p/ZNWLrKtd35wllldKwD3newHkQzWDosziXuoHDiTy4=; b=Lx3lJrQ9yhMOnCsbBWCU0S5RhjP0OhM6vOberXLLb+IzF8wHR+3Zz3tM2BaBi2Vn iDtFDe+hMAFFs1JubE7hgVT76dmXPaPvy1cVR4kBdgwzJrB6mfQlnbNZBtGyUVHxgfj NfCfz2+FlDQWx/1kQqcNCnmKJNnZoGQkr9RjBnc4= 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 v4 6/7] virtio-gpu: Make virtio_gpu_virgl_init() return -1 on error Date: Tue, 25 Nov 2025 05:35:16 +0300 Message-ID: <20251125023517.177714-7-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251125023517.177714-1-dmitry.osipenko@collabora.com> References: <20251125023517.177714-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: 1764038234026019200 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 91951c3ffb0a..9b36b378c2fd 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -1371,7 +1371,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 @@ -1379,7 +1379,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 Sat Feb 7 08:55:16 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=1764038247; cv=pass; d=zohomail.com; s=zohoarc; b=EMu1AgIyaSU+uU1l0+wMG6K9FhhBcmwO1VywFlnKMmTklcKGyPKEib5yTCfT1QrdRD4gOvwZQMCuUN6zWRAOZvvNvdhYB7/T9SziHns/jUbN+Nkj0qcGFI8Hykh8drGqwIy67nr1PxgwyOQcod+IpYYZM3ZnOgmu2RtCoG9gZrM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764038247; 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=qYsTCziv1rWIzyxYEug6rTq2AvTzUYRi9nyYR5kx0ow=; b=J4fEYOjFvI4LidCaMQv8/ax/WDEPth0CJ2V0ccv9t8ctgsEXecuAc3elKNWvGr+6G0ahV35cmLhUcZxO4NYj8nSFUaGW8eNtfWSTaLFKhXlEnQJXDLwB8Bkjrf/N9dPqIIb/3lIs8NltuSdpaR4Rb8ItRg97/3YK/V2A15NrQ20= 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 1764038247053737.4127719883943; Mon, 24 Nov 2025 18:37:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNivM-0004Bv-Rm; Mon, 24 Nov 2025 21:37:04 -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 1vNivE-0004Ab-1j for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36:52 -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 1vNivC-0001FC-8B for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36:51 -0500 Received: by mx.zohomail.com with SMTPS id 1764038194356208.33316025653096; Mon, 24 Nov 2025 18:36:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1764038196; cv=none; d=zohomail.com; s=zohoarc; b=EN/UK/cZhsUPdVsbDF1ca/Zl1RRLiXNvYJbjKa7FM/He9S8JlTsxAqpoiEaUWMKLw7QAkvkgZvJyvWMYkE5xfFInraF8klEzWK6cgkzmNdLwxtCJQoTrq2e7fiI3/lU32BHcWRm0x3WFMAImoVeWMrYsdjYFBSIY3H+9gK7GTzI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764038196; 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=qYsTCziv1rWIzyxYEug6rTq2AvTzUYRi9nyYR5kx0ow=; b=NIegVHuRYe9USEOYG2HBauvC1TOVOyJv87Ji+7nw4wQgI8W4hLx4UKIDM7vMDjKpReuLfkFhrNjF+YPlzDWrnkZMBYDQZ108qmtODTnIWsQakCFxiNYcOcCHFm2SEcuu+ZV2hYM5LbkSN1DBnXeaYx3e2j6vcK8IuVdKo9GAA5g= 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=1764038196; 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=qYsTCziv1rWIzyxYEug6rTq2AvTzUYRi9nyYR5kx0ow=; b=QVko3cGoznJhf1Riqpwd5zXWpKaDnOU8uYE+NJyLKFp1g81dz5fI6u24G9JE3Mf0 VXHmbVzKkdltyA3oWFoZGKch/agcxwrhO0k94H3KUIstUNWN1aPVMnaFpdPS422u7sj 5sH24QcjKxgSWKNDpmOQl9iXmCvmpYUgC2MqGyjE= 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 v4 7/7] virtio-gpu: Support mapping hostmem blobs with map_fixed Date: Tue, 25 Nov 2025 05:35:17 +0300 Message-ID: <20251125023517.177714-8-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251125023517.177714-1-dmitry.osipenko@collabora.com> References: <20251125023517.177714-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: 1764038248330019202 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 | 41 +++++++++++++++++++++++- hw/display/virtio-gpu-virgl.c | 58 +++++++++++++++++++++++++++++++++- include/hw/virtio/virtio-gpu.h | 3 ++ 3 files changed, 100 insertions(+), 2 deletions(-) diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c index d65da4863923..8a7a33946085 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,28 @@ static void virtio_gpu_gl_device_realize(DeviceState *= qdev, Error **errp) #endif =20 virtio_gpu_device_realize(qdev, errp); + if (*errp) { + return; + } + +#if !defined(CONFIG_WIN32) + 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); + } +#endif } =20 static const Property virtio_gpu_gl_properties[] =3D { @@ -190,6 +218,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 9b36b378c2fd..987980e8a49d 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -41,9 +41,13 @@ VIRGL_VERSION_MICRO >=3D (micro)) #endif =20 +#define VIRGL_HAS_MAP_FIXED \ + (VIRGL_CHECK_VERSION(1, 2, 1) && !IS_ENABLED(CONFIG_WIN32)) + 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 +120,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 +141,41 @@ virtio_gpu_virgl_map_resource_blob(VirtIOGPU *g, return -EINVAL; } =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 -EBUSY; + } + + 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 +188,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 +215,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