From nobody Wed Nov 27 02:21:46 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=1701961014; cv=none; d=zohomail.com; s=zohoarc; b=eMMnWh3vrYbKhwxHgL52yQ2E9xMOc2w20ck2tyjFbFTPLvMruI3dhTP0I7+B2hZYOGXhq4WELGJO9C7cTgT3GP/kFbaLTs/9WJe094uL61NlOfxTpiUDk4ZPc41l2YPbLhql45OWeDLbEhx7LYMRLO7FY94f6QqpY/pSkWCAdmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1701961014; 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=QBRx27/qQ/Roe1g7sLnDhSTKHcE1DGB5YASgOjq2noY=; b=AjPRIkFkHXbDT3zIpPjR4qvf3xCu/hkvPlDk3ctNf2gOVWyj/ZBCRw3Req5xzCwVJab6mKCfpcgeKlgxTosxVHfcJG0Yp3Y6lXDJn2ut5LnHiIoRaF/7JykHbP2r27kyDUt3L5MgHgaXSItZv0BHw9chFgoekPyy8g5ZF1igaFI= 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 1701961014546696.3671532843948; Thu, 7 Dec 2023 06:56:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBFnK-0000S4-66; Thu, 07 Dec 2023 09:56:06 -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 1rBFnI-0000Rg-Q9 for qemu-devel@nongnu.org; Thu, 07 Dec 2023 09:56:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.145.221.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBFnF-0003ru-0Z for qemu-devel@nongnu.org; Thu, 07 Dec 2023 09:56:04 -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-2-c-ApOOhNMweT7RbZGEUGQg-1; Thu, 07 Dec 2023 09:55:54 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 C85D51C0CCC7; Thu, 7 Dec 2023 14:55:53 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3541B492BC6; Thu, 7 Dec 2023 14:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701960959; 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=QBRx27/qQ/Roe1g7sLnDhSTKHcE1DGB5YASgOjq2noY=; b=HKbKx45fu1sQ7goVwDy1chtsPwRHvHCyZFr54Hu2UP+5fAQZUCUEN7+CneaQi4omTJM4k2 GdVgXenLerBfq3JtSL3JYtfI/vCBofFoU6jA2RBl4MLqVr86y9aVjq4MVdOThaaQ0K1m23 69g/zWvynJj6dFyGUK31QoeNwBY5mGw= X-MC-Unique: c-ApOOhNMweT7RbZGEUGQg-1 From: Albert Esteve To: qemu-devel@nongnu.org Cc: marcandre.lureau@gmail.com, kraxel@redhat.com, "Michael S. Tsirkin" , stefanha@gmail.com, Albert Esteve Subject: [PATCH v2 3/3] hw/virtio: rename virtio dmabuf API Date: Thu, 7 Dec 2023 15:55:45 +0100 Message-ID: <20231207145545.783877-4-aesteve@redhat.com> In-Reply-To: <20231207145545.783877-1-aesteve@redhat.com> References: <20231207145545.783877-1-aesteve@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 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=216.145.221.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: 1701961015592100011 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 +++++----- include/hw/virtio/virtio-dmabuf.h | 33 ++++++++++++----------- tests/unit/test-virtio-dmabuf.c | 44 +++++++++++++++---------------- 4 files changed, 53 insertions(+), 52 deletions(-) diff --git a/hw/display/virtio-dmabuf.c b/hw/display/virtio-dmabuf.c index 6688809777..42495f87ec 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) { @@ -158,7 +158,7 @@ int virtio_dmabuf_vhost_cleanup(struct vhost_dev *dev) return num_removed; } =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 1c3f2357be..2ab9e13f9e 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -1607,7 +1607,7 @@ vhost_user_backend_handle_shared_object_add(struct vh= ost_dev *dev, QemuUUID uuid; =20 memcpy(uuid.data, object->uuid, sizeof(object->uuid)); - return virtio_add_vhost_device(&uuid, dev); + return virtio_dmabuf_add_vhost_device(&uuid, dev); } =20 static int @@ -1617,10 +1617,10 @@ vhost_user_backend_handle_shared_object_remove(stru= ct vhost_dev *dev, QemuUUID uuid; =20 memcpy(uuid.data, object->uuid, sizeof(object->uuid)); - 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; @@ -1632,7 +1632,7 @@ vhost_user_backend_handle_shared_object_remove(struct= vhost_dev *dev, return 0; } =20 - return virtio_remove_resource(&uuid); + return virtio_dmabuf_remove_resource(&uuid); } =20 static bool vhost_user_send_resp(QIOChannel *ioc, VhostUserHeader *hdr, @@ -1710,13 +1710,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/include/hw/virtio/virtio-dmabuf.h b/include/hw/virtio/virtio-d= mabuf.h index 73f70fb482..186a18a33b 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,41 +55,42 @@ 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_dmabuf_vhost_cleanup() - Destroys all entries of the shared @@ -102,9 +103,9 @@ SharedObjectType virtio_object_type(const QemuUUID *uui= d); int virtio_dmabuf_vhost_cleanup(struct vhost_dev *dev); =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 1c8123c2d2..7471ed4fbd 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 @@ -143,13 +143,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.43.0