diff options
| author | Max Gurtovoy <mgurtovoy@nvidia.com> | 2021-08-06 03:18:59 +0200 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2021-08-11 17:50:10 +0200 |
| commit | ae03c3771b8cbbed3802ad1153d896c32015c520 (patch) | |
| tree | 88b17c4754f6823d47dc2516ba43f8ff2ba38506 /drivers/vfio/mdev | |
| parent | vfio/mbochs: Fix missing error unwind of mbochs_used_mbytes (diff) | |
| download | linux-ae03c3771b8cbbed3802ad1153d896c32015c520.tar.xz linux-ae03c3771b8cbbed3802ad1153d896c32015c520.zip | |
vfio: Introduce a vfio_uninit_group_dev() API call
This pairs with vfio_init_group_dev() and allows undoing any state that is
stored in the vfio_device unrelated to registration. Add appropriately
placed calls to all the drivers.
The following patch will use this to add pre-registration state for the
device set.
Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/3-v4-9ea22c5e6afb+1adf-vfio_reflck_jgg@nvidia.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'drivers/vfio/mdev')
| -rw-r--r-- | drivers/vfio/mdev/vfio_mdev.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/vfio/mdev/vfio_mdev.c b/drivers/vfio/mdev/vfio_mdev.c index 39ef7489fe47..a5c77ccb24f7 100644 --- a/drivers/vfio/mdev/vfio_mdev.c +++ b/drivers/vfio/mdev/vfio_mdev.c @@ -120,12 +120,16 @@ static int vfio_mdev_probe(struct mdev_device *mdev) vfio_init_group_dev(vdev, &mdev->dev, &vfio_mdev_dev_ops); ret = vfio_register_group_dev(vdev); - if (ret) { - kfree(vdev); - return ret; - } + if (ret) + goto out_uninit; + dev_set_drvdata(&mdev->dev, vdev); return 0; + +out_uninit: + vfio_uninit_group_dev(vdev); + kfree(vdev); + return ret; } static void vfio_mdev_remove(struct mdev_device *mdev) @@ -133,6 +137,7 @@ static void vfio_mdev_remove(struct mdev_device *mdev) struct vfio_device *vdev = dev_get_drvdata(&mdev->dev); vfio_unregister_group_dev(vdev); + vfio_uninit_group_dev(vdev); kfree(vdev); } |