cleanup vfio iommu_group creation v4
Subsystems (9)
Hi Alex,
this series cleans up how iommu group are created in VFIO as well as various other lose ends around that. It sits on top of the
"Introduce vfio_pci_core subsystem"
series from Yishai
Changes since v3:
- restore the attribution to Jason for patch 1, which git-rebase lost
- fix a vfio vs iommu group counting issue that I added over Jasons original patch
- add comments describing the VFIO_EMULATED_IOMMU and VFIO_NO_IOMMU flags
- use the emulated iommu naming consistently in comments
- a spelling fix
Changes since v2:
- cosmetic changes to the code flow in vfio_group_find_or_alloc
- replace "mediated" with "emulated iommu"
- add a comment describing vfio_register_emulated_iommu_dev
- rebased on top of the "Introduce vfio_pci_core subsystem" series
Changes since v1:
- only taint if a noiommu group was successfully created
Diffstat:
drivers/vfio/fsl-mc/vfio_fsl_mc.c | 17 - drivers/vfio/mdev/mdev_driver.c | 46 ---- drivers/vfio/mdev/vfio_mdev.c | 2 drivers/vfio/pci/vfio_pci_core.c | 13 - drivers/vfio/platform/vfio_platform_common.c | 13 - drivers/vfio/vfio.c | 306 ++++++++++++--------------- drivers/vfio/vfio.h | 63 +++++ drivers/vfio/vfio_iommu_spapr_tce.c | 6 drivers/vfio/vfio_iommu_type1.c | 255 ++++++---------------- include/linux/mdev.h | 20 - include/linux/vfio.h | 53 ---- samples/vfio-mdev/mbochs.c | 2 samples/vfio-mdev/mdpy.c | 2 samples/vfio-mdev/mtty.c | 2 14 files changed, 292 insertions(+), 508 deletions(-)
PATCH 1/14 vfio: Move vfio_iommu_group_get() to vfio_register_group_dev()
From: Jason Gunthorpe <[email protected]>
We don't need to hold a reference to the group in the driver as well as obtain a reference to the same group as the first thing vfio_register_group_dev() does.
Since the drivers never use the group move this all into the core code.
--- drivers/vfio/fsl-mc/vfio_fsl_mc.c | 17 ++------- drivers/vfio/pci/vfio_pci_core.c | 13 ++----- drivers/vfio/platform/vfio_platform_common.c | 13 +------ drivers/vfio/vfio.c | 36 ++++++++------------ include/linux/vfio.h | 3 -- 5 files changed, 19 insertions(+), 63 deletions(-)
drivers/vfio/fsl-mc/vfio_fsl_mc.c +2 -15
@@ -505,22 +505,13 @@ static void vfio_fsl_uninit_device(struct vfio_fsl_mc_device *vdev)static int vfio_fsl_mc_probe (struct fsl_mc_device *mc_dev) { -struct iommu_group *group;struct vfio_fsl_mc_device *vdev;struct device *dev = &mc_dev->dev;int ret; - group =vfio_iommu_group_get (dev); -if (!group) { -dev_err (dev,"VFIO_FSL_MC: No IOMMU group\n" ); -return -EINVAL ; - } - vdev =kzalloc (sizeof (*vdev),GFP_KERNEL ); -if (!vdev) { - ret = -ENOMEM ; - goto out_group_put; - } +if (!vdev) +return -ENOMEM ;vfio_init_group_dev (&vdev->vdev, dev, &vfio_fsl_mc_ops); vdev->mc_dev = mc_dev;
@@ -556,8 +547,6 @@ static int vfio_fsl_mc_probe(struct fsl_mc_device *mc_dev) out_uninit:vfio_uninit_group_dev (&vdev->vdev);kfree (vdev); -out_group_put: -vfio_iommu_group_put (group, dev);return ret; }
@@ -574,8 +563,6 @@ static int vfio_fsl_mc_remove(struct fsl_mc_device *mc_dev)vfio_uninit_group_dev (&vdev->vdev);kfree (vdev); -vfio_iommu_group_put (mc_dev->dev.iommu_group, dev); -return 0 ; }
drivers/vfio/pci/vfio_pci_core.c +2 -11
@@ -1807,7 +1807,6 @@ EXPORT_SYMBOL_GPL(vfio_pci_core_uninit_device);int vfio_pci_core_register_device (struct vfio_pci_core_device *vdev) {struct pci_dev *pdev = vdev->pdev; -struct iommu_group *group;int ret;if (pdev->hdr_type !=PCI_HEADER_TYPE_NORMAL )
@@ -1826,10 +1825,6 @@ int vfio_pci_core_register_device(struct vfio_pci_core_device *vdev)return -EBUSY ; } - group =vfio_iommu_group_get (&pdev->dev); -if (!group) -return -EINVAL ; -if (pci_is_root_bus (pdev->bus)) { ret =vfio_assign_device_set (&vdev->vdev, vdev); }else if (!pci_probe_reset_slot (pdev->slot)) {
@@ -1843,10 +1838,10 @@ int vfio_pci_core_register_device(struct vfio_pci_core_device *vdev) }if (ret) - goto out_group_put; +return ret; ret =vfio_pci_vf_init (vdev);if (ret) - goto out_group_put; +return ret; ret =vfio_pci_vga_init (vdev);if (ret) goto out_vf;
@@ -1877,8 +1872,6 @@ int vfio_pci_core_register_device(struct vfio_pci_core_device *vdev)vfio_pci_set_power_state (vdev,PCI_D0 ); out_vf:vfio_pci_vf_uninit (vdev); -out_group_put: -vfio_iommu_group_put (group, &pdev->dev);return ret; }EXPORT_SYMBOL_GPL (vfio_pci_core_register_device);
@@ -1894,8 +1887,6 @@ void vfio_pci_core_unregister_device(struct vfio_pci_core_device *vdev)vfio_pci_vf_uninit (vdev);vfio_pci_vga_uninit (vdev); -vfio_iommu_group_put (pdev->dev.iommu_group, &pdev->dev); -if (!disable_idle_d3)vfio_pci_set_power_state (vdev,PCI_D0 ); }
drivers/vfio/platform/vfio_platform_common.c +1 -12
@@ -642,7 +642,6 @@ static int vfio_platform_of_probe(struct vfio_platform_device *vdev,int vfio_platform_probe_common (struct vfio_platform_device *vdev,struct device *dev) { -struct iommu_group *group;int ret;vfio_init_group_dev (&vdev->vdev, dev, &vfio_platform_ops);
@@ -663,24 +662,15 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev, goto out_uninit; } - group =vfio_iommu_group_get (dev); -if (!group) { -dev_err (dev,"No IOMMU group for device %s\n" , vdev->name); - ret = -EINVAL ; - goto put_reset; - } - ret =vfio_register_group_dev (&vdev->vdev);if (ret) - goto put_iommu; + goto put_reset;mutex_init (&vdev->igate);pm_runtime_enable (dev);return 0 ; -put_iommu: -vfio_iommu_group_put (group, dev); put_reset:vfio_platform_put_reset (vdev); out_uninit:
@@ -696,7 +686,6 @@ void vfio_platform_remove_common(struct vfio_platform_device *vdev)pm_runtime_disable (vdev->device);vfio_platform_put_reset (vdev);vfio_uninit_group_dev (&vdev->vdev); -vfio_iommu_group_put (vdev->vdev.dev->iommu_group, vdev->vdev.dev); }EXPORT_SYMBOL_GPL (vfio_platform_remove_common);
drivers/vfio/vfio.c +14 -22
@@ -169,15 +169,7 @@ static void vfio_release_device_set(struct vfio_device *device)xa_unlock (&vfio_device_set_xa); } -/* -* vfio_iommu_group_{get,put} are only intended for VFIO bus driver probe -* and remove functions, any use cases other than acquiring the first -* reference for the purpose of calling vfio_register_group_dev() or removing -* that symmetric reference after vfio_unregister_group_dev() should use the raw -* iommu_group_{get,put} functions. In particular, vfio_iommu_group_put() -* removes the device from the dummy group and cannot be nested. -*/ -struct iommu_group *vfio_iommu_group_get (struct device *dev) +static struct iommu_group *vfio_iommu_group_get (struct device *dev) {struct iommu_group *group;int __maybe_unused ret;
@@ -220,18 +212,6 @@ struct iommu_group *vfio_iommu_group_get(struct device *dev)return group; } -EXPORT_SYMBOL_GPL (vfio_iommu_group_get); - -void vfio_iommu_group_put (struct iommu_group *group,struct device *dev) -{ -#ifdef CONFIG_VFIO_NOIOMMU -if (iommu_group_get_iommudata (group) == &noiommu) -iommu_group_remove_device (dev); -#endif - -iommu_group_put (group); -} -EXPORT_SYMBOL_GPL (vfio_iommu_group_put);#ifdef CONFIG_VFIO_NOIOMMU static void *vfio_noiommu_open (unsigned long arg)
@@ -841,7 +821,7 @@ int vfio_register_group_dev(struct vfio_device *device)if (!device->dev_set)vfio_assign_device_set (device, device); - iommu_group =iommu_group_get (device->dev); + iommu_group =vfio_iommu_group_get (device->dev);if (!iommu_group)return -EINVAL ;
@@ -849,6 +829,10 @@ int vfio_register_group_dev(struct vfio_device *device)if (!group) { group =vfio_create_group (iommu_group);if (IS_ERR (group)) { +#ifdef CONFIG_VFIO_NOIOMMU +if (iommu_group_get_iommudata (iommu_group) == &noiommu) +iommu_group_remove_device (device->dev); +#endif iommu_group_put (iommu_group);return PTR_ERR (group); }
@@ -865,6 +849,10 @@ int vfio_register_group_dev(struct vfio_device *device)dev_WARN (device->dev,"Device already exists on group %d\n" ,iommu_group_id (iommu_group));vfio_device_put (existing_device); +#ifdef CONFIG_VFIO_NOIOMMU +if (iommu_group_get_iommudata (iommu_group) == &noiommu) +iommu_group_remove_device (device->dev); +#endif vfio_group_put (group);return -EBUSY ; }
@@ -1010,6 +998,10 @@ void vfio_unregister_group_dev(struct vfio_device *device)if (list_empty (&group->device_list))wait_event (group->container_q, !group->container); +#ifdef CONFIG_VFIO_NOIOMMU +if (iommu_group_get_iommudata (group) == &noiommu) +iommu_group_remove_device (dev); +#endif /* Matches the get in vfio_register_group_dev() */ vfio_group_put (group); }
include/linux/vfio.h +0 -3
@@ -71,9 +71,6 @@ struct vfio_device_ops {int (*match)(struct vfio_device *vdev,char *buf); }; -extern struct iommu_group *vfio_iommu_group_get (struct device *dev); -extern void vfio_iommu_group_put (struct iommu_group *group,struct device *dev); -void vfio_init_group_dev (struct vfio_device *device,struct device *dev,const struct vfio_device_ops *ops);void vfio_uninit_group_dev (struct vfio_device *device);
Signature · 1 line
2.30.2
RE: [PATCH 01/14] vfio: Move vfio_iommu_group_get() to vfio_register_group_dev()
Quoted 5 lines
From: Christoph Hellwig <[email protected]>
Sent: Thursday, August 26, 2021 9:34 PMFrom: Jason Gunthorpe <[email protected]>
Quoted 8 lines
We don't need to hold a reference to the group in the driver as well as obtain a reference to the same group as the first thing
vfio_register_group_dev()does.Since the drivers never use the group move this all into the core code.
Signed-off-by Jason Gunthorpe <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>
Quoted 281 lines
--- drivers/vfio/fsl-mc/vfio_fsl_mc.c | 17 ++------- drivers/vfio/pci/vfio_pci_core.c | 13 ++----- drivers/vfio/platform/vfio_platform_common.c | 13 +------ drivers/vfio/vfio.c | 36 ++++++++------------ include/linux/vfio.h | 3 -- 5 files changed, 19 insertions(+), 63 deletions(-)drivers/vfio/fsl- renamed from drivers/vfio/fsl-mc/vfio_fsl_mc.c +0
-0
mc/vfio_fsl_mc.c
index0ead91bfa83867..9e838fed560339100644drivers/vfio/fsl-mc/vfio_fsl_mc.c +2
-11@@ -505,22 +505,13 @@ static void vfio_fsl_uninit_device(struct vfio_fsl_mc_device *vdev)static int vfio_fsl_mc_probe (struct fsl_mc_device *mc_dev) { -struct iommu_group *group;struct vfio_fsl_mc_device *vdev;struct device *dev = &mc_dev->dev;int ret; - group =vfio_iommu_group_get (dev); -if (!group) { -dev_err (dev,"VFIO_FSL_MC: No IOMMU group\n" ); -return -EINVAL ; - } - vdev =kzalloc (sizeof (*vdev),GFP_KERNEL ); -if (!vdev) { - ret = -ENOMEM ; - goto out_group_put; - } +if (!vdev) +return -ENOMEM ;vfio_init_group_dev (&vdev->vdev, dev, &vfio_fsl_mc_ops);drivers/vfio/fsl-mc/vfio_fsl_mc.c +0
-4vdev->mc_dev = mc_dev;@@ -556,8 +547,6 @@ static int vfio_fsl_mc_probe(struct fsl_mc_device *mc_dev) out_uninit:vfio_uninit_group_dev (&vdev->vdev);kfree (vdev); -out_group_put: -vfio_iommu_group_put (group, dev);return ret; }@@ -574,8 +563,6 @@ static int vfio_fsl_mc_remove(struct fsl_mc_device *mc_dev)vfio_uninit_group_dev (&vdev->vdev);kfree (vdev); -vfio_iommu_group_put (mc_dev->dev.iommu_group, dev); -return 0 ; }drivers/vfio/pci/vfio_pci_core.c +0
-1@@ -1807,7 +1807,6 @@EXPORT_SYMBOL_GPL (vfio_pci_core_uninit_device);int vfio_pci_core_register_device (struct vfio_pci_core_device *vdev) {struct pci_dev *pdev = vdev->pdev; -struct iommu_group *group;int ret;drivers/vfio/pci/vfio_pci_core.c +0
-4if (pdev->hdr_type !=PCI_HEADER_TYPE_NORMAL )@@ -1826,10 +1825,6 @@ int vfio_pci_core_register_device(struct vfio_pci_core_device *vdev)return -EBUSY ; } - group =vfio_iommu_group_get (&pdev->dev); -if (!group) -return -EINVAL ; -if (pci_is_root_bus (pdev->bus)) { ret =vfio_assign_device_set (&vdev->vdev, vdev);drivers/vfio/pci/vfio_pci_core.c +2
-2}else if (!pci_probe_reset_slot (pdev->slot)) {@@ -1843,10 +1838,10 @@ int vfio_pci_core_register_device(struct vfio_pci_core_device *vdev) }if (ret) - goto out_group_put; +return ret; ret =vfio_pci_vf_init (vdev);if (ret) - goto out_group_put; +return ret; ret =vfio_pci_vga_init (vdev);if (ret)drivers/vfio/pci/vfio_pci_core.c +0
-2goto out_vf;@@ -1877,8 +1872,6 @@ int vfio_pci_core_register_device(struct vfio_pci_core_device *vdev)vfio_pci_set_power_state (vdev ,PCI_D0 ); out_vf:vfio_pci_vf_uninit (vdev); -out_group_put: -vfio_iommu_group_put (group, &pdev->dev);return ret; }
EXPORT_SYMBOL_GPL(vfio_pci_core_register_device);drivers/vfio/pci/vfio_pci_core.c +0
-2@@ -1894,8 +1887,6 @@ void vfio_pci_core_unregister_device(struct vfio_pci_core_device *vdev)vfio_pci_vf_uninit (vdev );vfio_pci_vga_uninit (vdev); -vfio_iommu_group_put (pdev->dev.iommu_group, &pdev->dev); -if (!disable_idle_d3)vfio_pci_set_power_state (vdev,PCI_D0 );}
drivers/vfio/platform/vfio_platform_common.c +0
-1@@ -642,7 +642,6 @@ static int vfio_platform_of_probe(structvfio_platform_device *vdev, int vfio_platform_probe_common(struct vfio_platform_device *vdev, struct device *dev) { - struct iommu_group *group; int ret;drivers/vfio/platform/vfio_platform_common.c +1
-10vfio_init_group_dev (&vdev->vdev, dev, &vfio_platform_ops);@@ -663,24 +662,15 @@ int vfio_platform_probe_common(structvfio_platform_device *vdev, goto out_uninit; } - group =vfio_iommu_group_get (dev); -if (!group) { -dev_err (dev,"No IOMMU group for device %s\n" , vdev- >name); - ret = -EINVAL ; - goto put_reset; - } - ret =vfio_register_group_dev (&vdev->vdev);if (ret) - goto put_iommu; + goto put_reset;mutex_init (&vdev->igate);pm_runtime_enable (dev);return 0 ; -put_iommu: -vfio_iommu_group_put (group, dev); put_reset:drivers/vfio/platform/vfio_platform_common.c +0
-1vfio_platform_put_reset (vdev); out_uninit:@@ -696,7 +686,6 @@ void vfio_platform_remove_common(struct vfio_platform_device *vdev) pm_runtime_disable(vdev->device);vfio_platform_put_reset (vdev);vfio_uninit_group_dev (&vdev->vdev); -vfio_iommu_group_put (vdev->vdev.dev->iommu_group, vdev- >vdev.dev); }
EXPORT_SYMBOL_GPL(vfio_platform_remove_common);drivers/vfio/vfio.c +0
-4@@ -169,15 +169,7 @@ static void vfio_release_device_set(struct vfio_device *device) xa_unlock(&vfio_device_set_xa); } -/* -* vfio_iommu_group_{get,put} are only intended for VFIO bus driver probe -* and remove functions, any use cases other than acquiring the first -* reference for the purpose of calling vfio_register_group_dev() or removing
- * that symmetric reference aftervfio_unregister_group_dev()should use the raw
- * iommu_group_{get,put} functions. In particular,vfio_iommu_group_put()
- * removes the device from the dummy group and cannot be nested.
- */drivers/vfio/vfio.c +1
-13-struct iommu_group *vfio_iommu_group_get (struct device *dev) +static struct iommu_group *vfio_iommu_group_get (struct device *dev) {struct iommu_group *group;int __maybe_unused ret;@@ -220,18 +212,6 @@ struct iommu_group *vfio_iommu_group_get(struct device *dev)return group; } -EXPORT_SYMBOL_GPL (vfio_iommu_group_get); - -void vfio_iommu_group_put (struct iommu_group *group,struct device *dev) -{ -#ifdef CONFIG_VFIO_NOIOMMU -if (iommu_group_get_iommudata (group) == &noiommu) -iommu_group_remove_device (dev); -#endif - -iommu_group_put (group); -} -EXPORT_SYMBOL_GPL (vfio_iommu_group_put);#ifdef
CONFIG_VFIO_NOIOMMU
static void *vfio_noiommu_open(unsigned long arg)drivers/vfio/vfio.c +5
-1@@ -841,7 +821,7 @@ int vfio_register_group_dev(struct vfio_device *device)if (!device->dev_set)vfio_assign_device_set (device, device); - iommu_group =iommu_group_get (device->dev); + iommu_group =vfio_iommu_group_get (device->dev);if (!iommu_group)return -EINVAL ;@@ -849,6 +829,10 @@ int vfio_register_group_dev(struct vfio_device *device)if (!group) { group =vfio_create_group (iommu_group);if (IS_ERR (group)) { +#ifdef CONFIG_VFIO_NOIOMMU +if (iommu_group_get_iommudata (iommu_group) == &noiommu) +iommu_group_remove_device (device->dev); +#endif iommu_group_put (iommu_group);drivers/vfio/vfio.c +4
-0return PTR_ERR (group); }@@ -865,6 +849,10 @@ int vfio_register_group_dev(struct vfio_device *device) dev_WARN(device->dev, "Device already exists on group %d\n", iommu_group_id(iommu_group));vfio_device_put (existing_device); +#ifdef CONFIG_VFIO_NOIOMMU +if (iommu_group_get_iommudata (iommu_group) == &noiommu) +iommu_group_remove_device (device->dev); +#endif drivers/vfio/vfio.c +4
-0vfio_group_put (group);return -EBUSY ; }@@ -1010,6 +998,10 @@ void vfio_unregister_group_dev(struct vfio_device *device)if (list_empty (&group->device_list))wait_event (group->container_q, !group->container); +#ifdef CONFIG_VFIO_NOIOMMU +if (iommu_group_get_iommudata (group) == &noiommu) +iommu_group_remove_device (dev); +#endif /* Matches the get in vfio_register_group_dev() */ vfio_group_put (group);}
include/linux/vfio.h +0
-3@@ -71,9 +71,6 @@ struct vfio_device_ops {int (*match)(struct vfio_device *vdev,char *buf); }; -extern struct iommu_group *vfio_iommu_group_get (struct device *dev); -extern void vfio_iommu_group_put (struct iommu_group *group,struct device *dev); -void vfio_init_group_dev (struct vfio_device *device,struct device *dev,const struct vfio_device_ops *ops);void
vfio_uninit_group_dev(struct vfio_device *device);
--
2.30.2
PATCH 2/14 vfio: factor out a vfio_iommu_driver_allowed helper
In reply to Christoph HellwigFactor out a little helper to make the checks for the noiommu driver less ugly.
--- drivers/vfio/vfio.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-)
drivers/vfio/vfio.c +19 -14
@@ -257,8 +257,23 @@ static const struct vfio_iommu_driver_ops vfio_noiommu_ops = { .attach_group = vfio_noiommu_attach_group, .detach_group = vfio_noiommu_detach_group, }; -#endif +/* +* Only noiommu containers can use vfio-noiommu and noiommu containers can only +* use vfio-noiommu. +*/ +static inline bool vfio_iommu_driver_allowed (struct vfio_container *container, +const struct vfio_iommu_driver *driver) +{ +return container->noiommu == (driver->ops == &vfio_noiommu_ops); +} +#else +static inline bool vfio_iommu_driver_allowed (struct vfio_container *container, +const struct vfio_iommu_driver *driver) +{ +return true; +} +#endif /* CONFIG_VFIO_NOIOMMU */ /** * IOMMU driver registration
@@ -1034,13 +1049,10 @@ static long vfio_ioctl_check_extension(struct vfio_container *container,list_for_each_entry (driver, &vfio.iommu_drivers_list, vfio_next) { -#ifdef CONFIG_VFIO_NOIOMMU if (!list_empty (&container->group_list) && - (container->noiommu != - (driver->ops == &vfio_noiommu_ops))) + !vfio_iommu_driver_allowed (container, + driver))continue ; -#endif -if (!try_module_get (driver->ops->owner))continue ;
@@ -1112,15 +1124,8 @@ static long vfio_ioctl_set_iommu(struct vfio_container *container,list_for_each_entry (driver, &vfio.iommu_drivers_list, vfio_next) {void *data; -#ifdef CONFIG_VFIO_NOIOMMU -/* -* Only noiommu containers can use vfio-noiommu and noiommu -* containers can only use vfio-noiommu. -*/ -if (container->noiommu != (driver->ops == &vfio_noiommu_ops)) +if (!vfio_iommu_driver_allowed (container, driver))continue ; -#endif -if (!try_module_get (driver->ops->owner))continue ;
Signature · 1 line
2.30.2
PATCH 3/14 vfio: remove the iommudata check in vfio_noiommu_attach_group
In reply to Christoph Hellwigvfio_noiommu_attach_group has two callers:
1) __vfio_container_attach_groups is called by vfio_ioctl_set_iommu, which just called vfio_iommu_driver_allowed
2) vfio_group_set_container requires already checks ->noiommu on the vfio_group, which is propagated from the iommudata in vfio_create_group
so this check is entirely superflous and can be removed.
--- drivers/vfio/vfio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vfio/vfio.c +1 -1
@@ -240,7 +240,7 @@ static long vfio_noiommu_ioctl(void *iommu_data,static int vfio_noiommu_attach_group (void *iommu_data,struct iommu_group *iommu_group) { -return iommu_group_get_iommudata (iommu_group) == &noiommu ?0 : -EINVAL ; +return 0 ; } static void vfio_noiommu_detach_group(void *iommu_data,
Signature · 1 line
2.30.2
PATCH 4/14 vfio: factor out a vfio_group_find_or_alloc helper
In reply to Christoph HellwigFactor out a helper to find or allocate the vfio_group to reduce the spagetthi code in vfio_register_group_dev a little.
--- drivers/vfio/vfio.c | 59 ++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 25 deletions(-)
drivers/vfio/vfio.c +34 -25
@@ -823,10 +823,38 @@ void vfio_uninit_group_dev(struct vfio_device *device) }EXPORT_SYMBOL_GPL (vfio_uninit_group_dev); +struct vfio_group *vfio_group_find_or_alloc (struct device *dev) +{ +struct iommu_group *iommu_group; +struct vfio_group *group; + + iommu_group =vfio_iommu_group_get (dev); +if (!iommu_group) +return ERR_PTR (-EINVAL ); + +/* a found vfio_group already holds a reference to the iommu_group */ + group =vfio_group_get_from_iommu (iommu_group); +if (group) + goto out_put; + +/* a newly created vfio_group keeps the reference. */ + group =vfio_create_group (iommu_group); +if (IS_ERR (group)) + goto out_put; +return group; + +out_put: +#ifdef CONFIG_VFIO_NOIOMMU +if (iommu_group_get_iommudata (iommu_group) == &noiommu) +iommu_group_remove_device (dev); +#endif +iommu_group_put (iommu_group); +return group; +} +int vfio_register_group_dev (struct vfio_device *device) {struct vfio_device *existing_device; -struct iommu_group *iommu_group;struct vfio_group *group;/*
@@ -836,36 +864,17 @@ int vfio_register_group_dev(struct vfio_device *device)if (!device->dev_set)vfio_assign_device_set (device, device); - iommu_group =vfio_iommu_group_get (device->dev); -if (!iommu_group) -return -EINVAL ; - - group =vfio_group_get_from_iommu (iommu_group); -if (!group) { - group =vfio_create_group (iommu_group); -if (IS_ERR (group)) { -#ifdef CONFIG_VFIO_NOIOMMU -if (iommu_group_get_iommudata (iommu_group) == &noiommu) -iommu_group_remove_device (device->dev); -#endif -iommu_group_put (iommu_group); -return PTR_ERR (group); - } - }else { -/* -* A found vfio_group already holds a reference to the -* iommu_group. A created vfio_group keeps the reference. -*/ -iommu_group_put (iommu_group); - } + group =vfio_group_find_or_alloc (device->dev); +if (IS_ERR (group)) +return PTR_ERR (group); existing_device =vfio_group_get_device (group, device->dev);if (existing_device) {dev_WARN (device->dev,"Device already exists on group %d\n" , -iommu_group_id (iommu_group)); +iommu_group_id (group->iommu_group));vfio_device_put (existing_device);#ifdef CONFIG_VFIO_NOIOMMU -if (iommu_group_get_iommudata (iommu_group) == &noiommu) +if (iommu_group_get_iommudata (group->iommu_group) == &noiommu)iommu_group_remove_device (device->dev);#endif vfio_group_put (group);
Signature · 1 line
2.30.2
Re: [PATCH 04/14] vfio: factor out a vfio_group_find_or_alloc helper
Quoted 32 lines · On Thu, 26 Aug 2021 15:34:14 +0200 Christoph Hellwig <[email protected]> wrote:
Factor out a helper to find or allocate the
vfio_groupto reduce the spagetthi code invfio_register_group_deva little.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Jason Gunthorpe <[email protected]>--- drivers/vfio/vfio.c | 59 ++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 25 deletions(-)drivers/vfio/vfio.c +15
-0@@ -823,10 +823,38 @@ void vfio_uninit_group_dev(struct vfio_device *device) }EXPORT_SYMBOL_GPL (vfio_uninit_group_dev); +struct vfio_group *vfio_group_find_or_alloc (struct device *dev) +{ +struct iommu_group *iommu_group; +struct vfio_group *group; + + iommu_group =vfio_iommu_group_get (dev); +if (!iommu_group) +return ERR_PTR (-EINVAL ); + +/* a found vfio_group already holds a reference to the iommu_group */ + group =vfio_group_get_from_iommu (iommu_group); +if (group) + goto out_put; + +/* a newly created vfio_group keeps the reference. */
drivers/vfio/vfio.c void vfio_uninit_group_dev(struct vfio_device *device) · line 850
Quoted 10 lines
drivers/vfio/vfio.c +10
-0+ group =vfio_create_group (iommu_group); +if (IS_ERR (group)) + goto out_put; +return group; + +out_put: +#ifdef CONFIG_VFIO_NOIOMMU +if (iommu_group_get_iommudata (iommu_group) == &noiommu) +iommu_group_remove_device (dev); +#endif
When we get here via the first goto above, it doesn't match the code we're removing below. I stared at the below logic from patch 01 for a while and came to the conclusion that the only way we take that else branch is if the iommu_group already existed and was not created because how else could we find a vfio group for that iommu group otherwise? Therefore we only put the iommu group reference without removing the device, because we didn't add the device.
The above assumes we created the iommu group and added the device. So I think there needs to be a separate goto target below that's reached in place of the first goto above. Thanks,
Alex
Quoted 53 lines
drivers/vfio/vfio.c +9
-25+iommu_group_put (iommu_group); +return group; +} +int vfio_register_group_dev (struct vfio_device *device) {struct vfio_device *existing_device; -struct iommu_group *iommu_group;struct vfio_group *group;/* @@ -836,36 +864,17 @@ int vfio_register_group_dev(struct vfio_device *device)if (!device->dev_set)vfio_assign_device_set (device, device); - iommu_group =vfio_iommu_group_get (device->dev); -if (!iommu_group) -return -EINVAL ; - - group =vfio_group_get_from_iommu (iommu_group); -if (!group) { - group =vfio_create_group (iommu_group); -if (IS_ERR (group)) { -#ifdef CONFIG_VFIO_NOIOMMU -if (iommu_group_get_iommudata (iommu_group) == &noiommu) -iommu_group_remove_device (device->dev); -#endif -iommu_group_put (iommu_group); -return PTR_ERR (group); - } - }else { -/* -* A found vfio_group already holds a reference to the -* iommu_group. A created vfio_group keeps the reference. -*/ -iommu_group_put (iommu_group); - } + group =vfio_group_find_or_alloc (device->dev); +if (IS_ERR (group)) +return PTR_ERR (group); existing_device =vfio_group_get_device (group, device->dev);if (existing_device) {dev_WARN (device->dev,"Device already exists on group %d\n" , -iommu_group_id (iommu_group)); +iommu_group_id (group->iommu_group));vfio_device_put (existing_device);#ifdef CONFIG_VFIO_NOIOMMU -if (iommu_group_get_iommudata (iommu_group) == &noiommu) +if (iommu_group_get_iommudata (group->iommu_group) == &noiommu)iommu_group_remove_device (device->dev);#endif vfio_group_put (group);
Re: [PATCH 04/14] vfio: factor out a vfio_group_find_or_alloc helper
Quoted 38 lines · Alex Williamson
Quoted 35 lines · On Thu, 26 Aug 2021 15:34:14 +0200 Christoph Hellwig <[email protected]> wrote:
Factor out a helper to find or allocate the
vfio_groupto reduce the spagetthi code invfio_register_group_deva little.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Jason Gunthorpe <[email protected]>drivers/vfio/vfio.c | 59 ++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 25 deletions(-)drivers/vfio/vfio.c +21
-0+++ b/drivers/vfio/vfio.c@@ -823,10 +823,38 @@ void vfio_uninit_group_dev(struct vfio_device *device) }EXPORT_SYMBOL_GPL (vfio_uninit_group_dev); +struct vfio_group *vfio_group_find_or_alloc (struct device *dev) +{ +struct iommu_group *iommu_group; +struct vfio_group *group; + + iommu_group =vfio_iommu_group_get (dev); +if (!iommu_group) +return ERR_PTR (-EINVAL ); + +/* a found vfio_group already holds a reference to the iommu_group */ + group =vfio_group_get_from_iommu (iommu_group); +if (group) + goto out_put; + +/* a newly created vfio_group keeps the reference. */ + group =vfio_create_group (iommu_group); +if (IS_ERR (group)) + goto out_put; +return group; +
Quoted 8 lines
drivers/vfio/vfio.c void vfio_uninit_group_dev(struct vfio_device *device) · line 850
Quoted 5 lines
drivers/vfio/vfio.c +5
-0+out_put: +#ifdef CONFIG_VFIO_NOIOMMU +if (iommu_group_get_iommudata (iommu_group) == &noiommu) +iommu_group_remove_device (dev); +#endif When we get here via the first goto above, it doesn't match the code we're removing below.
If we are in noiommu mode then the group is a new singleton group and vfio_group_get_from_iommu() cannot succeed, so the out_put cannot trigger for the noiommu path.
This is all improved in patch 6 where the logic becomes clear:
+ iommu_group = iommu_group_get(dev);
+#ifdef CONFIG_VFIO_NOIOMMU
+ if (!iommu_group && noiommu && !iommu_present(dev->bus)) {
+ /*
+ * With noiommu enabled, create an IOMMU group for devices that
+ * don't already have one and don't have an iommu_ops on their
+ * bus. Taint the kernel because we're about to give a DMA
+ * capable device to a user without IOMMU protection.
+ */
+ group = vfio_noiommu_group_alloc(dev);
+ if (group) {
+ add_taint(TAINT_USER, LOCKDEP_STILL_OK);
+ dev_warn(dev, "Adding kernel taint for vfio-noiommu group on device\n");
+ }
+ return group;
Eg we never do a pointless vfio_group_get_from_iommu() on a no-iommu group in the first place, we just create everything directly.
It would be fine to add an extra label and then remove it in patch 6, but it is also fine this way and properly cleaned by the end.
Jason
RE: [PATCH 04/14] vfio: factor out a vfio_group_find_or_alloc helper
Quoted 53 lines
From: Jason Gunthorpe <[email protected]>
Sent: Friday, August 27, 2021 7:36 AMQuoted 11 lines · Alex Williamson
Quoted 8 lines · On Thu, 26 Aug 2021 15:34:14 +0200 Christoph Hellwig <[email protected]> wrote:
Factor out a helper to find or allocate the
vfio_groupto reduce the spagetthi code invfio_register_group_deva little.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Jason Gunthorpe <[email protected]>drivers/vfio/vfio.c | 59 ++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 25 deletions(-)Quoted 4 lines
drivers/vfio/vfio.c void vfio_uninit_group_dev(struct vfio_device
Quoted 4 lines
drivers/vfio/vfio.c +1
-0+++ b/drivers/vfio/vfio.c@@ -823,10 +823,38 @@ void vfio_uninit_group_dev(struct vfio_device*device)
Quoted 13 lines
drivers/vfio/vfio.c void vfio_uninit_group_dev(struct vfio_device *device)
Quoted 13 lines
drivers/vfio/vfio.c +10
-0}EXPORT_SYMBOL_GPL (vfio_uninit_group_dev); +struct vfio_group *vfio_group_find_or_alloc (struct device *dev) +{ +struct iommu_group *iommu_group; +struct vfio_group *group; + + iommu_group =vfio_iommu_group_get (dev); +if (!iommu_group) +return ERR_PTR (-EINVAL ); + +/* a found vfio_group already holds a reference to the iommu_group */
Quoted 10 lines
Quoted 10 lines
drivers/vfio/vfio.c +10
-0+ group =vfio_group_get_from_iommu (iommu_group); +if (group) + goto out_put; + +/* a newly created vfio_group keeps the reference. */ + group =vfio_create_group (iommu_group); +if (IS_ERR (group)) + goto out_put; +return group; +Quoted 8 lines
drivers/vfio/vfio.c void vfio_uninit_group_dev(struct vfio_device *device) · line 850
Quoted 5 lines
drivers/vfio/vfio.c +5
-0+out_put: +#ifdef CONFIG_VFIO_NOIOMMU +if (iommu_group_get_iommudata (iommu_group) == &noiommu) +iommu_group_remove_device (dev); +#endif When we get here via the first goto above, it doesn't match the code we're removing below.
Quoted 5 lines
If we are in noiommu mode then the group is a new singleton group and
vfio_group_get_from_iommu()cannot succeed, so theout_putcannot trigger for the noiommu path.This is all improved in patch 6 where the logic becomes clear:
patch 5. 😊
Quoted 20 lines
(quoted diff) +5
-0+ iommu_group = iommu_group_get(dev); +#ifdef CONFIG_VFIO_NOIOMMU + if (!iommu_group && noiommu && !iommu_present(dev->bus)) { + /* + * With noiommu enabled, create an IOMMU group fordevices that
(quoted diff) +1
-0+ * don't already have one and don't have an iommu_ops ontheir
(quoted diff) +7
-0+ * bus. Taint the kernel because we're about to give a DMA + * capable device to a user without IOMMU protection. + */ + group = vfio_noiommu_group_alloc(dev); + if (group) { + add_taint(TAINT_USER, LOCKDEP_STILL_OK); + dev_warn(dev, "Adding kernel taint for vfio-noiommu group on device\n");
(quoted diff) +2
-0+ } + return group;
Quoted 6 lines
Eg we never do a pointless
vfio_group_get_from_iommu()on a no-iommu group in the first place, we just create everything directly.It would be fine to add an extra label and then remove it in patch 6, but it is also fine this way and properly cleaned by the end.
either way is fine as no function is broken in bisect with above explanation. but my slight preference is to add the label as it does make this patch clearer for other reviewers (or with a simple explanation in the commit msg).
Thanks
Kevin
Re: [PATCH 04/14] vfio: factor out a vfio_group_find_or_alloc helper
In reply to Jason GunthorpeQuoted 70 lines · On Thu, 26 Aug 2021 20:35:58 -0300 Jason Gunthorpe <[email protected]> wrote:
Quoted 38 lines · Alex Williamson
Quoted 35 lines · On Thu, 26 Aug 2021 15:34:14 +0200 Christoph Hellwig <[email protected]> wrote:
Factor out a helper to find or allocate the
vfio_groupto reduce the spagetthi code invfio_register_group_deva little.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Jason Gunthorpe <[email protected]>drivers/vfio/vfio.c | 59 ++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 25 deletions(-)drivers/vfio/vfio.c +21
-0+++ b/drivers/vfio/vfio.c@@ -823,10 +823,38 @@ void vfio_uninit_group_dev(struct vfio_device *device) }EXPORT_SYMBOL_GPL (vfio_uninit_group_dev); +struct vfio_group *vfio_group_find_or_alloc (struct device *dev) +{ +struct iommu_group *iommu_group; +struct vfio_group *group; + + iommu_group =vfio_iommu_group_get (dev); +if (!iommu_group) +return ERR_PTR (-EINVAL ); + +/* a found vfio_group already holds a reference to the iommu_group */ + group =vfio_group_get_from_iommu (iommu_group); +if (group) + goto out_put; + +/* a newly created vfio_group keeps the reference. */ + group =vfio_create_group (iommu_group); +if (IS_ERR (group)) + goto out_put; +return group; +Quoted 8 lines
drivers/vfio/vfio.c void vfio_uninit_group_dev(struct vfio_device *device) · line 850
Quoted 5 lines
drivers/vfio/vfio.c +5
-0+out_put: +#ifdef CONFIG_VFIO_NOIOMMU +if (iommu_group_get_iommudata (iommu_group) == &noiommu) +iommu_group_remove_device (dev); +#endif When we get here via the first goto above, it doesn't match the code we're removing below.
If we are in noiommu mode then the group is a new singleton group and
vfio_group_get_from_iommu()cannot succeed, so theout_putcannot trigger for the noiommu path.This is all improved in patch 6 where the logic becomes clear:
(quoted diff) +15
-0+ iommu_group = iommu_group_get(dev); +#ifdef CONFIG_VFIO_NOIOMMU + if (!iommu_group && noiommu && !iommu_present(dev->bus)) { + /* + * With noiommu enabled, create an IOMMU group for devices that + * don't already have one and don't have an iommu_ops on their + * bus. Taint the kernel because we're about to give a DMA + * capable device to a user without IOMMU protection. + */ + group = vfio_noiommu_group_alloc(dev); + if (group) { + add_taint(TAINT_USER, LOCKDEP_STILL_OK); + dev_warn(dev, "Adding kernel taint for vfio-noiommu group on device\n"); + } + return group;
Quoted 5 lines
Eg we never do a pointless
vfio_group_get_from_iommu()on a no-iommu group in the first place, we just create everything directly.It would be fine to add an extra label and then remove it in patch 6, but it is also fine this way and properly cleaned by the end.
I agree that it's resolved later in the series, but it's confusing here, particularly because in patch 1 we need to come to the conclusion that path is unreachable, thus the different return paths, then we ignore it here with a common exit. Thanks,
Alex
PATCH 5/14 vfio: refactor noiommu group creation
In reply to Christoph HellwigSplit the actual noiommu group creation from vfio_iommu_group_get into a new helper, and open code the rest of vfio_iommu_group_get in its only caller. This creates an entirely separate and clear code path for the noiommu group creation.
--- drivers/vfio/vfio.c | 101 ++++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 50 deletions(-)
drivers/vfio/vfio.c +51 -50
@@ -169,50 +169,6 @@ static void vfio_release_device_set(struct vfio_device *device)xa_unlock (&vfio_device_set_xa); } -static struct iommu_group *vfio_iommu_group_get (struct device *dev) -{ -struct iommu_group *group; -int __maybe_unused ret; - - group =iommu_group_get (dev); - -#ifdef CONFIG_VFIO_NOIOMMU -/* -* With noiommu enabled, an IOMMU group will be created for a device -* that doesn't already have one and doesn't have an iommu_ops on their -* bus. We set iommudata simply to be able to identify these groups -* as special use and for reclamation later. -*/ -if (group || !noiommu ||iommu_present (dev->bus)) -return group; - - group =iommu_group_alloc (); -if (IS_ERR (group)) -return NULL ; - -iommu_group_set_name (group,"vfio-noiommu" ); -iommu_group_set_iommudata (group, &noiommu,NULL ); - ret =iommu_group_add_device (group, dev); -if (ret) { -iommu_group_put (group); -return NULL ; - } - -/* -* Where to taint? At this point we've added an IOMMU group for a -* device that is not backed by iommu_ops, therefore any iommu_ -* callback using iommu_ops can legitimately Oops. So, while we may -* be about to give a DMA capable device to a user without IOMMU -* protection, which is clearly taint-worthy, let's go ahead and do -* it here. -*/ -add_taint (TAINT_USER ,LOCKDEP_STILL_OK ); -dev_warn (dev,"Adding kernel taint for vfio-noiommu group on device\n" ); -#endif - -return group; -} -#ifdef CONFIG_VFIO_NOIOMMU static void *vfio_noiommu_open (unsigned long arg) {
@@ -823,12 +779,61 @@ void vfio_uninit_group_dev(struct vfio_device *device) }EXPORT_SYMBOL_GPL (vfio_uninit_group_dev); -struct vfio_group *vfio_group_find_or_alloc (struct device *dev) +#ifdef CONFIG_VFIO_NOIOMMU +static struct vfio_group *vfio_noiommu_group_alloc (struct device *dev) {struct iommu_group *iommu_group;struct vfio_group *group; +int ret; + + iommu_group =iommu_group_alloc (); +if (IS_ERR (iommu_group)) +return ERR_CAST (iommu_group); - iommu_group =vfio_iommu_group_get (dev); +iommu_group_set_name (iommu_group,"vfio-noiommu" ); +iommu_group_set_iommudata (iommu_group, &noiommu,NULL ); + ret =iommu_group_add_device (iommu_group, dev); +if (ret) + goto out_put_group; + + group =vfio_create_group (iommu_group); +if (IS_ERR (group)) { + ret =PTR_ERR (group); + goto out_remove_device; + } + +return group; + +out_remove_device: +iommu_group_remove_device (dev); +out_put_group: +iommu_group_put (iommu_group); +return ERR_PTR (ret); +} +#endif + +static struct vfio_group *vfio_group_find_or_alloc (struct device *dev) +{ +struct iommu_group *iommu_group; +struct vfio_group *group; + + iommu_group =iommu_group_get (dev); +#ifdef CONFIG_VFIO_NOIOMMU +if (!iommu_group && noiommu && !iommu_present (dev->bus)) { +/* +* With noiommu enabled, create an IOMMU group for devices that +* don't already have one and don't have an iommu_ops on their +* bus. Taint the kernel because we're about to give a DMA +* capable device to a user without IOMMU protection. +*/ + group =vfio_noiommu_group_alloc (dev); +if (group) { +add_taint (TAINT_USER ,LOCKDEP_STILL_OK ); +dev_warn (dev,"Adding kernel taint for vfio-noiommu group on device\n" ); + } +return group; + } +#endif if (!iommu_group)return ERR_PTR (-EINVAL );
@@ -844,10 +849,6 @@ struct vfio_group *vfio_group_find_or_alloc(struct device *dev)return group; out_put: -#ifdef CONFIG_VFIO_NOIOMMU -if (iommu_group_get_iommudata (iommu_group) == &noiommu) -iommu_group_remove_device (dev); -#endif iommu_group_put (iommu_group);return group; }
Signature · 1 line
2.30.2
Re: [PATCH 05/14] vfio: refactor noiommu group creation
Quoted 43 lines · On Thu, 26 Aug 2021 15:34:15 +0200 Christoph Hellwig <[email protected]> wrote:
drivers/vfio/vfio.c +38
-1+#ifdef CONFIG_VFIO_NOIOMMU +static struct vfio_group *vfio_noiommu_group_alloc (struct device *dev) {struct iommu_group *iommu_group;struct vfio_group *group; +int ret; + + iommu_group =iommu_group_alloc (); +if (IS_ERR (iommu_group)) +return ERR_CAST (iommu_group); - iommu_group =vfio_iommu_group_get (dev); +iommu_group_set_name (iommu_group,"vfio-noiommu" ); +iommu_group_set_iommudata (iommu_group, &noiommu,NULL ); + ret =iommu_group_add_device (iommu_group, dev); +if (ret) + goto out_put_group; + + group =vfio_create_group (iommu_group); +if (IS_ERR (group)) { + ret =PTR_ERR (group); + goto out_remove_device; + } + +return group; + +out_remove_device: +iommu_group_remove_device (dev); +out_put_group: +iommu_group_put (iommu_group); +return ERR_PTR (ret); +} +#endif + +static struct vfio_group *vfio_group_find_or_alloc (struct device *dev) +{ +struct iommu_group *iommu_group; +struct vfio_group *group; + + iommu_group =iommu_group_get (dev); +#ifdef CONFIG_VFIO_NOIOMMU +if (!iommu_group && noiommu && !iommu_present (dev->bus)) { +/*
drivers/vfio/vfio.c void vfio_uninit_group_dev(struct vfio_device *device) · line 833
Quoted 10 lines
drivers/vfio/vfio.c +10
-0+* With noiommu enabled, create an IOMMU group for devices that +* don't already have one and don't have an iommu_ops on their +* bus. Taint the kernel because we're about to give a DMA +* capable device to a user without IOMMU protection. +*/ + group =vfio_noiommu_group_alloc (dev); +if (group) { +add_taint (TAINT_USER ,LOCKDEP_STILL_OK ); +dev_warn (dev,"Adding kernel taint for vfio-noiommu group on device\n" ); + }
Perhaps what Kevin was pointing out here in the previous version, vfio_noiommu_group_alloc() returns a pointer, so this should test !IS_ERR(group). Thanks,
Alex
RE: [PATCH 05/14] vfio: refactor noiommu group creation
Quoted 60 lines
From: Alex Williamson <[email protected]>
Sent: Friday, August 27, 2021 6:47 AMQuoted 34 lines · On Thu, 26 Aug 2021 15:34:15 +0200 Christoph Hellwig <[email protected]> wrote:
drivers/vfio/vfio.c +29
-1+#ifdef CONFIG_VFIO_NOIOMMU +static struct vfio_group *vfio_noiommu_group_alloc (struct device *dev) {struct iommu_group *iommu_group;struct vfio_group *group; +int ret; + + iommu_group =iommu_group_alloc (); +if (IS_ERR (iommu_group)) +return ERR_CAST (iommu_group); - iommu_group =vfio_iommu_group_get (dev); +iommu_group_set_name (iommu_group,"vfio-noiommu" ); +iommu_group_set_iommudata (iommu_group, &noiommu,NULL ); + ret =iommu_group_add_device (iommu_group, dev); +if (ret) + goto out_put_group; + + group =vfio_create_group (iommu_group); +if (IS_ERR (group)) { + ret =PTR_ERR (group); + goto out_remove_device; + } + +return group; + +out_remove_device: +iommu_group_remove_device (dev); +out_put_group: +iommu_group_put (iommu_group); +return ERR_PTR (ret); +} +#endif +drivers/vfio/vfio.c void vfio_uninit_group_dev(struct vfio_device *device)
Quoted 10 lines
drivers/vfio/vfio.c +10
-0+static struct vfio_group *vfio_group_find_or_alloc (struct device *dev) +{ +struct iommu_group *iommu_group; +struct vfio_group *group; + + iommu_group =iommu_group_get (dev); +#ifdef CONFIG_VFIO_NOIOMMU +if (!iommu_group && noiommu && !iommu_present (dev->bus)) { +/* +* With noiommu enabled, create an IOMMU group for devices that
Review
Quoted 1 line
(quoted diff) +1
-0+ * don't already have one and don't have an iommu_ops ontheir
drivers/vfio/vfio.c void vfio_uninit_group_dev(struct vfio_device *device)
Quoted 7 lines
drivers/vfio/vfio.c +7
-0+* bus. Taint the kernel because we're about to give a DMA +* capable device to a user without IOMMU protection. +*/ + group =vfio_noiommu_group_alloc (dev); +if (group) { +add_taint (TAINT_USER ,LOCKDEP_STILL_OK ); + dev_warn(dev, "Adding kernel taint for vfio-noiommu group on device\n");
Quoted 6 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ }Perhaps what Kevin was pointing out here in the previous version,
vfio_noiommu_group_alloc()returns a pointer, so this should test !IS_ERR(group). Thanks,
yes, that is what I meant.
PATCH 6/14 vfio: remove the iommudata hack for noiommu groups
In reply to Christoph HellwigJust pass a noiommu argument to vfio_create_group and set up the ->noiommu flag directly, and remove the now superflous vfio_iommu_group_put helper.
--- drivers/vfio/vfio.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
drivers/vfio/vfio.c +9 -14
@@ -335,7 +335,8 @@ static void vfio_group_unlock_and_free(struct vfio_group *group)/** * Group objects - create, release, get, put, search */ -static struct vfio_group *vfio_create_group (struct iommu_group *iommu_group) +static struct vfio_group *vfio_create_group (struct iommu_group *iommu_group, +bool noiommu) {struct vfio_group *group, *tmp;struct device *dev;
@@ -354,9 +355,7 @@ static struct vfio_group *vfio_create_group(struct iommu_group *iommu_group)atomic_set (&group->opened,0 );init_waitqueue_head (&group->container_q); group->iommu_group = iommu_group; -#ifdef CONFIG_VFIO_NOIOMMU - group->noiommu = (iommu_group_get_iommudata (iommu_group) == &noiommu); -#endif + group->noiommu = noiommu;BLOCKING_INIT_NOTIFIER_HEAD (&group->notifier); group->nb.notifier_call = vfio_iommu_group_notifier;
@@ -791,12 +790,11 @@ static struct vfio_group *vfio_noiommu_group_alloc(struct device *dev)return ERR_CAST (iommu_group);iommu_group_set_name (iommu_group,"vfio-noiommu" ); -iommu_group_set_iommudata (iommu_group, &noiommu,NULL ); ret =iommu_group_add_device (iommu_group, dev);if (ret) goto out_put_group; - group =vfio_create_group (iommu_group); + group =vfio_create_group (iommu_group, true);if (IS_ERR (group)) { ret =PTR_ERR (group); goto out_remove_device;
@@ -843,7 +841,7 @@ static struct vfio_group *vfio_group_find_or_alloc(struct device *dev) goto out_put;/* a newly created vfio_group keeps the reference. */ - group =vfio_create_group (iommu_group); + group =vfio_create_group (iommu_group, false);if (IS_ERR (group)) goto out_put;return group;
@@ -874,10 +872,8 @@ int vfio_register_group_dev(struct vfio_device *device)dev_WARN (device->dev,"Device already exists on group %d\n" ,iommu_group_id (group->iommu_group));vfio_device_put (existing_device); -#ifdef CONFIG_VFIO_NOIOMMU -if (iommu_group_get_iommudata (group->iommu_group) == &noiommu) +if (group->noiommu)iommu_group_remove_device (device->dev); -#endif vfio_group_put (group);return -EBUSY ; }
@@ -1023,10 +1019,9 @@ void vfio_unregister_group_dev(struct vfio_device *device)if (list_empty (&group->device_list))wait_event (group->container_q, !group->container); -#ifdef CONFIG_VFIO_NOIOMMU -if (iommu_group_get_iommudata (group) == &noiommu) -iommu_group_remove_device (dev); -#endif +if (group->noiommu) +iommu_group_remove_device (device->dev); +/* Matches the get in vfio_register_group_dev() */ vfio_group_put (group); }
Signature · 1 line
2.30.2
PATCH 7/14 vfio: simplify iommu group allocation for mediated devices
In reply to Christoph HellwigReuse the logic in vfio_noiommu_group_alloc to allocate a fake single-device iommu group for mediated devices. A new function is exposed to create vfio_device for this emulated case and the noiommu boolean field in struct vfio_group is replaced with a set of flags so that devices with an emulated IOMMU can be distinguished from those with no IOMMU at all.
--- drivers/vfio/mdev/mdev_driver.c | 46 ++---------------- drivers/vfio/mdev/vfio_mdev.c | 2 +- drivers/vfio/vfio.c | 82 ++++++++++++++++++++++----------- include/linux/vfio.h | 1 + samples/vfio-mdev/mbochs.c | 2 +- samples/vfio-mdev/mdpy.c | 2 +- samples/vfio-mdev/mtty.c | 2 +- 7 files changed, 65 insertions(+), 72 deletions(-)
drivers/vfio/mdev/mdev_driver.c +4 -42
@@ -13,61 +13,23 @@#include "mdev_private.h" -static int mdev_attach_iommu (struct mdev_device *mdev) -{ -int ret; -struct iommu_group *group; - - group =iommu_group_alloc (); -if (IS_ERR (group)) -return PTR_ERR (group); - - ret =iommu_group_add_device (group, &mdev->dev); -if (!ret) -dev_info (&mdev->dev,"MDEV: group_id = %d\n" , -iommu_group_id (group)); - -iommu_group_put (group); -return ret; -} - -static void mdev_detach_iommu (struct mdev_device *mdev) -{ -iommu_group_remove_device (&mdev->dev); -dev_info (&mdev->dev,"MDEV: detaching iommu\n" ); -} -static int mdev_probe (struct device *dev) {struct mdev_driver *drv = container_of(dev->driver, struct mdev_driver, driver); -struct mdev_device *mdev =to_mdev_device (dev); -int ret; - - ret =mdev_attach_iommu (mdev); -if (ret) -return ret; -if (drv->probe) { - ret = drv->probe (mdev); -if (ret) -mdev_detach_iommu (mdev); - } - -return ret; +if (!drv->probe) +return 0 ; +return drv->probe (to_mdev_device (dev)); }static int mdev_remove (struct device *dev) {struct mdev_driver *drv = container_of(dev->driver, struct mdev_driver, driver); -struct mdev_device *mdev =to_mdev_device (dev);if (drv->remove) - drv->remove (mdev); - -mdev_detach_iommu (mdev); - + drv->remove (to_mdev_device (dev));return 0 ; }
drivers/vfio/mdev/vfio_mdev.c +1 -1
@@ -119,7 +119,7 @@ static int vfio_mdev_probe(struct mdev_device *mdev)return -ENOMEM ;vfio_init_group_dev (vdev, &mdev->dev, &vfio_mdev_dev_ops); - ret =vfio_register_group_dev (vdev); + ret =vfio_register_emulated_iommu_dev (vdev);if (ret) goto out_uninit;
drivers/vfio/vfio.c +56 -26
217 lines not on this page · raw message
include/linux/vfio.h +1 -0
@@ -75,6 +75,7 @@ void vfio_init_group_dev(struct vfio_device *device, struct device *dev, const struct vfio_device_ops *ops);void vfio_uninit_group_dev (struct vfio_device *device);int vfio_register_group_dev (struct vfio_device *device); +int vfio_register_emulated_iommu_dev (struct vfio_device *device);void vfio_unregister_group_dev (struct vfio_device *device);extern struct vfio_device *vfio_device_get_from_dev (struct device *dev);extern void vfio_device_put (struct vfio_device *device);
samples/vfio-mdev/mbochs.c +1 -1
@@ -553,7 +553,7 @@ static int mbochs_probe(struct mdev_device *mdev)mbochs_create_config_space (mdev_state);mbochs_reset (mdev_state); - ret =vfio_register_group_dev (&mdev_state->vdev); + ret =vfio_register_emulated_iommu_dev (&mdev_state->vdev);if (ret) goto err_mem;dev_set_drvdata (&mdev->dev, mdev_state);
samples/vfio-mdev/mdpy.c +1 -1
@@ -258,7 +258,7 @@ static int mdpy_probe(struct mdev_device *mdev) mdpy_count++; - ret =vfio_register_group_dev (&mdev_state->vdev); + ret =vfio_register_emulated_iommu_dev (&mdev_state->vdev);if (ret) goto err_mem;dev_set_drvdata (&mdev->dev, mdev_state);
samples/vfio-mdev/mtty.c +1 -1
@@ -741,7 +741,7 @@ static int mtty_probe(struct mdev_device *mdev)mtty_create_config_space (mdev_state); - ret =vfio_register_group_dev (&mdev_state->vdev); + ret =vfio_register_emulated_iommu_dev (&mdev_state->vdev);if (ret) goto err_vconfig;dev_set_drvdata (&mdev->dev, mdev_state);
Signature · 1 line
2.30.2
Re: [PATCH 07/14] vfio: simplify iommu group allocation for mediated devices
[Cc +Tony]
Quoted 9 lines · On Thu, 26 Aug 2021 15:34:17 +0200 Christoph Hellwig <[email protected]> wrote:
Reuse the logic in
vfio_noiommu_group_allocto allocate a fake single-device iommu group for mediated devices. A new function is exposed to createvfio_devicefor this emulated case and the noiommu boolean field in structvfio_groupis replaced with a set of flags so that devices with an emulated IOMMU can be distinguished from those with no IOMMU at all.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Jason Gunthorpe <[email protected]>
Quoted 9 lines
--- drivers/vfio/mdev/mdev_driver.c | 46 ++---------------- drivers/vfio/mdev/vfio_mdev.c | 2 +- drivers/vfio/vfio.c | 82 ++++++++++++++++++++++----------- include/linux/vfio.h | 1 + samples/vfio-mdev/mbochs.c | 2 +- samples/vfio-mdev/mdpy.c | 2 +- samples/vfio-mdev/mtty.c | 2 +- 7 files changed, 65 insertions(+), 72 deletions(-)
As Jason suggested, I'll apply this after [email protected] and roll in the following:
drivers/s390/crypto/vfio_ap_ops.c +1 -1
@@ -350,7 +350,7 @@ static int vfio_ap_mdev_probe(struct mdev_device *mdev)list_add (&matrix_mdev->node, &matrix_dev->mdev_list);mutex_unlock (&matrix_dev->lock); - ret =vfio_register_group_dev (&matrix_mdev->vdev); + ret =vfio_register_emulated_iommu_dev (&matrix_mdev->vdev);if (ret) goto err_list;dev_set_drvdata (&mdev->dev, matrix_mdev);
Shout if this is incorrect. Thanks,
Alex
Re: [PATCH 07/14] vfio: simplify iommu group allocation for mediated devices
In reply to Christoph HellwigQuoted 27 lines · On Thu, 26 Aug 2021 15:34:17 +0200 Christoph Hellwig <[email protected]> wrote:
drivers/vfio/vfio.c +15
-0@@ -67,6 +67,21 @@ struct vfio_unbound_dev {struct list_head unbound_next; }; +/* +* Virtual device without IOMMU backing. The VFIO core fakes up an iommu_group +* as the iommu_group sysfs interface is part of the userspace ABI. The user +* of these devices must not be able to directly trigger unmediated DMA. +*/ +#define VFIO_EMULATED_IOMMU (1 << 0) + +/* +* Physical device without IOMMU backing. The VFIO core fakes up an iommu_group +* as the iommu_group sysfs interface is part of the userspace ABI. Users can +* trigger unmediated DMA by the device, usage is highly dangerous, requires +* an explicit opt-in and will taint the kernel. +*/ +#define VFIO_NO_IOMMU (1 << 1) +struct vfio_group {struct kref kref;int minor;
drivers/vfio/vfio.c struct vfio_group { · line 101
Quoted 5 lines
drivers/vfio/vfio.c +1
-1@@ -83,7 +98,7 @@ struct vfio_group {struct mutex unbound_lock;atomic_t opened;wait_queue_head_t container_q; -bool noiommu; +unsigned int flags;
flags suggests to me a bit field, but we can't have EMULATED|NOIOMMU. Should this be an enum iommu_type?
Note that my next branch now includes the vfio-ap changes, so respins can include the change Jason noted directly. Thanks,
Alex
RE: [PATCH 07/14] vfio: simplify iommu group allocation for mediated devices
Quoted 29 lines
From: Alex Williamson <[email protected]>
Sent: Friday, August 27, 2021 6:59 AMdrivers/vfio/vfio.c struct vfio_unbound_dev { · line 71
Quoted 10 lines · On Thu, 26 Aug 2021 15:34:17 +0200 Christoph Hellwig <[email protected]> wrote:
drivers/vfio/vfio.c +2
-0@@ -67,6 +67,21 @@ struct vfio_unbound_dev {struct list_head unbound_next; }; +/* +* Virtual device without IOMMU backing. The VFIO core fakes up an
iommu_groupdrivers/vfio/vfio.c struct vfio_unbound_dev { · line 72
Quoted 1 line
drivers/vfio/vfio.c +1
-0+* as the iommu_group sysfs interface is part of the userspace ABI. The user
drivers/vfio/vfio.c struct vfio_unbound_dev {
Quoted 6 lines
drivers/vfio/vfio.c +6
-0+* of these devices must not be able to directly trigger unmediated DMA. +*/ +#define VFIO_EMULATED_IOMMU (1 << 0) + +/* +* Physical device without IOMMU backing. The VFIO core fakes up an
iommu_groupdrivers/vfio/vfio.c struct vfio_unbound_dev { · line 79
Quoted 1 line
drivers/vfio/vfio.c +1
-0+* as the iommu_group sysfs interface is part of the userspace ABI. Users can
drivers/vfio/vfio.c struct vfio_unbound_dev { · line 80
Quoted 1 line
drivers/vfio/vfio.c +1
-0+* trigger unmediated DMA by the device, usage is highly dangerous, requires
Quoted 17 lines
drivers/vfio/vfio.c struct vfio_group { · line 101
Quoted 13 lines
drivers/vfio/vfio.c +5
-1+* an explicit opt-in and will taint the kernel. +*/ +#define VFIO_NO_IOMMU (1 << 1) +struct vfio_group {struct kref kref;int minor;@@ -83,7 +98,7 @@ struct vfio_group {struct mutex unbound_lock;atomic_t opened;wait_queue_head_t container_q; -bool noiommu; +unsigned int flags;flags suggests to me a bit field, but we can't have EMULATED|NOIOMMU. Should this be an enum
iommu_type?
and I wonder whether we should also define a type (VFIO_IOMMU) for the remaining groups which are backed by IOMMU. This can be set implicitly when the caller doesn't specify a specific type when creating the group. It's not checked in any place now, but it might be helpful for readability and diagnostic purpose? or change the name to noiommu_flags then no confusion on its scope...
Thanks
Kevin
Re: [PATCH 07/14] vfio: simplify iommu group allocation for mediated devices
Quoted 10 lines · Kevin
Quoted 3 lines
flags suggests to me a bit field, but we can't have EMULATED|NOIOMMU. Should this be an enum
iommu_type?and I wonder whether we should also define a type (
VFIO_IOMMU) for the remaining groups which are backed by IOMMU. This can be set implicitly when the caller doesn't specify a specific type when creating the group. It's not checked in any place now, but it might be helpful for readability and diagnostic purpose? or change the name tonoiommu_flagsthen no confusion on its scope...
If we move to a type field we should definitively define a value for the normal case as well. The advantage of the flags is that we can also use it for other needs it it arises. An emum OTOH would be easier to follow.
PATCH 8/14 vfio: remove unused method from vfio_iommu_driver_ops
In reply to Christoph HellwigThe read, write and mmap methods are never implemented, so remove them.
--- drivers/vfio/vfio.c | 50 -------------------------------------------- include/linux/vfio.h | 5 ----- 2 files changed, 55 deletions(-)
drivers/vfio/vfio.c +0 -50
@@ -1266,62 +1266,12 @@ static int vfio_fops_release(struct inode *inode, struct file *filep)return 0 ; } -/* -* Once an iommu driver is set, we optionally pass read/write/mmap -* on to the driver, allowing management interfaces beyond ioctl. -*/ -static ssize_t vfio_fops_read (struct file *filep,char __user *buf, -size_t count,loff_t *ppos) -{ -struct vfio_container *container = filep->private_data; -struct vfio_iommu_driver *driver; -ssize_t ret = -EINVAL ; - - driver = container->iommu_driver; -if (likely (driver && driver->ops->read)) - ret = driver->ops->read (container->iommu_data, - buf, count, ppos); - -return ret; -} - -static ssize_t vfio_fops_write (struct file *filep,const char __user *buf, -size_t count,loff_t *ppos) -{ -struct vfio_container *container = filep->private_data; -struct vfio_iommu_driver *driver; -ssize_t ret = -EINVAL ; - - driver = container->iommu_driver; -if (likely (driver && driver->ops->write)) - ret = driver->ops->write (container->iommu_data, - buf, count, ppos); - -return ret; -} - -static int vfio_fops_mmap (struct file *filep,struct vm_area_struct *vma) -{ -struct vfio_container *container = filep->private_data; -struct vfio_iommu_driver *driver; -int ret = -EINVAL ; - - driver = container->iommu_driver; -if (likely (driver && driver->ops->mmap)) - ret = driver->ops->mmap (container->iommu_data, vma); - -return ret; -} -static const struct file_operations vfio_fops = { .owner =THIS_MODULE , .open = vfio_fops_open, .release = vfio_fops_release, - .read = vfio_fops_read, - .write = vfio_fops_write, .unlocked_ioctl = vfio_fops_unl_ioctl, .compat_ioctl = compat_ptr_ioctl, - .mmap = vfio_fops_mmap, };/**
include/linux/vfio.h +0 -5
@@ -95,13 +95,8 @@ struct vfio_iommu_driver_ops {struct module *owner;void *(*open)(unsigned long arg);void (*release)(void *iommu_data); -ssize_t (*read)(void *iommu_data,char __user *buf, -size_t count,loff_t *ppos); -ssize_t (*write)(void *iommu_data,const char __user *buf, -size_t count,loff_t *size);long (*ioctl)(void *iommu_data,unsigned int cmd,unsigned long arg); -int (*mmap)(void *iommu_data,struct vm_area_struct *vma);int (*attach_group)(void *iommu_data,struct iommu_group *group); void (*detach_group)(void *iommu_data,
Signature · 1 line
2.30.2
PATCH 9/14 vfio: move the vfio_iommu_driver_ops interface out of <linux/vfio.h>
In reply to Christoph HellwigCreate a new private drivers/vfio/vfio.h header for the interface between the VFIO core and the iommu drivers.
--- drivers/vfio/vfio.c | 1 + drivers/vfio/vfio.h | 47 +++++++++++++++++++++++++++++ drivers/vfio/vfio_iommu_spapr_tce.c | 1 + drivers/vfio/vfio_iommu_type1.c | 1 + include/linux/vfio.h | 44 --------------------------- 5 files changed, 50 insertions(+), 44 deletions(-) create mode 100644 drivers/vfio/vfio.h
drivers/vfio/vfio.c +1 -0
@@ -32,6 +32,7 @@#include <linux/vfio.h> #include <linux/wait.h> #include <linux/sched/signal.h> +#include "vfio.h" #define DRIVER_VERSION "0.3"#define DRIVER_AUTHOR "Alex Williamson <[email protected]>"
drivers/vfio/vfio.h new file +47 -0
47 lines not on this page · raw message
drivers/vfio/vfio_iommu_spapr_tce.c +1 -0
@@ -20,6 +20,7 @@#include <linux/sched/mm.h> #include <linux/sched/signal.h> #include <linux/mm.h> +#include "vfio.h" #include <asm/iommu.h> #include <asm/tce.h>
drivers/vfio/vfio_iommu_type1.c +1 -0
@@ -40,6 +40,7 @@#include <linux/notifier.h> #include <linux/dma-iommu.h> #include <linux/irqdomain.h> +#include "vfio.h" #define DRIVER_VERSION "0.2"#define DRIVER_AUTHOR "Alex Williamson <[email protected]>"
include/linux/vfio.h +0 -44
50 lines not on this page · raw message
Signature · 1 line
2.30.2
PATCH 10/14 vfio: remove the unused mdev iommu hook
In reply to Christoph HellwigThe iommu_device field in struct mdev_device has never been used since it was added more than 2 years ago.
This is a manual revert of commit 7bd50f0cd2 ("vfio/type1: Add domain at(de)taching group helpers").
--- drivers/vfio/vfio_iommu_type1.c | 133 +++++++------------------------- include/linux/mdev.h | 20 ----- 2 files changed, 26 insertions(+), 127 deletions(-)
drivers/vfio/vfio_iommu_type1.c +26 -107
@@ -114,7 +114,6 @@ struct vfio_batch {struct vfio_iommu_group {struct iommu_group *iommu_group;struct list_head next; -bool mdev_group;/* An mdev group */ bool pinned_page_dirty_scope; };
@@ -1935,61 +1934,6 @@ static bool vfio_iommu_has_sw_msi(struct list_head *group_resv_regions,return ret; } -static int vfio_mdev_attach_domain (struct device *dev,void *data) -{ -struct mdev_device *mdev =to_mdev_device (dev); -struct iommu_domain *domain = data; -struct device *iommu_device; - - iommu_device =mdev_get_iommu_device (mdev); -if (iommu_device) { -if (iommu_dev_feature_enabled (iommu_device,IOMMU_DEV_FEAT_AUX )) -return iommu_aux_attach_device (domain, iommu_device); -else -return iommu_attach_device (domain, iommu_device); - } - -return -EINVAL ; -} - -static int vfio_mdev_detach_domain (struct device *dev,void *data) -{ -struct mdev_device *mdev =to_mdev_device (dev); -struct iommu_domain *domain = data; -struct device *iommu_device; - - iommu_device =mdev_get_iommu_device (mdev); -if (iommu_device) { -if (iommu_dev_feature_enabled (iommu_device,IOMMU_DEV_FEAT_AUX )) -iommu_aux_detach_device (domain, iommu_device); -else -iommu_detach_device (domain, iommu_device); - } - -return 0 ; -} - -static int vfio_iommu_attach_group (struct vfio_domain *domain, -struct vfio_iommu_group *group) -{ -if (group->mdev_group) -return iommu_group_for_each_dev (group->iommu_group, - domain->domain, - vfio_mdev_attach_domain); -else -return iommu_attach_group (domain->domain, group->iommu_group); -} - -static void vfio_iommu_detach_group (struct vfio_domain *domain, -struct vfio_iommu_group *group) -{ -if (group->mdev_group) -iommu_group_for_each_dev (group->iommu_group, domain->domain, - vfio_mdev_detach_domain); -else -iommu_detach_group (domain->domain, group->iommu_group); -} -static bool vfio_bus_is_mdev (struct bus_type *bus) {struct bus_type *mdev_bus;
@@ -2004,20 +1948,6 @@ static bool vfio_bus_is_mdev(struct bus_type *bus)return ret; } -static int vfio_mdev_iommu_device (struct device *dev,void *data) -{ -struct mdev_device *mdev =to_mdev_device (dev); -struct device **old = data, *new; - - new =mdev_get_iommu_device (mdev); -if (!new || (*old && *old != new)) -return -EINVAL ; - - *old = new; - -return 0 ; -} -/* * This is a helper function to insert an address range to iova list. * The list is initially created with a single entry corresponding to
@@ -2278,38 +2208,25 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, goto out_free;if (vfio_bus_is_mdev (bus)) { -struct device *iommu_device =NULL ; - - group->mdev_group = true; - -/* Determine the isolation type */ - ret =iommu_group_for_each_dev (iommu_group, &iommu_device, - vfio_mdev_iommu_device); -if (ret || !iommu_device) { -if (!iommu->external_domain) { -INIT_LIST_HEAD (&domain->group_list); - iommu->external_domain = domain; -vfio_update_pgsize_bitmap (iommu); - }else { -kfree (domain); - } - -list_add (&group->next, - &iommu->external_domain->group_list); -/* -* Non-iommu backed group cannot dirty memory directly, -* it can only use interfaces that provide dirty -* tracking. -* The iommu scope can only be promoted with the -* addition of a dirty tracking group. -*/ - group->pinned_page_dirty_scope = true; -mutex_unlock (&iommu->lock); - -return 0 ; +if (!iommu->external_domain) { +INIT_LIST_HEAD (&domain->group_list); + iommu->external_domain = domain; +vfio_update_pgsize_bitmap (iommu); + }else { +kfree (domain); } - bus = iommu_device->bus; +list_add (&group->next, &iommu->external_domain->group_list); +/* +* Non-iommu backed group cannot dirty memory directly, it can +* only use interfaces that provide dirty tracking. +* The iommu scope can only be promoted with the addition of a +* dirty tracking group. +*/ + group->pinned_page_dirty_scope = true; +mutex_unlock (&iommu->lock); + +return 0 ; } domain->domain =iommu_domain_alloc (bus);
@@ -2324,7 +2241,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, goto out_domain; } - ret =vfio_iommu_attach_group (domain, group); + ret =iommu_attach_group (domain->domain, group->iommu_group);if (ret) goto out_domain;
@@ -2391,15 +2308,17 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,list_for_each_entry (d, &iommu->domain_list, next) {if (d->domain->ops == domain->domain->ops && d->prot == domain->prot) { -vfio_iommu_detach_group (domain, group); -if (!vfio_iommu_attach_group (d, group)) { +iommu_detach_group (domain->domain, group->iommu_group); +if (!iommu_attach_group (d->domain, + group->iommu_group)) {list_add (&group->next, &d->group_list);iommu_domain_free (domain->domain);kfree (domain); goto done; } - ret =vfio_iommu_attach_group (domain, group); + ret =iommu_attach_group (domain->domain, + group->iommu_group);if (ret) goto out_domain; }
@@ -2436,7 +2355,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,return 0 ; out_detach: -vfio_iommu_detach_group (domain, group); +iommu_detach_group (domain->domain, group->iommu_group); out_domain:iommu_domain_free (domain->domain);vfio_iommu_iova_free (&iova_copy);
@@ -2601,7 +2520,7 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,if (!group)continue ; -vfio_iommu_detach_group (domain, group); +iommu_detach_group (domain->domain, group->iommu_group); update_dirty_scope = !group->pinned_page_dirty_scope;list_del (&group->next);kfree (group);
@@ -2689,7 +2608,7 @@ static void vfio_release_domain(struct vfio_domain *domain, bool external)list_for_each_entry_safe (group, group_tmp, &domain->group_list, next) {if (!external) -vfio_iommu_detach_group (domain, group); +iommu_detach_group (domain->domain, group->iommu_group);list_del (&group->next);kfree (group); }
include/linux/mdev.h +0 -20
@@ -18,7 +18,6 @@ struct mdev_device {void *driver_data;struct list_head next;struct mdev_type *type; -struct device *iommu_device;bool active; };
@@ -27,25 +26,6 @@ static inline struct mdev_device *to_mdev_device(struct device *dev) return container_of(dev, struct mdev_device, dev); } -/* -* Called by the parent device driver to set the device which represents -* this mdev in iommu protection scope. By default, the iommu device is -* NULL, that indicates using vendor defined isolation. -* -* @dev: the mediated device that iommu will isolate. -* @iommu_device: a pci device which represents the iommu for @dev. -*/ -static inline void mdev_set_iommu_device (struct mdev_device *mdev, -struct device *iommu_device) -{ - mdev->iommu_device = iommu_device; -} - -static inline struct device *mdev_get_iommu_device (struct mdev_device *mdev) -{ -return mdev->iommu_device; -} -unsigned int mdev_get_type_group_id (struct mdev_device *mdev);unsigned int mtype_get_type_group_id (struct mdev_type *mtype);struct device *mtype_get_parent_dev (struct mdev_type *mtype);
Signature · 1 line
2.30.2
PATCH 11/14 vfio: clean up the check for mediated device in vfio_iommu_type1
In reply to Christoph HellwigPass the group flags to ->attach_group and remove the messy check for the bus type.
--- drivers/vfio/vfio.c | 23 +++++------------------ drivers/vfio/vfio.h | 18 +++++++++++++++++- drivers/vfio/vfio_iommu_spapr_tce.c | 2 +- drivers/vfio/vfio_iommu_type1.c | 19 ++----------------- 4 files changed, 25 insertions(+), 37 deletions(-)
drivers/vfio/vfio.c +5 -18
@@ -68,21 +68,6 @@ struct vfio_unbound_dev {struct list_head unbound_next; }; -/* -* Virtual device without IOMMU backing. The VFIO core fakes up an iommu_group -* as the iommu_group sysfs interface is part of the userspace ABI. The user -* of these devices must not be able to directly trigger unmediated DMA. -*/ -#define VFIO_EMULATED_IOMMU (1 << 0) - -/* -* Physical device without IOMMU backing. The VFIO core fakes up an iommu_group -* as the iommu_group sysfs interface is part of the userspace ABI. Users can -* trigger unmediated DMA by the device, usage is highly dangerous, requires -* an explicit opt-in and will taint the kernel. -*/ -#define VFIO_NO_IOMMU (1 << 1) -struct vfio_group {struct kref kref;int minor;
@@ -210,7 +195,7 @@ static long vfio_noiommu_ioctl(void *iommu_data, }static int vfio_noiommu_attach_group (void *iommu_data, -struct iommu_group *iommu_group) +struct iommu_group *iommu_group,unsigned int flags) {return 0 ; }
@@ -1119,7 +1104,8 @@ static int __vfio_container_attach_groups(struct vfio_container *container,int ret = -ENODEV ;list_for_each_entry (group, &container->group_list, container_next) { - ret = driver->ops->attach_group (data, group->iommu_group); + ret = driver->ops->attach_group (data, group->iommu_group, + group->flags);if (ret) goto unwind; }
@@ -1377,7 +1363,8 @@ static int vfio_group_set_container(struct vfio_group *group, int container_fd) driver = container->iommu_driver;if (driver) { ret = driver->ops->attach_group (container->iommu_data, - group->iommu_group); + group->iommu_group, + group->flags);if (ret) goto unlock_out; }
drivers/vfio/vfio.h +17 -1
@@ -9,6 +9,21 @@ enum vfio_iommu_notify_type { VFIO_IOMMU_CONTAINER_CLOSE = 0, }; +/* +* Virtual device without IOMMU backing. The VFIO core fakes up an iommu_group +* as the iommu_group sysfs interface is part of the userspace ABI. The user +* of these devices must not be able to directly trigger unmediated DMA. +*/ +#define VFIO_EMULATED_IOMMU (1 << 0) + +/* +* Physical device without IOMMU backing. The VFIO core fakes up an iommu_group +* as the iommu_group sysfs interface is part of the userspace ABI. Users can +* trigger unmediated DMA by the device, usage is highly dangerous, requires +* an explicit opt-in and will taint the kernel. +*/ +#define VFIO_NO_IOMMU (1 << 1) +/** * struct vfio_iommu_driver_ops - VFIO IOMMU driver callbacks */
@@ -20,7 +35,8 @@ struct vfio_iommu_driver_ops {long (*ioctl)(void *iommu_data,unsigned int cmd,unsigned long arg);int (*attach_group)(void *iommu_data, -struct iommu_group *group); +struct iommu_group *group, +unsigned int flags);void (*detach_group)(void *iommu_data,struct iommu_group *group); int (*pin_pages)(void *iommu_data,
drivers/vfio/vfio_iommu_spapr_tce.c +1 -1
@@ -1239,7 +1239,7 @@ static long tce_iommu_take_ownership_ddw(struct tce_container *container, }static int tce_iommu_attach_group (void *iommu_data, -struct iommu_group *iommu_group) +struct iommu_group *iommu_group,unsigned int flags) {int ret =0 ;struct tce_container *container = iommu_data;
drivers/vfio/vfio_iommu_type1.c +2 -17
@@ -36,7 +36,6 @@#include <linux/uaccess.h> #include <linux/vfio.h> #include <linux/workqueue.h> -#include <linux/mdev.h> #include <linux/notifier.h> #include <linux/dma-iommu.h> #include <linux/irqdomain.h>
@@ -1934,20 +1933,6 @@ static bool vfio_iommu_has_sw_msi(struct list_head *group_resv_regions,return ret; } -static bool vfio_bus_is_mdev (struct bus_type *bus) -{ -struct bus_type *mdev_bus; -bool ret = false; - - mdev_bus =symbol_get (mdev_bus_type); -if (mdev_bus) { - ret = (bus == mdev_bus); -symbol_put (mdev_bus_type); - } - -return ret; -} -/* * This is a helper function to insert an address range to iova list. * The list is initially created with a single entry corresponding to
@@ -2172,7 +2157,7 @@ static void vfio_iommu_iova_insert_copy(struct vfio_iommu *iommu, }static int vfio_iommu_type1_attach_group (void *iommu_data, -struct iommu_group *iommu_group) +struct iommu_group *iommu_group,unsigned int flags) {struct vfio_iommu *iommu = iommu_data;struct vfio_iommu_group *group;
@@ -2207,7 +2192,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,if (ret) goto out_free; -if (vfio_bus_is_mdev (bus)) { +if (flags &VFIO_EMULATED_IOMMU ) {if (!iommu->external_domain) {INIT_LIST_HEAD (&domain->group_list); iommu->external_domain = domain;
Signature · 1 line
2.30.2
PATCH 12/14 vfio/spapr_tce: reject mediated devices
In reply to Christoph HellwigUnlike the the type1 IOMMU backend, the SPAPR one does not contain any support for the magic non-IOMMU backed iommu_group used by mediated devices, so reject them in ->attach_group.
--- drivers/vfio/vfio_iommu_spapr_tce.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/vfio/vfio_iommu_spapr_tce.c +3 -0
@@ -1246,6 +1246,9 @@ static int tce_iommu_attach_group(void *iommu_data,struct iommu_table_group *table_group;struct tce_iommu_group *tcegrp =NULL ; +if (flags &VFIO_EMULATED_IOMMU ) +return -EINVAL ; +mutex_lock (&container->lock);/* pr_debug("tce_vfio: Attaching group #%u to iommu %p\n",
Signature · 1 line
2.30.2
PATCH 13/14 vfio/iommu_type1: remove the "external" domain
In reply to Christoph HellwigThe external_domain concept rather misleading and not actually needed. Replace it with a list of emulated groups in struct vfio_iommu and document the purpose.
--- drivers/vfio/vfio_iommu_type1.c | 121 ++++++++++++++------------------ 1 file changed, 54 insertions(+), 67 deletions(-)
drivers/vfio/vfio_iommu_type1.c +54 -67
@@ -65,7 +65,6 @@ MODULE_PARM_DESC(dma_entry_limit,struct vfio_iommu {struct list_head domain_list;struct list_head iova_list; -struct vfio_domain *external_domain;/* domain for external user */ struct mutex lock;struct rb_root dma_list;struct blocking_notifier_head notifier;
@@ -78,6 +77,7 @@ struct vfio_iommu {bool nesting;bool dirty_page_tracking;bool container_open; +struct list_head emulated_iommu_groups; };struct vfio_domain {
@@ -1892,8 +1892,8 @@ static struct vfio_iommu_group* vfio_iommu_find_iommu_group(struct vfio_iommu *iommu, struct iommu_group *iommu_group) { + struct vfio_iommu_group *group;struct vfio_domain *domain; -struct vfio_iommu_group *group =NULL ;list_for_each_entry (domain, &iommu->domain_list, next) { group =find_iommu_group (domain, iommu_group);
@@ -1901,10 +1901,10 @@ vfio_iommu_find_iommu_group(struct vfio_iommu *iommu,return group; } -if (iommu->external_domain) - group =find_iommu_group (iommu->external_domain, iommu_group); - -return group; +list_for_each_entry (group, &iommu->emulated_iommu_groups, next) +if (group->iommu_group == iommu_group) +return group; +return NULL ; } static bool vfio_iommu_has_sw_msi(struct list_head *group_resv_regions,
@@ -2163,62 +2163,52 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,struct vfio_iommu_group *group;struct vfio_domain *domain, *d;struct bus_type *bus =NULL ; -int ret;bool resv_msi, msi_remap;phys_addr_t resv_msi_base =0 ;struct iommu_domain_geometry *geo;LIST_HEAD (iova_copy);LIST_HEAD (group_resv_regions); +int ret = -EINVAL ;mutex_lock (&iommu->lock);/* Check for duplicates */ -if (vfio_iommu_find_iommu_group (iommu, iommu_group)) { -mutex_unlock (&iommu->lock); -return -EINVAL ; - } +if (vfio_iommu_find_iommu_group (iommu, iommu_group)) + goto out_unlock; + ret = -ENOMEM ; group =kzalloc (sizeof (*group),GFP_KERNEL ); - domain =kzalloc (sizeof (*domain),GFP_KERNEL ); -if (!group || !domain) { - ret = -ENOMEM ; - goto out_free; - } - +if (!group) + goto out_unlock; group->iommu_group = iommu_group; -/* Determine bus_type in order to allocate a domain */ - ret =iommu_group_for_each_dev (iommu_group, &bus, vfio_bus_type); -if (ret) - goto out_free; -if (flags &VFIO_EMULATED_IOMMU ) { -if (!iommu->external_domain) { -INIT_LIST_HEAD (&domain->group_list); - iommu->external_domain = domain; -vfio_update_pgsize_bitmap (iommu); - }else { -kfree (domain); - } - -list_add (&group->next, &iommu->external_domain->group_list); +list_add (&group->next, &iommu->emulated_iommu_groups);/* -* Non-iommu backed group cannot dirty memory directly, it can +* An emulated IOMMU group cannot dirty memory directly, it can * only use interfaces that provide dirty tracking. * The iommu scope can only be promoted with the addition of a * dirty tracking group. */ group->pinned_page_dirty_scope = true; -mutex_unlock (&iommu->lock); - -return 0 ; + ret =0 ; + goto out_unlock; } +/* Determine bus_type in order to allocate a domain */ + ret =iommu_group_for_each_dev (iommu_group, &bus, vfio_bus_type); +if (ret) + goto out_free_group; + + ret = -ENOMEM ; + domain =kzalloc (sizeof (*domain),GFP_KERNEL ); +if (!domain) + goto out_free_group; + + ret = -EIO ; domain->domain =iommu_domain_alloc (bus); -if (!domain->domain) { - ret = -EIO ; - goto out_free; - } +if (!domain->domain) + goto out_free_domain;if (iommu->nesting) { ret =iommu_enable_nesting (domain->domain);
@@ -2345,9 +2335,11 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,iommu_domain_free (domain->domain);vfio_iommu_iova_free (&iova_copy);vfio_iommu_resv_free (&group_resv_regions); -out_free: +out_free_domain:kfree (domain); +out_free_group:kfree (group); +out_unlock:mutex_unlock (&iommu->lock);return ret; }
@@ -2472,25 +2464,19 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,LIST_HEAD (iova_copy);mutex_lock (&iommu->lock); +list_for_each_entry (group, &iommu->emulated_iommu_groups, next) { +if (group->iommu_group != iommu_group) +continue ; + update_dirty_scope = !group->pinned_page_dirty_scope; +list_del (&group->next); +kfree (group); -if (iommu->external_domain) { - group =find_iommu_group (iommu->external_domain, iommu_group); -if (group) { - update_dirty_scope = !group->pinned_page_dirty_scope; -list_del (&group->next); -kfree (group); - -if (list_empty (&iommu->external_domain->group_list)) { -if (!IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu)) { -WARN_ON (iommu->notifier.head); -vfio_iommu_unmap_unpin_all (iommu); - } - -kfree (iommu->external_domain); - iommu->external_domain =NULL ; - } - goto detach_group_done; +if (list_empty (&iommu->emulated_iommu_groups) && + !IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu)) { +WARN_ON (iommu->notifier.head); +vfio_iommu_unmap_unpin_all (iommu); } + goto detach_group_done; }/*
@@ -2518,7 +2504,7 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,*/ if (list_empty (&domain->group_list)) {if (list_is_singular (&iommu->domain_list)) { -if (!iommu->external_domain) { +if (list_empty (&iommu->emulated_iommu_groups)) {WARN_ON (iommu->notifier.head);vfio_iommu_unmap_unpin_all (iommu); }else {
@@ -2582,41 +2568,42 @@ static void *vfio_iommu_type1_open(unsigned long arg)mutex_init (&iommu->lock);BLOCKING_INIT_NOTIFIER_HEAD (&iommu->notifier);init_waitqueue_head (&iommu->vaddr_wait); +INIT_LIST_HEAD (&iommu->emulated_iommu_groups);return iommu; } -static void vfio_release_domain (struct vfio_domain *domain,bool external) +static void vfio_release_domain (struct vfio_domain *domain) {struct vfio_iommu_group *group, *group_tmp;list_for_each_entry_safe (group, group_tmp, &domain->group_list, next) { -if (!external) -iommu_detach_group (domain->domain, group->iommu_group); +iommu_detach_group (domain->domain, group->iommu_group);list_del (&group->next);kfree (group); } -if (!external) -iommu_domain_free (domain->domain); +iommu_domain_free (domain->domain); }static void vfio_iommu_type1_release (void *iommu_data) {struct vfio_iommu *iommu = iommu_data;struct vfio_domain *domain, *domain_tmp; +struct vfio_iommu_group *group, *next_group; -if (iommu->external_domain) { -vfio_release_domain (iommu->external_domain, true); -kfree (iommu->external_domain); +list_for_each_entry_safe (group, next_group, + &iommu->emulated_iommu_groups, next) { +list_del (&group->next); +kfree (group); }vfio_iommu_unmap_unpin_all (iommu);list_for_each_entry_safe (domain, domain_tmp, &iommu->domain_list, next) { -vfio_release_domain (domain, false); +vfio_release_domain (domain);list_del (&domain->next);kfree (domain); }
Signature · 1 line
2.30.2
Re: [PATCH 13/14] vfio/iommu_type1: remove the "external" domain
Quoted 103 lines · On Thu, 26 Aug 2021 15:34:23 +0200 Christoph Hellwig <[email protected]> wrote:
The
external_domainconcept rather misleading and not actually needed. Replace it with a list of emulated groups in structvfio_iommuand document the purpose.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Jason Gunthorpe <[email protected]>Reviewed-by Kevin Tian <[email protected]>--- drivers/vfio/vfio_iommu_type1.c | 121 ++++++++++++++------------------ 1 file changed, 54 insertions(+), 67 deletions(-)drivers/vfio/vfio_iommu_type1.c +12
-29@@ -65,7 +65,6 @@ MODULE_PARM_DESC(dma_entry_limit,struct vfio_iommu {struct list_head domain_list;struct list_head iova_list; -struct vfio_domain *external_domain;/* domain for external user */ struct mutex lock;struct rb_root dma_list;struct blocking_notifier_head notifier;@@ -78,6 +77,7 @@ struct vfio_iommu {bool nesting;bool dirty_page_tracking;bool container_open; +struct list_head emulated_iommu_groups; };struct vfio_domain {@@ -1892,8 +1892,8 @@ static struct vfio_iommu_group* vfio_iommu_find_iommu_group(struct vfio_iommu *iommu, struct iommu_group *iommu_group) { + struct vfio_iommu_group *group;struct vfio_domain *domain; -struct vfio_iommu_group *group =NULL ;list_for_each_entry (domain, &iommu->domain_list, next) { group =find_iommu_group (domain, iommu_group);@@ -1901,10 +1901,10 @@ vfio_iommu_find_iommu_group(struct vfio_iommu *iommu,return group; } -if (iommu->external_domain) - group =find_iommu_group (iommu->external_domain, iommu_group); - -return group; +list_for_each_entry (group, &iommu->emulated_iommu_groups, next) +if (group->iommu_group == iommu_group) +return group; +return NULL ; } static bool vfio_iommu_has_sw_msi(struct list_head *group_resv_regions,@@ -2163,62 +2163,52 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,struct vfio_iommu_group *group;struct vfio_domain *domain, *d;struct bus_type *bus =NULL ; -int ret;bool resv_msi, msi_remap;phys_addr_t resv_msi_base =0 ;struct iommu_domain_geometry *geo;LIST_HEAD (iova_copy);LIST_HEAD (group_resv_regions); +int ret = -EINVAL ;mutex_lock (&iommu->lock);/* Check for duplicates */ -if (vfio_iommu_find_iommu_group (iommu, iommu_group)) { -mutex_unlock (&iommu->lock); -return -EINVAL ; - } +if (vfio_iommu_find_iommu_group (iommu, iommu_group)) + goto out_unlock; + ret = -ENOMEM ; group =kzalloc (sizeof (*group),GFP_KERNEL ); - domain =kzalloc (sizeof (*domain),GFP_KERNEL ); -if (!group || !domain) { - ret = -ENOMEM ; - goto out_free; - } - +if (!group) + goto out_unlock; group->iommu_group = iommu_group; -/* Determine bus_type in order to allocate a domain */ - ret =iommu_group_for_each_dev (iommu_group, &bus, vfio_bus_type); -if (ret) - goto out_free; -if (flags &VFIO_EMULATED_IOMMU ) { -if (!iommu->external_domain) { -INIT_LIST_HEAD (&domain->group_list); - iommu->external_domain = domain; -vfio_update_pgsize_bitmap (iommu); - }else { -kfree (domain); - }
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void *iommu_data, · line 2192
Quoted 10 lines
drivers/vfio/vfio_iommu_type1.c +2
-3- -list_add (&group->next, &iommu->external_domain->group_list); +list_add (&group->next, &iommu->emulated_iommu_groups);/* -* Non-iommu backed group cannot dirty memory directly, it can +* An emulated IOMMU group cannot dirty memory directly, it can * only use interfaces that provide dirty tracking. * The iommu scope can only be promoted with the addition of a * dirty tracking group. */
I didn't actually spot the additional documentation noted in the commit log, is this it? Thanks,
Alex
Quoted 140 lines
drivers/vfio/vfio_iommu_type1.c +40
-35group->pinned_page_dirty_scope = true; -mutex_unlock (&iommu->lock); - -return 0 ; + ret =0 ; + goto out_unlock; } +/* Determine bus_type in order to allocate a domain */ + ret =iommu_group_for_each_dev (iommu_group, &bus, vfio_bus_type); +if (ret) + goto out_free_group; + + ret = -ENOMEM ; + domain =kzalloc (sizeof (*domain),GFP_KERNEL ); +if (!domain) + goto out_free_group; + + ret = -EIO ; domain->domain =iommu_domain_alloc (bus); -if (!domain->domain) { - ret = -EIO ; - goto out_free; - } +if (!domain->domain) + goto out_free_domain;if (iommu->nesting) { ret =iommu_enable_nesting (domain->domain);@@ -2345,9 +2335,11 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,iommu_domain_free (domain->domain);vfio_iommu_iova_free (&iova_copy);vfio_iommu_resv_free (&group_resv_regions); -out_free: +out_free_domain:kfree (domain); +out_free_group:kfree (group); +out_unlock:mutex_unlock (&iommu->lock);return ret; }@@ -2472,25 +2464,19 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,LIST_HEAD (iova_copy);mutex_lock (&iommu->lock); +list_for_each_entry (group, &iommu->emulated_iommu_groups, next) { +if (group->iommu_group != iommu_group) +continue ; + update_dirty_scope = !group->pinned_page_dirty_scope; +list_del (&group->next); +kfree (group); -if (iommu->external_domain) { - group =find_iommu_group (iommu->external_domain, iommu_group); -if (group) { - update_dirty_scope = !group->pinned_page_dirty_scope; -list_del (&group->next); -kfree (group); - -if (list_empty (&iommu->external_domain->group_list)) { -if (!IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu)) { -WARN_ON (iommu->notifier.head); -vfio_iommu_unmap_unpin_all (iommu); - } - -kfree (iommu->external_domain); - iommu->external_domain =NULL ; - } - goto detach_group_done; +if (list_empty (&iommu->emulated_iommu_groups) && + !IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu)) { +WARN_ON (iommu->notifier.head); +vfio_iommu_unmap_unpin_all (iommu); } + goto detach_group_done; }/* @@ -2518,7 +2504,7 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,*/ if (list_empty (&domain->group_list)) {if (list_is_singular (&iommu->domain_list)) { -if (!iommu->external_domain) { +if (list_empty (&iommu->emulated_iommu_groups)) {WARN_ON (iommu->notifier.head);vfio_iommu_unmap_unpin_all (iommu); }else {@@ -2582,41 +2568,42 @@ static void *vfio_iommu_type1_open(unsigned long arg)mutex_init (&iommu->lock);BLOCKING_INIT_NOTIFIER_HEAD (&iommu->notifier);init_waitqueue_head (&iommu->vaddr_wait); +INIT_LIST_HEAD (&iommu->emulated_iommu_groups);return iommu; } -static void vfio_release_domain (struct vfio_domain *domain,bool external) +static void vfio_release_domain (struct vfio_domain *domain) {struct vfio_iommu_group *group, *group_tmp;list_for_each_entry_safe (group, group_tmp, &domain->group_list, next) { -if (!external) -iommu_detach_group (domain->domain, group->iommu_group); +iommu_detach_group (domain->domain, group->iommu_group);list_del (&group->next);kfree (group); } -if (!external) -iommu_domain_free (domain->domain); +iommu_domain_free (domain->domain); }static void vfio_iommu_type1_release (void *iommu_data) {struct vfio_iommu *iommu = iommu_data;struct vfio_domain *domain, *domain_tmp; +struct vfio_iommu_group *group, *next_group; -if (iommu->external_domain) { -vfio_release_domain (iommu->external_domain, true); -kfree (iommu->external_domain); +list_for_each_entry_safe (group, next_group, + &iommu->emulated_iommu_groups, next) { +list_del (&group->next); +kfree (group); }vfio_iommu_unmap_unpin_all (iommu);list_for_each_entry_safe (domain, domain_tmp, &iommu->domain_list, next) { -vfio_release_domain (domain, false); +vfio_release_domain (domain);list_del (&domain->next);kfree (domain); }
PATCH 14/14 vfio/iommu_type1: remove IS_IOMMU_CAP_DOMAIN_IN_CONTAINER
In reply to Christoph HellwigIS_IOMMU_CAP_DOMAIN_IN_CONTAINER just obsfucated the checks being performed, so open code it in the callers.
--- drivers/vfio/vfio_iommu_type1.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/vfio/vfio_iommu_type1.c +5 -8
@@ -139,9 +139,6 @@ struct vfio_regions {size_t len; }; -#define IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu) \ - (!list_empty(&iommu->domain_list)) -#define DIRTY_BITMAP_BYTES (n) (ALIGN(n, BITS_PER_TYPE(u64)) / BITS_PER_BYTE)/*
@@ -879,7 +876,7 @@ static int vfio_iommu_type1_pin_pages(void *iommu_data,* already pinned and accounted. Accounting should be done if there is no * iommu capable domain in the container. */ - do_accounting = !IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu); + do_accounting =list_empty (&iommu->domain_list);for (i =0 ; i < npage; i++) {struct vfio_pfn *vpfn;
@@ -968,7 +965,7 @@ static int vfio_iommu_type1_unpin_pages(void *iommu_data,mutex_lock (&iommu->lock); - do_accounting = !IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu); + do_accounting =list_empty (&iommu->domain_list);for (i =0 ; i < npage; i++) {struct vfio_dma *dma;dma_addr_t iova;
@@ -1089,7 +1086,7 @@ static long vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma,if (!dma->size)return 0 ; -if (!IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu)) +if (list_empty (&iommu->domain_list))return 0 ;/*
@@ -1666,7 +1663,7 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu,vfio_link_dma (iommu, dma);/* Don't pin and map if container doesn't contain IOMMU capable domain*/ -if (!IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu)) +if (list_empty (&iommu->domain_list)) dma->size = size;else ret =vfio_pin_map_dma (iommu, dma, size);
@@ -2472,7 +2469,7 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,kfree (group);if (list_empty (&iommu->emulated_iommu_groups) && - !IS_IOMMU_CAP_DOMAIN_IN_CONTAINER (iommu)) { +list_empty (&iommu->domain_list)) {WARN_ON (iommu->notifier.head);vfio_iommu_unmap_unpin_all (iommu); }
Signature · 1 line
2.30.2
Xu, Terrence
Tested-byQuoted 33 lines
-----Original Message-----
From: Christoph Hellwig <[email protected]>
Sent: Thursday, August 26, 2021 9:34 PMHi Alex,
this series cleans up how iommu group are created in VFIO as well as various other lose ends around that. It sits on top of the
"Introduce
vfio_pci_coresubsystem"series from Yishai
Changes since v3:
- restore the attribution to Jason for patch 1, which git-rebase lost
- fix a vfio vs iommu group counting issue that I added over Jasons original patch
- add comments describing theVFIO_EMULATED_IOMMUandVFIO_NO_IOMMU
flags
- use the emulated iommu naming consistently in comments
- a spelling fixChanges since v2:
- cosmetic changes to the code flow invfio_group_find_or_alloc
- replace "mediated" with "emulated iommu"
- add a comment describingvfio_register_emulated_iommu_dev
- rebased on top of the "Introducevfio_pci_coresubsystem" seriesChanges since v1:
- only taint if a noiommu group was successfully createdDiffstat:
Quoted 15 lines
drivers/vfio/fsl-mc/vfio_fsl_mc.c | 17 - drivers/vfio/mdev/mdev_driver.c | 46 ---- drivers/vfio/mdev/vfio_mdev.c | 2 drivers/vfio/pci/vfio_pci_core.c | 13 - drivers/vfio/platform/vfio_platform_common.c | 13 - drivers/vfio/vfio.c | 306 ++++++++++++--------------- drivers/vfio/vfio.h | 63 +++++ drivers/vfio/vfio_iommu_spapr_tce.c | 6 drivers/vfio/vfio_iommu_type1.c | 255 ++++++---------------- include/linux/mdev.h | 20 - include/linux/vfio.h | 53 ---- samples/vfio-mdev/mbochs.c | 2 samples/vfio-mdev/mdpy.c | 2 samples/vfio-mdev/mtty.c | 2 14 files changed, 292 insertions(+), 508 deletions(-)
We verified the Intel KVMGT feature, no regression be introduced by these patch series.
Thanks
Terrence