[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/21] vfio/common: Extract out vfio_kvm_device_[add/del]_fd
From: |
Cédric Le Goater |
Subject: |
[PULL 12/21] vfio/common: Extract out vfio_kvm_device_[add/del]_fd |
Date: |
Fri, 6 Oct 2023 08:19:56 +0200 |
From: Zhenzhong Duan <zhenzhong.duan@intel.com>
Introduce two new helpers, vfio_kvm_device_[add/del]_fd
which take as input a file descriptor which can be either a group fd or
a cdev fd. This uses the new KVM_DEV_VFIO_FILE VFIO KVM device group,
which aliases to the legacy KVM_DEV_VFIO_GROUP.
vfio_kvm_device_[add/del]_group then call those new helpers.
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
include/hw/vfio/vfio-common.h | 3 ++
hw/vfio/common.c | 55 +++++++++++++++++++++++++----------
2 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index
e0483893d14b536a79c372b8d02471255ea3da25..c4e7c3b4a7757087ab4bc02b634216bf3ae857d6
100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -226,6 +226,9 @@ struct vfio_device_info *vfio_get_device_info(int fd);
int vfio_get_device(VFIOGroup *group, const char *name,
VFIODevice *vbasedev, Error **errp);
+int vfio_kvm_device_add_fd(int fd, Error **errp);
+int vfio_kvm_device_del_fd(int fd, Error **errp);
+
extern const MemoryRegionOps vfio_region_ops;
typedef QLIST_HEAD(VFIOGroupList, VFIOGroup) VFIOGroupList;
extern VFIOGroupList vfio_group_list;
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index
0397788aa58c8deaa8cf3ed19fa8eb40e91d7678..d8ed432cb6d0e8e955984401cdbbe921d87636f7
100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1818,17 +1818,17 @@ void vfio_reset_handler(void *opaque)
}
}
-static void vfio_kvm_device_add_group(VFIOGroup *group)
+int vfio_kvm_device_add_fd(int fd, Error **errp)
{
#ifdef CONFIG_KVM
struct kvm_device_attr attr = {
- .group = KVM_DEV_VFIO_GROUP,
- .attr = KVM_DEV_VFIO_GROUP_ADD,
- .addr = (uint64_t)(unsigned long)&group->fd,
+ .group = KVM_DEV_VFIO_FILE,
+ .attr = KVM_DEV_VFIO_FILE_ADD,
+ .addr = (uint64_t)(unsigned long)&fd,
};
if (!kvm_enabled()) {
- return;
+ return 0;
}
if (vfio_kvm_device_fd < 0) {
@@ -1837,38 +1837,61 @@ static void vfio_kvm_device_add_group(VFIOGroup *group)
};
if (kvm_vm_ioctl(kvm_state, KVM_CREATE_DEVICE, &cd)) {
- error_report("Failed to create KVM VFIO device: %m");
- return;
+ error_setg_errno(errp, errno, "Failed to create KVM VFIO device");
+ return -errno;
}
vfio_kvm_device_fd = cd.fd;
}
if (ioctl(vfio_kvm_device_fd, KVM_SET_DEVICE_ATTR, &attr)) {
- error_report("Failed to add group %d to KVM VFIO device: %m",
- group->groupid);
+ error_setg_errno(errp, errno, "Failed to add fd %d to KVM VFIO device",
+ fd);
+ return -errno;
}
#endif
+ return 0;
}
-static void vfio_kvm_device_del_group(VFIOGroup *group)
+int vfio_kvm_device_del_fd(int fd, Error **errp)
{
#ifdef CONFIG_KVM
struct kvm_device_attr attr = {
- .group = KVM_DEV_VFIO_GROUP,
- .attr = KVM_DEV_VFIO_GROUP_DEL,
- .addr = (uint64_t)(unsigned long)&group->fd,
+ .group = KVM_DEV_VFIO_FILE,
+ .attr = KVM_DEV_VFIO_FILE_DEL,
+ .addr = (uint64_t)(unsigned long)&fd,
};
if (vfio_kvm_device_fd < 0) {
- return;
+ error_setg(errp, "KVM VFIO device isn't created yet");
+ return -EINVAL;
}
if (ioctl(vfio_kvm_device_fd, KVM_SET_DEVICE_ATTR, &attr)) {
- error_report("Failed to remove group %d from KVM VFIO device: %m",
- group->groupid);
+ error_setg_errno(errp, errno,
+ "Failed to remove fd %d from KVM VFIO device", fd);
+ return -errno;
}
#endif
+ return 0;
+}
+
+static void vfio_kvm_device_add_group(VFIOGroup *group)
+{
+ Error *err = NULL;
+
+ if (vfio_kvm_device_add_fd(group->fd, &err)) {
+ error_reportf_err(err, "group ID %d: ", group->groupid);
+ }
+}
+
+static void vfio_kvm_device_del_group(VFIOGroup *group)
+{
+ Error *err = NULL;
+
+ if (vfio_kvm_device_del_fd(group->fd, &err)) {
+ error_reportf_err(err, "group ID %d: ", group->groupid);
+ }
}
static VFIOAddressSpace *vfio_get_address_space(AddressSpace *as)
--
2.41.0
- [PULL 01/21] vfio/display: Fix missing update to set backing fields, (continued)
- [PULL 01/21] vfio/display: Fix missing update to set backing fields, Cédric Le Goater, 2023/10/06
- [PULL 03/21] vfio/pci: detect the support of dynamic MSI-X allocation, Cédric Le Goater, 2023/10/06
- [PULL 02/21] vfio/pci: rename vfio_put_device to vfio_pci_put_device, Cédric Le Goater, 2023/10/06
- [PULL 06/21] vfio/pci: enable MSI-X in interrupt restoring on dynamic allocation, Cédric Le Goater, 2023/10/06
- [PULL 07/21] scripts/update-linux-headers: Add iommufd.h, Cédric Le Goater, 2023/10/06
- [PULL 05/21] vfio/pci: use an invalid fd to enable MSI-X, Cédric Le Goater, 2023/10/06
- [PULL 08/21] linux-headers: Add iommufd.h, Cédric Le Goater, 2023/10/06
- [PULL 09/21] vfio/common: Move IOMMU agnostic helpers to a separate file, Cédric Le Goater, 2023/10/06
- [PULL 10/21] vfio/common: Propagate KVM_SET_DEVICE_ATTR error if any, Cédric Le Goater, 2023/10/06
- [PULL 11/21] vfio/common: Introduce vfio_container_add|del_section_window(), Cédric Le Goater, 2023/10/06
- [PULL 12/21] vfio/common: Extract out vfio_kvm_device_[add/del]_fd,
Cédric Le Goater <=
- [PULL 15/21] vfio/ap: Use vfio_[attach/detach]_device, Cédric Le Goater, 2023/10/06
- [PULL 14/21] vfio/platform: Use vfio_[attach/detach]_device, Cédric Le Goater, 2023/10/06
- [PULL 13/21] vfio/pci: Introduce vfio_[attach/detach]_device, Cédric Le Goater, 2023/10/06
- [PULL 18/21] vfio/common: Introduce a per container device list, Cédric Le Goater, 2023/10/06
- [PULL 16/21] vfio/ccw: Use vfio_[attach/detach]_device, Cédric Le Goater, 2023/10/06
- [PULL 21/21] vfio/common: Move legacy VFIO backend code into separate container.c, Cédric Le Goater, 2023/10/06
- [PULL 17/21] vfio/common: Move VFIO reset handler registration to a group agnostic function, Cédric Le Goater, 2023/10/06
- [PULL 20/21] vfio/common: Introduce a global VFIODevice list, Cédric Le Goater, 2023/10/06
- [PULL 19/21] vfio/common: Store the parent container in VFIODevice, Cédric Le Goater, 2023/10/06
- Re: [PULL 00/21] vfio queue, Cédric Le Goater, 2023/10/06