From nobody Fri Apr 4 08:21:39 2025
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=quarantine dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1742975969; cv=none;
d=zohomail.com; s=zohoarc;
b=K1Ya1C6dQ84fsummumIUa4WJp96YWK5XwY0renIoSigIQa3s85Cqc5/3nOcPqjuBXj+d0aFgcI8sWia9nv0/UtdTCNxmOlQC8I5YLwBW1YeNZkzEGMIkQ9Ggi8Qbxa+hhflPMuCn4PB30UiUqPlbn1EbA1pA5+oPQT9gD+2L6OQ=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1742975969;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=Ym1v2fZBJ3CnZ1RPTd7he/nfGwa6xkIP+hhwDrCcC3g=;
b=OouZZj9wb7MTMINlWXJESO6BK1LS99hfd5w3MS1C8HpKydHWppnK30M7mzzynUxLWUt0hBIfktI6w1puOMul52buQP3BnrEB2U4zrmJlSfxB6iGe6LOJ6/RSiTaDC4sRQCDTLoqbs4sIXx/1iyTtB7rySVCYz7v1ZZqWYxUMo+0=
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=<clg@redhat.com> (p=quarantine dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1742975969499513.5997562656943;
Wed, 26 Mar 2025 00:59:29 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1txLd0-00067V-6M; Wed, 26 Mar 2025 03:56:47 -0400
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 <clg@redhat.com>) id 1txLaI-0002NU-AC
for qemu-devel@nongnu.org; Wed, 26 Mar 2025 03:54:01 -0400
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 <clg@redhat.com>) id 1txLaG-0006PM-4F
for qemu-devel@nongnu.org; Wed, 26 Mar 2025 03:53:58 -0400
Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com
(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by
relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
cipher=TLS_AES_256_GCM_SHA384) id us-mta-445-nNHF_B_JOniGwDAIaBBFzQ-1; Wed,
26 Mar 2025 03:53:49 -0400
Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com
(mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40])
(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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
id D28A0196D2CF; Wed, 26 Mar 2025 07:53:48 +0000 (UTC)
Received: from corto.redhat.com (unknown [10.45.226.180])
by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
id 209C519560AB; Wed, 26 Mar 2025 07:53:45 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1742975635;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=Ym1v2fZBJ3CnZ1RPTd7he/nfGwa6xkIP+hhwDrCcC3g=;
b=HKDq8DSva4QgQYknabaw3dRhXtEWyebO+z0aUhnyG05jza098kFJmFC2smZFslmK+dfJKO
JBLeDabhxm+agR6j02XgmFQqwnZ/SBkgWX6yZQc8nHKe/vxb/+f8ppToy7AIwMV6USEJzD
pHni5rkAa84bZ2AF/L0F/9W3B11LSqU=
X-MC-Unique: nNHF_B_JOniGwDAIaBBFzQ-1
X-Mimecast-MFC-AGG-ID: nNHF_B_JOniGwDAIaBBFzQ_1742975628
From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
To: qemu-devel@nongnu.org,
Alex Williamson <alex.williamson@redhat.com>
Cc: Avihai Horon <avihaih@nvidia.com>, Eric Auger <eric.auger@redhat.com>,
Zhenzhong Duan <zhenzhong.duan@intel.com>,
John Levon <john.levon@nutanix.com>,
Joao Martins <joao.m.martins@oracle.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
Subject: [PATCH for-10.1 v2 37/37] vfio: Rename VFIOContainer related services
Date: Wed, 26 Mar 2025 08:51:22 +0100
Message-ID: <20250326075122.1299361-38-clg@redhat.com>
In-Reply-To: <20250326075122.1299361-1-clg@redhat.com>
References: <20250326075122.1299361-1-clg@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40
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=clg@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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=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: 1742975970155019000
Rename these routines :
vfio_put_group -> vfio_group_put
vfio_get_group -> vfio_group_get
vfio_kvm_device_del_group -> vfio_group_del_kvm_device
vfio_kvm_device_add_group -> vfio_group_add_kvm_device
vfio_get_device -> vfio_device_get
vfio_put_base_device -> vfio_device_put
vfio_device_groupid -> vfio_device_get_groupid
vfio_connect_container -> vfio_container_connect
vfio_disconnect_container -> vfio_container_disconnect
to better reflect the namespace they belong to.
Reviewed-by: John Levon <john.levon@nutanix.com>
Link: https://lore.kernel.org/qemu-devel/20250318095415.670319-30-clg@redha=
t.com
Signed-off-by: C=C3=A9dric Le Goater <clg@redhat.com>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
---
hw/vfio/container.c | 52 ++++++++++++++++++++++----------------------
hw/vfio/trace-events | 12 +++++-----
2 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index 721d10b64bc0304e73870faf3dba74f79a6fd5ad..23a337347007752556b7088295b=
d783ec3a412fa 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -306,7 +306,7 @@ static bool vfio_get_info_iova_range(struct vfio_iommu_=
type1_info *info,
return true;
}
=20
-static void vfio_kvm_device_add_group(VFIOGroup *group)
+static void vfio_group_add_kvm_device(VFIOGroup *group)
{
Error *err =3D NULL;
=20
@@ -315,7 +315,7 @@ static void vfio_kvm_device_add_group(VFIOGroup *group)
}
}
=20
-static void vfio_kvm_device_del_group(VFIOGroup *group)
+static void vfio_group_del_kvm_device(VFIOGroup *group)
{
Error *err =3D NULL;
=20
@@ -511,7 +511,7 @@ static bool vfio_legacy_setup(VFIOContainerBase *bconta=
iner, Error **errp)
return true;
}
=20
-static bool vfio_connect_container(VFIOGroup *group, AddressSpace *as,
+static bool vfio_container_connect(VFIOGroup *group, AddressSpace *as,
Error **errp)
{
VFIOContainer *container;
@@ -569,7 +569,7 @@ static bool vfio_connect_container(VFIOGroup *group, Ad=
dressSpace *as,
}
group->container =3D container;
QLIST_INSERT_HEAD(&container->group_list, group, container_nex=
t);
- vfio_kvm_device_add_group(group);
+ vfio_group_add_kvm_device(group);
return true;
}
}
@@ -609,7 +609,7 @@ static bool vfio_connect_container(VFIOGroup *group, Ad=
dressSpace *as,
goto enable_discards_exit;
}
=20
- vfio_kvm_device_add_group(group);
+ vfio_group_add_kvm_device(group);
=20
vfio_address_space_insert(space, bcontainer);
=20
@@ -625,7 +625,7 @@ static bool vfio_connect_container(VFIOGroup *group, Ad=
dressSpace *as,
return true;
listener_release_exit:
QLIST_REMOVE(group, container_next);
- vfio_kvm_device_del_group(group);
+ vfio_group_del_kvm_device(group);
vfio_listener_unregister(bcontainer);
if (vioc->release) {
vioc->release(bcontainer);
@@ -649,7 +649,7 @@ put_space_exit:
return false;
}
=20
-static void vfio_disconnect_container(VFIOGroup *group)
+static void vfio_container_disconnect(VFIOGroup *group)
{
VFIOContainer *container =3D group->container;
VFIOContainerBase *bcontainer =3D &container->bcontainer;
@@ -678,7 +678,7 @@ static void vfio_disconnect_container(VFIOGroup *group)
if (QLIST_EMPTY(&container->group_list)) {
VFIOAddressSpace *space =3D bcontainer->space;
=20
- trace_vfio_disconnect_container(container->fd);
+ trace_vfio_container_disconnect(container->fd);
vfio_cpr_unregister_container(bcontainer);
close(container->fd);
object_unref(container);
@@ -687,7 +687,7 @@ static void vfio_disconnect_container(VFIOGroup *group)
}
}
=20
-static VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, Error **er=
rp)
+static VFIOGroup *vfio_group_get(int groupid, AddressSpace *as, Error **er=
rp)
{
ERRP_GUARD();
VFIOGroup *group;
@@ -731,7 +731,7 @@ static VFIOGroup *vfio_get_group(int groupid, AddressSp=
ace *as, Error **errp)
group->groupid =3D groupid;
QLIST_INIT(&group->device_list);
=20
- if (!vfio_connect_container(group, as, errp)) {
+ if (!vfio_container_connect(group, as, errp)) {
error_prepend(errp, "failed to setup container for group %d: ",
groupid);
goto close_fd_exit;
@@ -750,7 +750,7 @@ free_group_exit:
return NULL;
}
=20
-static void vfio_put_group(VFIOGroup *group)
+static void vfio_group_put(VFIOGroup *group)
{
if (!group || !QLIST_EMPTY(&group->device_list)) {
return;
@@ -759,15 +759,15 @@ static void vfio_put_group(VFIOGroup *group)
if (!group->ram_block_discard_allowed) {
vfio_ram_block_discard_disable(group->container, false);
}
- vfio_kvm_device_del_group(group);
- vfio_disconnect_container(group);
+ vfio_group_del_kvm_device(group);
+ vfio_container_disconnect(group);
QLIST_REMOVE(group, next);
- trace_vfio_put_group(group->fd);
+ trace_vfio_group_put(group->fd);
close(group->fd);
g_free(group);
}
=20
-static bool vfio_get_device(VFIOGroup *group, const char *name,
+static bool vfio_device_get(VFIOGroup *group, const char *name,
VFIODevice *vbasedev, Error **errp)
{
g_autofree struct vfio_device_info *info =3D NULL;
@@ -819,25 +819,25 @@ static bool vfio_get_device(VFIOGroup *group, const c=
har *name,
vbasedev->num_regions =3D info->num_regions;
vbasedev->flags =3D info->flags;
=20
- trace_vfio_get_device(name, info->flags, info->num_regions, info->num_=
irqs);
+ trace_vfio_device_get(name, info->flags, info->num_regions, info->num_=
irqs);
=20
vbasedev->reset_works =3D !!(info->flags & VFIO_DEVICE_FLAGS_RESET);
=20
return true;
}
=20
-static void vfio_put_base_device(VFIODevice *vbasedev)
+static void vfio_device_put(VFIODevice *vbasedev)
{
if (!vbasedev->group) {
return;
}
QLIST_REMOVE(vbasedev, next);
vbasedev->group =3D NULL;
- trace_vfio_put_base_device(vbasedev->fd);
+ trace_vfio_device_put(vbasedev->fd);
close(vbasedev->fd);
}
=20
-static int vfio_device_groupid(VFIODevice *vbasedev, Error **errp)
+static int vfio_device_get_groupid(VFIODevice *vbasedev, Error **errp)
{
char *tmp, group_path[PATH_MAX];
g_autofree char *group_name =3D NULL;
@@ -872,7 +872,7 @@ static int vfio_device_groupid(VFIODevice *vbasedev, Er=
ror **errp)
static bool vfio_legacy_attach_device(const char *name, VFIODevice *vbased=
ev,
AddressSpace *as, Error **errp)
{
- int groupid =3D vfio_device_groupid(vbasedev, errp);
+ int groupid =3D vfio_device_get_groupid(vbasedev, errp);
VFIODevice *vbasedev_iter;
VFIOGroup *group;
VFIOContainerBase *bcontainer;
@@ -887,7 +887,7 @@ static bool vfio_legacy_attach_device(const char *name,=
VFIODevice *vbasedev,
return false;
}
=20
- group =3D vfio_get_group(groupid, as, errp);
+ group =3D vfio_group_get(groupid, as, errp);
if (!group) {
return false;
}
@@ -895,12 +895,12 @@ static bool vfio_legacy_attach_device(const char *nam=
e, VFIODevice *vbasedev,
QLIST_FOREACH(vbasedev_iter, &group->device_list, next) {
if (strcmp(vbasedev_iter->name, vbasedev->name) =3D=3D 0) {
error_setg(errp, "device is already attached");
- vfio_put_group(group);
+ vfio_group_put(group);
return false;
}
}
- if (!vfio_get_device(group, name, vbasedev, errp)) {
- vfio_put_group(group);
+ if (!vfio_device_get(group, name, vbasedev, errp)) {
+ vfio_group_put(group);
return false;
}
=20
@@ -920,8 +920,8 @@ static void vfio_legacy_detach_device(VFIODevice *vbase=
dev)
QLIST_REMOVE(vbasedev, container_next);
vbasedev->bcontainer =3D NULL;
trace_vfio_device_detach(vbasedev->name, group->groupid);
- vfio_put_base_device(vbasedev);
- vfio_put_group(group);
+ vfio_device_put(vbasedev);
+ vfio_group_put(group);
}
=20
static int vfio_legacy_pci_hot_reset(VFIODevice *vbasedev, bool single)
diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
index 8843560576935232a68a31d43e00be520e0284be..e90ec9bff8d5fa51afde7b55fb7=
36a8d51fef1b0 100644
--- a/hw/vfio/trace-events
+++ b/hw/vfio/trace-events
@@ -99,16 +99,18 @@ vfio_listener_region_add_no_dma_map(const char *name, u=
int64_t iova, uint64_t si
vfio_listener_region_del(uint64_t start, uint64_t end) "region_del 0x%"PRI=
x64" - 0x%"PRIx64
vfio_device_dirty_tracking_update(uint64_t start, uint64_t end, uint64_t m=
in, uint64_t max) "section 0x%"PRIx64" - 0x%"PRIx64" -> update [0x%"PRIx64"=
- 0x%"PRIx64"]"
vfio_device_dirty_tracking_start(int nr_ranges, uint64_t min32, uint64_t m=
ax32, uint64_t min64, uint64_t max64, uint64_t minpci, uint64_t maxpci) "nr=
_ranges %d 32:[0x%"PRIx64" - 0x%"PRIx64"], 64:[0x%"PRIx64" - 0x%"PRIx64"], =
pci64:[0x%"PRIx64" - 0x%"PRIx64"]"
-vfio_disconnect_container(int fd) "close container->fd=3D%d"
-vfio_put_group(int fd) "close group->fd=3D%d"
-vfio_get_device(const char * name, unsigned int flags, unsigned int num_re=
gions, unsigned int num_irqs) "Device %s flags: %u, regions: %u, irqs: %u"
-vfio_put_base_device(int fd) "close vdev->fd=3D%d"
-vfio_legacy_dma_unmap_overflow_workaround(void) ""
vfio_iommu_map_dirty_notify(uint64_t iova_start, uint64_t iova_end) "iommu=
dirty @ 0x%"PRIx64" - 0x%"PRIx64
=20
# container-base.c
vfio_container_query_dirty_bitmap(uint64_t iova, uint64_t size, uint64_t b=
itmap_size, uint64_t start, uint64_t dirty_pages) "iova=3D0x%"PRIx64" size=
=3D 0x%"PRIx64" bitmap_size=3D0x%"PRIx64" start=3D0x%"PRIx64" dirty_pages=
=3D%"PRIu64
=20
+# container.c
+vfio_container_disconnect(int fd) "close container->fd=3D%d"
+vfio_group_put(int fd) "close group->fd=3D%d"
+vfio_device_get(const char * name, unsigned int flags, unsigned int num_re=
gions, unsigned int num_irqs) "Device %s flags: %u, regions: %u, irqs: %u"
+vfio_device_put(int fd) "close vdev->fd=3D%d"
+vfio_legacy_dma_unmap_overflow_workaround(void) ""
+
# region.c
vfio_region_write(const char *name, int index, uint64_t addr, uint64_t dat=
a, unsigned size) " (%s:region%d+0x%"PRIx64", 0x%"PRIx64 ", %d)"
vfio_region_read(char *name, int index, uint64_t addr, unsigned size, uint=
64_t data) " (%s:region%d+0x%"PRIx64", %d) =3D 0x%"PRIx64
--=20
2.49.0