Commit ffc17596 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:

 - new vdpa features to allow creation and deletion of new devices

 - virtio-blk support per-device queue depth

 - fixes, cleanups all over the place

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (31 commits)
  virtio-input: add multi-touch support
  virtio_mmio: fix one typo
  vdpa/mlx5: fix param validation in mlx5_vdpa_get_config()
  virtio_net: Fix fall-through warnings for Clang
  virtio_input: Prevent EV_MSC/MSC_TIMESTAMP loop storm for MT.
  virtio-blk: support per-device queue depth
  virtio_vdpa: don't warn when fail to disable vq
  virtio-pci: introduce modern device module
  virito-pci-modern: rename map_capability() to vp_modern_map_capability()
  virtio-pci-modern: introduce helper to get notification offset
  virtio-pci-modern: introduce helper for getting queue nums
  virtio-pci-modern: introduce helper for setting/geting queue size
  virtio-pci-modern: introduce helper to set/get queue_enable
  virtio-pci-modern: introduce vp_modern_queue_address()
  virtio-pci-modern: introduce vp_modern_set_queue_vector()
  virtio-pci-modern: introduce vp_modern_generation()
  virtio-pci-modern: introduce helpers for setting and getting features
  virtio-pci-modern: introduce helpers for setting and getting status
  virtio-pci-modern: introduce helper to set config vector
  virtio-pci-modern: introduce vp_modern_remove()
  ...
parents a6525b99 16c10bed

drivers/block/virtio_blk.c

+7 −4
Original line number Diff line number Diff line
@@ -705,6 +705,7 @@ static int virtblk_probe(struct virtio_device *vdev) 
	u32 v, blk_size, max_size, sg_elems, opt_io_size;

	u16 min_io_size;

	u8 physical_block_exp, alignment_offset;

	unsigned int queue_depth;



	if (!vdev->config->get) {

		dev_err(&vdev->dev, "%s failure: config access disabled\n",
@@ -756,16 +757,18 @@ static int virtblk_probe(struct virtio_device *vdev) 
	}



	/* Default queue sizing is to fill the ring. */

	if (!virtblk_queue_depth) {

		virtblk_queue_depth = vblk->vqs[0].vq->num_free;

	if (likely(!virtblk_queue_depth)) {

		queue_depth = vblk->vqs[0].vq->num_free;

		/* ... but without indirect descs, we use 2 descs per req */

		if (!virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC))

			virtblk_queue_depth /= 2;

			queue_depth /= 2;

	} else {

		queue_depth = virtblk_queue_depth;

	}



	memset(&vblk->tag_set, 0, sizeof(vblk->tag_set));

	vblk->tag_set.ops = &virtio_mq_ops;

	vblk->tag_set.queue_depth = virtblk_queue_depth;

	vblk->tag_set.queue_depth = queue_depth;

	vblk->tag_set.numa_node = NUMA_NO_NODE;

	vblk->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;

	vblk->tag_set.cmd_size =

drivers/net/virtio_net.c

+1 −0
Original line number Diff line number Diff line
@@ -729,6 +729,7 @@ static struct sk_buff *receive_small(struct net_device *dev, 
			fallthrough;

		case XDP_ABORTED:

			trace_xdp_exception(vi->dev, xdp_prog, act);

			goto err_xdp;

		case XDP_DROP:

			goto err_xdp;

		}

drivers/vdpa/Kconfig

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

menuconfig VDPA

	tristate "vDPA drivers"

	depends on NET

	help

	  Enable this module to support vDPA device that uses a

	  datapath which complies with virtio specifications with

drivers/vdpa/ifcvf/ifcvf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static int ifcvf_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	adapter = vdpa_alloc_device(struct ifcvf_adapter, vdpa,

				    dev, &ifc_vdpa_ops,

				    IFCVF_MAX_QUEUE_PAIRS * 2);

				    IFCVF_MAX_QUEUE_PAIRS * 2, NULL);

	if (adapter == NULL) {

		IFCVF_ERR(pdev, "Failed to allocate vDPA structure");

		return -ENOMEM;

drivers/vdpa/mlx5/net/mlx5_vnet.c

+2 −2
Original line number Diff line number Diff line
@@ -1820,7 +1820,7 @@ static void mlx5_vdpa_get_config(struct vdpa_device *vdev, unsigned int offset, 
	struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev);

	struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);



	if (offset + len < sizeof(struct virtio_net_config))

	if (offset + len <= sizeof(struct virtio_net_config))

		memcpy(buf, (u8 *)&ndev->config + offset, len);

}
@@ -1982,7 +1982,7 @@ static int mlx5v_probe(struct auxiliary_device *adev, 
	max_vqs = min_t(u32, max_vqs, MLX5_MAX_SUPPORTED_VQS);



	ndev = vdpa_alloc_device(struct mlx5_vdpa_net, mvdev.vdev, mdev->device, &mlx5_vdpa_ops,

				 2 * mlx5_vdpa_max_qps(max_vqs));

				 2 * mlx5_vdpa_max_qps(max_vqs), NULL);

	if (IS_ERR(ndev))

		return PTR_ERR(ndev);