Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f94682dd authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

virtio: add context flag to find vqs 



Allows maintaining extra context per vq.  For ease of use, passing in
NULL is legal and disables the feature for all vqs.

Includes fixes by Christian for s390, acked by Cornelia.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 9b2bbdb2

drivers/misc/mic/vop/vop_main.c

+6 −3
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static void vop_del_vqs(struct virtio_device *dev) 
static struct virtqueue *vop_find_vq(struct virtio_device *dev,

				     unsigned index,

				     void (*callback)(struct virtqueue *vq),

				     const char *name)

				     const char *name, bool ctx)

{

	struct _vop_vdev *vdev = to_vopvdev(dev);

	struct vop_device *vpdev = vdev->vpdev;
@@ -314,6 +314,7 @@ static struct virtqueue *vop_find_vq(struct virtio_device *dev, 
				le16_to_cpu(config.num), MIC_VIRTIO_RING_ALIGN,

				dev,

				false,

				ctx,

				(void __force *)va, vop_notify, callback, name);

	if (!vq) {

		err = -ENOMEM;
@@ -374,7 +375,8 @@ static struct virtqueue *vop_find_vq(struct virtio_device *dev, 
static int vop_find_vqs(struct virtio_device *dev, unsigned nvqs,

			struct virtqueue *vqs[],

			vq_callback_t *callbacks[],

			const char * const names[], struct irq_affinity *desc)

			const char * const names[], const bool *ctx,

			struct irq_affinity *desc)

{

	struct _vop_vdev *vdev = to_vopvdev(dev);

	struct vop_device *vpdev = vdev->vpdev;
@@ -388,7 +390,8 @@ static int vop_find_vqs(struct virtio_device *dev, unsigned nvqs, 
	for (i = 0; i < nvqs; ++i) {

		dev_dbg(_vop_dev(vdev), "%s: %d: %s\n",

			__func__, i, names[i]);

		vqs[i] = vop_find_vq(dev, i, callbacks[i], names[i]);

		vqs[i] = vop_find_vq(dev, i, callbacks[i], names[i],

				     ctx ? ctx[i] : false);

		if (IS_ERR(vqs[i])) {

			err = PTR_ERR(vqs[i]);

			goto error;

drivers/remoteproc/remoteproc_virtio.c

+6 −4
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ EXPORT_SYMBOL(rproc_vq_interrupt); 
static struct virtqueue *rp_find_vq(struct virtio_device *vdev,

				    unsigned int id,

				    void (*callback)(struct virtqueue *vq),

				    const char *name)

				    const char *name, bool ctx)

{

	struct rproc_vdev *rvdev = vdev_to_rvdev(vdev);

	struct rproc *rproc = vdev_to_rproc(vdev);
@@ -103,8 +103,8 @@ static struct virtqueue *rp_find_vq(struct virtio_device *vdev, 
	 * Create the new vq, and tell virtio we're not interested in

	 * the 'weak' smp barriers, since we're talking with a real device.

	 */

	vq = vring_new_virtqueue(id, len, rvring->align, vdev, false, addr,

				 rproc_virtio_notify, callback, name);

	vq = vring_new_virtqueue(id, len, rvring->align, vdev, false, ctx,

				 addr, rproc_virtio_notify, callback, name);

	if (!vq) {

		dev_err(dev, "vring_new_virtqueue %s failed\n", name);

		rproc_free_vring(rvring);
@@ -138,12 +138,14 @@ static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned int nvqs, 
				 struct virtqueue *vqs[],

				 vq_callback_t *callbacks[],

				 const char * const names[],

				 const bool * ctx,

				 struct irq_affinity *desc)

{

	int i, ret;



	for (i = 0; i < nvqs; ++i) {

		vqs[i] = rp_find_vq(vdev, i, callbacks[i], names[i]);

		vqs[i] = rp_find_vq(vdev, i, callbacks[i], names[i],

				    ctx ? ctx[i] : false);

		if (IS_ERR(vqs[i])) {

			ret = PTR_ERR(vqs[i]);

			goto error;

drivers/s390/virtio/kvm_virtio.c

+5 −3
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static bool kvm_notify(struct virtqueue *vq) 
static struct virtqueue *kvm_find_vq(struct virtio_device *vdev,

				     unsigned index,

				     void (*callback)(struct virtqueue *vq),

				     const char *name)

				     const char *name, bool ctx)

{

	struct kvm_device *kdev = to_kvmdev(vdev);

	struct kvm_vqconfig *config;
@@ -211,7 +211,7 @@ static struct virtqueue *kvm_find_vq(struct virtio_device *vdev, 
		goto out;



	vq = vring_new_virtqueue(index, config->num, KVM_S390_VIRTIO_RING_ALIGN,

				 vdev, true, (void *) config->address,

				 vdev, true, ctx, (void *) config->address,

				 kvm_notify, callback, name);

	if (!vq) {

		err = -ENOMEM;
@@ -256,6 +256,7 @@ static int kvm_find_vqs(struct virtio_device *vdev, unsigned nvqs, 
			struct virtqueue *vqs[],

			vq_callback_t *callbacks[],

			const char * const names[],

			const bool *ctx,

			struct irq_affinity *desc)

{

	struct kvm_device *kdev = to_kvmdev(vdev);
@@ -266,7 +267,8 @@ static int kvm_find_vqs(struct virtio_device *vdev, unsigned nvqs, 
		return -ENOENT;



	for (i = 0; i < nvqs; ++i) {

		vqs[i] = kvm_find_vq(vdev, i, callbacks[i], names[i]);

		vqs[i] = kvm_find_vq(vdev, i, callbacks[i], names[i],

				     ctx ? ctx[i] : false);

		if (IS_ERR(vqs[i]))

			goto error;

	}

drivers/s390/virtio/virtio_ccw.c

+4 −3
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ static void virtio_ccw_del_vqs(struct virtio_device *vdev) 


static struct virtqueue *virtio_ccw_setup_vq(struct virtio_device *vdev,

					     int i, vq_callback_t *callback,

					     const char *name,

					     const char *name, bool ctx,

					     struct ccw1 *ccw)

{

	struct virtio_ccw_device *vcdev = to_vc_device(vdev);
@@ -522,7 +522,7 @@ static struct virtqueue *virtio_ccw_setup_vq(struct virtio_device *vdev, 
	}



	vq = vring_new_virtqueue(i, info->num, KVM_VIRTIO_CCW_RING_ALIGN, vdev,

				 true, info->queue, virtio_ccw_kvm_notify,

				 true, ctx, info->queue, virtio_ccw_kvm_notify,

				 callback, name);

	if (!vq) {

		/* For now, we fail if we can't get the requested size. */
@@ -629,6 +629,7 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs, 
			       struct virtqueue *vqs[],

			       vq_callback_t *callbacks[],

			       const char * const names[],

			       const bool *ctx,

			       struct irq_affinity *desc)

{

	struct virtio_ccw_device *vcdev = to_vc_device(vdev);
@@ -642,7 +643,7 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs, 


	for (i = 0; i < nvqs; ++i) {

		vqs[i] = virtio_ccw_setup_vq(vdev, i, callbacks[i], names[i],

					     ccw);

					     ctx ? ctx[i] : false, ccw);

		if (IS_ERR(vqs[i])) {

			ret = PTR_ERR(vqs[i]);

			vqs[i] = NULL;

drivers/virtio/virtio_mmio.c

+5 −3
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static void vm_del_vqs(struct virtio_device *vdev) 


static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned index,

				  void (*callback)(struct virtqueue *vq),

				  const char *name)

				  const char *name, bool ctx)

{

	struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);

	struct virtio_mmio_vq_info *info;
@@ -388,7 +388,7 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned index, 


	/* Create the vring */

	vq = vring_create_virtqueue(index, num, VIRTIO_MMIO_VRING_ALIGN, vdev,

				 true, true, vm_notify, callback, name);

				 true, true, ctx, vm_notify, callback, name);

	if (!vq) {

		err = -ENOMEM;

		goto error_new_virtqueue;
@@ -447,6 +447,7 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned nvqs, 
		       struct virtqueue *vqs[],

		       vq_callback_t *callbacks[],

		       const char * const names[],

		       const bool *ctx,

		       struct irq_affinity *desc)

{

	struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
@@ -459,7 +460,8 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned nvqs, 
		return err;



	for (i = 0; i < nvqs; ++i) {

		vqs[i] = vm_setup_vq(vdev, i, callbacks[i], names[i]);

		vqs[i] = vm_setup_vq(vdev, i, callbacks[i], names[i],

				     ctx ? ctx[i] : false);

		if (IS_ERR(vqs[i])) {

			vm_del_vqs(vdev);

			return PTR_ERR(vqs[i]);