RE: [PATCH 1/6] virtio: wrap find_vqs

-----Original Message----- From: Michael S. Tsirkin [mailto:mst@redhat.com] Sent: Thursday, March 30, 2017 4:49 AM Subject: [PATCH 1/6] virtio: wrap find_vqs

We are going to add more parameters to find_vqs, let's wrap the call so we don't need to tweak all drivers every time.

Signed-off-by: Michael S. Tsirkin mst@redhat.com

drivers/block/virtio_blk.c | 3 +-- drivers/char/virtio_console.c | 6 +++--- drivers/crypto/virtio/virtio_crypto_core.c | 3 +-- drivers/gpu/drm/virtio/virtgpu_kms.c | 3 +-- drivers/net/caif/caif_virtio.c | 3 +-- drivers/net/virtio_net.c | 3 +-- drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- drivers/scsi/virtio_scsi.c | 3 +-- drivers/virtio/virtio_balloon.c | 3 +-- drivers/virtio/virtio_input.c | 3 +-- include/linux/virtio_config.h | 9 +++++++++ net/vmw_vsock/virtio_transport.c | 6 +++--- 12 files changed, 24 insertions(+), 23 deletions(-)

Acked-by: Gonglei arei.gonglei@huawei.com

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 1d4c9f8..c08c30c 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -455,8 +455,7 @@ static int init_vq(struct virtio_blk *vblk) }

/* Discover virtqueues and write information to configuration. */

• err = vdev->config->find_vqs(vdev, num_vqs, vqs, callbacks, names,

• 	&desc);
  

• err = virtio_find_vqs(vdev, num_vqs, vqs, callbacks, names, &desc); if (err) goto out;

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index e9b7e0b..5da4c8e 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -1945,9 +1945,9 @@ static int init_vqs(struct ports_device *portdev) } } /* Find the queues. */

• err = portdev->vdev->config->find_vqs(portdev->vdev, nr_queues, vqs,

• 			      io_callbacks,
  

• 			      (const char **)io_names, NULL);
  

• err = virtio_find_vqs(portdev->vdev, nr_queues, vqs,

• 	      io_callbacks,
  

• 	      (const char **)io_names, NULL);
  

  if (err) goto free;

diff --git a/drivers/crypto/virtio/virtio_crypto_core.c b/drivers/crypto/virtio/virtio_crypto_core.c index 21472e4..a111cd72 100644 --- a/drivers/crypto/virtio/virtio_crypto_core.c +++ b/drivers/crypto/virtio/virtio_crypto_core.c @@ -119,8 +119,7 @@ static int virtcrypto_find_vqs(struct virtio_crypto *vi) names[i] = vi->data_vq[i].name; }

• ret = vi->vdev->config->find_vqs(vi->vdev, total_vqs, vqs, callbacks,

• 			 names, NULL);
  

• ret = virtio_find_vqs(vi->vdev, total_vqs, vqs, callbacks, names, NULL); if (ret) goto err_find;

diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c index 4918668..1e1c90b 100644 --- a/drivers/gpu/drm/virtio/virtgpu_kms.c +++ b/drivers/gpu/drm/virtio/virtgpu_kms.c @@ -175,8 +175,7 @@ int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags) DRM_INFO("virgl 3d acceleration not supported by guest\n"); #endif

• ret = vgdev->vdev->config->find_vqs(vgdev->vdev, 2, vqs,

• 			    callbacks, names, NULL);
  

• ret = virtio_find_vqs(vgdev->vdev, 2, vqs, callbacks, names, NULL); if (ret) { DRM_ERROR("failed to find virt queues\n"); goto err_vqs;

diff --git a/drivers/net/caif/caif_virtio.c b/drivers/net/caif/caif_virtio.c index bc0eb47..6122768 100644 --- a/drivers/net/caif/caif_virtio.c +++ b/drivers/net/caif/caif_virtio.c @@ -679,8 +679,7 @@ static int cfv_probe(struct virtio_device *vdev) goto err;

/* Get the TX virtio ring. This is a "guest side vring". */

• err = vdev->config->find_vqs(vdev, 1, &cfv->vq_tx, &vq_cbs, &names,

• 	NULL);
  

• err = virtio_find_vqs(vdev, 1, &cfv->vq_tx, &vq_cbs, &names, NULL); if (err) goto err;

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index ea9890d..6802169 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2079,8 +2079,7 @@ static int virtnet_find_vqs(struct virtnet_info *vi) names[txq2vq(i)] = vi->sq[i].name; }

