XSA-343 followup patches
cover XSA-343 followup patches
The patches for XSA-343 produced some fallout, especially the event channel locking has shown to be problematic.
Patch 1 is targeting fifo event channels for avoiding any races for the case that the fifo queue has been changed for a specific event channel.
The second patch is modifying the per event channel locking scheme in order to avoid deadlocks and problems due to the event channel lock having been changed to require IRQs off by the XSA-343 patches.
Juergen Gross (2):
xen/events: access last_priority and last_vcpu_id together xen/evtchn: rework per event channel lock
xen/arch/x86/irq.c | 6 +- xen/arch/x86/pv/shim.c | 9 +-- xen/common/event_channel.c | 109 +++++++++++++++++-------------------- xen/common/event_fifo.c | 25 +++++++-- xen/include/xen/event.h | 50 ++++++++++++++--- xen/include/xen/sched.h | 5 +- 6 files changed, 120 insertions(+), 84 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/2 xen/events: access last_priority and last_vcpu_id together
The queue for a fifo event is depending on the vcpu_id and the priority of the event. When sending an event it might happen the event needs to change queues and the old queue needs to be kept for keeping the links between queue elements intact. For this purpose the event channel contains last_priority and last_vcpu_id values elements for being able to identify the old queue.
In order to avoid races always access last_priority and last_vcpu_id with a single atomic operation avoiding any inconsistencies.
--- xen/common/event_fifo.c | 25 +++++++++++++++++++------ xen/include/xen/sched.h | 3 +-- 2 files changed, 20 insertions(+), 8 deletions(-)
xen/common/event_fifo.c +19 -6
@@ -42,6 +42,14 @@ struct evtchn_fifo_domain {unsigned int num_evtchns; }; +union evtchn_fifo_lastq { +u32 raw; +struct { +u8 last_priority; +u16 last_vcpu_id; + }; +}; +static inline event_word_t *evtchn_fifo_word_from_port (const struct domain *d,unsigned int port) {
@@ -86,16 +94,18 @@ static struct evtchn_fifo_queue *lock_old_queue(const struct domain *d,struct vcpu *v;struct evtchn_fifo_queue *q, *old_q;unsigned int try; +union evtchn_fifo_lastq lastq;for ( try =0 ; try <3 ; try++ ) { - v = d->vcpu[evtchn->last_vcpu_id]; - old_q = &v->evtchn_fifo->queue[evtchn->last_priority]; + lastq.raw =read_atomic (&evtchn->fifo_lastq); + v = d->vcpu[lastq.last_vcpu_id]; + old_q = &v->evtchn_fifo->queue[lastq.last_priority];spin_lock_irqsave (&old_q->lock, *flags); - v = d->vcpu[evtchn->last_vcpu_id]; - q = &v->evtchn_fifo->queue[evtchn->last_priority]; + v = d->vcpu[lastq.last_vcpu_id]; + q = &v->evtchn_fifo->queue[lastq.last_priority];if ( old_q == q )return old_q;
@@ -246,8 +256,11 @@ static void evtchn_fifo_set_pending(struct vcpu *v, struct evtchn *evtchn)/* Moved to a different queue? */ if ( old_q != q ) { - evtchn->last_vcpu_id = v->vcpu_id; - evtchn->last_priority = q->priority; +union evtchn_fifo_lastq lastq; + + lastq.last_vcpu_id = v->vcpu_id; + lastq.last_priority = q->priority; +write_atomic (&evtchn->fifo_lastq, lastq.raw);spin_unlock_irqrestore (&old_q->lock, flags);spin_lock_irqsave (&q->lock, flags);
xen/include/xen/sched.h +1 -2
@@ -114,8 +114,7 @@ struct evtchnu16 virq;/* state == ECS_VIRQ */ } u;u8 priority; -u8 last_priority; -u16 last_vcpu_id; +u32 fifo_lastq;/* Data for fifo events identifying last queue. */ #ifdef CONFIG_XSM union { #ifdef XSM_NEED_GENERIC_EVTCHN_SSID
Signature · 1 line
2.26.2
PATCH 2/2 xen/evtchn: rework per event channel lock
In reply to Juergen GrossCurrently the lock for a single event channel needs to be taken with interrupts off, which causes deadlocks in some cases.
Rework the per event channel lock to be non-blocking for the case of sending an event and removing the need for disabling interrupts for taking the lock.
The lock is needed for avoiding races between sending an event or querying the channel's state against removal of the event channel.
Use a locking scheme similar to a rwlock, but with some modifications:
- sending an event or querying the event channel's state uses an operation similar to read_trylock(), in case of not obtaining the lock the sending is omitted or a default state is returned
- closing an event channel is similar to write_lock(), but without real fairness regarding multiple writers (this saves some space in the event channel structure and multiple writers are impossible as closing an event channel requires the domain's event_lock to be held).
With this locking scheme it is mandatory that a writer will always either start with an unbound or free event channel or will end with an unbound or free event channel, as otherwise the reaction of a reader not getting the lock would be wrong.
--- xen/arch/x86/irq.c | 6 +- xen/arch/x86/pv/shim.c | 9 +-- xen/common/event_channel.c | 109 +++++++++++++++++-------------------- xen/include/xen/event.h | 50 ++++++++++++++--- xen/include/xen/sched.h | 2 +- 5 files changed, 100 insertions(+), 76 deletions(-)
xen/arch/x86/irq.c +2 -4
@@ -2495,14 +2495,12 @@ static void dump_irqs(unsigned char key) pirq =domain_irq_to_pirq (d, irq); info =pirq_info (d, pirq); evtchn =evtchn_from_port (d, info->evtchn); -local_irq_disable (); -if (spin_trylock (&evtchn->lock) ) +if (evtchn_tryread_lock (evtchn) ) { pending =evtchn_is_pending (d, evtchn); masked =evtchn_is_masked (d, evtchn); -spin_unlock (&evtchn->lock); +evtchn_read_unlock (evtchn); } -local_irq_enable (); printk("d%d:%3d(%c%c%c)%c", d->domain_id, pirq, "-P?"[pending], "-M?"[masked], info->masked ? 'M' : '-',
xen/arch/x86/pv/shim.c +5 -4
@@ -660,11 +660,12 @@ void pv_shim_inject_evtchn(unsigned int port)if (port_is_valid (guest, port) ) {struct evtchn *chn =evtchn_from_port (guest, port); -unsigned long flags; -spin_lock_irqsave (&chn->lock, flags); -evtchn_port_set_pending (guest, chn->notify_vcpu_id, chn); -spin_unlock_irqrestore (&chn->lock, flags); +if (evtchn_tryread_lock (chn) ) + { +evtchn_port_set_pending (guest, chn->notify_vcpu_id, chn); +evtchn_read_unlock (chn); + } } }
xen/common/event_channel.c +51 -58
336 lines not on this page · raw message
xen/include/xen/event.h +41 -9
71 lines not on this page · raw message
xen/include/xen/sched.h +1 -1
@@ -85,7 +85,7 @@ extern domid_t hardware_domid;struct evtchn { -spinlock_t lock; +atomic_t lock;/* kind of rwlock, use evtchn_*_[un]lock() */ #define ECS_FREE 0/* Channel is available for use. */ #define ECS_RESERVED 1/* Channel is reserved. */ #define ECS_UNBOUND 2/* Channel is waiting to bind to a remote domain. */
Signature · 1 line
2.26.2
Re: [PATCH 2/2] xen/evtchn: rework per event channel lock
Quoted 22 lines · Juergen Gross
Currently the lock for a single event channel needs to be taken with interrupts off, which causes deadlocks in some cases.
Rework the per event channel lock to be non-blocking for the case of sending an event and removing the need for disabling interrupts for taking the lock.
The lock is needed for avoiding races between sending an event or querying the channel's state against removal of the event channel.
Use a locking scheme similar to a rwlock, but with some modifications:
- sending an event or querying the event channel's state uses an operation similar to
read_trylock(), in case of not obtaining the lock the sending is omitted or a default state is returned- closing an event channel is similar to
write_lock(), but without real fairness regarding multiple writers (this saves some space in the event channel structure and multiple writers are impossible as closing an event channel requires the domain'sevent_lockto be held).
Quoted 7 lines
With this locking scheme it is mandatory that a writer will always either start with an unbound or free event channel or will end with an unbound or free event channel, as otherwise the reaction of a reader not getting the lock would be wrong.
Fixes e045199c7c9c54 ("evtchn: address races with evtchn_reset()")Signed-off-by Juergen Gross <[email protected]>
Oh, please ignore. I forgot to add the needed barriers to the locking functions.
Juergen