From 9e842bdf9968ee6c1ed2a13b06012b5cec05c5c8 Mon Sep 17 00:00:00 2001 From: Ksawlii Date: Sun, 24 Nov 2024 00:23:19 +0100 Subject: [PATCH] Revert "vdpa: Add eventfd for the vdpa callback" This reverts commit aebec288796c1f2cc5fe6bccf660a3a66b19ac18. --- drivers/vhost/vdpa.c | 2 -- drivers/virtio/virtio_vdpa.c | 1 - include/linux/vdpa.h | 6 ------ 3 files changed, 9 deletions(-) diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index fdd175730..c9f585db1 100755 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -422,11 +422,9 @@ static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v, unsigned int cmd, if (vq->call_ctx.ctx) { cb.callback = vhost_vdpa_virtqueue_cb; cb.private = vq; - cb.trigger = vq->call_ctx.ctx; } else { cb.callback = NULL; cb.private = NULL; - cb.trigger = NULL; } ops->set_vq_cb(vdpa, idx, &cb); vhost_vdpa_setup_vq_irq(v, idx); diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c index 7b2c37a38..3f95dedcc 100755 --- a/drivers/virtio/virtio_vdpa.c +++ b/drivers/virtio/virtio_vdpa.c @@ -180,7 +180,6 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsigned int index, /* Setup virtqueue callback */ cb.callback = virtio_vdpa_virtqueue_cb; cb.private = info; - cb.trigger = NULL; ops->set_vq_cb(vdpa, index, &cb); ops->set_vq_num(vdpa, index, virtqueue_get_vring_size(vq)); diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h index 2ee60c7c1..30bc7a722 100755 --- a/include/linux/vdpa.h +++ b/include/linux/vdpa.h @@ -11,16 +11,10 @@ * vDPA callback definition. * @callback: interrupt callback function * @private: the data passed to the callback function - * @trigger: the eventfd for the callback (Optional). - * When it is set, the vDPA driver must guarantee that - * signaling it is functional equivalent to triggering - * the callback. Then vDPA parent can signal it directly - * instead of triggering the callback. */ struct vdpa_callback { irqreturn_t (*callback)(void *data); void *private; - struct eventfd_ctx *trigger; }; /**