Commit abe71eb3 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:
 "Fixes all over the place, most notably fixes for latent bugs in
  drivers that got exposed by suppressing interrupts before DRIVER_OK,
  which in turn has been done by 8b4ec69d ("virtio: harden vring
  IRQ")"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  um: virt-pci: set device ready in probe()
  vdpa: make get_vq_group and set_group_asid optional
  virtio: Fix all occurences of the "the the" typo
  vduse: Fix NULL pointer dereference on sysfs access
  vringh: Fix loop descriptors check in the indirect cases
  vdpa/mlx5: clean up indenting in handle_ctrl_vlan()
  vdpa/mlx5: fix error code for deleting vlan
  virtio-mmio: fix missing put_device() when vm_cmdline_parent registration failed
  vdpa/mlx5: Fix syntax errors in comments
  virtio-rng: make device ready before making request
parents 0678afa6 eacea844

arch/um/drivers/virt-pci.c

+6 −1
Original line number Diff line number Diff line
@@ -544,6 +544,8 @@ static int um_pci_init_vqs(struct um_pci_device *dev) 
	dev->cmd_vq = vqs[0];

	dev->irq_vq = vqs[1];



	virtio_device_ready(dev->vdev);



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

		void *msg = kzalloc(MAX_IRQ_MSG_SIZE, GFP_KERNEL);
@@ -587,7 +589,7 @@ static int um_pci_virtio_probe(struct virtio_device *vdev) 
	dev->irq = irq_alloc_desc(numa_node_id());

	if (dev->irq < 0) {

		err = dev->irq;

		goto error;

		goto err_reset;

	}

	um_pci_devices[free].dev = dev;

	vdev->priv = dev;
@@ -604,6 +606,9 @@ static int um_pci_virtio_probe(struct virtio_device *vdev) 


	um_pci_rescan();

	return 0;

err_reset:

	virtio_reset_device(vdev);

	vdev->config->del_vqs(vdev);

error:

	mutex_unlock(&um_pci_mtx);

	kfree(dev);

drivers/char/hw_random/virtio-rng.c

+2 −0
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ static int probe_common(struct virtio_device *vdev) 
		goto err_find;

	}



	virtio_device_ready(vdev);



	/* we always have a pending entropy request */

	request_entropy(vi);

drivers/vdpa/mlx5/net/mlx5_vnet.c

+5 −4
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ struct mlx5_vdpa_virtqueue { 


	/* Resources for implementing the notification channel from the device

	 * to the driver. fwqp is the firmware end of an RC connection; the

	 * other end is vqqp used by the driver. cq is is where completions are

	 * other end is vqqp used by the driver. cq is where completions are

	 * reported.

	 */

	struct mlx5_vdpa_cq cq;
@@ -1814,6 +1814,7 @@ static virtio_net_ctrl_ack handle_ctrl_vlan(struct mlx5_vdpa_dev *mvdev, u8 cmd) 


		id = mlx5vdpa16_to_cpu(mvdev, vlan);

		mac_vlan_del(ndev, ndev->config.mac, id, true);

		status = VIRTIO_NET_OK;

		break;

	default:

		break;

drivers/vdpa/vdpa_user/vduse_dev.c

+3 −4
Original line number Diff line number Diff line
@@ -1345,9 +1345,9 @@ static int vduse_create_dev(struct vduse_dev_config *config, 


	dev->minor = ret;

	dev->msg_timeout = VDUSE_MSG_DEFAULT_TIMEOUT;

	dev->dev = device_create(vduse_class, NULL,

	dev->dev = device_create_with_groups(vduse_class, NULL,

				MKDEV(MAJOR(vduse_major), dev->minor),

				 dev, "%s", config->name);

				dev, vduse_dev_groups, "%s", config->name);

	if (IS_ERR(dev->dev)) {

		ret = PTR_ERR(dev->dev);

		goto err_dev;
@@ -1596,7 +1596,6 @@ static int vduse_init(void) 
		return PTR_ERR(vduse_class);



	vduse_class->devnode = vduse_devnode;

	vduse_class->dev_groups = vduse_dev_groups;



	ret = alloc_chrdev_region(&vduse_major, 0, VDUSE_DEV_MAX, "vduse");

	if (ret)

drivers/vhost/vdpa.c

+2 −0
Original line number Diff line number Diff line
@@ -499,6 +499,8 @@ static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v, unsigned int cmd, 
		ops->set_vq_ready(vdpa, idx, s.num);

		return 0;

	case VHOST_VDPA_GET_VRING_GROUP:

		if (!ops->get_vq_group)

			return -EOPNOTSUPP;

		s.index = idx;

		s.num = ops->get_vq_group(vdpa, idx);

		if (s.num >= vdpa->ngroups)