Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00ade1f5 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 and cleanups from Michael Tsirkin:
 "This fixes the virtio-test tool, and improves the error handling for
  virtio-ccw"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio/s390: handle failures of READ_VQ_CONF ccw
  tools/virtio: propagate V=X to kernel build
  vhost: move features to core
  tools/virtio: fix build after 4.2 changes
parents 3ae83945 ad2aa042

drivers/s390/virtio/virtio_ccw.c

+9 −1
Original line number Diff line number Diff line
@@ -400,12 +400,16 @@ static bool virtio_ccw_kvm_notify(struct virtqueue *vq) 
static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev,

				   struct ccw1 *ccw, int index)

{

	int ret;



	vcdev->config_block->index = index;

	ccw->cmd_code = CCW_CMD_READ_VQ_CONF;

	ccw->flags = 0;

	ccw->count = sizeof(struct vq_config_block);

	ccw->cda = (__u32)(unsigned long)(vcdev->config_block);

	ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_READ_VQ_CONF);

	ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_READ_VQ_CONF);

	if (ret)

		return ret;

	return vcdev->config_block->num;

}
@@ -503,6 +507,10 @@ static struct virtqueue *virtio_ccw_setup_vq(struct virtio_device *vdev, 
		goto out_err;

	}

	info->num = virtio_ccw_read_vq_conf(vcdev, ccw, i);

	if (info->num < 0) {

		err = info->num;

		goto out_err;

	}

	size = PAGE_ALIGN(vring_size(info->num, KVM_VIRTIO_CCW_RING_ALIGN));

	info->queue = alloc_pages_exact(size, GFP_KERNEL | __GFP_ZERO);

	if (info->queue == NULL) {

drivers/vhost/net.c

+1 −2
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@ MODULE_PARM_DESC(experimental_zcopytx, "Enable Zero Copy TX;" 
enum {

	VHOST_NET_FEATURES = VHOST_FEATURES |

			 (1ULL << VHOST_NET_F_VIRTIO_NET_HDR) |

			 (1ULL << VIRTIO_NET_F_MRG_RXBUF) |

			 (1ULL << VIRTIO_F_VERSION_1),

			 (1ULL << VIRTIO_NET_F_MRG_RXBUF)

};



enum {

drivers/vhost/scsi.c

+1 −3
Original line number Diff line number Diff line
@@ -166,9 +166,7 @@ enum { 
/* Note: can't set VIRTIO_F_VERSION_1 yet, since that implies ANY_LAYOUT. */

enum {

	VHOST_SCSI_FEATURES = VHOST_FEATURES | (1ULL << VIRTIO_SCSI_F_HOTPLUG) |

					       (1ULL << VIRTIO_SCSI_F_T10_PI) |

					       (1ULL << VIRTIO_F_ANY_LAYOUT) |

					       (1ULL << VIRTIO_F_VERSION_1)

					       (1ULL << VIRTIO_SCSI_F_T10_PI)

};



#define VHOST_SCSI_MAX_TARGET	256

drivers/vhost/test.c

+3 −0
Original line number Diff line number Diff line
@@ -277,10 +277,13 @@ static long vhost_test_ioctl(struct file *f, unsigned int ioctl, 
			return -EFAULT;

		return 0;

	case VHOST_SET_FEATURES:

		printk(KERN_ERR "1\n");

		if (copy_from_user(&features, featurep, sizeof features))

			return -EFAULT;

		printk(KERN_ERR "2\n");

		if (features & ~VHOST_FEATURES)

			return -EOPNOTSUPP;

		printk(KERN_ERR "3\n");

		return vhost_test_set_features(n, features);

	case VHOST_RESET_OWNER:

		return vhost_test_reset_owner(n);

drivers/vhost/vhost.h

+3 −1
Original line number Diff line number Diff line
@@ -173,7 +173,9 @@ enum { 
	VHOST_FEATURES = (1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) |

			 (1ULL << VIRTIO_RING_F_INDIRECT_DESC) |

			 (1ULL << VIRTIO_RING_F_EVENT_IDX) |

			 (1ULL << VHOST_F_LOG_ALL),

			 (1ULL << VHOST_F_LOG_ALL) |

			 (1ULL << VIRTIO_F_ANY_LAYOUT) |

			 (1ULL << VIRTIO_F_VERSION_1)

};



static inline bool vhost_has_feature(struct vhost_virtqueue *vq, int bit)