Commit bb617b9b 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/vhost fixes and cleanups from Michael Tsirkin:
 "Fixes and cleanups all over the place"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost/scsi: Use copy_to_iter() to send control queue response
  vhost: return EINVAL if iovecs size does not match the message size
  virtio-balloon: tweak config_changed implementation
  virtio: don't allocate vqs when names[i] = NULL
  virtio_pci: use queue idx instead of array idx to set up the vq
  virtio: document virtio_config_ops restrictions
  virtio: fix virtio_config_ops description
parents 1be969f4 8e5dadfe

drivers/misc/mic/vop/vop_main.c

+7 −2
Original line number Diff line number Diff line
@@ -394,16 +394,21 @@ static int vop_find_vqs(struct virtio_device *dev, unsigned nvqs, 
	struct _vop_vdev *vdev = to_vopvdev(dev);

	struct vop_device *vpdev = vdev->vpdev;

	struct mic_device_ctrl __iomem *dc = vdev->dc;

	int i, err, retry;

	int i, err, retry, queue_idx = 0;



	/* We must have this many virtqueues. */

	if (nvqs > ioread8(&vdev->desc->num_vq))

		return -ENOENT;



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

		if (!names[i]) {

			vqs[i] = NULL;

			continue;

		}



		dev_dbg(_vop_dev(vdev), "%s: %d: %s\n",

			__func__, i, names[i]);

		vqs[i] = vop_find_vq(dev, i, callbacks[i], names[i],

		vqs[i] = vop_find_vq(dev, queue_idx++, callbacks[i], names[i],

				     ctx ? ctx[i] : false);

		if (IS_ERR(vqs[i])) {

			err = PTR_ERR(vqs[i]);

drivers/remoteproc/remoteproc_virtio.c

+7 −2
Original line number Diff line number Diff line
@@ -153,10 +153,15 @@ static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned int nvqs, 
				 const bool * ctx,

				 struct irq_affinity *desc)

{

	int i, ret;

	int i, ret, queue_idx = 0;



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

		vqs[i] = rp_find_vq(vdev, i, callbacks[i], names[i],

		if (!names[i]) {

			vqs[i] = NULL;

			continue;

		}



		vqs[i] = rp_find_vq(vdev, queue_idx++, callbacks[i], names[i],

				    ctx ? ctx[i] : false);

		if (IS_ERR(vqs[i])) {

			ret = PTR_ERR(vqs[i]);

drivers/s390/virtio/virtio_ccw.c

+9 −3
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs, 
{

	struct virtio_ccw_device *vcdev = to_vc_device(vdev);

	unsigned long *indicatorp = NULL;

	int ret, i;

	int ret, i, queue_idx = 0;

	struct ccw1 *ccw;



	ccw = kzalloc(sizeof(*ccw), GFP_DMA | GFP_KERNEL);
@@ -643,8 +643,14 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs, 
		return -ENOMEM;



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

		vqs[i] = virtio_ccw_setup_vq(vdev, i, callbacks[i], names[i],

					     ctx ? ctx[i] : false, ccw);

		if (!names[i]) {

			vqs[i] = NULL;

			continue;

		}



		vqs[i] = virtio_ccw_setup_vq(vdev, queue_idx++, callbacks[i],

					     names[i], ctx ? ctx[i] : false,

					     ccw);

		if (IS_ERR(vqs[i])) {

			ret = PTR_ERR(vqs[i]);

			vqs[i] = NULL;

drivers/vhost/scsi.c

+12 −8
Original line number Diff line number Diff line
@@ -1127,16 +1127,18 @@ vhost_scsi_send_tmf_reject(struct vhost_scsi *vs, 
			   struct vhost_virtqueue *vq,

			   struct vhost_scsi_ctx *vc)

{

	struct virtio_scsi_ctrl_tmf_resp __user *resp;

	struct virtio_scsi_ctrl_tmf_resp rsp;

	struct iov_iter iov_iter;

	int ret;



	pr_debug("%s\n", __func__);

	memset(&rsp, 0, sizeof(rsp));

	rsp.response = VIRTIO_SCSI_S_FUNCTION_REJECTED;

	resp = vq->iov[vc->out].iov_base;

	ret = __copy_to_user(resp, &rsp, sizeof(rsp));

	if (!ret)



	iov_iter_init(&iov_iter, READ, &vq->iov[vc->out], vc->in, sizeof(rsp));



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

	if (likely(ret == sizeof(rsp)))

		vhost_add_used_and_signal(&vs->dev, vq, vc->head, 0);

	else

		pr_err("Faulted on virtio_scsi_ctrl_tmf_resp\n");
@@ -1147,16 +1149,18 @@ vhost_scsi_send_an_resp(struct vhost_scsi *vs, 
			struct vhost_virtqueue *vq,

			struct vhost_scsi_ctx *vc)

{

	struct virtio_scsi_ctrl_an_resp __user *resp;

	struct virtio_scsi_ctrl_an_resp rsp;

	struct iov_iter iov_iter;

	int ret;



	pr_debug("%s\n", __func__);

	memset(&rsp, 0, sizeof(rsp));	/* event_actual = 0 */

	rsp.response = VIRTIO_SCSI_S_OK;

	resp = vq->iov[vc->out].iov_base;

	ret = __copy_to_user(resp, &rsp, sizeof(rsp));

	if (!ret)



	iov_iter_init(&iov_iter, READ, &vq->iov[vc->out], vc->in, sizeof(rsp));



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

	if (likely(ret == sizeof(rsp)))

		vhost_add_used_and_signal(&vs->dev, vq, vc->head, 0);

	else

		pr_err("Faulted on virtio_scsi_ctrl_an_resp\n");

drivers/vhost/vhost.c

+6 −2
Original line number Diff line number Diff line
@@ -1034,8 +1034,10 @@ ssize_t vhost_chr_write_iter(struct vhost_dev *dev, 
	int type, ret;



	ret = copy_from_iter(&type, sizeof(type), from);

	if (ret != sizeof(type))

	if (ret != sizeof(type)) {

		ret = -EINVAL;

		goto done;

	}



	switch (type) {

	case VHOST_IOTLB_MSG:
@@ -1054,8 +1056,10 @@ ssize_t vhost_chr_write_iter(struct vhost_dev *dev, 


	iov_iter_advance(from, offset);

	ret = copy_from_iter(&msg, sizeof(msg), from);

	if (ret != sizeof(msg))

	if (ret != sizeof(msg)) {

		ret = -EINVAL;

		goto done;

	}

	if (vhost_process_iotlb_msg(dev, &msg)) {

		ret = -EFAULT;

		goto done;

CRA Git | Maintained and supported by SUSTech CRA and CCSE