xen/events: Fix Global and Domain VIRQ tracking
Subsystems (2)
v2 cover xen/events: Fix Global and Domain VIRQ tracking
v2 is now a series first changing find_virq() to return -EEXIST in some cases, and then tracking cpu movement of VIRQs. This keeps ensures the cpu is correct when calling unbind_from_irq().
Jason Andryuk (3):
xen/events: Cleanup find_virq() return codes
xen/events: Return -EEXIST for bound VIRQs
xen/events: Update virq_to_irq on migration
drivers/xen/events/events_base.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-)
Signature · 1 line
2.50.1
PATCH v2 1/3 xen/events: Cleanup find_virq() return codes
rc is overwritten by the evtchn_status hypercall in each iteration, so the return value will be whatever the last iteration is. Change to an explicit -ENOENT for an un-found virq and return 0 on a successful match.
---
v2:
New
--- drivers/xen/events/events_base.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/xen/events/events_base.c +3 -3
@@ -1318,7 +1318,7 @@ static int find_virq(unsigned int virq, unsigned int cpu, evtchn_port_t *evtchn) {struct evtchn_status status;evtchn_port_t port; -int rc = -ENOENT ; +int rc;memset (&status,0 ,sizeof (status));for (port =0 ; port <xen_evtchn_max_channels (); port++) {
@@ -1331,10 +1331,10 @@ static int find_virq(unsigned int virq, unsigned int cpu, evtchn_port_t *evtchn)continue ;if (status.u.virq == virq && status.vcpu ==xen_vcpu_nr (cpu)) { *evtchn = port; -break ; +return 0 ; } } -return rc; +return -ENOENT ; }/**
Signature · 1 line
2.50.1
Re: [PATCH v2 1/3] xen/events: Cleanup find_virq() return codes
Quoted 2 lines · Jason Andryuk
rc is overwritten by the
evtchn_statushypercall in each iteration, so the return value will be whatever the last iteration is.
Which may even be a false "success". Especially for that it feels like ...
Quoted 5 lines
Change to an
explicit-ENOENTfor an un-found virq and return 0 on a successful match.Signed-off-by Jason Andryuk <[email protected]>
... this also wants a Fixes: tag and perhaps a Cc: to stable@.
drivers/xen/events/events_base.c static int find_virq(unsigned int virq, unsigned int cpu, evtchn_port_t *evtchn) · line 1321
Quoted 8 lines
drivers/xen/events/events_base.c +1
-1@@ -1318,7 +1318,7 @@ static int find_virq(unsigned int virq, unsigned int cpu, evtchn_port_t *evtchn) {struct evtchn_status status;evtchn_port_t port; -int rc = -ENOENT ; +int rc;
Maybe best to also move this into the more narrow scope (loop body)? Either way:
drivers/xen/events/events_base.c static int find_virq(unsigned int virq, unsigned int cpu, evtchn_port_t *evtchn) · line 1323
Quoted 1 line
drivers/xen/events/events_base.c +0
-0memset (&status,0 ,sizeof (status));
Having this outside of the loop is a little odd, too: It makes assumptions on the behavior of the hypervisor (like not altering the structure upon error). Yet likely not something to deal with right here.
Jan
Re: [PATCH v2 1/3] xen/events: Cleanup find_virq() return codes
Quoted 5 lines · Jan Beulich
Quoted 2 lines · Jason Andryuk
rc is overwritten by the
evtchn_statushypercall in each iteration, so the return value will be whatever the last iteration is.Which may even be a false "success". Especially for that it feels like ...
I'll state that here...
Quoted 8 lines
Quoted 6 lines
Change to an
explicit-ENOENTfor an un-found virq and return 0 on a successful match.Signed-off-by Jason Andryuk <[email protected]>... this also wants a Fixes: tag and perhaps a Cc: to stable@.
and add these.
Quoted 11 lines
drivers/xen/events/events_base.c static int find_virq(unsigned int virq, unsigned int cpu, evtchn_port_t *evtchn) · line 1321
Quoted 9 lines
drivers/xen/events/events_base.c +1
-1@@ -1318,7 +1318,7 @@ static int find_virq(unsigned int virq, unsigned int cpu, evtchn_port_t *evtchn) {struct evtchn_status status;evtchn_port_t port; -int rc = -ENOENT ; +int rc;Maybe best to also move this into the more narrow scope (loop body)?
Sounds good.
Quoted 2 lines
Either way:
Reviewed-by Jan Beulich <[email protected]>
Thanks.
Quoted 6 lines
drivers/xen/events/events_base.c static int find_virq(unsigned int virq, unsigned int cpu, evtchn_port_t *evtchn) · line 1323
Quoted 2 lines
drivers/xen/events/events_base.c +0
-0memset (&status,0 ,sizeof (status));Having this outside of the loop is a little odd, too: It makes assumptions on the behavior of the hypervisor (like not altering the structure upon error). Yet likely not something to deal with right here.
Agreed.
Thanks,
Jason
Re: [PATCH v2 1/3] xen/events: Cleanup find_virq() return codes
Quoted 33 lines · Jason Andryuk
Quoted 5 lines · Jan Beulich
Quoted 2 lines · Jason Andryuk
rc is overwritten by the
evtchn_statushypercall in each iteration, so the return value will be whatever the last iteration is.Which may even be a false "success". Especially for that it feels like ...
I'll state that here...
Quoted 8 lines
Quoted 6 lines
Change to an
explicit-ENOENTfor an un-found virq and return 0 on a successful match.Signed-off-by Jason Andryuk <[email protected]>... this also wants a Fixes: tag and perhaps a Cc: to stable@.
and add these.
Quoted 12 lines
drivers/xen/events/events_base.c static int find_virq(unsigned int virq, unsigned int · line 1322
Quoted 10 lines
drivers/xen/events/events_base.c +1
-1@@ -1318,7 +1318,7 @@ static int find_virq(unsigned int virq, unsigned int cpu, evtchn_port_t *evtchn) { struct evtchn_status status; evtchn_port_t port; - int rc = -ENOENT; + int rc;Maybe best to also move this into the more narrow scope (loop body)?
Quoted 4 lines
Sounds good.
Quoted 2 lines
Either way:
Reviewed-by Jan Beulich <[email protected]>
With the changes you promised to do:
Juergen
PATCH v2 2/3 xen/events: Return -EEXIST for bound VIRQs
In reply to Jason AndryukChange find_virq() to return -EEXIST when a VIRQ is bound to a different CPU than the one passed in. With that, remove the BUG_ON() from bind_virq_to_irq() to propogate the error upwards.
Some VIRQs are per-cpu, but others are per-domain or global. Those must be bound to CPU0 and can then migrate elsewhere. The lookup for per-domain and global will probably fail when migrated off CPU 0, especially when the current CPU is tracked. This now returns -EEXIST instead of BUG_ON().
A second call to bind a per-domain or global VIRQ is not expected, but make it non-fatal to avoid trying to look up the irq, since we don't know which per_cpu(virq_to_irq) it will be in.
---
V2:
New
--- drivers/xen/events/events_base.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/xen/events/events_base.c +12 -5
@@ -1314,10 +1314,12 @@ int bind_interdomain_evtchn_to_irq_lateeoi(struct xenbus_device *dev, }EXPORT_SYMBOL_GPL (bind_interdomain_evtchn_to_irq_lateeoi); -static int find_virq (unsigned int virq,unsigned int cpu,evtchn_port_t *evtchn) +static int find_virq (unsigned int virq,unsigned int cpu,evtchn_port_t *evtchn, +bool percpu) {struct evtchn_status status;evtchn_port_t port; +bool exists = false;int rc;memset (&status,0 ,sizeof (status));
@@ -1329,12 +1331,16 @@ static int find_virq(unsigned int virq, unsigned int cpu, evtchn_port_t *evtchn)continue ;if (status.status != EVTCHNSTAT_virq)continue ; -if (status.u.virq == virq && status.vcpu ==xen_vcpu_nr (cpu)) { +if (status.u.virq != virq) +continue ; +if (status.vcpu ==xen_vcpu_nr (cpu)) { *evtchn = port;return 0 ; + }else if (!percpu) { + exists = true; } } -return -ENOENT ; +return exists ? -EEXIST : -ENOENT ; }/**
@@ -1381,8 +1387,9 @@ int bind_virq_to_irq(unsigned int virq, unsigned int cpu, bool percpu) evtchn = bind_virq.port; else {if (ret == -EEXIST ) - ret =find_virq (virq, cpu, &evtchn); -BUG_ON (ret <0 ); + ret =find_virq (virq, cpu, &evtchn, percpu); +if (ret) + goto out; } ret =xen_irq_info_virq_setup (info, cpu, evtchn, virq);
Signature · 1 line
2.50.1
Jürgen Groß
maintainerRe: [PATCH v2 2/3] xen/events: Return -EEXIST for bound VIRQs
Quoted 60 lines · Jason Andryuk
Change
find_virq()to return-EEXISTwhen a VIRQ is bound to a different CPU than the one passed in. With that, remove theBUG_ON()frombind_virq_to_irq()to propogate the error upwards.Some VIRQs are per-cpu, but others are per-domain or global. Those must be bound to CPU0 and can then migrate elsewhere. The lookup for per-domain and global will probably fail when migrated off CPU 0, especially when the current CPU is tracked. This now returns
-EEXISTinstead ofBUG_ON().A second call to bind a per-domain or global VIRQ is not expected, but make it non-fatal to avoid trying to look up the irq, since we don't know which
per_cpu(virq_to_irq)it will be in.Signed-off-by Jason Andryuk <[email protected]>---
V2:
New--- drivers/xen/events/events_base.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)drivers/xen/events/events_base.c +9
-3@@ -1314,10 +1314,12 @@ int bind_interdomain_evtchn_to_irq_lateeoi(struct xenbus_device *dev, }EXPORT_SYMBOL_GPL (bind_interdomain_evtchn_to_irq_lateeoi); -static int find_virq (unsigned int virq,unsigned int cpu,evtchn_port_t *evtchn) +static int find_virq (unsigned int virq,unsigned int cpu,evtchn_port_t *evtchn, +bool percpu) {struct evtchn_status status;evtchn_port_t port; +bool exists = false;int rc;memset (&status,0 ,sizeof (status));@@ -1329,12 +1331,16 @@ static int find_virq(unsigned int virq, unsigned int cpu, evtchn_port_t *evtchn)continue ;if (status.status != EVTCHNSTAT_virq)continue ; -if (status.u.virq == virq && status.vcpu ==xen_vcpu_nr (cpu)) { +if (status.u.virq != virq) +continue ; +if (status.vcpu ==xen_vcpu_nr (cpu)) { *evtchn = port;return 0 ; + }else if (!percpu) { + exists = true; } } -return -ENOENT ; +return exists ? -EEXIST : -ENOENT ; }/**
drivers/xen/events/events_base.c int bind_virq_to_irq(unsigned int virq, unsigned int cpu, bool percpu) · line 1392
Quoted 8 lines
drivers/xen/events/events_base.c +3
-2@@ -1381,8 +1387,9 @@ int bind_virq_to_irq(unsigned int virq, unsigned int cpu, bool percpu) evtchn = bind_virq.port; else {if (ret == -EEXIST ) - ret =find_virq (virq, cpu, &evtchn); -BUG_ON (ret <0 ); + ret =find_virq (virq, cpu, &evtchn, percpu); +if (ret) + goto out;
I think you are leaking info here. I guess a call of __unbind_from_irq() is wanted like in the error case below (note that the case of no valid evtchn is handled there just fine).
Juergen
Re: [PATCH v2 2/3] xen/events: Return -EEXIST for bound VIRQs
Quoted 17 lines · Jürgen Groß
Quoted 15 lines · Jason Andryuk
Change
find_virq()to return-EEXISTwhen a VIRQ is bound to a different CPU than the one passed in. With that, remove theBUG_ON()frombind_virq_to_irq()to propogate the error upwards.Some VIRQs are per-cpu, but others are per-domain or global. Those must be bound to CPU0 and can then migrate elsewhere. The lookup for per-domain and global will probably fail when migrated off CPU 0, especially when the current CPU is tracked. This now returns
-EEXISTinstead ofBUG_ON().A second call to bind a per-domain or global VIRQ is not expected, but make it non-fatal to avoid trying to look up the irq, since we don't know which
per_cpu(virq_to_irq)it will be in.Signed-off-by Jason Andryuk <[email protected]>
Quoted 14 lines
drivers/xen/events/events_base.c int bind_virq_to_irq(unsigned int virq, unsigned · line 1393
Quoted 10 lines
drivers/xen/events/events_base.c +3
-2@@ -1381,8 +1387,9 @@ int bind_virq_to_irq(unsigned int virq, unsigned int cpu, bool percpu) evtchn = bind_virq.port; else { if (ret == -EEXIST) - ret = find_virq(virq, cpu, &evtchn); - BUG_ON(ret < 0); + ret = find_virq(virq, cpu, &evtchn, percpu); + if (ret) + goto out;I think you are leaking info here. I guess a call of
__unbind_from_irq()is wanted like in the error case below (note that the case of no valid evtchn is handled there just fine).
Ok, thanks for catching that.
I'm going to add Cc: stable to the next version of this. While it doesn't have a Fixes associated, we want this as a prerequisite for patch 3.
Regards,
Jason
PATCH v2 3/3 xen/events: Update virq_to_irq on migration
In reply to Jason AndryukVIRQs come in 3 flavors, per-VPU, per-domain, and global, and the VIRQs are tracked in per-cpu virq_to_irq arrays.
Per-domain and global VIRQs must be bound on CPU 0, and bind_virq_to_irq() sets the per_cpu virq_to_irq at registration time Later, the interrupt can migrate, and info->cpu is updated. When calling __unbind_from_irq(), the per-cpu virq_to_irq is cleared for a different cpu. If bind_virq_to_irq() is called again with CPU 0, the stale irq is returned. There won't be any irq_info for the irq, so things break.
Make xen_rebind_evtchn_to_cpu() update the per_cpu virq_to_irq mappings to keep them update to date with the current cpu. This ensures the correct virq_to_irq is cleared in __unbind_from_irq().
---
V2:
Different approach changing virq_to_irq
--- drivers/xen/events/events_base.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/xen/events/events_base.c +11 -0
@@ -1772,6 +1772,7 @@ static int xen_rebind_evtchn_to_cpu(struct irq_info *info, unsigned int tcpu) {struct evtchn_bind_vcpu bind_vcpu;evtchn_port_t evtchn = info ? info->evtchn :0 ; +int old_cpu = info ? info->cpu : tcpu;if (!VALID_EVTCHN (evtchn))return -1 ;
@@ -1795,8 +1796,18 @@ static int xen_rebind_evtchn_to_cpu(struct irq_info *info, unsigned int tcpu)* it, but don't do the xenlinux-level rebind in that case. */ if (HYPERVISOR_event_channel_op (EVTCHNOP_bind_vcpu, &bind_vcpu) >=0 ) + {bind_evtchn_to_cpu (info, tcpu, false); +if (info->type ==IRQT_VIRQ ) { +int virq = info->u.virq; +int irq =per_cpu (virq_to_irq, old_cpu)[virq]; + +per_cpu (virq_to_irq, old_cpu)[virq] =-1 ; +per_cpu (virq_to_irq, tcpu)[virq] = irq; + } + } +do_unmask (info,EVT_MASK_REASON_TEMPORARY );return 0 ;
Signature · 1 line
2.50.1
Jürgen Groß
maintainerRe: [PATCH v2 3/3] xen/events: Update virq_to_irq on migration
Quoted 30 lines · Jason Andryuk
VIRQs come in 3 flavors, per-VPU, per-domain, and global, and the VIRQs are tracked in per-cpu
virq_to_irqarrays.Per-domain and global VIRQs must be bound on CPU 0, and
bind_virq_to_irq()sets theper_cpuvirq_to_irqat registration time Later, the interrupt can migrate, andinfo->cpuis updated. When calling__unbind_from_irq(), the per-cpuvirq_to_irqis cleared for a different cpu. Ifbind_virq_to_irq()is called again with CPU 0, the stale irq is returned. There won't be anyirq_infofor the irq, so things break.Make
xen_rebind_evtchn_to_cpu()update theper_cpuvirq_to_irqmappings to keep them update to date with the current cpu. This ensures the correctvirq_to_irqis cleared in__unbind_from_irq().Fixes e46cdb66c8fc ("xen: event channels")Signed-off-by Jason Andryuk <[email protected]>---
V2:
Different approach changingvirq_to_irq--- drivers/xen/events/events_base.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/xen/events/events_base.c +0
-0
drivers/xen/events/events_base.c static int xen_rebind_evtchn_to_cpu(struct irq_info *info, unsigned int tcpu) · line 1775
Quoted 4 lines
drivers/xen/events/events_base.c +1
-0@@ -1772,6 +1772,7 @@ static int xen_rebind_evtchn_to_cpu(struct irq_info *info, unsigned int tcpu) {struct evtchn_bind_vcpu bind_vcpu;evtchn_port_t evtchn = info ? info->evtchn :0 ; +int old_cpu = info ? info->cpu : tcpu;
I'd prefer not to initialize old_cpu just here ...
drivers/xen/events/events_base.c static int xen_rebind_evtchn_to_cpu(struct irq_info *info, unsigned int tcpu) · line 1778
Quoted 3 lines
drivers/xen/events/events_base.c +0
-0if (!VALID_EVTCHN (evtchn))return -1 ;
... as here info is always valid, so you can just use "old_cpu = info->cpu;" (probably just after the hypercall).
drivers/xen/events/events_base.c static int xen_rebind_evtchn_to_cpu(struct irq_info *info, unsigned int tcpu) · line 1799
Quoted 5 lines
drivers/xen/events/events_base.c +1
-0@@ -1795,8 +1796,18 @@ static int xen_rebind_evtchn_to_cpu(struct irq_info *info, unsigned int tcpu)* it, but don't do the xenlinux-level rebind in that case. */ if (HYPERVISOR_event_channel_op (EVTCHNOP_bind_vcpu, &bind_vcpu) >=0 ) + {
Kernel style, please.
Quoted 4 lines
drivers/xen/events/events_base.c +2
-0bind_evtchn_to_cpu (info, tcpu, false); +if (info->type ==IRQT_VIRQ ) { +int virq = info->u.virq;
drivers/xen/events/events_base.c static int xen_rebind_evtchn_to_cpu(struct irq_info *info, unsigned int tcpu) · line 1813
Quoted 10 lines
drivers/xen/events/events_base.c +7
-0+int irq =per_cpu (virq_to_irq, old_cpu)[virq]; + +per_cpu (virq_to_irq, old_cpu)[virq] =-1 ; +per_cpu (virq_to_irq, tcpu)[virq] = irq; + } + } +do_unmask (info,EVT_MASK_REASON_TEMPORARY );return 0 ;
Juergen