[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210315053721.189-11-xieyongji@bytedance.com>
Date: Mon, 15 Mar 2021 13:37:20 +0800
From: Xie Yongji <xieyongji@...edance.com>
To: mst@...hat.com, jasowang@...hat.com, stefanha@...hat.com,
sgarzare@...hat.com, parav@...dia.com, bob.liu@...cle.com,
hch@...radead.org, rdunlap@...radead.org, willy@...radead.org,
viro@...iv.linux.org.uk, axboe@...nel.dk, bcrl@...ck.org,
corbet@....net, mika.penttila@...tfour.com,
dan.carpenter@...cle.com
Cc: virtualization@...ts.linux-foundation.org, netdev@...r.kernel.org,
kvm@...r.kernel.org, linux-fsdevel@...r.kernel.org
Subject: [PATCH v5 10/11] vduse: Add config interrupt support
This patch introduces a new ioctl VDUSE_INJECT_CONFIG_IRQ
to support injecting config interrupt.
Signed-off-by: Xie Yongji <xieyongji@...edance.com>
---
drivers/vdpa/vdpa_user/vduse_dev.c | 24 +++++++++++++++++++++++-
include/uapi/linux/vduse.h | 3 +++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c
index 07d0ae92d470..cc12b58bdc09 100644
--- a/drivers/vdpa/vdpa_user/vduse_dev.c
+++ b/drivers/vdpa/vdpa_user/vduse_dev.c
@@ -64,6 +64,8 @@ struct vduse_dev {
struct list_head send_list;
struct list_head recv_list;
struct list_head list;
+ struct vdpa_callback config_cb;
+ spinlock_t irq_lock;
bool connected;
int minor;
u16 vq_size_max;
@@ -439,6 +441,11 @@ static void vduse_dev_reset(struct vduse_dev *dev)
vduse_domain_reset_bounce_map(dev->domain);
vduse_dev_update_iotlb(dev, 0ULL, ULLONG_MAX);
+ spin_lock(&dev->irq_lock);
+ dev->config_cb.callback = NULL;
+ dev->config_cb.private = NULL;
+ spin_unlock(&dev->irq_lock);
+
for (i = 0; i < dev->vq_num; i++) {
struct vduse_virtqueue *vq = &dev->vqs[i];
@@ -557,7 +564,12 @@ static int vduse_vdpa_set_features(struct vdpa_device *vdpa, u64 features)
static void vduse_vdpa_set_config_cb(struct vdpa_device *vdpa,
struct vdpa_callback *cb)
{
- /* We don't support config interrupt */
+ struct vduse_dev *dev = vdpa_to_vduse(vdpa);
+
+ spin_lock(&dev->irq_lock);
+ dev->config_cb.callback = cb->callback;
+ dev->config_cb.private = cb->private;
+ spin_unlock(&dev->irq_lock);
}
static u16 vduse_vdpa_get_vq_num_max(struct vdpa_device *vdpa)
@@ -842,6 +854,15 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
ret = 0;
queue_work(vduse_irq_wq, &dev->vqs[arg].inject);
break;
+ case VDUSE_INJECT_CONFIG_IRQ:
+ ret = -EINVAL;
+ spin_lock_irq(&dev->irq_lock);
+ if (dev->config_cb.callback) {
+ dev->config_cb.callback(dev->config_cb.private);
+ ret = 0;
+ }
+ spin_unlock_irq(&dev->irq_lock);
+ break;
default:
ret = -ENOIOCTLCMD;
break;
@@ -918,6 +939,7 @@ static struct vduse_dev *vduse_dev_create(void)
INIT_LIST_HEAD(&dev->send_list);
INIT_LIST_HEAD(&dev->recv_list);
atomic64_set(&dev->msg_unique, 0);
+ spin_lock_init(&dev->irq_lock);
init_waitqueue_head(&dev->waitq);
diff --git a/include/uapi/linux/vduse.h b/include/uapi/linux/vduse.h
index 37f7d7059aa8..337e766f5622 100644
--- a/include/uapi/linux/vduse.h
+++ b/include/uapi/linux/vduse.h
@@ -150,4 +150,7 @@ struct vduse_vq_eventfd {
/* Inject an interrupt for specific virtqueue */
#define VDUSE_INJECT_VQ_IRQ _IO(VDUSE_BASE, 0x05)
+/* Inject a config interrupt */
+#define VDUSE_INJECT_CONFIG_IRQ _IO(VDUSE_BASE, 0x06)
+
#endif /* _UAPI_VDUSE_H_ */
--
2.11.0
Powered by blists - more mailing lists