Commit 9f266cca 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:
 "Just small bugfixes all over the place"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vdpa: ifcvf: Do proper cleanup if IFCVF init fails
  vhost-scsi: unbreak any layout for response
  tools/virtio: fix the vringh test for virtio ring changes
  vhost/net: Clear the pending messages when the backend is removed
parents ce18d3aa 6b04456e

drivers/vdpa/ifcvf/ifcvf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static int ifcvf_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	ret = ifcvf_init_hw(vf, pdev);

	if (ret) {

		IFCVF_ERR(pdev, "Failed to init IFCVF hw\n");

		return ret;

		goto err;

	}



	for (i = 0; i < vf->nr_vring; i++)

drivers/vhost/net.c

+3 −0
Original line number Diff line number Diff line
@@ -1511,6 +1511,9 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd) 
	nvq = &n->vqs[index];

	mutex_lock(&vq->mutex);



	if (fd == -1)

		vhost_clear_msg(&n->dev);



	/* Verify that ring has been setup correctly. */

	if (!vhost_vq_access_ok(vq)) {

		r = -EFAULT;

drivers/vhost/scsi.c

+17 −4
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ struct vhost_scsi_cmd { 
	struct scatterlist *tvc_prot_sgl;

	struct page **tvc_upages;

	/* Pointer to response header iovec */

	struct iovec tvc_resp_iov;

	struct iovec *tvc_resp_iov;

	/* Pointer to vhost_scsi for our device */

	struct vhost_scsi *tvc_vhost;

	/* Pointer to vhost_virtqueue for the cmd */
@@ -563,7 +563,7 @@ static void vhost_scsi_complete_cmd_work(struct vhost_work *work) 
		memcpy(v_rsp.sense, cmd->tvc_sense_buf,

		       se_cmd->scsi_sense_length);



		iov_iter_init(&iov_iter, ITER_DEST, &cmd->tvc_resp_iov,

		iov_iter_init(&iov_iter, ITER_DEST, cmd->tvc_resp_iov,

			      cmd->tvc_in_iovs, sizeof(v_rsp));

		ret = copy_to_iter(&v_rsp, sizeof(v_rsp), &iov_iter);

		if (likely(ret == sizeof(v_rsp))) {
@@ -594,6 +594,7 @@ vhost_scsi_get_cmd(struct vhost_virtqueue *vq, struct vhost_scsi_tpg *tpg, 
	struct vhost_scsi_cmd *cmd;

	struct vhost_scsi_nexus *tv_nexus;

	struct scatterlist *sg, *prot_sg;

	struct iovec *tvc_resp_iov;

	struct page **pages;

	int tag;
@@ -613,6 +614,7 @@ vhost_scsi_get_cmd(struct vhost_virtqueue *vq, struct vhost_scsi_tpg *tpg, 
	sg = cmd->tvc_sgl;

	prot_sg = cmd->tvc_prot_sgl;

	pages = cmd->tvc_upages;

	tvc_resp_iov = cmd->tvc_resp_iov;

	memset(cmd, 0, sizeof(*cmd));

	cmd->tvc_sgl = sg;

	cmd->tvc_prot_sgl = prot_sg;
@@ -625,6 +627,7 @@ vhost_scsi_get_cmd(struct vhost_virtqueue *vq, struct vhost_scsi_tpg *tpg, 
	cmd->tvc_data_direction = data_direction;

	cmd->tvc_nexus = tv_nexus;

	cmd->inflight = vhost_scsi_get_inflight(vq);

	cmd->tvc_resp_iov = tvc_resp_iov;



	memcpy(cmd->tvc_cdb, cdb, VHOST_SCSI_MAX_CDB_SIZE);
@@ -935,7 +938,7 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) 
	struct iov_iter in_iter, prot_iter, data_iter;

	u64 tag;

	u32 exp_data_len, data_direction;

	int ret, prot_bytes, c = 0;

	int ret, prot_bytes, i, c = 0;

	u16 lun;

	u8 task_attr;

	bool t10_pi = vhost_has_feature(vq, VIRTIO_SCSI_F_T10_PI);
@@ -1092,7 +1095,8 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) 
		}

		cmd->tvc_vhost = vs;

		cmd->tvc_vq = vq;

		cmd->tvc_resp_iov = vq->iov[vc.out];

		for (i = 0; i < vc.in ; i++)

			cmd->tvc_resp_iov[i] = vq->iov[vc.out + i];

		cmd->tvc_in_iovs = vc.in;



		pr_debug("vhost_scsi got command opcode: %#02x, lun: %d\n",
@@ -1461,6 +1465,7 @@ static void vhost_scsi_destroy_vq_cmds(struct vhost_virtqueue *vq) 
		kfree(tv_cmd->tvc_sgl);

		kfree(tv_cmd->tvc_prot_sgl);

		kfree(tv_cmd->tvc_upages);

		kfree(tv_cmd->tvc_resp_iov);

	}



	sbitmap_free(&svq->scsi_tags);
@@ -1508,6 +1513,14 @@ static int vhost_scsi_setup_vq_cmds(struct vhost_virtqueue *vq, int max_cmds) 
			goto out;

		}



		tv_cmd->tvc_resp_iov = kcalloc(UIO_MAXIOV,

					       sizeof(struct iovec),

					       GFP_KERNEL);

		if (!tv_cmd->tvc_resp_iov) {

			pr_err("Unable to allocate tv_cmd->tvc_resp_iov\n");

			goto out;

		}



		tv_cmd->tvc_prot_sgl = kcalloc(VHOST_SCSI_PREALLOC_PROT_SGLS,

					       sizeof(struct scatterlist),

					       GFP_KERNEL);

drivers/vhost/vhost.c

+2 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ void vhost_dev_stop(struct vhost_dev *dev) 
}

EXPORT_SYMBOL_GPL(vhost_dev_stop);



static void vhost_clear_msg(struct vhost_dev *dev)

void vhost_clear_msg(struct vhost_dev *dev)

{

	struct vhost_msg_node *node, *n;
@@ -679,6 +679,7 @@ static void vhost_clear_msg(struct vhost_dev *dev) 


	spin_unlock(&dev->iotlb_lock);

}

EXPORT_SYMBOL_GPL(vhost_clear_msg);



void vhost_dev_cleanup(struct vhost_dev *dev)

{

drivers/vhost/vhost.h

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ long vhost_dev_ioctl(struct vhost_dev *, unsigned int ioctl, void __user *argp); 
long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp);

bool vhost_vq_access_ok(struct vhost_virtqueue *vq);

bool vhost_log_access_ok(struct vhost_dev *);

void vhost_clear_msg(struct vhost_dev *dev);



int vhost_get_vq_desc(struct vhost_virtqueue *,

		      struct iovec iov[], unsigned int iov_count,