Move vfio_ccw to the new mdev API
Subsystems (4)
v4 cover Move vfio_ccw to the new mdev API
This is the first 4 patches of the v3 series which only change CCW to use the new VFIO API for mdevs and leaves the lifetime model as-is.
As agreed, we will go ahead with this set and IBM can take the remaining patches of cleanup when they want. (I won't resend them)
Alex: as Eric has now ack'd them please take them to the VFIO tree for this upcoming merge window
This is on github: https://github.com/jgunthorpe/linux/commits/vfio_ccw
Thanks,
Jason
v4:
- Rebase to vfio-next (9cef73918), no change
- Add acks
v3: https://lore.kernel.org/r/[email protected]
- Rebase to Christoph's group work & rc3; use vfio_register_emulated_iommu_dev()
- Remove GFP_DMA
- Order mdev_unregister_driver() symmetrically with init
- Rework what is considered a BROKEN event in fsm_close()
- NOP both CCW_EVENT_OPEN/CLOSE
- Documentation updates
- Remane goto label to err_init vfio_ccw_mdev_probe()
- Fix NULL pointer deref in mdev_device_create()
v2: https://lore.kernel.org/r/[email protected]
- Clean up the lifecycle in ccw with 7 new patches
- Rebase
v1: https://lore.kernel.org/all/[email protected]
Jason Gunthorpe (4):
vfio/ccw: Remove unneeded GFP_DMA
vfio/ccw: Use functions for alloc/free of the vfio_ccw_private vfio/ccw: Pass vfio_ccw_private not mdev_device to various functions vfio/ccw: Convert to use vfio_register_emulated_iommu_dev()
drivers/s390/cio/vfio_ccw_drv.c | 158 ++++++++++++++++------------ drivers/s390/cio/vfio_ccw_ops.c | 142 ++++++++++++++----------- drivers/s390/cio/vfio_ccw_private.h | 5 + 3 files changed, 177 insertions(+), 128 deletions(-)
base-commit: 9cef73918e15d2284e71022291a8a07901e80bad
Signature · 1 line
2.33.0
PATCH v4 1/4 vfio/ccw: Remove unneeded GFP_DMA
Since the ccw_io_region was split out of the private the allocation no longer needs the GFP_DMA. Remove it.
--- drivers/s390/cio/vfio_ccw_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/cio/vfio_ccw_drv.c +1 -1
@@ -161,7 +161,7 @@ static int vfio_ccw_sch_probe(struct subchannel *sch)return -ENODEV ; } - private =kzalloc (sizeof (*private),GFP_KERNEL |GFP_DMA ); + private =kzalloc (sizeof (*private),GFP_KERNEL );if (!private)return -ENOMEM ;
Signature · 1 line
2.33.0
PATCH v4 2/4 vfio/ccw: Use functions for alloc/free of the vfio_ccw_private
In reply to Jason GunthorpeMakes the code easier to understand what is memory lifecycle and what is other stuff.
--- drivers/s390/cio/vfio_ccw_drv.c | 137 ++++++++++++++++++-------------- 1 file changed, 78 insertions(+), 59 deletions(-)
drivers/s390/cio/vfio_ccw_drv.c +78 -59
@@ -137,16 +137,80 @@ static void vfio_ccw_sch_irq(struct subchannel *sch)vfio_ccw_fsm_event (private,VFIO_CCW_EVENT_INTERRUPT ); } -static void vfio_ccw_free_regions (struct vfio_ccw_private *private) +static struct vfio_ccw_private *vfio_ccw_alloc_private (struct subchannel *sch) { -if (private->crw_region) -kmem_cache_free (vfio_ccw_crw_region, private->crw_region); -if (private->schib_region) -kmem_cache_free (vfio_ccw_schib_region, private->schib_region); -if (private->cmd_region) -kmem_cache_free (vfio_ccw_cmd_region, private->cmd_region); -if (private->io_region) -kmem_cache_free (vfio_ccw_io_region, private->io_region); +struct vfio_ccw_private *private; + + private =kzalloc (sizeof (*private),GFP_KERNEL ); +if (!private) +return ERR_PTR (-ENOMEM ); + + private->sch = sch; +mutex_init (&private->io_mutex); + private->state =VFIO_CCW_STATE_NOT_OPER ; +INIT_LIST_HEAD (&private->crw); +INIT_WORK (&private->io_work, vfio_ccw_sch_io_todo); +INIT_WORK (&private->crw_work, vfio_ccw_crw_todo); +atomic_set (&private->avail,1 ); + + private->cp.guest_cp =kcalloc (CCWCHAIN_LEN_MAX ,sizeof (struct ccw1 ), +GFP_KERNEL ); +if (!private->cp.guest_cp) + goto out_free_private; + + private->io_region =kmem_cache_zalloc (vfio_ccw_io_region, +GFP_KERNEL |GFP_DMA ); +if (!private->io_region) + goto out_free_cp; + + private->cmd_region =kmem_cache_zalloc (vfio_ccw_cmd_region, +GFP_KERNEL |GFP_DMA ); +if (!private->cmd_region) + goto out_free_io; + + private->schib_region =kmem_cache_zalloc (vfio_ccw_schib_region, +GFP_KERNEL |GFP_DMA ); + +if (!private->schib_region) + goto out_free_cmd; + + private->crw_region =kmem_cache_zalloc (vfio_ccw_crw_region, +GFP_KERNEL |GFP_DMA ); + +if (!private->crw_region) + goto out_free_schib; +return private; + +out_free_schib: +kmem_cache_free (vfio_ccw_schib_region, private->schib_region); +out_free_cmd: +kmem_cache_free (vfio_ccw_cmd_region, private->cmd_region); +out_free_io: +kmem_cache_free (vfio_ccw_io_region, private->io_region); +out_free_cp: +kfree (private->cp.guest_cp); +out_free_private: +mutex_destroy (&private->io_mutex); +kfree (private); +return ERR_PTR (-ENOMEM ); +} + +static void vfio_ccw_free_private (struct vfio_ccw_private *private) +{ +struct vfio_ccw_crw *crw, *temp; + +list_for_each_entry_safe (crw, temp, &private->crw, next) { +list_del (&crw->next); +kfree (crw); + } + +kmem_cache_free (vfio_ccw_crw_region, private->crw_region); +kmem_cache_free (vfio_ccw_schib_region, private->schib_region); +kmem_cache_free (vfio_ccw_cmd_region, private->cmd_region); +kmem_cache_free (vfio_ccw_io_region, private->io_region); +kfree (private->cp.guest_cp); +mutex_destroy (&private->io_mutex); +kfree (private); }static int vfio_ccw_sch_probe (struct subchannel *sch)
@@ -161,53 +225,19 @@ static int vfio_ccw_sch_probe(struct subchannel *sch)return -ENODEV ; } - private =kzalloc (sizeof (*private),GFP_KERNEL ); -if (!private) -return -ENOMEM ; + private =vfio_ccw_alloc_private (sch); +if (IS_ERR (private)) +return PTR_ERR (private); - private->cp.guest_cp =kcalloc (CCWCHAIN_LEN_MAX ,sizeof (struct ccw1 ), -GFP_KERNEL ); -if (!private->cp.guest_cp) - goto out_free; - - private->io_region =kmem_cache_zalloc (vfio_ccw_io_region, -GFP_KERNEL |GFP_DMA ); -if (!private->io_region) - goto out_free; - - private->cmd_region =kmem_cache_zalloc (vfio_ccw_cmd_region, -GFP_KERNEL |GFP_DMA ); -if (!private->cmd_region) - goto out_free; - - private->schib_region =kmem_cache_zalloc (vfio_ccw_schib_region, -GFP_KERNEL |GFP_DMA ); - -if (!private->schib_region) - goto out_free; - - private->crw_region =kmem_cache_zalloc (vfio_ccw_crw_region, -GFP_KERNEL |GFP_DMA ); - -if (!private->crw_region) - goto out_free; - - private->sch = sch;dev_set_drvdata (&sch->dev, private); -mutex_init (&private->io_mutex);spin_lock_irq (sch->lock); - private->state =VFIO_CCW_STATE_NOT_OPER ; sch->isc =VFIO_CCW_ISC ; ret =cio_enable_subchannel (sch, (u32 )(unsigned long )sch);spin_unlock_irq (sch->lock);if (ret) goto out_free; -INIT_LIST_HEAD (&private->crw); -INIT_WORK (&private->io_work, vfio_ccw_sch_io_todo); -INIT_WORK (&private->crw_work, vfio_ccw_crw_todo); -atomic_set (&private->avail,1 ); private->state =VFIO_CCW_STATE_STANDBY ; ret =vfio_ccw_mdev_reg (sch);
@@ -228,31 +258,20 @@ static int vfio_ccw_sch_probe(struct subchannel *sch)cio_disable_subchannel (sch); out_free:dev_set_drvdata (&sch->dev,NULL ); -vfio_ccw_free_regions (private); -kfree (private->cp.guest_cp); -kfree (private); +vfio_ccw_free_private (private);return ret; }static void vfio_ccw_sch_remove (struct subchannel *sch) {struct vfio_ccw_private *private =dev_get_drvdata (&sch->dev); -struct vfio_ccw_crw *crw, *temp;vfio_ccw_sch_quiesce (sch); - -list_for_each_entry_safe (crw, temp, &private->crw, next) { -list_del (&crw->next); -kfree (crw); - } -vfio_ccw_mdev_unreg (sch);dev_set_drvdata (&sch->dev,NULL ); -vfio_ccw_free_regions (private); -kfree (private->cp.guest_cp); -kfree (private); +vfio_ccw_free_private (private); VFIO_CCW_MSG_EVENT(4, "unbound from subchannel %x.%x.%04x\n", sch->schid.cssid, sch->schid.ssid,
Signature · 1 line
2.33.0
PATCH v4 3/4 vfio/ccw: Pass vfio_ccw_private not mdev_device to various functions
In reply to Jason Gunthorpemdev_device should only be used in functions assigned to ops callbacks, interior functions should use the struct vfio_ccw_private instead of repeatedly trying to get it from the mdev.
--- drivers/s390/cio/vfio_ccw_ops.c | 37 +++++++++++++-------------------- 1 file changed, 15 insertions(+), 22 deletions(-)
drivers/s390/cio/vfio_ccw_ops.c +15 -22
@@ -17,13 +17,11 @@#include "vfio_ccw_private.h" -static int vfio_ccw_mdev_reset (struct mdev_device *mdev) +static int vfio_ccw_mdev_reset (struct vfio_ccw_private *private) { -struct vfio_ccw_private *private;struct subchannel *sch;int ret; - private =dev_get_drvdata (mdev_parent_dev (mdev)); sch = private->sch;/* * TODO:
@@ -61,7 +59,7 @@ static int vfio_ccw_mdev_notifier(struct notifier_block *nb,if (!cp_iova_pinned (&private->cp, unmap->iova))return NOTIFY_OK ; -if (vfio_ccw_mdev_reset (private->mdev)) +if (vfio_ccw_mdev_reset (private))return NOTIFY_BAD ;cp_free (&private->cp);
@@ -201,7 +199,7 @@ static void vfio_ccw_mdev_close_device(struct mdev_device *mdev)if ((private->state !=VFIO_CCW_STATE_NOT_OPER ) && (private->state !=VFIO_CCW_STATE_STANDBY )) { -if (!vfio_ccw_mdev_reset (mdev)) +if (!vfio_ccw_mdev_reset (private)) private->state =VFIO_CCW_STATE_STANDBY ;/* The state will be NOT_OPER on error. */ }
@@ -311,12 +309,9 @@ static ssize_t vfio_ccw_mdev_write(struct mdev_device *mdev,return -EINVAL ; } -static int vfio_ccw_mdev_get_device_info (struct vfio_device_info *info, -struct mdev_device *mdev) +static int vfio_ccw_mdev_get_device_info (struct vfio_ccw_private *private, +struct vfio_device_info *info) { -struct vfio_ccw_private *private; - - private =dev_get_drvdata (mdev_parent_dev (mdev)); info->flags =VFIO_DEVICE_FLAGS_CCW |VFIO_DEVICE_FLAGS_RESET ; info->num_regions =VFIO_CCW_NUM_REGIONS + private->num_regions; info->num_irqs =VFIO_CCW_NUM_IRQS ;
@@ -324,14 +319,12 @@ static int vfio_ccw_mdev_get_device_info(struct vfio_device_info *info,return 0 ; } -static int vfio_ccw_mdev_get_region_info (struct vfio_region_info *info, -struct mdev_device *mdev, +static int vfio_ccw_mdev_get_region_info (struct vfio_ccw_private *private, +struct vfio_region_info *info,unsigned long arg) { -struct vfio_ccw_private *private;int i; - private =dev_get_drvdata (mdev_parent_dev (mdev));switch (info->index) {case VFIO_CCW_CONFIG_REGION_INDEX : info->offset =0 ;
@@ -406,19 +399,16 @@ static int vfio_ccw_mdev_get_irq_info(struct vfio_irq_info *info)return 0 ; } -static int vfio_ccw_mdev_set_irqs (struct mdev_device *mdev, +static int vfio_ccw_mdev_set_irqs (struct vfio_ccw_private *private,uint32_t flags,uint32_t index,void __user *data) { -struct vfio_ccw_private *private;struct eventfd_ctx **ctx;if (!(flags &VFIO_IRQ_SET_ACTION_TRIGGER ))return -EINVAL ; - private =dev_get_drvdata (mdev_parent_dev (mdev)); -switch (index) {case VFIO_CCW_IO_IRQ_INDEX : ctx = &private->io_trigger;
@@ -524,6 +514,8 @@ static ssize_t vfio_ccw_mdev_ioctl(struct mdev_device *mdev, unsigned int cmd, unsigned long arg) { +struct vfio_ccw_private *private = +dev_get_drvdata (mdev_parent_dev (mdev));int ret =0 ;unsigned long minsz;
@@ -540,7 +532,7 @@ static ssize_t vfio_ccw_mdev_ioctl(struct mdev_device *mdev,if (info.argsz < minsz)return -EINVAL ; - ret =vfio_ccw_mdev_get_device_info (&info, mdev); + ret =vfio_ccw_mdev_get_device_info (private, &info);if (ret)return ret;
@@ -558,7 +550,7 @@ static ssize_t vfio_ccw_mdev_ioctl(struct mdev_device *mdev,if (info.argsz < minsz)return -EINVAL ; - ret =vfio_ccw_mdev_get_region_info (&info, mdev, arg); + ret =vfio_ccw_mdev_get_region_info (private, &info, arg);if (ret)return ret;
@@ -603,10 +595,11 @@ static ssize_t vfio_ccw_mdev_ioctl(struct mdev_device *mdev,return ret; data = (void __user *)(arg + minsz); -return vfio_ccw_mdev_set_irqs (mdev, hdr.flags, hdr.index, data); +return vfio_ccw_mdev_set_irqs (private, hdr.flags, hdr.index, + data); }case VFIO_DEVICE_RESET : -return vfio_ccw_mdev_reset (mdev); +return vfio_ccw_mdev_reset (private);default :return -ENOTTY ; }
Signature · 1 line
2.33.0
PATCH v4 4/4 vfio/ccw: Convert to use vfio_register_emulated_iommu_dev()
In reply to Jason GunthorpeThis is a more complicated conversion because vfio_ccw is sharing the vfio_device between both the mdev_device, its vfio_device and the css_driver.
The mdev is a singleton, and the reason for this sharing is so the extra css_driver function callbacks to be delivered to the vfio_device implementation.
This keeps things as they are, with the css_driver allocating the singleton, not the mdev_driver.
Embed the vfio_device in the vfio_ccw_private and instantiate it as a vfio_device when the mdev probes. The drvdata of both the css_device and the mdev_device point at the private, and container_of is used to get it back from the vfio_device.
--- drivers/s390/cio/vfio_ccw_drv.c | 21 ++++-- drivers/s390/cio/vfio_ccw_ops.c | 107 +++++++++++++++++----------- drivers/s390/cio/vfio_ccw_private.h | 5 ++ 3 files changed, 85 insertions(+), 48 deletions(-)
drivers/s390/cio/vfio_ccw_drv.c +14 -7
@@ -468,7 +468,7 @@ static int __init vfio_ccw_sch_init(void) vfio_ccw_work_q =create_singlethread_workqueue ("vfio-ccw" );if (!vfio_ccw_work_q) { ret = -ENOMEM ; - goto out_err; + goto out_regions; } vfio_ccw_io_region = kmem_cache_create_usercopy("vfio_ccw_io_region",
@@ -477,7 +477,7 @@ static int __init vfio_ccw_sch_init(void) sizeof(struct ccw_io_region), NULL);if (!vfio_ccw_io_region) { ret = -ENOMEM ; - goto out_err; + goto out_regions; } vfio_ccw_cmd_region = kmem_cache_create_usercopy("vfio_ccw_cmd_region",
@@ -486,7 +486,7 @@ static int __init vfio_ccw_sch_init(void) sizeof(struct ccw_cmd_region), NULL);if (!vfio_ccw_cmd_region) { ret = -ENOMEM ; - goto out_err; + goto out_regions; } vfio_ccw_schib_region = kmem_cache_create_usercopy("vfio_ccw_schib_region",
@@ -496,7 +496,7 @@ static int __init vfio_ccw_sch_init(void)if (!vfio_ccw_schib_region) { ret = -ENOMEM ; - goto out_err; + goto out_regions; } vfio_ccw_crw_region = kmem_cache_create_usercopy("vfio_ccw_crw_region",
@@ -506,19 +506,25 @@ static int __init vfio_ccw_sch_init(void)if (!vfio_ccw_crw_region) { ret = -ENOMEM ; - goto out_err; + goto out_regions; } + ret =mdev_register_driver (&vfio_ccw_mdev_driver); +if (ret) + goto out_regions; +isc_register (VFIO_CCW_ISC ); ret =css_driver_register (&vfio_ccw_sch_driver);if (ret) {isc_unregister (VFIO_CCW_ISC ); - goto out_err; + goto out_driver; }return ret; -out_err: +out_driver: +mdev_unregister_driver (&vfio_ccw_mdev_driver); +out_regions:vfio_ccw_destroy_regions ();destroy_workqueue (vfio_ccw_work_q);vfio_ccw_debug_exit ();
@@ -528,6 +534,7 @@ static int __init vfio_ccw_sch_init(void) static void __exit vfio_ccw_sch_exit(void) {css_driver_unregister (&vfio_ccw_sch_driver); +mdev_unregister_driver (&vfio_ccw_mdev_driver);isc_unregister (VFIO_CCW_ISC );vfio_ccw_destroy_regions ();destroy_workqueue (vfio_ccw_work_q);
drivers/s390/cio/vfio_ccw_ops.c +66 -41
232 lines not on this page · raw message
drivers/s390/cio/vfio_ccw_private.h +5 -0
@@ -17,6 +17,7 @@#include <linux/eventfd.h> #include <linux/workqueue.h> #include <linux/vfio_ccw.h> +#include <linux/vfio.h> #include <asm/crw.h> #include <asm/debug.h>
@@ -67,6 +68,7 @@ struct vfio_ccw_crw {/** * struct vfio_ccw_private +* @vdev: Embedded VFIO device * @sch: pointer to the subchannel * @state: internal state of the device * @completion: synchronization helper of the I/O completion
@@ -90,6 +92,7 @@ struct vfio_ccw_crw {* @crw_work: work for deferral process of CRW handling */ struct vfio_ccw_private { +struct vfio_device vdev;struct subchannel *sch;int state;struct completion *completion;
@@ -121,6 +124,8 @@ extern void vfio_ccw_mdev_unreg(struct subchannel *sch);extern int vfio_ccw_sch_quiesce (struct subchannel *sch); +extern struct mdev_driver vfio_ccw_mdev_driver; +/* * States of the device statemachine. */
Signature · 1 line
2.33.0
Alex Williamson
AppliedQuoted 8 lines · On Tue, 26 Oct 2021 14:57:29 -0300 Jason Gunthorpe <[email protected]> wrote:
This is the first 4 patches of the v3 series which only change CCW to use the new VFIO API for mdevs and leaves the lifetime model as-is.
As agreed, we will go ahead with this set and IBM can take the remaining patches of cleanup when they want. (I won't resend them)
Alex: as Eric has now ack'd them please take them to the VFIO tree for this upcoming merge window
Applied to vfio next branch for v5.16. Thanks,
Alex