Commit 42de956c authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Alex Williamson
Browse files

vfio/ap_ops: Add missed vfio_uninit_group_dev() 



Without this call an xarray entry is leaked when the vfio_ap device is
unprobed. It was missed when the below patch was rebased across the
dev_set patch. Keep the remove function in the same order as the error
unwind in probe.

Fixes: eb0feefd ("vfio/ap_ops: Convert to use vfio_register_group_dev()")
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarTony Krowiak <akrowiak@linux.ibm.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarTony Krowiak <akrowiak@linux.ibm.com>
Link: https://lore.kernel.org/r/0-v3-f9b50340cdbb+e4-ap_uninit_jgg@nvidia.com


Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 8bd8d1df

drivers/s390/crypto/vfio_ap_ops.c

+3 −1
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ static int vfio_ap_mdev_probe(struct mdev_device *mdev) 
	mutex_lock(&matrix_dev->lock);

	list_del(&matrix_mdev->node);

	mutex_unlock(&matrix_dev->lock);

	vfio_uninit_group_dev(&matrix_mdev->vdev);

	kfree(matrix_mdev);

err_dec_available:

	atomic_inc(&matrix_dev->available_instances);
@@ -376,9 +377,10 @@ static void vfio_ap_mdev_remove(struct mdev_device *mdev) 
	mutex_lock(&matrix_dev->lock);

	vfio_ap_mdev_reset_queues(matrix_mdev);

	list_del(&matrix_mdev->node);

	mutex_unlock(&matrix_dev->lock);

	vfio_uninit_group_dev(&matrix_mdev->vdev);

	kfree(matrix_mdev);

	atomic_inc(&matrix_dev->available_instances);

	mutex_unlock(&matrix_dev->lock);

}



static ssize_t name_show(struct mdev_type *mtype,