Commit 274a2eeb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

Pull virtio fixes from Michael Tsirkin:
 "Most notably this drops the commits that trip up google cloud (turns
  out, any legacy device).

  Plus a kerneldoc patch"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio: kerneldocs fixes and enhancements
  virtio: Revert "virtio: find_vqs() add arg sizes"
  virtio_vdpa: Revert "virtio_vdpa: support the arg sizes of find_vqs()"
  virtio_pci: Revert "virtio_pci: support the arg sizes of find_vqs()"
  virtio-mmio: Revert "virtio_mmio: support the arg sizes of find_vqs()"
  virtio: Revert "virtio: add helper virtio_find_vqs_ctx_size()"
  virtio_net: Revert "virtio_net: set the default max ring size by find_vqs()"
parents 3cc40a44 5c669c4a

arch/um/drivers/virtio_uml.c

+1 −1
Original line number Diff line number Diff line
@@ -1011,7 +1011,7 @@ static struct virtqueue *vu_setup_vq(struct virtio_device *vdev, 


static int vu_find_vqs(struct virtio_device *vdev, unsigned nvqs,

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

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

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

		       struct irq_affinity *desc)

{

	struct virtio_uml_device *vu_dev = to_virtio_uml_device(vdev);

drivers/net/virtio_net.c

+4 −38
Original line number Diff line number Diff line
@@ -3432,29 +3432,6 @@ static unsigned int mergeable_min_buf_len(struct virtnet_info *vi, struct virtqu 
		   (unsigned int)GOOD_PACKET_LEN);

}



static void virtnet_config_sizes(struct virtnet_info *vi, u32 *sizes)

{

	u32 i, rx_size, tx_size;



	if (vi->speed == SPEED_UNKNOWN || vi->speed < SPEED_10000) {

		rx_size = 1024;

		tx_size = 1024;



	} else if (vi->speed < SPEED_40000) {

		rx_size = 1024 * 4;

		tx_size = 1024 * 4;



	} else {

		rx_size = 1024 * 8;

		tx_size = 1024 * 8;

	}



	for (i = 0; i < vi->max_queue_pairs; i++) {

		sizes[rxq2vq(i)] = rx_size;

		sizes[txq2vq(i)] = tx_size;

	}

}



static int virtnet_find_vqs(struct virtnet_info *vi)

{

	vq_callback_t **callbacks;
@@ -3462,7 +3439,6 @@ static int virtnet_find_vqs(struct virtnet_info *vi) 
	int ret = -ENOMEM;

	int i, total_vqs;

	const char **names;

	u32 *sizes;

	bool *ctx;



	/* We expect 1 RX virtqueue followed by 1 TX virtqueue, followed by
@@ -3490,15 +3466,10 @@ static int virtnet_find_vqs(struct virtnet_info *vi) 
		ctx = NULL;

	}



	sizes = kmalloc_array(total_vqs, sizeof(*sizes), GFP_KERNEL);

	if (!sizes)

		goto err_sizes;



	/* Parameters for control virtqueue, if any */

	if (vi->has_cvq) {

		callbacks[total_vqs - 1] = NULL;

		names[total_vqs - 1] = "control";

		sizes[total_vqs - 1] = 64;

	}



	/* Allocate/initialize parameters for send/receive virtqueues */
@@ -3513,10 +3484,8 @@ static int virtnet_find_vqs(struct virtnet_info *vi) 
			ctx[rxq2vq(i)] = true;

	}



	virtnet_config_sizes(vi, sizes);



	ret = virtio_find_vqs_ctx_size(vi->vdev, total_vqs, vqs, callbacks,

				       names, sizes, ctx, NULL);

	ret = virtio_find_vqs_ctx(vi->vdev, total_vqs, vqs, callbacks,

				  names, ctx, NULL);

	if (ret)

		goto err_find;
@@ -3536,8 +3505,6 @@ static int virtnet_find_vqs(struct virtnet_info *vi) 




err_find:

	kfree(sizes);

err_sizes:

	kfree(ctx);

err_ctx:

	kfree(names);
@@ -3897,9 +3864,6 @@ static int virtnet_probe(struct virtio_device *vdev) 
		vi->curr_queue_pairs = num_online_cpus();

	vi->max_queue_pairs = max_queue_pairs;



	virtnet_init_settings(dev);

	virtnet_update_settings(vi);



	/* Allocate/initialize the rx/tx queues, and invoke find_vqs */

	err = init_vqs(vi);

	if (err)
@@ -3912,6 +3876,8 @@ static int virtnet_probe(struct virtio_device *vdev) 
	netif_set_real_num_tx_queues(dev, vi->curr_queue_pairs);

	netif_set_real_num_rx_queues(dev, vi->curr_queue_pairs);



	virtnet_init_settings(dev);



	if (virtio_has_feature(vdev, VIRTIO_NET_F_STANDBY)) {

		vi->failover = net_failover_create(vi->dev);

		if (IS_ERR(vi->failover)) {

drivers/platform/mellanox/mlxbf-tmfifo.c

+0 −1
Original line number Diff line number Diff line
@@ -928,7 +928,6 @@ static int mlxbf_tmfifo_virtio_find_vqs(struct virtio_device *vdev, 
					struct virtqueue *vqs[],

					vq_callback_t *callbacks[],

					const char * const names[],

					u32 sizes[],

					const bool *ctx,

					struct irq_affinity *desc)

{

drivers/remoteproc/remoteproc_virtio.c

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned int nvqs, 
				 struct virtqueue *vqs[],

				 vq_callback_t *callbacks[],

				 const char * const names[],

				 u32 sizes[],

				 const bool * ctx,

				 struct irq_affinity *desc)

{

drivers/s390/virtio/virtio_ccw.c

+0 −1
Original line number Diff line number Diff line
@@ -637,7 +637,6 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs, 
			       struct virtqueue *vqs[],

			       vq_callback_t *callbacks[],

			       const char * const names[],

			       u32 sizes[],

			       const bool *ctx,

			       struct irq_affinity *desc)

{