[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v4 11/24] vfio/container: Introduce vfio_[attach/detach]_devi
From: |
Zhenzhong Duan |
Subject: |
[RFC PATCH v4 11/24] vfio/container: Introduce vfio_[attach/detach]_device |
Date: |
Wed, 12 Jul 2023 15:25:15 +0800 |
From: Eric Auger <eric.auger@redhat.com>
We want the VFIO devices to be able to use two different
IOMMU callbacks, the legacy VFIO one and the new iommufd one.
Introduce vfio_[attach/detach]_device which aim at hiding the
underlying IOMMU backend (IOCTLs, datatypes, ...).
Once vfio_attach_device completes, the device is attached
to a security context and its fd can be used. Conversely
When vfio_detach_device completes, the device has been
detached to the security context.
In this patch, only the vfio-pci device gets converted to use
the new API. Subsequent patches will handle other devices.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
---
hw/vfio/container.c | 70 +++++++++++++++++++++++++++++++++++
hw/vfio/pci.c | 50 +++----------------------
include/hw/vfio/vfio-common.h | 3 ++
3 files changed, 78 insertions(+), 45 deletions(-)
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index f45a2f6e66..23b9d5a901 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -1008,6 +1008,8 @@ int vfio_get_device(VFIOGroup *group, const char *name,
void vfio_put_base_device(VFIODevice *vbasedev)
{
+ g_free(vbasedev->name);
+
if (!vbasedev->group) {
return;
}
@@ -1116,6 +1118,74 @@ int vfio_eeh_as_op(AddressSpace *as, uint32_t op)
return vfio_eeh_container_op(container, op);
}
+static int vfio_device_groupid(VFIODevice *vbasedev, Error **errp)
+{
+ char *tmp, group_path[PATH_MAX], *group_name;
+ int ret, groupid;
+ ssize_t len;
+
+ tmp = g_strdup_printf("%s/iommu_group", vbasedev->sysfsdev);
+ len = readlink(tmp, group_path, sizeof(group_path));
+ g_free(tmp);
+
+ if (len <= 0 || len >= sizeof(group_path)) {
+ ret = len < 0 ? -errno : -ENAMETOOLONG;
+ error_setg_errno(errp, -ret, "no iommu_group found");
+ return ret;
+ }
+
+ group_path[len] = 0;
+
+ group_name = basename(group_path);
+ if (sscanf(group_name, "%d", &groupid) != 1) {
+ error_setg_errno(errp, errno, "failed to read %s", group_path);
+ return -errno;
+ }
+ return groupid;
+}
+
+int vfio_attach_device(char *name, VFIODevice *vbasedev,
+ AddressSpace *as, Error **errp)
+{
+ int groupid = vfio_device_groupid(vbasedev, errp);
+ VFIODevice *vbasedev_iter;
+ VFIOGroup *group;
+ int ret;
+
+ if (groupid < 0) {
+ return groupid;
+ }
+
+ trace_vfio_realize(vbasedev->name, groupid);
+ group = vfio_get_group(groupid, as, errp);
+ if (!group) {
+ return -1;
+ }
+
+ QLIST_FOREACH(vbasedev_iter, &group->device_list, next) {
+ if (strcmp(vbasedev_iter->name, vbasedev->name) == 0) {
+ error_setg(errp, "device is already attached");
+ vfio_put_group(group);
+ return -1;
+ }
+ }
+ ret = vfio_get_device(group, name, vbasedev, errp);
+ if (ret) {
+ vfio_put_group(group);
+ return -1;
+ }
+
+ return 0;
+}
+
+void vfio_detach_device(VFIODevice *vbasedev)
+{
+ VFIOGroup *group = vbasedev->group;
+
+ vfio_put_base_device(vbasedev);
+ vfio_put_group(group);
+}
+
static void vfio_iommu_backend_legacy_ops_class_init(ObjectClass *oc,
void *data) {
VFIOIOMMUBackendOpsClass *ops = VFIO_IOMMU_BACKEND_OPS_CLASS(oc);
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index a205c6b113..43e4da9bff 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -2828,10 +2828,9 @@ static void vfio_populate_device(VFIOPCIDevice *vdev,
Error **errp)
static void vfio_put_device(VFIOPCIDevice *vdev)
{
- g_free(vdev->vbasedev.name);
g_free(vdev->msix);
- vfio_put_base_device(&vdev->vbasedev);
+ vfio_detach_device(&vdev->vbasedev);
}
static void vfio_err_notifier_handler(void *opaque)
@@ -2978,13 +2977,9 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
{
VFIOPCIDevice *vdev = VFIO_PCI(pdev);
VFIODevice *vbasedev = &vdev->vbasedev;
- VFIODevice *vbasedev_iter;
- VFIOGroup *group;
- char *tmp, *subsys, group_path[PATH_MAX], *group_name;
+ char *tmp, *subsys;
Error *err = NULL;
- ssize_t len;
struct stat st;
- int groupid;
int i, ret;
bool is_mdev;
char uuid[UUID_FMT_LEN];
@@ -3015,39 +3010,6 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
vbasedev->type = VFIO_DEVICE_TYPE_PCI;
vbasedev->dev = DEVICE(vdev);
- tmp = g_strdup_printf("%s/iommu_group", vbasedev->sysfsdev);
- len = readlink(tmp, group_path, sizeof(group_path));
- g_free(tmp);
-
- if (len <= 0 || len >= sizeof(group_path)) {
- error_setg_errno(errp, len < 0 ? errno : ENAMETOOLONG,
- "no iommu_group found");
- goto error;
- }
-
- group_path[len] = 0;
-
- group_name = basename(group_path);
- if (sscanf(group_name, "%d", &groupid) != 1) {
- error_setg_errno(errp, errno, "failed to read %s", group_path);
- goto error;
- }
-
- trace_vfio_realize(vbasedev->name, groupid);
-
- group = vfio_get_group(groupid, pci_device_iommu_address_space(pdev),
errp);
- if (!group) {
- goto error;
- }
-
- QLIST_FOREACH(vbasedev_iter, &group->device_list, next) {
- if (strcmp(vbasedev_iter->name, vbasedev->name) == 0) {
- error_setg(errp, "device is already attached");
- vfio_put_group(group);
- goto error;
- }
- }
-
/*
* Mediated devices *might* operate compatibly with discarding of RAM, but
* we cannot know for certain, it depends on whether the mdev vendor driver
@@ -3065,7 +3027,6 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
if (vbasedev->ram_block_discard_allowed && !is_mdev) {
error_setg(errp, "x-balloon-allowed only potentially compatible "
"with mdev devices");
- vfio_put_group(group);
goto error;
}
@@ -3076,10 +3037,10 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
name = g_strdup(vbasedev->name);
}
- ret = vfio_get_device(group, name, vbasedev, errp);
+ ret = vfio_attach_device(name, vbasedev,
+ pci_device_iommu_address_space(pdev), errp);
g_free(name);
if (ret) {
- vfio_put_group(group);
goto error;
}
@@ -3313,12 +3274,12 @@ out_teardown:
vfio_bars_exit(vdev);
error:
error_prepend(errp, VFIO_MSG_PREFIX, vbasedev->name);
+ vfio_detach_device(vbasedev);
}
static void vfio_instance_finalize(Object *obj)
{
VFIOPCIDevice *vdev = VFIO_PCI(obj);
- VFIOGroup *group = vdev->vbasedev.group;
vfio_display_finalize(vdev);
vfio_bars_finalize(vdev);
@@ -3332,7 +3293,6 @@ static void vfio_instance_finalize(Object *obj)
* g_free(vdev->igd_opregion);
*/
vfio_put_device(vdev);
- vfio_put_group(group);
}
static void vfio_exitfn(PCIDevice *pdev)
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index cd11ffa01b..f42aef2515 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -187,6 +187,9 @@ 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);
+int vfio_attach_device(char *name, VFIODevice *vbasedev,
+ AddressSpace *as, Error **errp);
+void vfio_detach_device(VFIODevice *vbasedev);
extern int vfio_kvm_device_fd;
--
2.34.1
- RE: [RFC PATCH v4 02/24] Update linux-header per VFIO device cdev v14, (continued)
[RFC PATCH v4 03/24] vfio/common: Move IOMMU agnostic helpers to a separate file, Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 04/24] vfio/common: Introduce vfio_container_add|del_section_window(), Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 05/24] vfio/common: Extract out vfio_kvm_device_[add/del]_fd, Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 07/24] vfio/common: Refactor vfio_viommu_preset() to be group agnostic, Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 06/24] vfio/common: Add a vfio device iterator, Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 09/24] vfio/common: Rename into as.c, Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 08/24] vfio/common: Move legacy VFIO backend code into separate container.c, Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 11/24] vfio/container: Introduce vfio_[attach/detach]_device,
Zhenzhong Duan <=
[RFC PATCH v4 12/24] vfio/platform: Use vfio_[attach/detach]_device, Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 10/24] vfio: Add base container, Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 15/24] vfio/container-base: Introduce [attach/detach]_device container callbacks, Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 14/24] vfio/ccw: Use vfio_[attach/detach]_device, Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 17/24] Add iommufd configure option, Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 13/24] vfio/ap: Use vfio_[attach/detach]_device, Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 18/24] backends/iommufd: Introduce the iommufd object, Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 16/24] vfio/as: Simplify vfio_viommu_preset(), Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 19/24] util/char_dev: Add open_cdev(), Zhenzhong Duan, 2023/07/12
[RFC PATCH v4 22/24] vfio/pci: Adapt vfio pci hot reset support with iommufd BE, Zhenzhong Duan, 2023/07/12