Commit d06c942e 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 vhost,virtio,vdpa bugfixes from Michael Tsirkin:
 "Misc fixes all over the place.

  Revert of virtio used length validation series: the approach taken
  does not seem to work, breaking too many guests in the process. We'll
  need to do length validation using some other approach"

[ This merge also ends up reverting commit f7a36b03 ("vsock/virtio:
  suppress used length validation"), which came in through the
  networking tree in the meantime, and was part of that whole used
  length validation series   - Linus ]

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vdpa_sim: avoid putting an uninitialized iova_domain
  vhost-vdpa: clean irqs before reseting vdpa device
  virtio-blk: modify the value type of num in virtio_queue_rq()
  vhost/vsock: cleanup removing `len` variable
  vhost/vsock: fix incorrect used length reported to the guest
  Revert "virtio_ring: validate used buffer length"
  Revert "virtio-net: don't let virtio core to validate used length"
  Revert "virtio-blk: don't let virtio core to validate used length"
  Revert "virtio-scsi: don't let virtio core to validate used buffer length"
parents 9557e60b bb93ce4b

drivers/block/virtio_blk.c

+1 −2
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static blk_status_t virtio_queue_rq(struct blk_mq_hw_ctx *hctx, 
	struct request *req = bd->rq;

	struct virtblk_req *vbr = blk_mq_rq_to_pdu(req);

	unsigned long flags;

	unsigned int num;

	int num;

	int qid = hctx->queue_num;

	bool notify = false;

	blk_status_t status;
@@ -1049,7 +1049,6 @@ static struct virtio_driver virtio_blk = { 
	.feature_table_size		= ARRAY_SIZE(features),

	.feature_table_legacy		= features_legacy,

	.feature_table_size_legacy	= ARRAY_SIZE(features_legacy),

	.suppress_used_validation	= true,

	.driver.name			= KBUILD_MODNAME,

	.driver.owner			= THIS_MODULE,

	.id_table			= id_table,

drivers/net/virtio_net.c

+0 −1
Original line number Diff line number Diff line
@@ -3423,7 +3423,6 @@ static struct virtio_driver virtio_net_driver = { 
	.feature_table_size = ARRAY_SIZE(features),

	.feature_table_legacy = features_legacy,

	.feature_table_size_legacy = ARRAY_SIZE(features_legacy),

	.suppress_used_validation = true,

	.driver.name =	KBUILD_MODNAME,

	.driver.owner =	THIS_MODULE,

	.id_table =	id_table,

drivers/scsi/virtio_scsi.c

+0 −1
Original line number Diff line number Diff line
@@ -977,7 +977,6 @@ static unsigned int features[] = { 
static struct virtio_driver virtio_scsi_driver = {

	.feature_table = features,

	.feature_table_size = ARRAY_SIZE(features),

	.suppress_used_validation = true,

	.driver.name = KBUILD_MODNAME,

	.driver.owner = THIS_MODULE,

	.id_table = id_table,

drivers/vdpa/vdpa_sim/vdpa_sim.c

+5 −2
Original line number Diff line number Diff line
@@ -591,8 +591,11 @@ static void vdpasim_free(struct vdpa_device *vdpa) 
		vringh_kiov_cleanup(&vdpasim->vqs[i].in_iov);

	}



	if (vdpa_get_dma_dev(vdpa)) {

		put_iova_domain(&vdpasim->iova);

		iova_cache_put();

	}



	kvfree(vdpasim->buffer);

	if (vdpasim->iommu)

		vhost_iotlb_free(vdpasim->iommu);

drivers/vhost/vdpa.c

+1 −1
Original line number Diff line number Diff line
@@ -1014,12 +1014,12 @@ static int vhost_vdpa_release(struct inode *inode, struct file *filep) 


	mutex_lock(&d->mutex);

	filep->private_data = NULL;

	vhost_vdpa_clean_irq(v);

	vhost_vdpa_reset(v);

	vhost_dev_stop(&v->vdev);

	vhost_vdpa_iotlb_free(v);

	vhost_vdpa_free_domain(v);

	vhost_vdpa_config_put(v);

	vhost_vdpa_clean_irq(v);

	vhost_dev_cleanup(&v->vdev);

	kfree(v->vdev.vqs);

	mutex_unlock(&d->mutex);