Commit 1ccfa66d 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:
 "A couple of last minute fixes"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost-vdpa: fix backend feature ioctls
  vhost: Fix documentation
parents fb0155a0 a127c5bb

drivers/vhost/iotlb.c

+2 −2
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ EXPORT_SYMBOL_GPL(vhost_iotlb_free); 
 * vhost_iotlb_itree_first - return the first overlapped range

 * @iotlb: the IOTLB

 * @start: start of IOVA range

 * @end: end of IOVA range

 * @last: last byte in IOVA range

 */

struct vhost_iotlb_map *

vhost_iotlb_itree_first(struct vhost_iotlb *iotlb, u64 start, u64 last)
@@ -162,7 +162,7 @@ EXPORT_SYMBOL_GPL(vhost_iotlb_itree_first); 
 * vhost_iotlb_itree_next - return the next overlapped range

 * @map: the starting map node

 * @start: start of IOVA range

 * @end: end of IOVA range

 * @last: last byte IOVA range

 */

struct vhost_iotlb_map *

vhost_iotlb_itree_next(struct vhost_iotlb_map *map, u64 start, u64 last)

drivers/vhost/vdpa.c

+16 −14
Original line number Diff line number Diff line
@@ -353,8 +353,6 @@ static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v, unsigned int cmd, 
	struct vdpa_callback cb;

	struct vhost_virtqueue *vq;

	struct vhost_vring_state s;

	u64 __user *featurep = argp;

	u64 features;

	u32 idx;

	long r;
@@ -381,18 +379,6 @@ static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v, unsigned int cmd, 


		vq->last_avail_idx = vq_state.avail_index;

		break;

	case VHOST_GET_BACKEND_FEATURES:

		features = VHOST_VDPA_BACKEND_FEATURES;

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

			return -EFAULT;

		return 0;

	case VHOST_SET_BACKEND_FEATURES:

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

			return -EFAULT;

		if (features & ~VHOST_VDPA_BACKEND_FEATURES)

			return -EOPNOTSUPP;

		vhost_set_backend_features(&v->vdev, features);

		return 0;

	}



	r = vhost_vring_ioctl(&v->vdev, cmd, argp);
@@ -440,8 +426,20 @@ static long vhost_vdpa_unlocked_ioctl(struct file *filep, 
	struct vhost_vdpa *v = filep->private_data;

	struct vhost_dev *d = &v->vdev;

	void __user *argp = (void __user *)arg;

	u64 __user *featurep = argp;

	u64 features;

	long r;



	if (cmd == VHOST_SET_BACKEND_FEATURES) {

		r = copy_from_user(&features, featurep, sizeof(features));

		if (r)

			return r;

		if (features & ~VHOST_VDPA_BACKEND_FEATURES)

			return -EOPNOTSUPP;

		vhost_set_backend_features(&v->vdev, features);

		return 0;

	}



	mutex_lock(&d->mutex);



	switch (cmd) {
@@ -476,6 +474,10 @@ static long vhost_vdpa_unlocked_ioctl(struct file *filep, 
	case VHOST_VDPA_SET_CONFIG_CALL:

		r = vhost_vdpa_set_config_call(v, argp);

		break;

	case VHOST_GET_BACKEND_FEATURES:

		features = VHOST_VDPA_BACKEND_FEATURES;

		r = copy_to_user(featurep, &features, sizeof(features));

		break;

	default:

		r = vhost_dev_ioctl(&v->vdev, cmd, argp);

		if (r == -ENOIOCTLCMD)