• ret = vi->vdev->config->find_vqs(vi->vdev, total_vqs, vqs, callbacks,

• 			 names, NULL);
  

• ret = virtio_find_vqs(vi->vdev, total_vqs, vqs, callbacks, names, NULL); if (ret) goto err_find;

diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 5e66e08..f7cade0 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -869,7 +869,7 @@ static int rpmsg_probe(struct virtio_device *vdev) init_waitqueue_head(&vrp->sendq);

/* We expect two virtqueues, rx and tx (and in this order) */

• err = vdev->config->find_vqs(vdev, 2, vqs, vq_cbs, names, NULL);

• err = virtio_find_vqs(vdev, 2, vqs, vq_cbs, names, NULL); if (err) goto free_vrp;

diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index 939c47d..e9222dc 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c @@ -870,8 +870,7 @@ static int virtscsi_init(struct virtio_device *vdev, }

/* Discover virtqueues and write information to configuration. */

• err = vdev->config->find_vqs(vdev, num_vqs, vqs, callbacks, names,

• 	&desc);
  

• err = virtio_find_vqs(vdev, num_vqs, vqs, callbacks, names, &desc); if (err) goto out;

diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 34adf9b..408c174 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -418,8 +418,7 @@ static int init_vqs(struct virtio_balloon *vb) * optionally stat. */ nvqs = virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_STATS_VQ) ? 3 : 2;

• err = vb->vdev->config->find_vqs(vb->vdev, nvqs, vqs, callbacks, names,

• 	NULL);
  

• err = virtio_find_vqs(vb->vdev, nvqs, vqs, callbacks, names, NULL); if (err) return err;

diff --git a/drivers/virtio/virtio_input.c b/drivers/virtio/virtio_input.c index 79f1293..3a0468f 100644 --- a/drivers/virtio/virtio_input.c +++ b/drivers/virtio/virtio_input.c @@ -173,8 +173,7 @@ static int virtinput_init_vqs(struct virtio_input *vi) static const char * const names[] = { "events", "status" }; int err;

• err = vi->vdev->config->find_vqs(vi->vdev, 2, vqs, cbs, names,

• 	NULL);
  

• err = virtio_find_vqs(vi->vdev, 2, vqs, cbs, names, NULL); if (err) return err; vi->evt = vqs[0];

diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h index 8355bab..47f3d80 100644 --- a/include/linux/virtio_config.h +++ b/include/linux/virtio_config.h @@ -179,6 +179,15 @@ struct virtqueue *virtio_find_single_vq(struct virtio_device *vdev, return vq; }

+static inline +int virtio_find_vqs(struct virtio_device *vdev, unsigned nvqs,

• 	struct virtqueue *vqs[], vq_callback_t *callbacks[],
  

• 	const char * const names[],
  

• 	struct irq_affinity *desc)
  

+{

• return vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names, desc);

+}

/**

• virtio_device_ready - enable vq use in probe function
• @vdev: the device

diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c index 68675a1..97e26e2 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -573,9 +573,9 @@ static int virtio_vsock_probe(struct virtio_device *vdev)

vsock->vdev = vdev;

• ret = vsock->vdev->config->find_vqs(vsock->vdev, VSOCK_VQ_MAX,

• 			    vsock->vqs, callbacks, names,
  

• 			    NULL);
  

• ret = virtio_find_vqs(vsock->vdev, VSOCK_VQ_MAX,

• 	      vsock->vqs, callbacks, names,
  

• 	      NULL);
  

  if (ret < 0) goto out;

-- MST