You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
197 lines
6.2 KiB
197 lines
6.2 KiB
1 year ago
|
From f68e8c5d841cd7fc785cc3d15b3c280211bfb4c3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
|
||
|
|
Date: Wed, 12 Jul 2023 17:46:57 +0200
|
||
|
|
Subject: [PATCH 17/37] vfio: Implement a common device info helper
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Cédric Le Goater <clg@redhat.com>
|
||
|
|
RH-MergeRequest: 179: vfio: live migration support
|
||
|
|
RH-Bugzilla: 2192818
|
||
|
|
RH-Acked-by: Eric Auger <eric.auger@redhat.com>
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Commit: [15/28] 9cfd233ab1b95dc7de776e8ef901823bd37c5a6b (clegoate/qemu-kvm-c9s)
|
||
|
|
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/2192818
|
||
|
|
|
||
|
|
commit 634f38f0f73f
|
||
|
|
Author: Alex Williamson <alex.williamson@redhat.com>
|
||
|
|
Date: Thu Jun 1 08:45:06 2023 -0600
|
||
|
|
|
||
|
|
vfio: Implement a common device info helper
|
||
|
|
|
||
|
|
A common helper implementing the realloc algorithm for handling
|
||
|
|
capabilities.
|
||
|
|
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
|
Reviewed-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
|
||
|
|
Reviewed-by: Robin Voetter <robin@streamhpc.com>
|
||
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
|
||
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
---
|
||
|
|
hw/s390x/s390-pci-vfio.c | 37 ++++------------------------
|
||
|
|
hw/vfio/common.c | 46 ++++++++++++++++++++++++++---------
|
||
|
|
include/hw/vfio/vfio-common.h | 1 +
|
||
|
|
3 files changed, 41 insertions(+), 43 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
|
||
|
|
index f51190d466..59a2e03873 100644
|
||
|
|
--- a/hw/s390x/s390-pci-vfio.c
|
||
|
|
+++ b/hw/s390x/s390-pci-vfio.c
|
||
|
|
@@ -289,38 +289,11 @@ static void s390_pci_read_pfip(S390PCIBusDevice *pbdev,
|
||
|
|
memcpy(pbdev->zpci_fn.pfip, cap->pfip, CLP_PFIP_NR_SEGMENTS);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static struct vfio_device_info *get_device_info(S390PCIBusDevice *pbdev,
|
||
|
|
- uint32_t argsz)
|
||
|
|
+static struct vfio_device_info *get_device_info(S390PCIBusDevice *pbdev)
|
||
|
|
{
|
||
|
|
- struct vfio_device_info *info = g_malloc0(argsz);
|
||
|
|
- VFIOPCIDevice *vfio_pci;
|
||
|
|
- int fd;
|
||
|
|
+ VFIOPCIDevice *vfio_pci = container_of(pbdev->pdev, VFIOPCIDevice, pdev);
|
||
|
|
|
||
|
|
- vfio_pci = container_of(pbdev->pdev, VFIOPCIDevice, pdev);
|
||
|
|
- fd = vfio_pci->vbasedev.fd;
|
||
|
|
-
|
||
|
|
- /*
|
||
|
|
- * If the specified argsz is not large enough to contain all capabilities
|
||
|
|
- * it will be updated upon return from the ioctl. Retry until we have
|
||
|
|
- * a big enough buffer to hold the entire capability chain. On error,
|
||
|
|
- * just exit and rely on CLP defaults.
|
||
|
|
- */
|
||
|
|
-retry:
|
||
|
|
- info->argsz = argsz;
|
||
|
|
-
|
||
|
|
- if (ioctl(fd, VFIO_DEVICE_GET_INFO, info)) {
|
||
|
|
- trace_s390_pci_clp_dev_info(vfio_pci->vbasedev.name);
|
||
|
|
- g_free(info);
|
||
|
|
- return NULL;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- if (info->argsz > argsz) {
|
||
|
|
- argsz = info->argsz;
|
||
|
|
- info = g_realloc(info, argsz);
|
||
|
|
- goto retry;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- return info;
|
||
|
|
+ return vfio_get_device_info(vfio_pci->vbasedev.fd);
|
||
|
|
}
|
||
|
|
|
||
|
|
/*
|
||
|
|
@@ -335,7 +308,7 @@ bool s390_pci_get_host_fh(S390PCIBusDevice *pbdev, uint32_t *fh)
|
||
|
|
|
||
|
|
assert(fh);
|
||
|
|
|
||
|
|
- info = get_device_info(pbdev, sizeof(*info));
|
||
|
|
+ info = get_device_info(pbdev);
|
||
|
|
if (!info) {
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
@@ -356,7 +329,7 @@ void s390_pci_get_clp_info(S390PCIBusDevice *pbdev)
|
||
|
|
{
|
||
|
|
g_autofree struct vfio_device_info *info = NULL;
|
||
|
|
|
||
|
|
- info = get_device_info(pbdev, sizeof(*info));
|
||
|
|
+ info = get_device_info(pbdev);
|
||
|
|
if (!info) {
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
|
||
|
|
index b73086e17a..3b4ac53f15 100644
|
||
|
|
--- a/hw/vfio/common.c
|
||
|
|
+++ b/hw/vfio/common.c
|
||
|
|
@@ -2845,11 +2845,35 @@ void vfio_put_group(VFIOGroup *group)
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
+struct vfio_device_info *vfio_get_device_info(int fd)
|
||
|
|
+{
|
||
|
|
+ struct vfio_device_info *info;
|
||
|
|
+ uint32_t argsz = sizeof(*info);
|
||
|
|
+
|
||
|
|
+ info = g_malloc0(argsz);
|
||
|
|
+
|
||
|
|
+retry:
|
||
|
|
+ info->argsz = argsz;
|
||
|
|
+
|
||
|
|
+ if (ioctl(fd, VFIO_DEVICE_GET_INFO, info)) {
|
||
|
|
+ g_free(info);
|
||
|
|
+ return NULL;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ if (info->argsz > argsz) {
|
||
|
|
+ argsz = info->argsz;
|
||
|
|
+ info = g_realloc(info, argsz);
|
||
|
|
+ goto retry;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return info;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
int vfio_get_device(VFIOGroup *group, const char *name,
|
||
|
|
VFIODevice *vbasedev, Error **errp)
|
||
|
|
{
|
||
|
|
- struct vfio_device_info dev_info = { .argsz = sizeof(dev_info) };
|
||
|
|
- int ret, fd;
|
||
|
|
+ g_autofree struct vfio_device_info *info = NULL;
|
||
|
|
+ int fd;
|
||
|
|
|
||
|
|
fd = ioctl(group->fd, VFIO_GROUP_GET_DEVICE_FD, name);
|
||
|
|
if (fd < 0) {
|
||
|
|
@@ -2861,11 +2885,11 @@ int vfio_get_device(VFIOGroup *group, const char *name,
|
||
|
|
return fd;
|
||
|
|
}
|
||
|
|
|
||
|
|
- ret = ioctl(fd, VFIO_DEVICE_GET_INFO, &dev_info);
|
||
|
|
- if (ret) {
|
||
|
|
+ info = vfio_get_device_info(fd);
|
||
|
|
+ if (!info) {
|
||
|
|
error_setg_errno(errp, errno, "error getting device info");
|
||
|
|
close(fd);
|
||
|
|
- return ret;
|
||
|
|
+ return -1;
|
||
|
|
}
|
||
|
|
|
||
|
|
/*
|
||
|
|
@@ -2893,14 +2917,14 @@ int vfio_get_device(VFIOGroup *group, const char *name,
|
||
|
|
vbasedev->group = group;
|
||
|
|
QLIST_INSERT_HEAD(&group->device_list, vbasedev, next);
|
||
|
|
|
||
|
|
- vbasedev->num_irqs = dev_info.num_irqs;
|
||
|
|
- vbasedev->num_regions = dev_info.num_regions;
|
||
|
|
- vbasedev->flags = dev_info.flags;
|
||
|
|
+ vbasedev->num_irqs = info->num_irqs;
|
||
|
|
+ vbasedev->num_regions = info->num_regions;
|
||
|
|
+ vbasedev->flags = info->flags;
|
||
|
|
+
|
||
|
|
+ trace_vfio_get_device(name, info->flags, info->num_regions, info->num_irqs);
|
||
|
|
|
||
|
|
- trace_vfio_get_device(name, dev_info.flags, dev_info.num_regions,
|
||
|
|
- dev_info.num_irqs);
|
||
|
|
+ vbasedev->reset_works = !!(info->flags & VFIO_DEVICE_FLAGS_RESET);
|
||
|
|
|
||
|
|
- vbasedev->reset_works = !!(dev_info.flags & VFIO_DEVICE_FLAGS_RESET);
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
|
||
|
|
index 3dc5f2104c..6d1b8487c3 100644
|
||
|
|
--- a/include/hw/vfio/vfio-common.h
|
||
|
|
+++ b/include/hw/vfio/vfio-common.h
|
||
|
|
@@ -216,6 +216,7 @@ void vfio_region_finalize(VFIORegion *region);
|
||
|
|
void vfio_reset_handler(void *opaque);
|
||
|
|
VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, Error **errp);
|
||
|
|
void vfio_put_group(VFIOGroup *group);
|
||
|
|
+struct vfio_device_info *vfio_get_device_info(int fd);
|
||
|
|
int vfio_get_device(VFIOGroup *group, const char *name,
|
||
|
|
VFIODevice *vbasedev, Error **errp);
|
||
|
|
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|