From nobody Wed Nov 27 09:51:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1699349896; cv=none; d=zohomail.com; s=zohoarc; b=l9lh+wDUwHjtdxBAuqLnFnKfk7qYOZRqo3pW2HqML90/UcvOx9Q5skRKG4zCMl/bJFZ3jV3/M4nitYovVDfcVzZ4d8/vJoc2c+gIUBvcrqv95ekXKTrI0UUWiZWlGery/b6pi2QJM9Flbw54EDAjtICRUjCWP1xqVrCl2uwN+YE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699349896; 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=z99vVTfPw7k6XBeUSE9yrh9VsYv9cbdkI19EpgickbA=; b=XULdIpj8a4ZjKaMZCGUUSPIHSLz6ykpC4UVWDNwWRfVj5ayEPs4PV0IoA/lZPpiGVuJmGA4VV2QpdwzsYmNvC+jBvR8aJfMwSelkcOXI6vU0Y8JKZSbWTq/Z9jc97vpoPcXuEp9gcM2pXv8PlXzANY41GRFWq2gtcDFSDfYee90= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1699349896658917.5495888889276; Tue, 7 Nov 2023 01:38:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0IWz-00038H-R7; Tue, 07 Nov 2023 04:37:57 -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 1r0IWx-00037U-HZ for qemu-devel@nongnu.org; Tue, 07 Nov 2023 04:37:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0IWv-0004VA-Gz for qemu-devel@nongnu.org; Tue, 07 Nov 2023 04:37:55 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-630-lmChmzUlOeyjo1jewODmtA-1; Tue, 07 Nov 2023 04:37:49 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CBB40852AC8; Tue, 7 Nov 2023 09:37:48 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B7D21C060AE; Tue, 7 Nov 2023 09:37:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699349872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z99vVTfPw7k6XBeUSE9yrh9VsYv9cbdkI19EpgickbA=; b=JZoYaZWRm3bnQ8qnA2itHkkVYne411VeMTu/ObRswGxjp0NPP4BPHwaq1h2pf2xHJcyrLq 0qY7ycYv0JMmk8bkn92giml33wnr6/TmUPRh1Vxuzi1fexTWPjh5O85H1aY0CAoAxJZQSb Zk2I+XVP1KNqvpLcqpxhlnVz4VSsgrE= X-MC-Unique: lmChmzUlOeyjo1jewODmtA-1 From: Albert Esteve To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , kraxel@redhat.com, stefanha@gmail.com, Albert Esteve , marcandre.lureau@gmail.com Subject: [PATCH 1/3] hw/virtio: check owner for removing objects Date: Tue, 7 Nov 2023 10:37:42 +0100 Message-ID: <20231107093744.388099-2-aesteve@redhat.com> In-Reply-To: <20231107093744.388099-1-aesteve@redhat.com> References: <20231107093744.388099-1-aesteve@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 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=170.10.133.124; envelope-from=aesteve@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @redhat.com) X-ZM-MESSAGEID: 1699349897078100005 Content-Type: text/plain; charset="utf-8" Shared objects lack spoofing protection. For VHOST_USER_BACKEND_SHARED_OBJECT_REMOVE messages received by the vhost-user interface, any backend was allowed to remove entries from the shared table just by knowing the UUID. Only the owner of the entry shall be allowed to removed their resources from the table. To fix that, add a check for all *SHARED_OBJECT_REMOVE messages received. A vhost device can only remove TYPE_VHOST_DEV entries that are owned by them, otherwise skip the removal, and inform the device that the entry has not been removed in the answer. Signed-off-by: Albert Esteve --- hw/virtio/vhost-user.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 7b42ae8aae..5fdff0241f 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -1602,10 +1602,26 @@ vhost_user_backend_handle_shared_object_add(struct = vhost_dev *dev, } =20 static int -vhost_user_backend_handle_shared_object_remove(VhostUserShared *object) +vhost_user_backend_handle_shared_object_remove(struct vhost_dev *dev, + VhostUserShared *object) { QemuUUID uuid; =20 + switch (virtio_object_type(&uuid)) { + case TYPE_VHOST_DEV: + { + struct vhost_dev *owner =3D virtio_lookup_vhost_device(&uuid); + if (owner =3D=3D NULL || dev !=3D owner) { + /* Not allowed to remove non-owned entries */ + return 0; + } + break; + } + default: + /* Not allowed to remove non-owned entries */ + return 0; + } + memcpy(uuid.data, object->uuid, sizeof(object->uuid)); return virtio_remove_resource(&uuid); } @@ -1785,7 +1801,8 @@ static gboolean backend_read(QIOChannel *ioc, GIOCond= ition condition, ret =3D vhost_user_backend_handle_shared_object_add(dev, &payload.= object); break; case VHOST_USER_BACKEND_SHARED_OBJECT_REMOVE: - ret =3D vhost_user_backend_handle_shared_object_remove(&payload.ob= ject); + ret =3D vhost_user_backend_handle_shared_object_remove(dev, + &payload.obje= ct); break; case VHOST_USER_BACKEND_SHARED_OBJECT_LOOKUP: ret =3D vhost_user_backend_handle_shared_object_lookup(dev->opaque= , ioc, --=20 2.41.0 From nobody Wed Nov 27 09:51:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1699349939; cv=none; d=zohomail.com; s=zohoarc; b=nTxvgPz3SwEL3DahrnXNrnlOrSY8IAOAGEEYIlFACcaCxxGYNqW9+KRlOQrwDaH9kJCoI3pp7leC9IcNSJE5dAYyAbyRivc0LBFp+bfuXj5gMNTIKuyqFfr/zDnDO8NtzBq0x44CAd78lkM3BuT2bXuYtpEZpiO+BXfrCqz1sH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699349939; 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=zjjdcY7o9oUZiTA07ZAlqUDuFqG/gJlydaXulzx4iKc=; b=EL0eKG3U4RpC0CBGTBTPWI58viMUPCz5Ta/9MDS3Lpzia6M31RFU26lwdUhRV4rQPSeuH2M999qLJapXgujRG8rF/2JbsVFx6QgrVZ+Kr365Nwn+sNSEdyk2yxWSYaIWW1LACQ6fJmm0QluQDaXs3wbgWyCtByXJSzzqdoMjb/E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1699349939199329.1303146890144; Tue, 7 Nov 2023 01:38:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0IXI-0003Cc-Ca; Tue, 07 Nov 2023 04:38:16 -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 1r0IXF-0003BB-Fk for qemu-devel@nongnu.org; Tue, 07 Nov 2023 04:38:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0IX2-0004WA-1S for qemu-devel@nongnu.org; Tue, 07 Nov 2023 04:38:13 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-399-Xdt1SzM9PnG72RJou8Iapw-1; Tue, 07 Nov 2023 04:37:50 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6B0972823815; Tue, 7 Nov 2023 09:37:50 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2805B1C060AE; Tue, 7 Nov 2023 09:37:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699349879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zjjdcY7o9oUZiTA07ZAlqUDuFqG/gJlydaXulzx4iKc=; b=JobXN7lT+7xjD2+/n4hFd3jl+5BifB4oO3aoGJ1Sf+Db8yqBffKdLj/l+XrKtgecpV9sYu 8ZnVY0C8C3w4E5/MwwNwNwNMYgMqnhQlRE3o4ziuLUyNULN+DoHODcilvXG4AUmCZEOENv lecY0jXuGqqhLNEjWbYWJYfkOAKfVV4= X-MC-Unique: Xdt1SzM9PnG72RJou8Iapw-1 From: Albert Esteve To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , kraxel@redhat.com, stefanha@gmail.com, Albert Esteve , marcandre.lureau@gmail.com Subject: [PATCH 2/3] hw/virtio: cleanup shared resources Date: Tue, 7 Nov 2023 10:37:43 +0100 Message-ID: <20231107093744.388099-3-aesteve@redhat.com> In-Reply-To: <20231107093744.388099-1-aesteve@redhat.com> References: <20231107093744.388099-1-aesteve@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 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=170.10.129.124; envelope-from=aesteve@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @redhat.com) X-ZM-MESSAGEID: 1699349941296100003 Content-Type: text/plain; charset="utf-8" Ensure that we cleanup all virtio shared resources when the vhost devices is cleaned up (after a hot unplug, or a crash). To track all owned uuids of a device, add a GSList to the vhost_dev struct. This way we can avoid traversing the full table for every cleanup, whether they actually own any shared resource or not. Signed-off-by: Albert Esteve --- hw/virtio/vhost-user.c | 2 ++ hw/virtio/vhost.c | 4 ++++ include/hw/virtio/vhost.h | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 5fdff0241f..04848d1fa0 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -1598,6 +1598,7 @@ vhost_user_backend_handle_shared_object_add(struct vh= ost_dev *dev, QemuUUID uuid; =20 memcpy(uuid.data, object->uuid, sizeof(object->uuid)); + dev->shared_uuids =3D g_slist_append(dev->shared_uuids, &uuid); return virtio_add_vhost_device(&uuid, dev); } =20 @@ -1623,6 +1624,7 @@ vhost_user_backend_handle_shared_object_remove(struct= vhost_dev *dev, } =20 memcpy(uuid.data, object->uuid, sizeof(object->uuid)); + dev->shared_uuids =3D g_slist_remove_all(dev->shared_uuids, &uuid); return virtio_remove_resource(&uuid); } =20 diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 9c9ae7109e..3aff94664b 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/virtio/vhost.h" +#include "hw/virtio/virtio-dmabuf.h" #include "qemu/atomic.h" #include "qemu/range.h" #include "qemu/error-report.h" @@ -1599,6 +1600,9 @@ void vhost_dev_cleanup(struct vhost_dev *hdev) migrate_del_blocker(&hdev->migration_blocker); g_free(hdev->mem); g_free(hdev->mem_sections); + /* free virtio shared objects */ + g_slist_foreach(hdev->shared_uuids, (GFunc)virtio_remove_resource, NUL= L); + g_slist_free_full(g_steal_pointer(&hdev->shared_uuids), g_free); if (hdev->vhost_ops) { hdev->vhost_ops->vhost_backend_cleanup(hdev); } diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h index 5e8183f64a..376bc8446d 100644 --- a/include/hw/virtio/vhost.h +++ b/include/hw/virtio/vhost.h @@ -118,6 +118,12 @@ struct vhost_dev { */ uint64_t protocol_features; =20 + /** + * @shared_uuids: contains the UUIDs of all the exported + * virtio objects owned by the vhost device. + */ + GSList *shared_uuids; + uint64_t max_queues; uint64_t backend_cap; /* @started: is the vhost device started? */ --=20 2.41.0 From nobody Wed Nov 27 09:51:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1699349896; cv=none; d=zohomail.com; s=zohoarc; b=RS5aUMqrzSOtTGFzMAF08ciFO7udMTmSXdk0s5s7FVAeRa3/ofcJf1rW1vIzuNJAh9lwX9vgswNVhzAGffMueByBOiiyLPu+xr7n7BoJofnotFiOZHR3XmP/y1ScZv/gKSTG9x22ASxjLYIiMmsQBFqPQq6fvBn9V6b25pAKy1c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699349896; 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=tT8jayzW3ogOJjjkCamjJ1rHm9fpmeIWVf+g0YM9Cqc=; b=Zhtw3ieFaqRmJiSDP2Fh/qan4XGm36+K9wegTblqqEC3n05Ey28gh7omECkgBKzHVPqhCqiaa+fiLTFk08zJDfqQyIo3g72bW31nmQCfAOXiA5XlHS2BkpXEyP4xtRBNcay628lMWgoU80S+bM7THFC4ddTrPOz02oEbQFbRsDA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1699349896548524.1082741439624; Tue, 7 Nov 2023 01:38:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0IX2-00038r-T3; Tue, 07 Nov 2023 04:38:00 -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 1r0IX0-00038Y-J6 for qemu-devel@nongnu.org; Tue, 07 Nov 2023 04:37:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0IWy-0004Vf-Hj for qemu-devel@nongnu.org; Tue, 07 Nov 2023 04:37:58 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-118-QV6e-wzXMda-b5dCzBcWlQ-1; Tue, 07 Nov 2023 04:37:52 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4AF2C3C100A8; Tue, 7 Nov 2023 09:37:52 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0E701C060AE; Tue, 7 Nov 2023 09:37:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699349876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tT8jayzW3ogOJjjkCamjJ1rHm9fpmeIWVf+g0YM9Cqc=; b=CQer4qma1xV5FBEy+JqMjyclydRMhMjL7aai16yvYnxZdRXMSG+6flSODJUFEBcAUJiqCJ HENXGOGEdcwDiVIztq0g9DNIKo9WaQh3pNAMSPi2PW2OO6Gvp/pTzSSSkLDgwbSckyxW4p vTMVj+DD5qNzosw0aabJGc1Qg3PuLz8= X-MC-Unique: QV6e-wzXMda-b5dCzBcWlQ-1 From: Albert Esteve To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , kraxel@redhat.com, stefanha@gmail.com, Albert Esteve , marcandre.lureau@gmail.com Subject: [PATCH 3/3] hw/virtio: rename virtio dmabuf API Date: Tue, 7 Nov 2023 10:37:44 +0100 Message-ID: <20231107093744.388099-4-aesteve@redhat.com> In-Reply-To: <20231107093744.388099-1-aesteve@redhat.com> References: <20231107093744.388099-1-aesteve@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 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=170.10.133.124; envelope-from=aesteve@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @redhat.com) X-ZM-MESSAGEID: 1699349897047100003 Content-Type: text/plain; charset="utf-8" Functions in the virtio-dmabuf module start with 'virtio_*', which is too generic and may not correctly identify them as part of the virtio dmabuf API. Rename all functions to 'virtio_dmabuf_*' instead to avoid confusion. Signed-off-by: Albert Esteve --- hw/display/virtio-dmabuf.c | 14 +++++----- hw/virtio/vhost-user.c | 14 +++++----- hw/virtio/vhost.c | 3 ++- include/hw/virtio/virtio-dmabuf.h | 33 ++++++++++++----------- tests/unit/test-virtio-dmabuf.c | 44 +++++++++++++++---------------- 5 files changed, 55 insertions(+), 53 deletions(-) diff --git a/hw/display/virtio-dmabuf.c b/hw/display/virtio-dmabuf.c index 3dba4577ca..40ee046e76 100644 --- a/hw/display/virtio-dmabuf.c +++ b/hw/display/virtio-dmabuf.c @@ -48,7 +48,7 @@ static bool virtio_add_resource(QemuUUID *uuid, VirtioSha= redObject *value) return result; } =20 -bool virtio_add_dmabuf(QemuUUID *uuid, int udmabuf_fd) +bool virtio_dmabuf_add(QemuUUID *uuid, int udmabuf_fd) { bool result; VirtioSharedObject *vso; @@ -66,7 +66,7 @@ bool virtio_add_dmabuf(QemuUUID *uuid, int udmabuf_fd) return result; } =20 -bool virtio_add_vhost_device(QemuUUID *uuid, struct vhost_dev *dev) +bool virtio_dmabuf_add_vhost_device(QemuUUID *uuid, struct vhost_dev *dev) { bool result; VirtioSharedObject *vso; @@ -84,7 +84,7 @@ bool virtio_add_vhost_device(QemuUUID *uuid, struct vhost= _dev *dev) return result; } =20 -bool virtio_remove_resource(const QemuUUID *uuid) +bool virtio_dmabuf_remove_resource(const QemuUUID *uuid) { bool result; g_mutex_lock(&lock); @@ -107,7 +107,7 @@ static VirtioSharedObject *get_shared_object(const Qemu= UUID *uuid) return (VirtioSharedObject *) lookup_res; } =20 -int virtio_lookup_dmabuf(const QemuUUID *uuid) +int virtio_dmabuf_lookup(const QemuUUID *uuid) { VirtioSharedObject *vso =3D get_shared_object(uuid); if (vso =3D=3D NULL) { @@ -117,7 +117,7 @@ int virtio_lookup_dmabuf(const QemuUUID *uuid) return GPOINTER_TO_INT(vso->value); } =20 -struct vhost_dev *virtio_lookup_vhost_device(const QemuUUID *uuid) +struct vhost_dev *virtio_dmabuf_lookup_vhost_device(const QemuUUID *uuid) { VirtioSharedObject *vso =3D get_shared_object(uuid); if (vso =3D=3D NULL) { @@ -127,7 +127,7 @@ struct vhost_dev *virtio_lookup_vhost_device(const Qemu= UUID *uuid) return (struct vhost_dev *) vso->value; } =20 -SharedObjectType virtio_object_type(const QemuUUID *uuid) +SharedObjectType virtio_dmabuf_object_type(const QemuUUID *uuid) { VirtioSharedObject *vso =3D get_shared_object(uuid); if (vso =3D=3D NULL) { @@ -136,7 +136,7 @@ SharedObjectType virtio_object_type(const QemuUUID *uui= d) return vso->type; } =20 -void virtio_free_resources(void) +void virtio_dmabuf_free_resources(void) { g_mutex_lock(&lock); g_hash_table_destroy(resource_uuids); diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 04848d1fa0..47c2465081 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -1599,7 +1599,7 @@ vhost_user_backend_handle_shared_object_add(struct vh= ost_dev *dev, =20 memcpy(uuid.data, object->uuid, sizeof(object->uuid)); dev->shared_uuids =3D g_slist_append(dev->shared_uuids, &uuid); - return virtio_add_vhost_device(&uuid, dev); + return virtio_dmabuf_add_vhost_device(&uuid, dev); } =20 static int @@ -1608,10 +1608,10 @@ vhost_user_backend_handle_shared_object_remove(stru= ct vhost_dev *dev, { QemuUUID uuid; =20 - switch (virtio_object_type(&uuid)) { + switch (virtio_dmabuf_object_type(&uuid)) { case TYPE_VHOST_DEV: { - struct vhost_dev *owner =3D virtio_lookup_vhost_device(&uuid); + struct vhost_dev *owner =3D virtio_dmabuf_lookup_vhost_device(&uui= d); if (owner =3D=3D NULL || dev !=3D owner) { /* Not allowed to remove non-owned entries */ return 0; @@ -1625,7 +1625,7 @@ vhost_user_backend_handle_shared_object_remove(struct= vhost_dev *dev, =20 memcpy(uuid.data, object->uuid, sizeof(object->uuid)); dev->shared_uuids =3D g_slist_remove_all(dev->shared_uuids, &uuid); - return virtio_remove_resource(&uuid); + return virtio_dmabuf_remove_resource(&uuid); } =20 static bool vhost_user_send_resp(QIOChannel *ioc, VhostUserHeader *hdr, @@ -1703,13 +1703,13 @@ vhost_user_backend_handle_shared_object_lookup(stru= ct vhost_user *u, memcpy(uuid.data, payload->object.uuid, sizeof(payload->object.uuid)); =20 payload->u64 =3D 0; - switch (virtio_object_type(&uuid)) { + switch (virtio_dmabuf_object_type(&uuid)) { case TYPE_DMABUF: - dmabuf_fd =3D virtio_lookup_dmabuf(&uuid); + dmabuf_fd =3D virtio_dmabuf_lookup(&uuid); break; case TYPE_VHOST_DEV: { - struct vhost_dev *dev =3D virtio_lookup_vhost_device(&uuid); + struct vhost_dev *dev =3D virtio_dmabuf_lookup_vhost_device(&uuid); if (dev =3D=3D NULL) { payload->u64 =3D -EINVAL; break; diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 3aff94664b..9ca2bf9889 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1601,7 +1601,8 @@ void vhost_dev_cleanup(struct vhost_dev *hdev) g_free(hdev->mem); g_free(hdev->mem_sections); /* free virtio shared objects */ - g_slist_foreach(hdev->shared_uuids, (GFunc)virtio_remove_resource, NUL= L); + g_slist_foreach(hdev->shared_uuids, (GFunc)virtio_dmabuf_remove_resour= ce, + NULL); g_slist_free_full(g_steal_pointer(&hdev->shared_uuids), g_free); if (hdev->vhost_ops) { hdev->vhost_ops->vhost_backend_cleanup(hdev); diff --git a/include/hw/virtio/virtio-dmabuf.h b/include/hw/virtio/virtio-d= mabuf.h index 627c3b6db7..9bcd44119c 100644 --- a/include/hw/virtio/virtio-dmabuf.h +++ b/include/hw/virtio/virtio-dmabuf.h @@ -28,7 +28,7 @@ typedef struct VirtioSharedObject { } VirtioSharedObject; =20 /** - * virtio_add_dmabuf() - Add a new dma-buf resource to the lookup table + * virtio_dmabuf_add() - Add a new dma-buf resource to the lookup table * @uuid: new resource's UUID * @dmabuf_fd: the dma-buf descriptor that will be stored and shared with * other virtio devices. The caller retains ownership over the @@ -41,11 +41,11 @@ typedef struct VirtioSharedObject { * Note that if it finds a repeated UUID, the resource is not inserted in * the lookup table. */ -bool virtio_add_dmabuf(QemuUUID *uuid, int dmabuf_fd); +bool virtio_dmabuf_add(QemuUUID *uuid, int dmabuf_fd); =20 /** - * virtio_add_vhost_device() - Add a new exporter vhost device that holds = the - * resource with the associated UUID + * virtio_dmabuf_add_vhost_device() - Add a new exporter vhost device that + * holds the resource with the associated UUID * @uuid: new resource's UUID * @dev: the pointer to the vhost device that holds the resource. The call= er * retains ownership over the device struct and its lifecycle. @@ -55,46 +55,47 @@ bool virtio_add_dmabuf(QemuUUID *uuid, int dmabuf_fd); * Note that if it finds a repeated UUID, the resource is not inserted in * the lookup table. */ -bool virtio_add_vhost_device(QemuUUID *uuid, struct vhost_dev *dev); +bool virtio_dmabuf_add_vhost_device(QemuUUID *uuid, struct vhost_dev *dev); =20 /** - * virtio_remove_resource() - Removes a resource from the lookup table + * virtio_dmabuf_remove_resource() - Removes a resource from the lookup ta= ble * @uuid: resource's UUID * * Return: true if the UUID has been found and removed from the lookup tab= le. */ -bool virtio_remove_resource(const QemuUUID *uuid); +bool virtio_dmabuf_remove_resource(const QemuUUID *uuid); =20 /** - * virtio_lookup_dmabuf() - Looks for a dma-buf resource in the lookup tab= le + * virtio_dmabuf_lookup() - Looks for a dma-buf resource in the lookup tab= le * @uuid: resource's UUID * * Return: the dma-buf file descriptor integer, or -1 if the key is not fo= und. */ -int virtio_lookup_dmabuf(const QemuUUID *uuid); +int virtio_dmabuf_lookup(const QemuUUID *uuid); =20 /** - * virtio_lookup_vhost_device() - Looks for an exporter vhost device in the - * lookup table + * virtio_dmabuf_lookup_vhost_device() - Looks for an exporter vhost device + * in the lookup table * @uuid: resource's UUID * * Return: pointer to the vhost_dev struct, or NULL if the key is not foun= d. */ -struct vhost_dev *virtio_lookup_vhost_device(const QemuUUID *uuid); +struct vhost_dev *virtio_dmabuf_lookup_vhost_device(const QemuUUID *uuid); =20 /** - * virtio_object_type() - Looks for the type of resource in the lookup tab= le + * virtio_dmabuf_object_type() - Looks for the type of resource in the + * lookup table * @uuid: resource's UUID * * Return: the type of resource associated with the UUID, or TYPE_INVALID = if * the key is not found. */ -SharedObjectType virtio_object_type(const QemuUUID *uuid); +SharedObjectType virtio_dmabuf_object_type(const QemuUUID *uuid); =20 /** - * virtio_free_resources() - Destroys all keys and values of the shared + * virtio_dmabuf_free_resources() - Destroys all keys and values of the sh= ared * resources lookup table, and frees them */ -void virtio_free_resources(void); +void virtio_dmabuf_free_resources(void); =20 #endif /* VIRTIO_DMABUF_H */ diff --git a/tests/unit/test-virtio-dmabuf.c b/tests/unit/test-virtio-dmabu= f.c index a45ec52f42..fe805836a4 100644 --- a/tests/unit/test-virtio-dmabuf.c +++ b/tests/unit/test-virtio-dmabuf.c @@ -31,12 +31,12 @@ static void test_add_remove_resources(void) qemu_uuid_generate(&uuid); dmabuf_fd =3D g_random_int_range(3, 500); /* Add a new resource */ - g_assert(virtio_add_dmabuf(&uuid, dmabuf_fd)); - g_assert_cmpint(virtio_lookup_dmabuf(&uuid), =3D=3D, dmabuf_fd); + g_assert(virtio_dmabuf_add(&uuid, dmabuf_fd)); + g_assert_cmpint(virtio_dmabuf_lookup(&uuid), =3D=3D, dmabuf_fd); /* Remove the resource */ - g_assert(virtio_remove_resource(&uuid)); + g_assert(virtio_dmabuf_remove_resource(&uuid)); /* Resource is not found anymore */ - g_assert_cmpint(virtio_lookup_dmabuf(&uuid), =3D=3D, -1); + g_assert_cmpint(virtio_dmabuf_lookup(&uuid), =3D=3D, -1); } } =20 @@ -48,13 +48,13 @@ static void test_add_remove_dev(void) =20 for (i =3D 0; i < 100; ++i) { qemu_uuid_generate(&uuid); - virtio_add_vhost_device(&uuid, dev); + virtio_dmabuf_add_vhost_device(&uuid, dev); /* vhost device is found */ - g_assert(virtio_lookup_vhost_device(&uuid) !=3D NULL); + g_assert(virtio_dmabuf_lookup_vhost_device(&uuid) !=3D NULL); /* Remove the vhost device */ - g_assert(virtio_remove_resource(&uuid)); + g_assert(virtio_dmabuf_remove_resource(&uuid)); /* vhost device is not found anymore */ - g_assert(virtio_lookup_vhost_device(&uuid) =3D=3D NULL); + g_assert(virtio_dmabuf_lookup_vhost_device(&uuid) =3D=3D NULL); } g_free(dev); } @@ -66,9 +66,9 @@ static void test_remove_invalid_resource(void) =20 for (i =3D 0; i < 20; ++i) { qemu_uuid_generate(&uuid); - g_assert_cmpint(virtio_lookup_dmabuf(&uuid), =3D=3D, -1); + g_assert_cmpint(virtio_dmabuf_lookup(&uuid), =3D=3D, -1); /* Removing a resource that does not exist returns false */ - g_assert_false(virtio_remove_resource(&uuid)); + g_assert_false(virtio_dmabuf_remove_resource(&uuid)); } } =20 @@ -81,25 +81,25 @@ static void test_add_invalid_resource(void) for (i =3D 0; i < 20; ++i) { qemu_uuid_generate(&uuid); /* Add a new resource with invalid (negative) resource fd */ - g_assert_false(virtio_add_dmabuf(&uuid, dmabuf_fd)); + g_assert_false(virtio_dmabuf_add(&uuid, dmabuf_fd)); /* Resource is not found */ - g_assert_cmpint(virtio_lookup_dmabuf(&uuid), =3D=3D, -1); + g_assert_cmpint(virtio_dmabuf_lookup(&uuid), =3D=3D, -1); /* Add a new vhost device with invalid (NULL) pointer */ - g_assert_false(virtio_add_vhost_device(&uuid, dev)); + g_assert_false(virtio_dmabuf_add_vhost_device(&uuid, dev)); /* vhost device is not found */ - g_assert(virtio_lookup_vhost_device(&uuid) =3D=3D NULL); + g_assert(virtio_dmabuf_lookup_vhost_device(&uuid) =3D=3D NULL); } =20 for (i =3D 0; i < 20; ++i) { /* Add a valid resource */ qemu_uuid_generate(&uuid); dmabuf_fd =3D g_random_int_range(3, 500); - g_assert(virtio_add_dmabuf(&uuid, dmabuf_fd)); - g_assert_cmpint(virtio_lookup_dmabuf(&uuid), =3D=3D, dmabuf_fd); + g_assert(virtio_dmabuf_add(&uuid, dmabuf_fd)); + g_assert_cmpint(virtio_dmabuf_lookup(&uuid), =3D=3D, dmabuf_fd); /* Add a new resource with repeated uuid returns false */ - g_assert_false(virtio_add_dmabuf(&uuid, alt_dmabuf)); + g_assert_false(virtio_dmabuf_add(&uuid, alt_dmabuf)); /* The value for the uuid key is not replaced */ - g_assert_cmpint(virtio_lookup_dmabuf(&uuid), =3D=3D, dmabuf_fd); + g_assert_cmpint(virtio_dmabuf_lookup(&uuid), =3D=3D, dmabuf_fd); } } =20 @@ -111,13 +111,13 @@ static void test_free_resources(void) for (i =3D 0; i < ARRAY_SIZE(uuids); ++i) { qemu_uuid_generate(&uuids[i]); dmabuf_fd =3D g_random_int_range(3, 500); - g_assert(virtio_add_dmabuf(&uuids[i], dmabuf_fd)); - g_assert_cmpint(virtio_lookup_dmabuf(&uuids[i]), =3D=3D, dmabuf_fd= ); + g_assert(virtio_dmabuf_add(&uuids[i], dmabuf_fd)); + g_assert_cmpint(virtio_dmabuf_lookup(&uuids[i]), =3D=3D, dmabuf_fd= ); } - virtio_free_resources(); + virtio_dmabuf_free_resources(); for (i =3D 0; i < ARRAY_SIZE(uuids); ++i) { /* None of the resources is found after free'd */ - g_assert_cmpint(virtio_lookup_dmabuf(&uuids[i]), =3D=3D, -1); + g_assert_cmpint(virtio_dmabuf_lookup(&uuids[i]), =3D=3D, -1); } =20 } --=20 2.41.0