Skip to content

Commit 3de218f

Browse files
committed
xen/events: reset active flag for lateeoi events later
In order to avoid a race condition for user events when changing cpu affinity reset the active flag only when EOI-ing the event. This is working fine as all user events are lateeoi events. Note that lateeoi_ack_mask_dynirq() is not modified as there is no explicit call to xen_irq_lateeoi() expected later. Cc: stable@vger.kernel.org Reported-by: Julien Grall <julien@xen.org> Fixes: b662279 ("xen/events: avoid handling the same event on two cpus at the same time") Tested-by: Julien Grall <julien@xen.org> Signed-off-by: Juergen Gross <jgross@suse.com> Reviewed-by: Boris Ostrovsky <boris.ostrvsky@oracle.com> Link: https://lore.kernel.org/r/20210623130913.9405-1-jgross@suse.com Signed-off-by: Juergen Gross <jgross@suse.com>
1 parent 107866a commit 3de218f

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

drivers/xen/events/events_base.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,9 @@ static void xen_irq_lateeoi_locked(struct irq_info *info, bool spurious)
642642
}
643643

644644
info->eoi_time = 0;
645+
646+
/* is_active hasn't been reset yet, do it now. */
647+
smp_store_release(&info->is_active, 0);
645648
do_unmask(info, EVT_MASK_REASON_EOI_PENDING);
646649
}
647650

@@ -811,6 +814,7 @@ static void xen_evtchn_close(evtchn_port_t port)
811814
BUG();
812815
}
813816

817+
/* Not called for lateeoi events. */
814818
static void event_handler_exit(struct irq_info *info)
815819
{
816820
smp_store_release(&info->is_active, 0);
@@ -1883,7 +1887,12 @@ static void lateeoi_ack_dynirq(struct irq_data *data)
18831887

18841888
if (VALID_EVTCHN(evtchn)) {
18851889
do_mask(info, EVT_MASK_REASON_EOI_PENDING);
1886-
event_handler_exit(info);
1890+
/*
1891+
* Don't call event_handler_exit().
1892+
* Need to keep is_active non-zero in order to ignore re-raised
1893+
* events after cpu affinity changes while a lateeoi is pending.
1894+
*/
1895+
clear_evtchn(evtchn);
18871896
}
18881897
}
18891898

0 commit comments

Comments
 (0)