From: Yi Liu <yi.l....@intel.com>

and manage mdpy_count inside @init/@release.

Signed-off-by: Yi Liu <yi.l....@intel.com>
Signed-off-by: Kevin Tian <kevin.t...@intel.com>
Reviewed-by: Jason Gunthorpe <j...@nvidia.com>
---
 samples/vfio-mdev/mdpy.c | 81 +++++++++++++++++++++++-----------------
 1 file changed, 47 insertions(+), 34 deletions(-)

diff --git a/samples/vfio-mdev/mdpy.c b/samples/vfio-mdev/mdpy.c
index e8c46eb2e246..bb2af1ec0f7c 100644
--- a/samples/vfio-mdev/mdpy.c
+++ b/samples/vfio-mdev/mdpy.c
@@ -216,61 +216,77 @@ static int mdpy_reset(struct mdev_state *mdev_state)
        return 0;
 }
 
-static int mdpy_probe(struct mdev_device *mdev)
+static int mdpy_init_dev(struct vfio_device *vdev)
 {
+       struct mdev_state *mdev_state =
+               container_of(vdev, struct mdev_state, vdev);
+       struct mdev_device *mdev = to_mdev_device(vdev->dev);
        const struct mdpy_type *type =
                &mdpy_types[mdev_get_type_group_id(mdev)];
-       struct device *dev = mdev_dev(mdev);
-       struct mdev_state *mdev_state;
        u32 fbsize;
-       int ret;
+       int ret = -ENOMEM;
 
        if (mdpy_count >= max_devices)
-               return -ENOMEM;
-
-       mdev_state = kzalloc(sizeof(struct mdev_state), GFP_KERNEL);
-       if (mdev_state == NULL)
-               return -ENOMEM;
-       vfio_init_group_dev(&mdev_state->vdev, &mdev->dev, &mdpy_dev_ops);
+               return ret;
 
        mdev_state->vconfig = kzalloc(MDPY_CONFIG_SPACE_SIZE, GFP_KERNEL);
-       if (mdev_state->vconfig == NULL) {
-               ret = -ENOMEM;
-               goto err_state;
-       }
+       if (!mdev_state->vconfig)
+               return ret;
 
        fbsize = roundup_pow_of_two(type->width * type->height * type->bytepp);
 
        mdev_state->memblk = vmalloc_user(fbsize);
-       if (!mdev_state->memblk) {
-               ret = -ENOMEM;
-               goto err_vconfig;
-       }
-       dev_info(dev, "%s: %s (%dx%d)\n", __func__, type->name, type->width,
-                type->height);
+       if (!mdev_state->memblk)
+               goto out_vconfig;
 
        mutex_init(&mdev_state->ops_lock);
        mdev_state->mdev = mdev;
-       mdev_state->type    = type;
+       mdev_state->type = type;
        mdev_state->memsize = fbsize;
        mdpy_create_config_space(mdev_state);
        mdpy_reset(mdev_state);
 
+       dev_info(vdev->dev, "%s: %s (%dx%d)\n", __func__, type->name, 
type->width,
+                type->height);
+
        mdpy_count++;
+       return 0;
+
+out_vconfig:
+       kfree(mdev_state->vconfig);
+       return ret;
+}
+
+static int mdpy_probe(struct mdev_device *mdev)
+{
+       struct mdev_state *mdev_state;
+       int ret;
+
+       mdev_state = vfio_alloc_device(mdev_state, vdev, &mdev->dev,
+                                      &mdpy_dev_ops);
+       if (IS_ERR(mdev_state))
+               return PTR_ERR(mdev_state);
 
        ret = vfio_register_emulated_iommu_dev(&mdev_state->vdev);
        if (ret)
-               goto err_mem;
+               goto err_put_vdev;
        dev_set_drvdata(&mdev->dev, mdev_state);
        return 0;
-err_mem:
+
+err_put_vdev:
+       vfio_put_device(&mdev_state->vdev);
+       return ret;
+}
+
+static void mdpy_release_dev(struct vfio_device *vdev)
+{
+       struct mdev_state *mdev_state =
+               container_of(vdev, struct mdev_state, vdev);
+
+       mdpy_count--;
        vfree(mdev_state->memblk);
-err_vconfig:
        kfree(mdev_state->vconfig);
-err_state:
-       vfio_uninit_group_dev(&mdev_state->vdev);
-       kfree(mdev_state);
-       return ret;
+       vfio_free_device(vdev);
 }
 
 static void mdpy_remove(struct mdev_device *mdev)
@@ -280,12 +296,7 @@ static void mdpy_remove(struct mdev_device *mdev)
        dev_info(&mdev->dev, "%s\n", __func__);
 
        vfio_unregister_group_dev(&mdev_state->vdev);
-       vfree(mdev_state->memblk);
-       kfree(mdev_state->vconfig);
-       vfio_uninit_group_dev(&mdev_state->vdev);
-       kfree(mdev_state);
-
-       mdpy_count--;
+       vfio_put_device(&mdev_state->vdev);
 }
 
 static ssize_t mdpy_read(struct vfio_device *vdev, char __user *buf,
@@ -708,6 +719,8 @@ static struct attribute_group *mdev_type_groups[] = {
 };
 
 static const struct vfio_device_ops mdpy_dev_ops = {
+       .init = mdpy_init_dev,
+       .release = mdpy_release_dev,
        .read = mdpy_read,
        .write = mdpy_write,
        .ioctl = mdpy_ioctl,
-- 
2.21.3

Reply via email to