On Tue, 24 Aug 2021 16:46:36 +0200
Christoph Hellwig <hch@xxxxxx> wrote:
> From: Jason Gunthorpe <jgg@xxxxxxxxxx>
>
> 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 <jgg@xxxxxxxxxx>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> drivers/vfio/fsl-mc/vfio_fsl_mc.c | 17 ++-----------
> drivers/vfio/pci/vfio_pci.c | 15 ++----------
> drivers/vfio/platform/vfio_platform_common.c | 13 +---------
> drivers/vfio/vfio.c | 25 ++++++--------------
> include/linux/vfio.h | 3 ---
> 5 files changed, 12 insertions(+), 61 deletions(-)
>
> diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
> index a4f44ea52fa324..b01c1c6cf1f5e6 100644
> --- a/drivers/vfio/pci/vfio_pci.c
> +++ b/drivers/vfio/pci/vfio_pci.c
> @@ -1875,7 +1875,6 @@ static void vfio_pci_vga_uninit(struct vfio_pci_device *vdev)
> static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> {
> struct vfio_pci_device *vdev;
> - struct iommu_group *group;
> int ret;
>
> if (vfio_pci_is_denylisted(pdev))
> @@ -1897,15 +1896,9 @@ static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> return -EBUSY;
> }
>
> - group = vfio_iommu_group_get(&pdev->dev);
> - if (!group)
> - 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, &pdev->dev, &vfio_pci_ops);
> vdev->pdev = pdev;
> @@ -1971,8 +1964,6 @@ static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> vfio_uninit_group_dev(&vdev->vdev);
> kfree(vdev->pm_save);
> kfree(vdev);
> -out_group_put:
> - vfio_iommu_group_put(group, &pdev->dev);
> return ret;
> }
>
> @@ -1988,8 +1979,6 @@ static void vfio_pci_remove(struct pci_dev *pdev)
> vfio_uninit_group_dev(&vdev->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);
>
I think this turns into the patch below on top of Yishai's
vfio-pci-core series. Please verify. If you'd like something
different, please post an update. Thanks,
Alex
diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c
index c67751948504..4134dceab3f7 100644
--- a/drivers/vfio/pci/vfio_pci_core.c
+++ b/drivers/vfio/pci/vfio_pci_core.c
@@ -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);
}
