Skip to content

Commit 3fcc8e1

Browse files
jandryukjgross1
authored andcommitted
xen/events: Update virq_to_irq on migration
VIRQs 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(). Fixes: e46cdb6 ("xen: event channels") Cc: stable@vger.kernel.org Signed-off-by: Jason Andryuk <jason.andryuk@amd.com> Reviewed-by: Juergen Gross <jgross@suse.com> Signed-off-by: Juergen Gross <jgross@suse.com> Message-ID: <20250828003604.8949-4-jason.andryuk@amd.com>
1 parent 07ce121 commit 3fcc8e1

1 file changed

Lines changed: 12 additions & 1 deletion

File tree

drivers/xen/events/events_base.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1797,9 +1797,20 @@ static int xen_rebind_evtchn_to_cpu(struct irq_info *info, unsigned int tcpu)
17971797
* virq or IPI channel, which don't actually need to be rebound. Ignore
17981798
* it, but don't do the xenlinux-level rebind in that case.
17991799
*/
1800-
if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_vcpu, &bind_vcpu) >= 0)
1800+
if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_vcpu, &bind_vcpu) >= 0) {
1801+
int old_cpu = info->cpu;
1802+
18011803
bind_evtchn_to_cpu(info, tcpu, false);
18021804

1805+
if (info->type == IRQT_VIRQ) {
1806+
int virq = info->u.virq;
1807+
int irq = per_cpu(virq_to_irq, old_cpu)[virq];
1808+
1809+
per_cpu(virq_to_irq, old_cpu)[virq] = -1;
1810+
per_cpu(virq_to_irq, tcpu)[virq] = irq;
1811+
}
1812+
}
1813+
18031814
do_unmask(info, EVT_MASK_REASON_TEMPORARY);
18041815

18051816
return 0;

0 commit comments

Comments
 (0)