vhost_vdpa: Support config interrupt in vdpa (776f3950) · Commits · 戴 / test

drivers/vhost/vdpa.c

+47 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		#include <linux/nospec.h>
		#include <linux/vhost.h>
		#include <linux/virtio_net.h>
		#include <linux/kernel.h>

		#include "vhost.h"

		@@ -71,6 +72,7 @@ struct vhost_vdpa {
		int nvqs;
		int virtio_id;
		int minor;
		struct eventfd_ctx *config_ctx;
		};

		static DEFINE_IDA(vhost_vdpa_ida);
		@@ -102,6 +104,17 @@ static irqreturn_t vhost_vdpa_virtqueue_cb(void *private)
		return IRQ_HANDLED;
		}

		static irqreturn_t vhost_vdpa_config_cb(void *private)
		{
		struct vhost_vdpa *v = private;
		struct eventfd_ctx *config_ctx = v->config_ctx;

		if (config_ctx)
		eventfd_signal(config_ctx, 1);

		return IRQ_HANDLED;
		}

		static void vhost_vdpa_reset(struct vhost_vdpa *v)
		{
		struct vdpa_device *vdpa = v->vdpa;
		@@ -289,6 +302,36 @@ static long vhost_vdpa_get_vring_num(struct vhost_vdpa v, u16 __user argp)
		return 0;
		}

		static void vhost_vdpa_config_put(struct vhost_vdpa *v)
		{
		if (v->config_ctx)
		eventfd_ctx_put(v->config_ctx);
		}

		static long vhost_vdpa_set_config_call(struct vhost_vdpa v, u32 __user argp)
		{
		struct vdpa_callback cb;
		int fd;
		struct eventfd_ctx *ctx;

		cb.callback = vhost_vdpa_config_cb;
		cb.private = v->vdpa;
		if (copy_from_user(&fd, argp, sizeof(fd)))
		return -EFAULT;

		ctx = fd == VHOST_FILE_UNBIND ? NULL : eventfd_ctx_fdget(fd);
		swap(ctx, v->config_ctx);

		if (!IS_ERR_OR_NULL(ctx))
		eventfd_ctx_put(ctx);

		if (IS_ERR(v->config_ctx))
		return PTR_ERR(v->config_ctx);

		v->vdpa->config->set_config_cb(v->vdpa, &cb);

		return 0;
		}
		static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v, unsigned int cmd,
		void __user *argp)
		{
		@@ -396,6 +439,9 @@ static long vhost_vdpa_unlocked_ioctl(struct file *filep,
		case VHOST_SET_LOG_FD:
		r = -ENOIOCTLCMD;
		break;
		case VHOST_VDPA_SET_CONFIG_CALL:
		r = vhost_vdpa_set_config_call(v, argp);
		break;
		default:
		r = vhost_dev_ioctl(&v->vdev, cmd, argp);
		if (r == -ENOIOCTLCMD)
		@@ -730,6 +776,7 @@ static int vhost_vdpa_release(struct inode inode, struct file filep)
		vhost_dev_stop(&v->vdev);
		vhost_vdpa_iotlb_free(v);
		vhost_vdpa_free_domain(v);
		vhost_vdpa_config_put(v);
		vhost_dev_cleanup(&v->vdev);
		kfree(v->vdev.vqs);
		mutex_unlock(&d->mutex);

include/uapi/linux/vhost.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		#include <linux/types.h>
		#include <linux/ioctl.h>

		#define VHOST_FILE_UNBIND -1

		/* ioctls */

		#define VHOST_VIRTIO 0xAF
		@@ -140,4 +142,6 @@
		/* Get the max ring size. */
		#define VHOST_VDPA_GET_VRING_NUM _IOR(VHOST_VIRTIO, 0x76, __u16)

		/* Set event fd for config interrupt*/
		#define VHOST_VDPA_SET_CONFIG_CALL _IOW(VHOST_VIRTIO, 0x77, int)
		#endif

Admin message