Merge tag 'vfio-v6.1-rc1' of https://github.com/awilliam/linux-vfio

[platform/kernel/linux-rpi.git] / drivers / s390 / crypto / vfio_ap_ops.c

diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c
index ee82207..0b4cc8c 100644 (file)
--- a/drivers/s390/crypto/vfio_ap_ops.c
+++ b/drivers/s390/crypto/vfio_ap_ops.c
@@ -684,42 +684,41 @@ static bool vfio_ap_mdev_filter_matrix(unsigned long *apm, unsigned long *aqm,
                             AP_DOMAINS);
 }
 
-static int vfio_ap_mdev_probe(struct mdev_device *mdev)
+static int vfio_ap_mdev_init_dev(struct vfio_device *vdev)
 {
-       struct ap_matrix_mdev *matrix_mdev;
-       int ret;
-
-       if ((atomic_dec_if_positive(&matrix_dev->available_instances) < 0))
-               return -EPERM;
-
-       matrix_mdev = kzalloc(sizeof(*matrix_mdev), GFP_KERNEL);
-       if (!matrix_mdev) {
-               ret = -ENOMEM;
-               goto err_dec_available;
-       }
-       vfio_init_group_dev(&matrix_mdev->vdev, &mdev->dev,
-                           &vfio_ap_matrix_dev_ops);
+       struct ap_matrix_mdev *matrix_mdev =
+               container_of(vdev, struct ap_matrix_mdev, vdev);
 
-       matrix_mdev->mdev = mdev;
+       matrix_mdev->mdev = to_mdev_device(vdev->dev);
        vfio_ap_matrix_init(&matrix_dev->info, &matrix_mdev->matrix);
        matrix_mdev->pqap_hook = handle_pqap;
        vfio_ap_matrix_init(&matrix_dev->info, &matrix_mdev->shadow_apcb);
        hash_init(matrix_mdev->qtable.queues);
 
+       return 0;
+}
+
+static int vfio_ap_mdev_probe(struct mdev_device *mdev)
+{
+       struct ap_matrix_mdev *matrix_mdev;
+       int ret;
+
+       matrix_mdev = vfio_alloc_device(ap_matrix_mdev, vdev, &mdev->dev,
+                                       &vfio_ap_matrix_dev_ops);
+       if (IS_ERR(matrix_mdev))
+               return PTR_ERR(matrix_mdev);
+
        ret = vfio_register_emulated_iommu_dev(&matrix_mdev->vdev);
        if (ret)
-               goto err_list;
+               goto err_put_vdev;
        dev_set_drvdata(&mdev->dev, matrix_mdev);
        mutex_lock(&matrix_dev->mdevs_lock);
        list_add(&matrix_mdev->node, &matrix_dev->mdev_list);
        mutex_unlock(&matrix_dev->mdevs_lock);
        return 0;
 
-err_list:
-       vfio_uninit_group_dev(&matrix_mdev->vdev);
-       kfree(matrix_mdev);
-err_dec_available:
-       atomic_inc(&matrix_dev->available_instances);
+err_put_vdev:
+       vfio_put_device(&matrix_mdev->vdev);
        return ret;
 }
 
@@ -766,6 +765,11 @@ static void vfio_ap_mdev_unlink_fr_queues(struct ap_matrix_mdev *matrix_mdev)
        }
 }
 
+static void vfio_ap_mdev_release_dev(struct vfio_device *vdev)
+{
+       vfio_free_device(vdev);
+}
+
 static void vfio_ap_mdev_remove(struct mdev_device *mdev)
 {
        struct ap_matrix_mdev *matrix_mdev = dev_get_drvdata(&mdev->dev);
@@ -779,54 +783,9 @@ static void vfio_ap_mdev_remove(struct mdev_device *mdev)
        list_del(&matrix_mdev->node);
        mutex_unlock(&matrix_dev->mdevs_lock);
        mutex_unlock(&matrix_dev->guests_lock);
-       vfio_uninit_group_dev(&matrix_mdev->vdev);
-       kfree(matrix_mdev);
-       atomic_inc(&matrix_dev->available_instances);
+       vfio_put_device(&matrix_mdev->vdev);
 }
 
-static ssize_t name_show(struct mdev_type *mtype,
-                        struct mdev_type_attribute *attr, char *buf)
-{
-       return sprintf(buf, "%s\n", VFIO_AP_MDEV_NAME_HWVIRT);
-}
-
-static MDEV_TYPE_ATTR_RO(name);
-
-static ssize_t available_instances_show(struct mdev_type *mtype,
-                                       struct mdev_type_attribute *attr,
-                                       char *buf)
-{
-       return sprintf(buf, "%d\n",
-                      atomic_read(&matrix_dev->available_instances));
-}
-
-static MDEV_TYPE_ATTR_RO(available_instances);
-
-static ssize_t device_api_show(struct mdev_type *mtype,
-                              struct mdev_type_attribute *attr, char *buf)
-{
-       return sprintf(buf, "%s\n", VFIO_DEVICE_API_AP_STRING);
-}
-
-static MDEV_TYPE_ATTR_RO(device_api);
-
-static struct attribute *vfio_ap_mdev_type_attrs[] = {
-       &mdev_type_attr_name.attr,
-       &mdev_type_attr_device_api.attr,
-       &mdev_type_attr_available_instances.attr,
-       NULL,
-};
-
-static struct attribute_group vfio_ap_mdev_hwvirt_type_group = {
-       .name = VFIO_AP_MDEV_TYPE_HWVIRT,
-       .attrs = vfio_ap_mdev_type_attrs,
-};
-
-static struct attribute_group *vfio_ap_mdev_type_groups[] = {
-       &vfio_ap_mdev_hwvirt_type_group,
-       NULL,
-};
-
 #define MDEV_SHARING_ERR "Userspace may not re-assign queue %02lx.%04lx " \
                         "already assigned to %s"
 
@@ -1824,6 +1783,8 @@ static const struct attribute_group vfio_queue_attr_group = {
 };
 
 static const struct vfio_device_ops vfio_ap_matrix_dev_ops = {
+       .init = vfio_ap_mdev_init_dev,
+       .release = vfio_ap_mdev_release_dev,
        .open_device = vfio_ap_mdev_open_device,
        .close_device = vfio_ap_mdev_close_device,
        .ioctl = vfio_ap_mdev_ioctl,
@@ -1831,6 +1792,8 @@ static const struct vfio_device_ops vfio_ap_matrix_dev_ops = {
 };
 
 static struct mdev_driver vfio_ap_matrix_driver = {
+       .device_api = VFIO_DEVICE_API_AP_STRING,
+       .max_instances = MAX_ZDEV_ENTRIES_EXT,
        .driver = {
                .name = "vfio_ap_mdev",
                .owner = THIS_MODULE,
@@ -1839,20 +1802,22 @@ static struct mdev_driver vfio_ap_matrix_driver = {
        },
        .probe = vfio_ap_mdev_probe,
        .remove = vfio_ap_mdev_remove,
-       .supported_type_groups = vfio_ap_mdev_type_groups,
 };
 
 int vfio_ap_mdev_register(void)
 {
        int ret;
 
-       atomic_set(&matrix_dev->available_instances, MAX_ZDEV_ENTRIES_EXT);
-
        ret = mdev_register_driver(&vfio_ap_matrix_driver);
        if (ret)
                return ret;
 
-       ret = mdev_register_device(&matrix_dev->device, &vfio_ap_matrix_driver);
+       matrix_dev->mdev_type.sysfs_name = VFIO_AP_MDEV_TYPE_HWVIRT;
+       matrix_dev->mdev_type.pretty_name = VFIO_AP_MDEV_NAME_HWVIRT;
+       matrix_dev->mdev_types[0] = &matrix_dev->mdev_type;
+       ret = mdev_register_parent(&matrix_dev->parent, &matrix_dev->device,
+                                  &vfio_ap_matrix_driver,
+                                  matrix_dev->mdev_types, 1);
        if (ret)
                goto err_driver;
        return 0;
@@ -1864,7 +1829,7 @@ err_driver:
 
 void vfio_ap_mdev_unregister(void)
 {
-       mdev_unregister_device(&matrix_dev->device);
+       mdev_unregister_parent(&matrix_dev->parent);
        mdev_unregister_driver(&vfio_ap_matrix_driver);
 }