Commit c44b5943 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 updates from Michael Tsirkin:
 "Fixes, cleanups, performance

  A bunch of changes to virtio, most affecting virtio net. Also ptr_ring
  batched zeroing - first of batching enhancements that seems ready."

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  s390/virtio: change maintainership
  tools/virtio: fix spelling mistake: "wakeus" -> "wakeups"
  virtio_net: tidy a couple debug statements
  ptr_ring: support testing different batching sizes
  ringtest: support test specific parameters
  ptr_ring: batch ring zeroing
  virtio: virtio_driver doc
  virtio_net: don't reset twice on XDP on/off
  virtio_net: fix support for small rings
  virtio_net: reduce alignment for buffers
  virtio_net: rework mergeable buffer handling
  virtio_net: allow specifying context for rx
  virtio: allow extra context per descriptor
  tools/virtio: fix build breakage
  virtio: add context flag to find vqs
  virtio: wrap find_vqs
  ringtest: fix an assert statement
parents 5ccd4140 c8b0d729

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -13556,8 +13556,8 @@ F: include/uapi/linux/virtio_*.h 
F:	drivers/crypto/virtio/



VIRTIO DRIVERS FOR S390

M:	Christian Borntraeger <borntraeger@de.ibm.com>

M:	Cornelia Huck <cornelia.huck@de.ibm.com>

M:	Halil Pasic <pasic@linux.vnet.ibm.com>

L:	linux-s390@vger.kernel.org

L:	virtualization@lists.linux-foundation.org

L:	kvm@vger.kernel.org

drivers/block/virtio_blk.c

+1 −2
Original line number Diff line number Diff line
@@ -452,8 +452,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;

drivers/char/virtio_console.c

+3 −3
Original line number Diff line number Diff line
@@ -1945,7 +1945,7 @@ static int init_vqs(struct ports_device *portdev) 
		}

	}

	/* Find the queues. */

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

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

			      io_callbacks,

			      (const char **)io_names, NULL);

	if (err)

drivers/crypto/virtio/virtio_crypto_core.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/virtio/virtgpu_kms.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE