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

Commit 8d10aae2 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 fixes and cleanups from Michael S Tsirkin:
 "This includes some fixes and cleanups for vhost net and scsi drivers"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost/test: update test after vhost cleanups
  vhost: Make local function static
  vhost: Make vhost a separate module
  vhost-scsi: Rename struct tcm_vhost_cmd *tv_cmd to *cmd
  vhost-scsi: Rename struct tcm_vhost_tpg *tv_tpg to *tpg
  vhost-scsi: Make func indention more consistent
  vhost-scsi: Rename struct vhost_scsi *s to *vs
  vhost-scsi: Remove unnecessary forward struct vhost_scsi declaration
  vhost: Simplify dev->vqs[i] access
  vhost-net: fix use-after-free in vhost_net_flush
parents 66645656 09a34c84

drivers/vhost/Kconfig

+8 −0
Original line number Diff line number Diff line 
config VHOST_NET

	tristate "Host kernel accelerator for virtio net"

	depends on NET && EVENTFD && (TUN || !TUN) && (MACVTAP || !MACVTAP)

	select VHOST

	select VHOST_RING

	---help---

	  This kernel module can be loaded in host kernel to accelerate
@@ -13,6 +14,7 @@ config VHOST_NET 
config VHOST_SCSI

	tristate "VHOST_SCSI TCM fabric driver"

	depends on TARGET_CORE && EVENTFD && m

	select VHOST

	select VHOST_RING

	default n

	---help---
@@ -24,3 +26,9 @@ config VHOST_RING 
	---help---

	  This option is selected by any driver which needs to access

	  the host side of a virtio ring.



config VHOST

	tristate

	---help---

	  This option is selected by any driver which needs to access

	  the core of vhost.

drivers/vhost/Makefile

+2 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_VHOST_NET) += vhost_net.o

vhost_net-y := vhost.o net.o

vhost_net-y := net.o



obj-$(CONFIG_VHOST_SCSI) += vhost_scsi.o

vhost_scsi-y := scsi.o



obj-$(CONFIG_VHOST_RING) += vringh.o

obj-$(CONFIG_VHOST)	+= vhost.o

drivers/vhost/net.c

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static void vhost_net_clear_ubuf_info(struct vhost_net *n) 
	}

}



int vhost_net_set_ubuf_info(struct vhost_net *n)

static int vhost_net_set_ubuf_info(struct vhost_net *n)

{

	bool zcopy;

	int i;
@@ -189,7 +189,7 @@ int vhost_net_set_ubuf_info(struct vhost_net *n) 
	return -ENOMEM;

}



void vhost_net_vq_reset(struct vhost_net *n)

static void vhost_net_vq_reset(struct vhost_net *n)

{

	int i;

drivers/vhost/scsi.c

+246 −226

File changed.

Preview size limit exceeded, changes collapsed.

drivers/vhost/test.c

+21 −12
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/slab.h>



#include "test.h"

#include "vhost.c"

#include "vhost.h"



/* Max number of bytes transferred before requeueing the job.

 * Using this limit prevents one virtqueue from starving others. */
@@ -38,17 +38,19 @@ struct vhost_test { 
 * read-size critical section for our kind of RCU. */

static void handle_vq(struct vhost_test *n)

{

	struct vhost_virtqueue *vq = &n->dev.vqs[VHOST_TEST_VQ];

	struct vhost_virtqueue *vq = &n->vqs[VHOST_TEST_VQ];

	unsigned out, in;

	int head;

	size_t len, total_len = 0;

	void *private;



	private = rcu_dereference_check(vq->private_data, 1);

	if (!private)

	mutex_lock(&vq->mutex);

	private = vq->private_data;

	if (!private) {

		mutex_unlock(&vq->mutex);

		return;

	}



	mutex_lock(&vq->mutex);

	vhost_disable_notify(&n->dev, vq);



	for (;;) {
@@ -102,15 +104,23 @@ static int vhost_test_open(struct inode *inode, struct file *f) 
{

	struct vhost_test *n = kmalloc(sizeof *n, GFP_KERNEL);

	struct vhost_dev *dev;

	struct vhost_virtqueue **vqs;

	int r;



	if (!n)

		return -ENOMEM;

	vqs = kmalloc(VHOST_TEST_VQ_MAX * sizeof(*vqs), GFP_KERNEL);

	if (!vqs) {

		kfree(n);

		return -ENOMEM;

	}



	dev = &n->dev;

	vqs[VHOST_TEST_VQ] = &n->vqs[VHOST_TEST_VQ];

	n->vqs[VHOST_TEST_VQ].handle_kick = handle_vq_kick;

	r = vhost_dev_init(dev, n->vqs, VHOST_TEST_VQ_MAX);

	r = vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX);

	if (r < 0) {

		kfree(vqs);

		kfree(n);

		return r;

	}
@@ -126,9 +136,8 @@ static void *vhost_test_stop_vq(struct vhost_test *n, 
	void *private;



	mutex_lock(&vq->mutex);

	private = rcu_dereference_protected(vq->private_data,

					 lockdep_is_held(&vq->mutex));

	rcu_assign_pointer(vq->private_data, NULL);

	private = vq->private_data;

	vq->private_data = NULL;

	mutex_unlock(&vq->mutex);

	return private;

}
@@ -140,7 +149,7 @@ static void vhost_test_stop(struct vhost_test *n, void **privatep) 


static void vhost_test_flush_vq(struct vhost_test *n, int index)

{

	vhost_poll_flush(&n->dev.vqs[index].poll);

	vhost_poll_flush(&n->vqs[index].poll);

}



static void vhost_test_flush(struct vhost_test *n)
@@ -268,14 +277,14 @@ static long vhost_test_ioctl(struct file *f, unsigned int ioctl, 
			return -EFAULT;

		return vhost_test_run(n, test);

	case VHOST_GET_FEATURES:

		features = VHOST_NET_FEATURES;

		features = VHOST_FEATURES;

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

			return -EFAULT;

		return 0;

	case VHOST_SET_FEATURES:

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

			return -EFAULT;

		if (features & ~VHOST_NET_FEATURES)

		if (features & ~VHOST_FEATURES)

			return -EOPNOTSUPP;

		return vhost_test_set_features(n, features);

	case VHOST_RESET_OWNER: