Commit d1104f93 authored by Eric Farman's avatar Eric Farman Committed by Alex Williamson
Browse files

vfio/ccw: replace vfio_init_device with _alloc_ 



Now that we have a reasonable separation of structs that follow
the subchannel and mdev lifecycles, there's no reason we can't
call the official vfio_alloc_device routine for our private data,
and behave like everyone else.

Signed-off-by: default avatarEric Farman <farman@linux.ibm.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarMatthew Rosato <mjrosato@linux.ibm.com>
Link: https://lore.kernel.org/r/20221104142007.1314999-7-farman@linux.ibm.com


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

drivers/s390/cio/vfio_ccw_drv.c

+0 −18
Original line number Diff line number Diff line
@@ -152,24 +152,6 @@ static void vfio_ccw_sch_irq(struct subchannel *sch) 
	vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_INTERRUPT);

}



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 void vfio_ccw_free_parent(struct device *dev)

{

	struct vfio_ccw_parent *parent = container_of(dev, struct vfio_ccw_parent, dev);

drivers/s390/cio/vfio_ccw_ops.c

+18 −10
Original line number Diff line number Diff line
@@ -102,15 +102,10 @@ static int vfio_ccw_mdev_probe(struct mdev_device *mdev) 
	struct vfio_ccw_private *private;

	int ret;



	private = kzalloc(sizeof(*private), GFP_KERNEL);

	if (!private)

		return -ENOMEM;



	ret = vfio_init_device(&private->vdev, &mdev->dev, &vfio_ccw_dev_ops);

	if (ret) {

		kfree(private);

		return ret;

	}

	private = vfio_alloc_device(vfio_ccw_private, vdev, &mdev->dev,

				    &vfio_ccw_dev_ops);

	if (IS_ERR(private))

		return PTR_ERR(private);



	dev_set_drvdata(&parent->dev, private);
@@ -135,8 +130,21 @@ static void vfio_ccw_mdev_release_dev(struct vfio_device *vdev) 
{

	struct vfio_ccw_private *private =

		container_of(vdev, struct vfio_ccw_private, vdev);

	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);



	vfio_ccw_free_private(private);

	vfio_free_device(vdev);

}



static void vfio_ccw_mdev_remove(struct mdev_device *mdev)

drivers/s390/cio/vfio_ccw_private.h

+0 −2
Original line number Diff line number Diff line
@@ -131,8 +131,6 @@ int vfio_ccw_sch_quiesce(struct subchannel *sch); 
void vfio_ccw_sch_io_todo(struct work_struct *work);

void vfio_ccw_crw_todo(struct work_struct *work);



void vfio_ccw_free_private(struct vfio_ccw_private *private);



extern struct mdev_driver vfio_ccw_mdev_driver;



/*

drivers/vfio/vfio_main.c

+5 −5
Original line number Diff line number Diff line
@@ -348,6 +348,9 @@ static void vfio_device_release(struct device *dev) 
	device->ops->release(device);

}



static int vfio_init_device(struct vfio_device *device, struct device *dev,

			    const struct vfio_device_ops *ops);



/*

 * Allocate and initialize vfio_device so it can be registered to vfio

 * core.
@@ -386,10 +389,8 @@ EXPORT_SYMBOL_GPL(_vfio_alloc_device); 


/*

 * Initialize a vfio_device so it can be registered to vfio core.

 *

 * Only vfio-ccw driver should call this interface.

 */

int vfio_init_device(struct vfio_device *device, struct device *dev,

static int vfio_init_device(struct vfio_device *device, struct device *dev,

			    const struct vfio_device_ops *ops)

{

	int ret;
@@ -422,7 +423,6 @@ int vfio_init_device(struct vfio_device *device, struct device *dev, 
	ida_free(&vfio.device_ida, device->index);

	return ret;

}

EXPORT_SYMBOL_GPL(vfio_init_device);



/*

 * The helper called by driver @release callback to free the device

include/linux/vfio.h

+0 −2
Original line number Diff line number Diff line
@@ -176,8 +176,6 @@ struct vfio_device *_vfio_alloc_device(size_t size, struct device *dev, 
					dev, ops),				\

		     struct dev_struct, member)



int vfio_init_device(struct vfio_device *device, struct device *dev,

		     const struct vfio_device_ops *ops);

void vfio_free_device(struct vfio_device *device);

static inline void vfio_put_device(struct vfio_device *device)

{