Skip to contentSkip to conversation

vfio/ap_ops: Add missed vfio_uninit_group_dev()

PATCH Superseded Jason Gunthorpe 3 participants 4 messages Sep 9, 2021 – Sep 10, 2021

Subsystems (4)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

Fixes eb0feefd4c02 ("vfio/ap_ops: Convert to use vfio_register_group_dev()")
---
 drivers/s390/crypto/vfio_ap_ops.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/s390/crypto/vfio_ap_ops.c +2 -0
index 2347808fa3e427..54bb0c22e8020e 100644
@@ -360,6 +360,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);
@@ -375,8 +376,8 @@ 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);
+	vfio_uninit_group_dev(&matrix_mdev->vdev);
 	kfree(matrix_mdev);
 	atomic_inc(&matrix_dev->available_instances);
 	mutex_unlock(&matrix_dev->lock);
 
Signature · 1 line
2.33.0
#2 lore raw
In reply to Jason Gunthorpe

drivers/s390/crypto/vfio_ap_ops.c static void vfio_ap_mdev_remove(struct mdev_device *mdev)

Quoted 23 lines · On Thu, 9 Sep 2021 14:24:00 -0300 Jason Gunthorpe <[email protected]> wrote:

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.

Fixes eb0feefd4c02 ("vfio/ap_ops: Convert to use vfio_register_group_dev()")
---
 drivers/s390/crypto/vfio_ap_ops.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/s390/crypto/vfio_ap_ops.c +1 -0
index 2347808fa3e427..54bb0c22e8020e 100644
@@ -360,6 +360,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);
@@ -375,8 +376,8 @@ static void vfio_ap_mdev_remove(struct mdev_device *mdev)

Not sure if you're editing patches by hand, but your line counts above don't match the chunk below, should be ,6..,7 as the previous chunk. It's malformed as is. Thanks,

Alex

Quoted 8 lines
drivers/s390/crypto/vfio_ap_ops.c +1 -0
 	mutex_lock(&matrix_dev->lock);
 	vfio_ap_mdev_reset_queues(matrix_mdev);
 	list_del(&matrix_mdev->node);
+	vfio_uninit_group_dev(&matrix_mdev->vdev);
 	kfree(matrix_mdev);
 	atomic_inc(&matrix_dev->available_instances);
 	mutex_unlock(&matrix_dev->lock);
 
#3 lore raw
Quoted 12 lines · Alex Williamson
Quoted 9 lines · On Thu, 9 Sep 2021 14:24:00 -0300 Jason Gunthorpe <[email protected]> wrote:

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.

Fixes eb0feefd4c02 ("vfio/ap_ops: Convert to use vfio_register_group_dev()")
 drivers/s390/crypto/vfio_ap_ops.c | 2 ++
 1 file changed, 2 insertions(+)
Quoted 16 lines

drivers/s390/crypto/vfio_ap_ops.c static void vfio_ap_mdev_remove(struct mdev_device *mdev)

Quoted 12 lines
drivers/s390/crypto/vfio_ap_ops.c +2 -0
index 2347808fa3e427..54bb0c22e8020e 100644
+++ b/drivers/s390/crypto/vfio_ap_ops.c
@@ -360,6 +360,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);
@@ -375,8 +376,8 @@ static void vfio_ap_mdev_remove(struct mdev_device *mdev)

Not sure if you're editing patches by hand, but your line counts above don't match the chunk below, should be ,6..,7 as the previous chunk.

No, never...

It took awhile to figure out but it turns out emacs did it?!

I've been trying out the 'base-commit' trailer feature and removed it by hand from this patch before sending because it was just some bogus local merge. When I did this emacs diff mode wrongly thought the diff was being edited and corrupted the @@ line.

Wow, I had no idea it could edit patches :\

Jason