IRQ offloading for vDPA
Subsystems (9)
v2 cover IRQ offloading for vDPA
This series intends to implement IRQ offloading for vhost_vdpa.
By the feat of irq forwarding facilities like posted interrupt on X86, irq bypass can help deliver interrupts to vCPU directly.
vDPA devices have dedicated hardware backends like VFIO pass-throughed devices. So it would be possible to setup irq offloading(irq bypass) for vDPA devices and gain performance improvements.
In my testing, with this feature, we can save 0.1ms in a ping between two VFs on average.
changes from V1:
(1)dropped vfio changes.
(3)removed KVM_HVAE_IRQ_BYPASS checks
(4)locking fixes
(5)simplified vhost_vdpa_update_vq_irq()
(6)minor improvements
Zhu Lingshan (6):
vhost: introduce vhost_call_ctx
kvm: detect assigned device via irqbypass manager
vDPA: implement IRQ offloading helpers in vDPA core
vhost_vdpa: implement IRQ offloading in vhost_vdpa
ifcvf: replace irq_request/free with vDPA helpers
irqbypass: do not start cons/prod when failed connect
arch/x86/kvm/x86.c | 10 ++++++-- drivers/vdpa/ifcvf/ifcvf_main.c | 14 +++++++---- drivers/vdpa/vdpa.c | 42 +++++++++++++++++++++++++++++++++ drivers/vhost/Kconfig | 1 + drivers/vhost/vdpa.c | 52 +++++++++++++++++++++++++++++++++++++++-- drivers/vhost/vhost.c | 22 ++++++++++++----- drivers/vhost/vhost.h | 9 ++++++- include/linux/vdpa.h | 13 +++++++++++ virt/lib/irqbypass.c | 16 ++++++++----- 9 files changed, 157 insertions(+), 22 deletions(-)
Signature · 1 line
1.8.3.1
PATCH v2 1/6 vhost: introduce vhost_call_ctx
This commit introduces struct vhost_call_ctx which replaced raw struct eventfd_ctx *call_ctx in struct vhost_virtqueue. Besides eventfd_ctx, it contains a spin lock and an irq_bypass_producer in its structure.
--- drivers/vhost/vdpa.c | 4 ++-- drivers/vhost/vhost.c | 22 ++++++++++++++++------ drivers/vhost/vhost.h | 9 ++++++++- 3 files changed, 26 insertions(+), 9 deletions(-)
drivers/vhost/vdpa.c +2 -2
@@ -96,7 +96,7 @@ static void handle_vq_kick(struct vhost_work *work)static irqreturn_t vhost_vdpa_virtqueue_cb (void *private) {struct vhost_virtqueue *vq = private; -struct eventfd_ctx *call_ctx = vq->call_ctx; +struct eventfd_ctx *call_ctx = vq->call_ctx.ctx;if (call_ctx)eventfd_signal (call_ctx,1 );
@@ -382,7 +382,7 @@ static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v, unsigned int cmd,break ;case VHOST_SET_VRING_CALL : -if (vq->call_ctx) { +if (vq->call_ctx.ctx) { cb.callback = vhost_vdpa_virtqueue_cb; cb.private = vq; }else {
drivers/vhost/vhost.c +16 -6
@@ -298,6 +298,13 @@ static void vhost_vq_meta_reset(struct vhost_dev *d)__vhost_vq_meta_reset (d->vqs[i]); } +static void vhost_call_ctx_reset (struct vhost_call_ctx *call_ctx) +{ + call_ctx->ctx =NULL ; +memset (&call_ctx->producer,0x0 ,sizeof (struct irq_bypass_producer )); +spin_lock_init (&call_ctx->ctx_lock); +} +static void vhost_vq_reset (struct vhost_dev *dev,struct vhost_virtqueue *vq) {
@@ -319,13 +326,13 @@ static void vhost_vq_reset(struct vhost_dev *dev, vq->log_base =NULL ; vq->error_ctx =NULL ; vq->kick =NULL ; - vq->call_ctx =NULL ; vq->log_ctx =NULL ;vhost_reset_is_le (vq);vhost_disable_cross_endian (vq); vq->busyloop_timeout =0 ; vq->umem =NULL ; vq->iotlb =NULL ; +vhost_call_ctx_reset (&vq->call_ctx);__vhost_vq_meta_reset (vq); }
@@ -685,8 +692,8 @@ void vhost_dev_cleanup(struct vhost_dev *dev)eventfd_ctx_put (dev->vqs[i]->error_ctx);if (dev->vqs[i]->kick)fput (dev->vqs[i]->kick); -if (dev->vqs[i]->call_ctx) -eventfd_ctx_put (dev->vqs[i]->call_ctx); +if (dev->vqs[i]->call_ctx.ctx) +eventfd_ctx_put (dev->vqs[i]->call_ctx.ctx);vhost_vq_reset (dev, dev->vqs[i]); }vhost_dev_free_iovecs (dev);
@@ -1629,7 +1636,10 @@ long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *arg r =PTR_ERR (ctx);break ; } -swap (ctx, vq->call_ctx); + +spin_lock (&vq->call_ctx.ctx_lock); +swap (ctx, vq->call_ctx.ctx); +spin_unlock (&vq->call_ctx.ctx_lock);break ;case VHOST_SET_VRING_ERR :if (copy_from_user (&f, argp,sizeof f)) {
@@ -2440,8 +2450,8 @@ static bool vhost_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq)void vhost_signal (struct vhost_dev *dev,struct vhost_virtqueue *vq) {/* Signal the Guest tell them we used something up. */ -if (vq->call_ctx &&vhost_notify (dev, vq)) -eventfd_signal (vq->call_ctx,1 ); +if (vq->call_ctx.ctx &&vhost_notify (dev, vq)) +eventfd_signal (vq->call_ctx.ctx,1 ); }EXPORT_SYMBOL_GPL (vhost_signal);
drivers/vhost/vhost.h +8 -1
@@ -13,6 +13,7 @@#include <linux/virtio_ring.h> #include <linux/atomic.h> #include <linux/vhost_iotlb.h> +#include <linux/irqbypass.h> struct vhost_work ;typedef void (*vhost_work_fn_t )(struct vhost_work *work);
@@ -60,6 +61,12 @@ enum vhost_uaddr_type { VHOST_NUM_ADDRS = 3, }; +struct vhost_call_ctx { +struct eventfd_ctx *ctx; +struct irq_bypass_producer producer; +spinlock_t ctx_lock; +}; +/* The virtqueue structure describes a queue attached to a device. */ struct vhost_virtqueue {struct vhost_dev *dev;
@@ -72,7 +79,7 @@ struct vhost_virtqueue {vring_used_t __user *used;const struct vhost_iotlb_map *meta_iotlb[VHOST_NUM_ADDRS ];struct file *kick; -struct eventfd_ctx *call_ctx; +struct vhost_call_ctx call_ctx;struct eventfd_ctx *error_ctx;struct eventfd_ctx *log_ctx;
Signature · 1 line
1.8.3.1
Re: [PATCH V2 1/6] vhost: introduce vhost_call_ctx
Quoted 115 lines · Zhu Lingshan
This commit introduces struct
vhost_call_ctxwhich replaced raw structeventfd_ctx*call_ctxin structvhost_virtqueue. Besideseventfd_ctx, it contains a spin lock and anirq_bypass_producerin its structure.Signed-off-by Zhu Lingshan <[email protected]>Suggested-by Jason Wang <[email protected]>--- drivers/vhost/vdpa.c | 4 ++-- drivers/vhost/vhost.c | 22 ++++++++++++++++------ drivers/vhost/vhost.h | 9 ++++++++- 3 files changed, 26 insertions(+), 9 deletions(-)drivers/vhost/vdpa.c +2
-2@@ -96,7 +96,7 @@ static void handle_vq_kick(struct vhost_work *work)static irqreturn_t vhost_vdpa_virtqueue_cb (void *private) {struct vhost_virtqueue *vq = private; -struct eventfd_ctx *call_ctx = vq->call_ctx; +struct eventfd_ctx *call_ctx = vq->call_ctx.ctx;if (call_ctx)eventfd_signal (call_ctx,1 );@@ -382,7 +382,7 @@ static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v, unsigned int cmd,break ;case VHOST_SET_VRING_CALL : -if (vq->call_ctx) { +if (vq->call_ctx.ctx) { cb.callback = vhost_vdpa_virtqueue_cb; cb.private = vq; }else {drivers/vhost/vhost.c +16
-6@@ -298,6 +298,13 @@ static void vhost_vq_meta_reset(struct vhost_dev *d)__vhost_vq_meta_reset (d->vqs[i]); } +static void vhost_call_ctx_reset (struct vhost_call_ctx *call_ctx) +{ + call_ctx->ctx =NULL ; +memset (&call_ctx->producer,0x0 ,sizeof (struct irq_bypass_producer )); +spin_lock_init (&call_ctx->ctx_lock); +} +static void vhost_vq_reset (struct vhost_dev *dev,struct vhost_virtqueue *vq) {@@ -319,13 +326,13 @@ static void vhost_vq_reset(struct vhost_dev *dev, vq->log_base =NULL ; vq->error_ctx =NULL ; vq->kick =NULL ; - vq->call_ctx =NULL ; vq->log_ctx =NULL ;vhost_reset_is_le (vq);vhost_disable_cross_endian (vq); vq->busyloop_timeout =0 ; vq->umem =NULL ; vq->iotlb =NULL ; +vhost_call_ctx_reset (&vq->call_ctx);__vhost_vq_meta_reset (vq); }@@ -685,8 +692,8 @@ void vhost_dev_cleanup(struct vhost_dev *dev)eventfd_ctx_put (dev->vqs[i]->error_ctx);if (dev->vqs[i]->kick)fput (dev->vqs[i]->kick); -if (dev->vqs[i]->call_ctx) -eventfd_ctx_put (dev->vqs[i]->call_ctx); +if (dev->vqs[i]->call_ctx.ctx) +eventfd_ctx_put (dev->vqs[i]->call_ctx.ctx);vhost_vq_reset (dev, dev->vqs[i]); }vhost_dev_free_iovecs (dev);@@ -1629,7 +1636,10 @@ long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *arg r =PTR_ERR (ctx);break ; } -swap (ctx, vq->call_ctx); + +spin_lock (&vq->call_ctx.ctx_lock); +swap (ctx, vq->call_ctx.ctx); +spin_unlock (&vq->call_ctx.ctx_lock);break ;case VHOST_SET_VRING_ERR :if (copy_from_user (&f, argp,sizeof f)) {@@ -2440,8 +2450,8 @@ static bool vhost_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq)void vhost_signal (struct vhost_dev *dev,struct vhost_virtqueue *vq) {/* Signal the Guest tell them we used something up. */ -if (vq->call_ctx &&vhost_notify (dev, vq)) -eventfd_signal (vq->call_ctx,1 ); +if (vq->call_ctx.ctx &&vhost_notify (dev, vq)) +eventfd_signal (vq->call_ctx.ctx,1 ); }EXPORT_SYMBOL_GPL (vhost_signal);drivers/vhost/vhost.h +1
-0@@ -13,6 +13,7 @@#include <linux/virtio_ring.h> #include <linux/atomic.h> #include <linux/vhost_iotlb.h> +#include <linux/irqbypass.h> struct vhost_work ;typedef void (*vhost_work_fn_t )(struct vhost_work *work);
drivers/vhost/vhost.h enum vhost_uaddr_type { · line 64
Quoted 4 lines
drivers/vhost/vhost.h +1
-0@@ -60,6 +61,12 @@ enum vhost_uaddr_type { VHOST_NUM_ADDRS = 3, }; +struct vhost_call_ctx {
I think maybe "vhost_vring_call" is a better name since it contains not only the eventfd_ctx now.
Thanks
Quoted 17 lines
drivers/vhost/vhost.h +6
-1+struct eventfd_ctx *ctx; +struct irq_bypass_producer producer; +spinlock_t ctx_lock; +}; +/* The virtqueue structure describes a queue attached to a device. */ struct vhost_virtqueue {struct vhost_dev *dev;@@ -72,7 +79,7 @@ struct vhost_virtqueue {vring_used_t __user *used;const struct vhost_iotlb_map *meta_iotlb[VHOST_NUM_ADDRS ];struct file *kick; -struct eventfd_ctx *call_ctx; +struct vhost_call_ctx call_ctx;struct eventfd_ctx *error_ctx;struct eventfd_ctx *log_ctx;
Re: [PATCH V2 1/6] vhost: introduce vhost_call_ctx
Quoted 123 lines · Jason Wang
Quoted 114 lines · Zhu Lingshan
This commit introduces struct
vhost_call_ctxwhich replaced raw structeventfd_ctx*call_ctxin structvhost_virtqueue. Besideseventfd_ctx, it contains a spin lock and anirq_bypass_producerin its structure.Signed-off-by Zhu Lingshan <[email protected]>Suggested-by Jason Wang <[email protected]>---
drivers/vhost/vdpa.c | 4 ++--drivers/vhost/vhost.c| 22 ++++++++++++++++------drivers/vhost/vhost.h| 9 ++++++++-3 files changed, 26 insertions(+), 9 deletions(-)drivers/vhost/vdpa.c +1
-1@@ -96,7 +96,7 @@ static void handle_vq_kick(struct vhost_work *work) static irqreturn_t vhost_vdpa_virtqueue_cb(void *private) { struct vhost_virtqueue *vq = private; - struct eventfd_ctx *call_ctx = vq->call_ctx; + struct eventfd_ctx *call_ctx = vq->call_ctx.ctx; if (call_ctx) eventfd_signal(call_ctx, 1);@@ -382,7 +382,7 @@ static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v, unsigned int cmd, break;case
VHOST_SET_VRING_CALL:
- if (vq->call_ctx) {
+ if (vq->call_ctx.ctx) {
cb.callback =vhost_vdpa_virtqueue_cb; cb.private = vq;
} else {drivers/vhost/vhost.c +6
-0@@ -298,6 +298,13 @@ static void vhost_vq_meta_reset(struct vhost_dev *d) __vhost_vq_meta_reset(d->vqs[i]); } +static void vhost_call_ctx_reset(struct vhost_call_ctx *call_ctx) +{ + call_ctx->ctx = NULL; + memset(&call_ctx->producer, 0x0, sizeof(structirq_bypass_producer )); + spin_lock_init(&call_ctx->ctx_lock); +} + static void vhost_vq_reset(struct vhost_dev *dev,struct
vhost_virtqueue*vq)
{drivers/vhost/vhost.c +1
-1@@ -319,13 +326,13 @@ static void vhost_vq_reset(struct vhost_dev *dev, vq->log_base = NULL; vq->error_ctx = NULL; vq->kick = NULL; - vq->call_ctx = NULL; vq->log_ctx = NULL; vhost_reset_is_le(vq); vhost_disable_cross_endian(vq); vq->busyloop_timeout = 0; vq->umem = NULL; vq->iotlb = NULL; + vhost_call_ctx_reset(&vq->call_ctx); __vhost_vq_meta_reset(vq); } @@ -685,8 +692,8 @@ void vhost_dev_cleanup(struct vhost_dev *dev)
eventfd_ctx_put(dev->vqs[i]->error_ctx);
if (dev->vqs[i]->kick)
fput(dev->vqs[i]->kick);
- if (dev->vqs[i]->call_ctx)
-eventfd_ctx_put(dev->vqs[i]->call_ctx);
+ if (dev->vqs[i]->call_ctx.ctx)
+eventfd_ctx_put(dev->vqs[i]->call_ctx.ctx);
vhost_vq_reset(dev, dev->vqs[i]);
}
vhost_dev_free_iovecs(dev);drivers/vhost/vhost.c +0
-0@@ -1629,7 +1636,10 @@ long vhost_vring_ioctl(struct vhost_dev *d,unsigned int ioctl, void
__user*arg
r =PTR_ERR(ctx);
break;
}
-swap(ctx, vq->call_ctx);
+
+spin_lock(&vq->call_ctx.ctx_lock); +swap(ctx, vq->call_ctx.ctx);
+spin_unlock(&vq->call_ctx.ctx_lock); break;
caseVHOST_SET_VRING_ERR:
if (copy_from_user(&f, argp, sizeof f)) {drivers/vhost/vhost.c +2
-2@@ -2440,8 +2450,8 @@ static bool vhost_notify(struct vhost_dev *dev, struct vhost_virtqueue *vq) void vhost_signal(struct vhost_dev *dev, struct vhost_virtqueue *vq) { /* Signal the Guest tell them we used something up. */ - if (vq->call_ctx && vhost_notify(dev, vq)) - eventfd_signal(vq->call_ctx, 1); + if (vq->call_ctx.ctx && vhost_notify(dev, vq)) + eventfd_signal(vq->call_ctx.ctx, 1); } EXPORT_SYMBOL_GPL(vhost_signal);diff --git
a/drivers/vhost/vhost.hb/drivers/vhost/vhost.hindex c8e96a0..402c62e 100644drivers/vhost/vhost.h +1
-0@@ -13,6 +13,7 @@ #include <linux/virtio_ring.h> #include <linux/atomic.h> #include <linux/vhost_iotlb.h> +#include <linux/irqbypass.h> struct vhost_work; typedef void (*vhost_work_fn_t)(struct vhost_work *work);drivers/vhost/vhost.h enum vhost_uaddr_type { · line 63
Quoted 3 lines
drivers/vhost/vhost.h +0
-0@@ -60,6 +61,12 @@ enum vhost_uaddr_type { VHOST_NUM_ADDRS = 3, }; +struct vhost_call_ctx {I think maybe "
vhost_vring_call" is a better name since it contains not only theeventfd_ctxnow.
Quoted 1 line
Thanks
Sure
Quoted 19 lines
Quoted 18 lines
drivers/vhost/vhost.h +6
-1+ struct eventfd_ctx *ctx; + struct irq_bypass_producer producer; + spinlock_t ctx_lock; +}; + /* The virtqueue structure describes a queue attached to a device. */ struct vhost_virtqueue { struct vhost_dev *dev;@@ -72,7 +79,7 @@ struct vhost_virtqueue { vring_used_t __user *used; const struct vhost_iotlb_map *meta_iotlb[VHOST_NUM_ADDRS]; struct file *kick; - struct eventfd_ctx *call_ctx; + struct vhost_call_ctx call_ctx; struct eventfd_ctx *error_ctx; struct eventfd_ctx *log_ctx;
PATCH v2 2/6 kvm: detect assigned device via irqbypass manager
In reply to Zhu LingshanvDPA devices has dedicated backed hardware like passthrough-ed devices. Then it is possible to setup irq offloading to vCPU for vDPA devices. Thus this patch tries to manipulated assigned device counters via irqbypass manager.
We will increase/decrease the assigned device counter in kvm/x86. Both vDPA and VFIO would go through this code path.
This code path only affect x86 for now.
--- arch/x86/kvm/x86.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +8 -2
@@ -10624,11 +10624,17 @@ int kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *cons, {struct kvm_kernel_irqfd *irqfd = container_of(cons, struct kvm_kernel_irqfd, consumer); +int ret; irqfd->producer = prod; +kvm_arch_start_assignment (irqfd->kvm); + ret = kvm_x86_ops.update_pi_irte (irqfd->kvm, + prod->irq, irqfd->gsi,1 ); + +if (ret) +kvm_arch_end_assignment (irqfd->kvm); -return kvm_x86_ops.update_pi_irte (irqfd->kvm, - prod->irq, irqfd->gsi,1 ); +return ret; } void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons,
Signature · 1 line
1.8.3.1
Re: [PATCH V2 2/6] kvm: detect assigned device via irqbypass manager
Quoted 4 lines · Zhu Lingshan
vDPA devices has dedicated backed hardware like passthrough-ed devices. Then it is possible to setup irq offloading to vCPU for vDPA devices. Thus this patch tries to manipulated assigned device counters via irqbypass manager.
This part needs some tweak, e.g why assigned device could be detected through this way.
Quoted 2 lines
We will increase/decrease the assigned device counter in kvm/x86.
And you need explain why we don't need similar thing in other arch.
Thanks
Quoted 34 lines
Both vDPA and VFIO would go through this code path.
This code path only affect x86 for now.
Signed-off-by Zhu Lingshan <[email protected]>Suggested-by Jason Wang <[email protected]>--- arch/x86/kvm/x86.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)arch/x86/kvm/x86.c +8
-2@@ -10624,11 +10624,17 @@ int kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *cons, {struct kvm_kernel_irqfd *irqfd = container_of(cons, struct kvm_kernel_irqfd, consumer); +int ret; irqfd->producer = prod; +kvm_arch_start_assignment (irqfd->kvm); + ret = kvm_x86_ops.update_pi_irte (irqfd->kvm, + prod->irq, irqfd->gsi,1 ); + +if (ret) +kvm_arch_end_assignment (irqfd->kvm); -return kvm_x86_ops.update_pi_irte (irqfd->kvm, - prod->irq, irqfd->gsi,1 ); +return ret; } void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons,
Re: [PATCH V2 2/6] kvm: detect assigned device via irqbypass manager
Quoted 12 lines · Jason Wang
Quoted 4 lines · Zhu Lingshan
vDPA devices has dedicated backed hardware like passthrough-ed devices. Then it is possible to setup irq offloading to vCPU for vDPA devices. Thus this patch tries to manipulated assigned device counters via irqbypass manager.
This part needs some tweak, e.g why assigned device could be detected through this way.
Quoted 1 line
Quoted 6 lines
Quoted 1 line
We will increase/decrease the assigned device counter in kvm/x86.
And you need explain why we don't need similar thing in other arch.
Thanks
OK Thanks!
Quoted 35 lines
Quoted 34 lines
Both vDPA and VFIO would go through this code path.
This code path only affect x86 for now.
Signed-off-by Zhu Lingshan <[email protected]>Suggested-by Jason Wang <[email protected]>---
arch/x86/kvm/x86.c| 10 ++++++++--1 file changed, 8 insertions(+), 2 deletions(-)arch/x86/kvm/x86.c +0
-0@@ -10624,11 +10624,17 @@ int kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *cons, {struct
kvm_kernel_irqfd*irqfd =
container_of(cons, struct kvm_kernel_irqfd, consumer); + int ret;
irqfd->producer= prod;
+kvm_arch_start_assignment(irqfd->kvm);
+ ret = kvm_x86_ops.update_pi_irte(irqfd->kvm,
+prod->irq,irqfd->gsi, 1);
+
+ if (ret)
+kvm_arch_end_assignment(irqfd->kvm);
- return kvm_x86_ops.update_pi_irte(irqfd->kvm,
-prod->irq,irqfd->gsi, 1);
+ return ret;
}
void kvm_arch_irq_bypass_del_producer(structirq_bypass_consumer*cons,
Re: [PATCH V2 2/6] kvm: detect assigned device via irqbypass manager
In reply to Zhu LingshanQuoted 30 lines · On Thu, 16 Jul 2020 19:23:45 +0800 Zhu Lingshan <[email protected]> wrote:
vDPA devices has dedicated backed hardware like passthrough-ed devices. Then it is possible to setup irq offloading to vCPU for vDPA devices. Thus this patch tries to manipulated assigned device counters via irqbypass manager.
We will increase/decrease the assigned device counter in kvm/x86. Both vDPA and VFIO would go through this code path.
This code path only affect x86 for now.
Signed-off-by Zhu Lingshan <[email protected]>Suggested-by Jason Wang <[email protected]>--- arch/x86/kvm/x86.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)arch/x86/kvm/x86.c +4
-0@@ -10624,11 +10624,17 @@ int kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *cons, {struct kvm_kernel_irqfd *irqfd = container_of(cons, struct kvm_kernel_irqfd, consumer); +int ret; irqfd->producer = prod; +kvm_arch_start_assignment (irqfd->kvm); + ret = kvm_x86_ops.update_pi_irte (irqfd->kvm, + prod->irq, irqfd->gsi,1 );
arch/x86/kvm/x86.c int kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *cons, · line 10640
Quoted 10 lines
arch/x86/kvm/x86.c +4
-2+ +if (ret) +kvm_arch_end_assignment (irqfd->kvm); -return kvm_x86_ops.update_pi_irte (irqfd->kvm, - prod->irq, irqfd->gsi,1 ); +return ret; } void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons,
Why isn't there a matching end-assignment in the del_producer path? It seems this only goes one-way, what happens when a device is hot-unplugged from the VM or the device interrupt configuration changes. This will still break vfio if it's not guaranteed to be symmetric. Thanks,
Alex
Re: [PATCH V2 2/6] kvm: detect assigned device via irqbypass manager
Quoted 50 lines · Alex Williamson
Quoted 30 lines · On Thu, 16 Jul 2020 19:23:45 +0800 Zhu Lingshan <[email protected]> wrote:
vDPA devices has dedicated backed hardware like passthrough-ed devices. Then it is possible to setup irq offloading to vCPU for vDPA devices. Thus this patch tries to manipulated assigned device counters via irqbypass manager.
We will increase/decrease the assigned device counter in kvm/x86. Both vDPA and VFIO would go through this code path.
This code path only affect x86 for now.
Signed-off-by Zhu Lingshan <[email protected]>Suggested-by Jason Wang <[email protected]>--- arch/x86/kvm/x86.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)arch/x86/kvm/x86.c +4
-0@@ -10624,11 +10624,17 @@ int kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *cons, {struct kvm_kernel_irqfd *irqfd = container_of(cons, struct kvm_kernel_irqfd, consumer); +int ret; irqfd->producer = prod; +kvm_arch_start_assignment (irqfd->kvm); + ret = kvm_x86_ops.update_pi_irte (irqfd->kvm, + prod->irq, irqfd->gsi,1 );arch/x86/kvm/x86.c int kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *cons, · line 10640
Quoted 10 lines
arch/x86/kvm/x86.c +4
-2+ +if (ret) +kvm_arch_end_assignment (irqfd->kvm); -return kvm_x86_ops.update_pi_irte (irqfd->kvm, - prod->irq, irqfd->gsi,1 ); +return ret; } void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons,Why isn't there a matching end-assignment in the
del_producerpath? It seems this only goes one-way, what happens when a device is hot-unplugged from the VM or the device interrupt configuration changes. This will still break vfio if it's not guaranteed to be symmetric. Thanks,
Quoted 1 line
Alex
Yes, we need add logic in the del_producer path.
Thanks
PATCH v2 3/6 vDPA: implement IRQ offloading helpers in vDPA core
In reply to Zhu LingshanThis commit implements IRQ offloading helpers in vDPA core by introducing two couple of functions:
vdpa_alloc_vq_irq() and vdpa_free_vq_irq(): request irq and free irq, will setup irq offloading.
vdpa_setup_irq() and vdpa_unsetup_irq(): supportive functions, will call vhost_vdpa helpers.
--- drivers/vdpa/vdpa.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/linux/vdpa.h | 13 +++++++++++++ 2 files changed, 55 insertions(+)
drivers/vdpa/vdpa.c +42 -0
@@ -163,6 +163,48 @@ void vdpa_unregister_driver(struct vdpa_driver *drv) }EXPORT_SYMBOL_GPL (vdpa_unregister_driver); +static void vdpa_setup_irq (struct vdpa_device *vdev,int qid,int irq) +{ +struct vdpa_driver *drv =drv_to_vdpa (vdev->dev.driver); + +if (drv->setup_vq_irq) + drv->setup_vq_irq (vdev, qid, irq); +} + +static void vdpa_unsetup_irq (struct vdpa_device *vdev,int qid) +{ +struct vdpa_driver *drv =drv_to_vdpa (vdev->dev.driver); + +if (drv->unsetup_vq_irq) + drv->unsetup_vq_irq (vdev, qid); +} + +int vdpa_alloc_vq_irq (struct device *dev,struct vdpa_device *vdev, +unsigned int irq,irq_handler_t handler, +unsigned long irqflags,const char *devname,void *dev_id, +int qid) +{ +int ret; + + ret =devm_request_irq (dev, irq, handler, irqflags, devname, dev_id); +if (ret) +dev_err (dev,"Failed to request irq for vq %d\n" , qid); +else +vdpa_setup_irq (vdev, qid, irq); + +return ret; + +} +EXPORT_SYMBOL_GPL (vdpa_alloc_vq_irq); + +void vdpa_free_vq_irq (struct device *dev,struct vdpa_device *vdev,int irq, +int qid,void *dev_id) +{ +devm_free_irq (dev, irq, dev_id); +vdpa_unsetup_irq (vdev, qid); +} +EXPORT_SYMBOL_GPL (vdpa_free_vq_irq); +static int vdpa_init (void ) {return bus_register (&vdpa_bus);
include/linux/vdpa.h +13 -0
@@ -220,17 +220,30 @@ struct vdpa_device *__vdpa_alloc_device(struct device *parent,int vdpa_register_device (struct vdpa_device *vdev);void vdpa_unregister_device (struct vdpa_device *vdev); +/* request irq for a vq, setup irq offloading if its a vhost_vdpa vq */ +int vdpa_alloc_vq_irq (struct device *dev,struct vdpa_device *vdev, +unsigned int irq,irq_handler_t handler, +unsigned long irqflags,const char *devname,void *dev_id, +int qid); +/* free irq for a vq, unsetup irq offloading if its a vhost_vdpa vq */ +void vdpa_free_vq_irq (struct device *dev,struct vdpa_device *vdev,int irq, +int qid,void *dev_id); +/** * vdpa_driver - operations for a vDPA driver * @driver: underlying device driver * @probe: the function to call when a device is found. Returns 0 or -errno. * @remove: the function to call when a device is removed. +* @setup_vq_irq: setup irq offloading for a vhost_vdpa vq. +* @unsetup_vq_irq: unsetup offloading for a vhost_vdpa vq. */ struct vdpa_driver {struct device_driver driver;int (*probe)(struct vdpa_device *vdev);void (*remove)(struct vdpa_device *vdev); +void (*setup_vq_irq)(struct vdpa_device *vdev,int qid,int irq); +void (*unsetup_vq_irq)(struct vdpa_device *vdev,int qid); };#define vdpa_register_driver (drv) \
Signature · 1 line
1.8.3.1
Re: [PATCH V2 3/6] vDPA: implement IRQ offloading helpers in vDPA core
Quoted 1 line · Zhu Lingshan
This commit implements IRQ offloading helpers
Let's say "vq irq allocate/free helpers" here.
Quoted 28 lines
in vDPA core by
introducing two couple of functions:
vdpa_alloc_vq_irq()andvdpa_free_vq_irq(): request irq and free irq, will setup irq offloading.
vdpa_setup_irq()andvdpa_unsetup_irq(): supportive functions, will callvhost_vdpahelpers.Signed-off-by Zhu Lingshan <[email protected]>Suggested-by Jason Wang <[email protected]>--- drivers/vdpa/vdpa.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/linux/vdpa.h | 13 +++++++++++++ 2 files changed, 55 insertions(+)drivers/vdpa/vdpa.c +4
-0@@ -163,6 +163,48 @@ void vdpa_unregister_driver(struct vdpa_driver *drv) }EXPORT_SYMBOL_GPL (vdpa_unregister_driver); +static void vdpa_setup_irq (struct vdpa_device *vdev,int qid,int irq) +{ +struct vdpa_driver *drv =drv_to_vdpa (vdev->dev.driver); +
drivers/vdpa/vdpa.c void vdpa_unregister_driver(struct vdpa_driver *drv) · line 179
Quoted 10 lines
drivers/vdpa/vdpa.c +10
-0+if (drv->setup_vq_irq) + drv->setup_vq_irq (vdev, qid, irq); +} + +static void vdpa_unsetup_irq (struct vdpa_device *vdev,int qid) +{ +struct vdpa_driver *drv =drv_to_vdpa (vdev->dev.driver); + +if (drv->unsetup_vq_irq) + drv->unsetup_vq_irq (vdev, qid);
Do you need to check the existence of drv before calling unset_vq_irq()?
And how can this synchronize with driver releasing and binding?
drivers/vdpa/vdpa.c void vdpa_unregister_driver(struct vdpa_driver *drv) · line 185
Quoted 6 lines
drivers/vdpa/vdpa.c +6
-0+} + +int vdpa_alloc_vq_irq (struct device *dev,struct vdpa_device *vdev, +unsigned int irq,irq_handler_t handler, +unsigned long irqflags,const char *devname,void *dev_id, +int qid)
Let's add comment as what has been done by other exported helpers.
Quoted 30 lines
drivers/vdpa/vdpa.c +22
-0+{ +int ret; + + ret =devm_request_irq (dev, irq, handler, irqflags, devname, dev_id); +if (ret) +dev_err (dev,"Failed to request irq for vq %d\n" , qid); +else +vdpa_setup_irq (vdev, qid, irq); + +return ret; + +} +EXPORT_SYMBOL_GPL (vdpa_alloc_vq_irq); + +void vdpa_free_vq_irq (struct device *dev,struct vdpa_device *vdev,int irq, +int qid,void *dev_id) +{ +devm_free_irq (dev, irq, dev_id); +vdpa_unsetup_irq (vdev, qid); +} +EXPORT_SYMBOL_GPL (vdpa_free_vq_irq); +static int vdpa_init (void ) {return bus_register (&vdpa_bus);include/linux/vdpa.h +0
-0
include/linux/vdpa.h struct vdpa_device *__vdpa_alloc_device(struct device *parent, · line 223
Quoted 4 lines
include/linux/vdpa.h +1
-0@@ -220,17 +220,30 @@ struct vdpa_device *__vdpa_alloc_device(struct device *parent,int vdpa_register_device (struct vdpa_device *vdev);void vdpa_unregister_device (struct vdpa_device *vdev); +/* request irq for a vq, setup irq offloading if its a vhost_vdpa vq */
Let's do the documentation in vdpa.c, and again, document the devres implications or j_xxxust name it as vdpa_devm_xxx.
Quoted 6 lines
include/linux/vdpa.h +6
-0+int vdpa_alloc_vq_irq (struct device *dev,struct vdpa_device *vdev, +unsigned int irq,irq_handler_t handler, +unsigned long irqflags,const char *devname,void *dev_id, +int qid); +/* free irq for a vq, unsetup irq offloading if its a vhost_vdpa vq */ +void vdpa_free_vq_irq(struct device *dev, struct vdpa_device *vdev, int irq,
include/linux/vdpa.h struct vdpa_device *__vdpa_alloc_device(struct device *parent, · line 239
Quoted 10 lines
include/linux/vdpa.h +4
-0+ int qid, void *dev_id); +/** * vdpa_driver - operations for a vDPA driver * @driver: underlying device driver * @probe: the function to call when a device is found. Returns 0 or -errno. * @remove: the function to call when a device is removed. +* @setup_vq_irq: setup irq offloading for a vhost_vdpa vq. +* @unsetup_vq_irq: unsetup offloading for a vhost_vdpa vq.
Let's not limit the methods for a specific use case like irq offloading here.
include/linux/vdpa.h struct vdpa_device *__vdpa_alloc_device(struct device *parent, · line 246
Quoted 7 lines
include/linux/vdpa.h +2
-0*/ struct vdpa_driver {struct device_driver driver;int (*probe)(struct vdpa_device *vdev);void (*remove)(struct vdpa_device *vdev); +void (*setup_vq_irq)(struct vdpa_device *vdev,int qid,int irq); +void (*unsetup_vq_irq)(struct vdpa_device *vdev,int qid);
To be consistent with the exported helper, let's use alloc_vq_irq/free_vq_irq
Thanks
Quoted 3 lines
include/linux/vdpa.h +0
-0};#define vdpa_register_driver (drv) \
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH V2 3/6] vDPA: implement IRQ offloading helpers in vDPA core
Quoted 14 lines · Lingshan
Quoted 12 lines
drivers/vdpa/vdpa.c void vdpa_unregister_driver(struct vdpa_driver *drv) · line 179
Quoted 9 lines
drivers/vdpa/vdpa.c +8
-0+} + +static void vdpa_unsetup_irq (struct vdpa_device *vdev,int qid) +{ + struct vdpa_driver *drv = drv_to_vdpa(vdev->dev.driver); + + if (drv->unsetup_vq_irq) + drv->unsetup_vq_irq(vdev, qid);Do you need to check the existence of drv before calling
unset_vq_irq()?Yes, we should check this when we take the releasing path into account.
Quoted 1 line
Quoted 7 lines
Quoted 1 line
And how can this synchronize with driver releasing and binding?
Will add an
vdpa_unsetup_irq()call invhsot_vdpa_release(). For binding, I think it is a new dev bound to the the driver, it should go through thevdpa_setup_irq()routine. or if it is a device re-bind tovhost_vdpa, I think we have cleaned upirq_bypass_producerfor it as we would callvhdpa_unsetup_irq()in the release function.
I meant can the following things happen?
1) some vDPA device driver probe the hardware and call vdpa_request_irq() in its PCI probe function.
2) vDPA device is probed by vhost-vDPA
Then irq bypass can't work since we when vdpa_unsetup_irq() is called, there's no driver bound. Or is there a requirement that vdap_request/free_irq() must be called somewhere (e.g in the set_status bus operations)? If yes, we need document those requirements.
Thanks
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH V2 3/6] vDPA: implement IRQ offloading helpers in vDPA core
Quoted 28 lines · Lingshan
Quoted 25 lines · Jason Wang
Quoted 21 lines · Lingshan
Quoted 12 lines
drivers/vdpa/vdpa.c void vdpa_unregister_driver(struct vdpa_driver *drv) · line 179
Quoted 9 lines
drivers/vdpa/vdpa.c +8
-0+} + +static void vdpa_unsetup_irq (struct vdpa_device *vdev,int qid) +{ + struct vdpa_driver *drv = drv_to_vdpa(vdev->dev.driver); + + if (drv->unsetup_vq_irq) + drv->unsetup_vq_irq(vdev, qid);Do you need to check the existence of drv before calling
unset_vq_irq()?Yes, we should check this when we take the releasing path into account.
Quoted 2 lines
And how can this synchronize with driver releasing and binding?
Will add an
vdpa_unsetup_irq()call invhsot_vdpa_release(). For binding, I think it is a new dev bound to the the driver, it should go through thevdpa_setup_irq()routine. or if it is a device re-bind tovhost_vdpa, I think we have cleaned upirq_bypass_producerfor it as we would callvhdpa_unsetup_irq()in the release function.
Quoted 7 lines
Quoted 6 lines
I meant can the following things happen?
1) some vDPA device driver probe the hardware and call
vdpa_request_irq()in its PCI probe function.
2) vDPA device is probed by vhost-vDPAThen irq bypass can't work since we when
vdpa_unsetup_irq()is called, there's no driver bound. Or is there a requirement that vdap_request/free_irq() must be called somewhere (e.g in theset_statusbus operations)? If yes, we need document those requirements.
vdpa_unseup_irqis only called when we want to unregister the producer,
Typo, I meant vdpa_setup_irq().
Thanks
Quoted 8 lines
now we have two code path using it:
free_irqandrelaase(). I agree we can document this requirements for the helpers, these functions can only be called through statuschanges(DRIVER_OK and !DRIVER_OK).Thanks,
BR
Zhu LingshanQuoted 3 lines
Thanks
PATCH v2 4/6 vhost_vdpa: implement IRQ offloading in vhost_vdpa
In reply to Zhu LingshanThis patch introduce a set of functions for setup/unsetup and update irq offloading respectively by register/unregister and re-register the irq_bypass_producer.
--- drivers/vhost/Kconfig | 1 + drivers/vhost/vdpa.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+)
drivers/vhost/Kconfig +1 -0
@@ -65,6 +65,7 @@ config VHOST_VDPA tristate "Vhost driver for vDPA-based backend" depends on EVENTFD select VHOST + select IRQ_BYPASS_MANAGER depends on VDPA help This kernel module can be loaded in host kernel to accelerate
drivers/vhost/vdpa.c +48 -0
72 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Re: [PATCH V2 4/6] vhost_vdpa: implement IRQ offloading in vhost_vdpa
Quoted 32 lines · Zhu Lingshan
This patch introduce a set of functions for setup/unsetup and update irq offloading respectively by register/unregister and re-register the
irq_bypass_producer.Signed-off-by Zhu Lingshan <[email protected]>Suggested-by Jason Wang <[email protected]>--- drivers/vhost/Kconfig | 1 + drivers/vhost/vdpa.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+)drivers/vhost/Kconfig +1
-0@@ -65,6 +65,7 @@ config VHOST_VDPA tristate "Vhost driver for vDPA-based backend" depends on EVENTFD select VHOST + select IRQ_BYPASS_MANAGER depends on VDPA help This kernel module can be loaded in host kernel to acceleratedrivers/vhost/vdpa.c +1
-0@@ -115,6 +115,43 @@ static irqreturn_t vhost_vdpa_config_cb(void *private)return IRQ_HANDLED ; } +static void vhost_vdpa_setup_vq_irq (struct vdpa_device *dev,int qid,int irq)
drivers/vhost/vdpa.c static irqreturn_t vhost_vdpa_config_cb(void *private) · line 128
Quoted 10 lines
drivers/vhost/vdpa.c +10
-0+{ +struct vhost_vdpa *v =vdpa_get_drvdata (dev); +struct vhost_virtqueue *vq = &v->vqs[qid]; +int ret; + +spin_lock (&vq->call_ctx.ctx_lock); +if (!vq->call_ctx.ctx) { +spin_unlock (&vq->call_ctx.ctx_lock); +return ; + }
I think we can simply remove this check as what is done in vhost_vdpq_update_vq_irq().
Quoted 30 lines
drivers/vhost/vdpa.c +26
-0+ + vq->call_ctx.producer.token = vq->call_ctx.ctx; + vq->call_ctx.producer.irq = irq; + ret =irq_bypass_register_producer (&vq->call_ctx.producer); +spin_unlock (&vq->call_ctx.ctx_lock); +} + +static void vhost_vdpa_unsetup_vq_irq (struct vdpa_device *dev,int qid) +{ +struct vhost_vdpa *v =vdpa_get_drvdata (dev); +struct vhost_virtqueue *vq = &v->vqs[qid]; + +spin_lock (&vq->call_ctx.ctx_lock); +irq_bypass_unregister_producer (&vq->call_ctx.producer); +spin_unlock (&vq->call_ctx.ctx_lock); +} + +static void vhost_vdpa_update_vq_irq (struct vhost_virtqueue *vq) +{ +spin_lock (&vq->call_ctx.ctx_lock); +irq_bypass_unregister_producer (&vq->call_ctx.producer); + vq->call_ctx.producer.token = vq->call_ctx.ctx; +irq_bypass_register_producer (&vq->call_ctx.producer); +spin_unlock (&vq->call_ctx.ctx_lock); +} +static void vhost_vdpa_reset (struct vhost_vdpa *v) {struct vdpa_device *vdpa = v->vdpa;
drivers/vhost/vdpa.c static long vhost_vdpa_set_config_call(struct vhost_vdpa *v, u32 __user *argp) · line 372
Quoted 4 lines
drivers/vhost/vdpa.c +1
-0@@ -332,6 +369,7 @@ static long vhost_vdpa_set_config_call(struct vhost_vdpa *v, u32 __user *argp)return 0 ; } +
If you really want to fix coding style issue, it's better to have another patch.
Quoted 5 lines
drivers/vhost/vdpa.c +0
-0static long vhost_vdpa_vring_ioctl (struct vhost_vdpa *v,unsigned int cmd,void __user *argp) {@@ -390,6 +428,14 @@ static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v, unsigned int cmd, cb.private =NULL ;
drivers/vhost/vdpa.c static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v, unsigned int cmd, · line 438
Quoted 10 lines
drivers/vhost/vdpa.c +8
-0} ops->set_vq_cb (vdpa, idx, &cb); +/* +* if it has a non-zero irq, means there is a +* previsouly registered irq_bypass_producer, +* we should update it when ctx (its token) +* changes. +*/ +if (vq->call_ctx.producer.irq) +vhost_vdpa_update_vq_irq (vq);
Is this safe to check producer.irq outside spinlock?
Thanks
Quoted 12 lines
drivers/vhost/vdpa.c +2
-0break ;case VHOST_SET_VRING_NUM :@@ -951,6 +997,8 @@ static void vhost_vdpa_remove(struct vdpa_device *vdpa) }, .probe = vhost_vdpa_probe, .remove = vhost_vdpa_remove, + .setup_vq_irq = vhost_vdpa_setup_vq_irq, + .unsetup_vq_irq = vhost_vdpa_unsetup_vq_irq, };static int __init vhost_vdpa_init (void )
kernel test robot
build botRe: [PATCH V2 4/6] vhost_vdpa: implement IRQ offloading in vhost_vdpa
In reply to Zhu LingshanThank you for the patch! Perhaps something to improve:
Hi Zhu,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on vhost/linux-next]
[also build test WARNING on kvm/linux-next linus/master v5.8-rc5 next-20200716] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Zhu-Lingshan/IRQ-offloading-for-vDPA/20200716-192910 base: https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git linux-next config: openrisc-randconfig-r016-20200717 (attached as .config) compiler: or1k-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=openrisc
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
drivers/vhost/vdpa.c: In function 'vhost_vdpa_setup_vq_irq':
>> drivers/vhost/vdpa.c:122:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
122 | int ret;
| ^~~vim +/ret +122 drivers/vhost/vdpa.c
117
118 static void vhost_vdpa_setup_vq_irq(struct vdpa_device *dev, int qid, int irq)
119 {
120 struct vhost_vdpa *v = vdpa_get_drvdata(dev);
121 struct vhost_virtqueue *vq = &v->vqs[qid];
> 122 int ret;
123
124 spin_lock(&vq->call_ctx.ctx_lock);
125 if (!vq->call_ctx.ctx) {
126 spin_unlock(&vq->call_ctx.ctx_lock);
127 return;
128 }
129
130 vq->call_ctx.producer.token = vq->call_ctx.ctx;
131 vq->call_ctx.producer.irq = irq;
132 ret = irq_bypass_register_producer(&vq->call_ctx.producer);
133 spin_unlock(&vq->call_ctx.ctx_lock);
134 }
135
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v2 5/6 ifcvf: replace irq_request/free with vDPA helpers
In reply to Zhu LingshanThis commit replaced irq_request/free() with helpers in vDPA core, so that it can request/free irq and setup irq offloading on order.
--- drivers/vdpa/ifcvf/ifcvf_main.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/vdpa/ifcvf/ifcvf_main.c +9 -5
@@ -47,11 +47,12 @@ static void ifcvf_free_irq(struct ifcvf_adapter *adapter, int queues) {struct pci_dev *pdev = adapter->pdev;struct ifcvf_hw *vf = &adapter->vf; +struct vdpa_device *vdpa = &adapter->vdpa;int i;for (i =0 ; i < queues; i++) -devm_free_irq (&pdev->dev, vf->vring[i].irq, &vf->vring[i]); +vdpa_free_vq_irq (&pdev->dev, vdpa, vf->vring[i].irq, i, &vf->vring[i]);ifcvf_free_irq_vectors (pdev); }
@@ -60,6 +61,7 @@ static int ifcvf_request_irq(struct ifcvf_adapter *adapter) {struct pci_dev *pdev = adapter->pdev;struct ifcvf_hw *vf = &adapter->vf; +struct vdpa_device *vdpa = &adapter->vdpa;int vector, i, ret, irq; ret = pci_alloc_irq_vectors(pdev, IFCVF_MAX_INTR,
@@ -73,6 +75,10 @@ static int ifcvf_request_irq(struct ifcvf_adapter *adapter) pci_name(pdev)); vector =0 ; irq =pci_irq_vector (pdev, vector); +/* This isconfig interrupt, config accesses all go +* through userspace, so no need to setup +* config interrupt offloading. +*/ ret =devm_request_irq (&pdev->dev, irq, ifcvf_config_changed,0 , vf->config_msix_name, vf);
@@ -82,13 +88,11 @@ static int ifcvf_request_irq(struct ifcvf_adapter *adapter) pci_name(pdev), i); vector = i +IFCVF_MSI_QUEUE_OFF ; irq =pci_irq_vector (pdev, vector); - ret =devm_request_irq (&pdev->dev, irq, + ret =vdpa_alloc_vq_irq (&pdev->dev, vdpa, irq, ifcvf_intr_handler,0 , vf->vring[i].msix_name, - &vf->vring[i]); + &vf->vring[i], i);if (ret) { -IFCVF_ERR (pdev, -"Failed to request irq for vq %d\n" , i);ifcvf_free_irq (adapter, i);return ret;
Signature · 1 line
1.8.3.1
Re: [PATCH V2 5/6] ifcvf: replace irq_request/free with vDPA helpers
Quoted 37 lines · Zhu Lingshan
This commit replaced irq_request/free() with helpers in vDPA core, so that it can request/free irq and setup irq offloading on order.
Signed-off-by Zhu Lingshan <[email protected]>Suggested-by Jason Wang <[email protected]>--- drivers/vdpa/ifcvf/ifcvf_main.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)drivers/vdpa/ifcvf/ifcvf_main.c +3
-1@@ -47,11 +47,12 @@ static void ifcvf_free_irq(struct ifcvf_adapter *adapter, int queues) {struct pci_dev *pdev = adapter->pdev;struct ifcvf_hw *vf = &adapter->vf; +struct vdpa_device *vdpa = &adapter->vdpa;int i;for (i =0 ; i < queues; i++) -devm_free_irq (&pdev->dev, vf->vring[i].irq, &vf->vring[i]); +vdpa_free_vq_irq (&pdev->dev, vdpa, vf->vring[i].irq, i, &vf->vring[i]);ifcvf_free_irq_vectors (pdev); }@@ -60,6 +61,7 @@ static int ifcvf_request_irq(struct ifcvf_adapter *adapter) {struct pci_dev *pdev = adapter->pdev;struct ifcvf_hw *vf = &adapter->vf; +struct vdpa_device *vdpa = &adapter->vdpa;int vector, i, ret, irq; ret = pci_alloc_irq_vectors(pdev, IFCVF_MAX_INTR,
drivers/vdpa/ifcvf/ifcvf_main.c static int ifcvf_request_irq(struct ifcvf_adapter *adapter) · line 78
Quoted 4 lines
drivers/vdpa/ifcvf/ifcvf_main.c +1
-0@@ -73,6 +75,10 @@ static int ifcvf_request_irq(struct ifcvf_adapter *adapter) pci_name(pdev)); vector =0 ; irq =pci_irq_vector (pdev, vector); +/* This isconfig interrupt, config accesses all go
Missing a blank between is and config.
Thanks
Quoted 22 lines
drivers/vdpa/ifcvf/ifcvf_main.c +5
-4+* through userspace, so no need to setup +* config interrupt offloading. +*/ ret =devm_request_irq (&pdev->dev, irq, ifcvf_config_changed,0 , vf->config_msix_name, vf);@@ -82,13 +88,11 @@ static int ifcvf_request_irq(struct ifcvf_adapter *adapter) pci_name(pdev), i); vector = i +IFCVF_MSI_QUEUE_OFF ; irq =pci_irq_vector (pdev, vector); - ret =devm_request_irq (&pdev->dev, irq, + ret =vdpa_alloc_vq_irq (&pdev->dev, vdpa, irq, ifcvf_intr_handler,0 , vf->vring[i].msix_name, - &vf->vring[i]); + &vf->vring[i], i);if (ret) { -IFCVF_ERR (pdev, -"Failed to request irq for vq %d\n" , i);ifcvf_free_irq (adapter, i);return ret;
PATCH v2 6/6 irqbypass: do not start cons/prod when failed connect
In reply to Zhu LingshanIf failed to connect, there is no need to start consumer nor producer.
--- virt/lib/irqbypass.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
virt/lib/irqbypass.c +10 -6
@@ -40,17 +40,21 @@ static int __connect(struct irq_bypass_producer *prod,if (prod->add_consumer) ret = prod->add_consumer (prod, cons); -if (!ret) { - ret = cons->add_producer (cons, prod); -if (ret && prod->del_consumer) - prod->del_consumer (prod, cons); - } +if (ret) + goto err_add_consumer; + + ret = cons->add_producer (cons, prod); +if (ret) + goto err_add_producer;if (cons->start) cons->start (cons);if (prod->start) prod->start (prod); - +err_add_producer: +if (prod->del_consumer) + prod->del_consumer (prod, cons); +err_add_consumer:return ret; }
Signature · 1 line
1.8.3.1