Hi all,
this series is a reworked version of "Fix multiple issues with the
interrupts on ARM":
http://marc.info/?l=xen-devel&m=137211515720144
It fixes a few different issues that affect interrupt handling in Xen on
ARM today:
- the guest looses a vtimer interrupt notification when it sets a
deadline in the past from the guest vtimer interrupt handler, before
EOIing the interrupt;
- Xen adds a guest irq to the LR registers twice if the guest disables
and renables an interrupt before EOIing it;
- Xen enables interrupts corresponding to devices assigned to dom0
before booting dom0, resulting in the possibility of receiving an
interrupt and not knowing what to do with it.
Changes in v5:
- introduce gic_add_to_lr_pending and use it to add irqs to lr_pending;
- remove the call to gic_inject_irq_stop from maintenance_interrupt;
- do not remove the irq from inflight if it is still pending or visible;
- introduce gic_remove_from_queues, call it from vgic_disable_irqs.
Changes in v4:
- move set_bit _GIC_IRQ_GUEST_VISIBLE and clear_bit
_GIC_IRQ_GUEST_PENDING to gic_set_lr;
- turn set_int into a bool_t;
- remove raw GIC_IRQ_GUEST values;
- in maintenance_interrupt if the irq is still PENDING, add it back into
the lr_pending queue instead of immediately reinjecting it;
- disable interrupts in gic_irq_enable;
- clear IRQ_DISABLED and dsb() before writing to the GICD register.
Changes in v3:
- do not set the GUEST_PENDING bit for evtchn_irq if the irq is already
guest visible.
Changes in v2:
- remove eoi variable and check on p->desc != NULL instead;
- use atomic operations to modify the pending_irq status bits, remove
the now unnecessary locks;
- make status unsigned long;
- in maintenance_interrupt only stops injecting interrupts if no new
interrupts have been added to the LRs;
- add a state to keep track whether the guest irq is enabled at the
vgicd level;
- no need to read the current GICD_ISENABLER before writing it;
- protect startup and shutdown with gic and desc locks;
- disable IRQs that were previously disabled.
Julien Grall (2):
xen/arm: Physical IRQ is not always equal to virtual IRQ
xen/arm: Only enable physical IRQs when the guest asks
Stefano Stabellini (4):
xen/arm: track the state of guest IRQs
xen/arm: do not add a second irq to the LRs if one is already present
xen/arm: implement gic_irq_enable and gic_irq_disable
xen/arm: disable a physical IRQ when the guest disables the corresponding
IRQ
xen/arch/arm/gic.c | 168 +++++++++++++++++++++++++-----------------
xen/arch/arm/vgic.c | 44 +++++++++--
xen/include/asm-arm/domain.h | 37 ++++++++++
xen/include/asm-arm/gic.h | 1 +
4 files changed, 176 insertions(+), 74 deletions(-)
Stefano Stabellini
2013-Dec-12 18:59 UTC
[PATCH v5 1/6] xen/arm: Physical IRQ is not always equal to virtual IRQ
From: Julien Grall <julien.grall@linaro.org>
When Xen needs to EOI a physical IRQ, we should use the IRQ number
in irq_desc instead of the virtual IRQ.
Remove the eoi flag in maintenance_interrupt and replace the check with
a check on p->desc != NULL.
Signed-off-by: Julien Grall <julien.grall@linaro.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
Changes in v2:
- remove eoi variable and check on p->desc != NULL instead.
---
xen/arch/arm/gic.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index 43c11cb..5f7a548 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -880,7 +880,7 @@ static void gic_irq_eoi(void *info)
static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs
*regs)
{
- int i = 0, virq;
+ int i = 0, virq, pirq = -1;
uint32_t lr;
struct vcpu *v = current;
uint64_t eisr = GICH[GICH_EISR0] | (((uint64_t) GICH[GICH_EISR1]) <<
32);
@@ -888,10 +888,9 @@ static void maintenance_interrupt(int irq, void *dev_id,
struct cpu_user_regs *r
while ((i = find_next_bit((const long unsigned int *) &eisr,
64, i)) < 64) {
struct pending_irq *p;
- int cpu, eoi;
+ int cpu;
cpu = -1;
- eoi = 0;
spin_lock_irq(&gic.lock);
lr = GICH[GICH_LR + i];
@@ -915,19 +914,19 @@ static void maintenance_interrupt(int irq, void *dev_id,
struct cpu_user_regs *r
p->desc->status &= ~IRQ_INPROGRESS;
/* Assume only one pcpu needs to EOI the irq */
cpu = p->desc->arch.eoi_cpu;
- eoi = 1;
+ pirq = p->desc->irq;
}
list_del_init(&p->inflight);
spin_unlock_irq(&v->arch.vgic.lock);
- if ( eoi ) {
+ if ( p->desc != NULL ) {
/* this is not racy because we can''t receive another irq
of the
* same type until we EOI it. */
if ( cpu == smp_processor_id() )
- gic_irq_eoi((void*)(uintptr_t)virq);
+ gic_irq_eoi((void*)(uintptr_t)pirq);
else
on_selected_cpus(cpumask_of(cpu),
- gic_irq_eoi, (void*)(uintptr_t)virq, 0);
+ gic_irq_eoi, (void*)(uintptr_t)pirq, 0);
}
i++;
--
1.7.10.4
Stefano Stabellini
2013-Dec-12 18:59 UTC
[PATCH v5 2/6] xen/arm: track the state of guest IRQs
Introduce a status field in struct pending_irq. Valid states are
GUEST_PENDING, GUEST_VISIBLE and GUEST_ENABLED and they are not mutually
exclusive. See the in-code comment for an explanation of the states and
how they are used.
Use atomic operations to set and clear the status bits. Note that
setting GIC_IRQ_GUEST_VISIBLE and clearing GIC_IRQ_GUEST_PENDING can be
done in two separate operations as the underlying pending status is
actually only cleared on the LR after the guest ACKs the interrupts.
Until that happens it''s not possible to receive another interrupt.
The main effect of this patch is that an IRQ can be set to GUEST_PENDING
while it is being serviced by the guest. In maintenance_interrupt we
check whether GUEST_PENDING is set and if it is we add the irq back into
the lr_pending queue so that it''s going to be reinjected one more time,
if the interrupt is still enabled at the vgicd level.
If it is not, it is going to be injected as soon as the guest renables
the interrupt.
One exception is evtchn_irq: in that case we don''t want to
set the GIC_IRQ_GUEST_PENDING bit if it is already GUEST_VISIBLE,
because as part of the event handling loop, the guest would realize that
new events are present even without a new notification.
Also we already have a way to figure out exactly when we do need to
inject a second notification if vgic_vcpu_inject_irq is called after the
end of the guest event handling loop and before the guest EOIs the
interrupt (see db453468d92369e7182663fb13e14d83ec4ce456 "arm: vgic: fix
race between evtchn upcall and evtchnop_send").
Don''t call gic_inject_irq_stop from maintenance_interrupt because
gic_inject (called by leave_hypervisor_tail) is going to call
gic_inject_irq_start/stop appropriately later anyway.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
Changes in v2:
- use atomic operations to modify the pending_irq status bits, remove
the now unnecessary locks;
- make status unsigned long;
- in maintenance_interrupt only stops injecting interrupts if no new
interrupts have been added to the LRs;
- add a state to keep track whether the guest irq is enabled at the
vgicd level;
Changes in v3:
- do not set the GUEST_PENDING bit for evtchn_irq if the irq is already
guest visible.
Changes in v4:
- move set_bit _GIC_IRQ_GUEST_VISIBLE and clear_bit
_GIC_IRQ_GUEST_PENDING to gic_set_lr;
- turn set_int into a bool_t;
- remove raw GIC_IRQ_GUEST values;
- in maintenance_interrupt if the irq is still PENDING, add it back into
the lr_pending queue instead of immediately reinjecting it.
Changes in v5:
- introduce gic_add_to_lr_pending and use it to add irqs to lr_pending;
- remove the call to gic_inject_irq_stop from maintenance_interrupt;
- do not remove the irq from inflight if it is still pending or visible.
---
xen/arch/arm/gic.c | 78 +++++++++++++++++++++++++++---------------
xen/arch/arm/vgic.c | 17 +++++++--
xen/include/asm-arm/domain.h | 37 ++++++++++++++++++++
3 files changed, 101 insertions(+), 31 deletions(-)
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index 5f7a548..02f1984 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -615,6 +615,7 @@ static inline void gic_set_lr(int lr, unsigned int
virtual_irq,
unsigned int state, unsigned int priority)
{
int maintenance_int = GICH_LR_MAINTENANCE_IRQ;
+ struct pending_irq *p = irq_to_pending(current, virtual_irq);
BUG_ON(lr >= nr_lrs);
BUG_ON(lr < 0);
@@ -624,13 +625,34 @@ static inline void gic_set_lr(int lr, unsigned int
virtual_irq,
maintenance_int |
((priority >> 3) << GICH_LR_PRIORITY_SHIFT) |
((virtual_irq & GICH_LR_VIRTUAL_MASK) <<
GICH_LR_VIRTUAL_SHIFT);
+
+ set_bit(GIC_IRQ_GUEST_VISIBLE, &p->status);
+ clear_bit(GIC_IRQ_GUEST_PENDING, &p->status);
+}
+
+static inline void gic_add_to_lr_pending(struct vcpu *v, unsigned int irq,
+ unsigned int priority)
+{
+ struct pending_irq *iter, *n = irq_to_pending(v, irq);
+
+ if ( !list_empty(&n->lr_queue) )
+ return;
+
+ list_for_each_entry ( iter, &v->arch.vgic.lr_pending, lr_queue )
+ {
+ if ( iter->priority > priority )
+ {
+ list_add_tail(&n->lr_queue, &iter->lr_queue);
+ return;
+ }
+ }
+ list_add_tail(&n->lr_queue, &v->arch.vgic.lr_pending);
}
void gic_set_guest_irq(struct vcpu *v, unsigned int virtual_irq,
unsigned int state, unsigned int priority)
{
int i;
- struct pending_irq *iter, *n;
unsigned long flags;
spin_lock_irqsave(&gic.lock, flags);
@@ -645,19 +667,7 @@ void gic_set_guest_irq(struct vcpu *v, unsigned int
virtual_irq,
}
}
- n = irq_to_pending(v, virtual_irq);
- if ( !list_empty(&n->lr_queue) )
- goto out;
-
- list_for_each_entry ( iter, &v->arch.vgic.lr_pending, lr_queue )
- {
- if ( iter->priority > priority )
- {
- list_add_tail(&n->lr_queue, &iter->lr_queue);
- goto out;
- }
- }
- list_add_tail(&n->lr_queue, &v->arch.vgic.lr_pending);
+ gic_add_to_lr_pending(v, virtual_irq, priority);
out:
spin_unlock_irqrestore(&gic.lock, flags);
@@ -887,10 +897,12 @@ static void maintenance_interrupt(int irq, void *dev_id,
struct cpu_user_regs *r
while ((i = find_next_bit((const long unsigned int *) &eisr,
64, i)) < 64) {
- struct pending_irq *p;
+ struct pending_irq *p, *p2;
int cpu;
+ bool_t inflight;
cpu = -1;
+ inflight = 0;
spin_lock_irq(&gic.lock);
lr = GICH[GICH_LR + i];
@@ -898,17 +910,6 @@ static void maintenance_interrupt(int irq, void *dev_id,
struct cpu_user_regs *r
GICH[GICH_LR + i] = 0;
clear_bit(i, &this_cpu(lr_mask));
- if ( !list_empty(&v->arch.vgic.lr_pending) ) {
- p = list_entry(v->arch.vgic.lr_pending.next, typeof(*p),
lr_queue);
- gic_set_lr(i, p->irq, GICH_LR_PENDING, p->priority);
- list_del_init(&p->lr_queue);
- set_bit(i, &this_cpu(lr_mask));
- } else {
- gic_inject_irq_stop();
- }
- spin_unlock_irq(&gic.lock);
-
- spin_lock_irq(&v->arch.vgic.lock);
p = irq_to_pending(v, virq);
if ( p->desc != NULL ) {
p->desc->status &= ~IRQ_INPROGRESS;
@@ -916,8 +917,29 @@ static void maintenance_interrupt(int irq, void *dev_id,
struct cpu_user_regs *r
cpu = p->desc->arch.eoi_cpu;
pirq = p->desc->irq;
}
- list_del_init(&p->inflight);
- spin_unlock_irq(&v->arch.vgic.lock);
+ if ( test_bit(GIC_IRQ_GUEST_PENDING, &p->status) &&
+ test_bit(GIC_IRQ_GUEST_ENABLED, &p->status))
+ {
+ inflight = 1;
+ gic_add_to_lr_pending(v, virq, p->priority);
+ }
+
+ clear_bit(GIC_IRQ_GUEST_VISIBLE, &p->status);
+
+ if ( !list_empty(&v->arch.vgic.lr_pending) ) {
+ p2 = list_entry(v->arch.vgic.lr_pending.next, typeof(*p2),
lr_queue);
+ gic_set_lr(i, p2->irq, GICH_LR_PENDING, p2->priority);
+ list_del_init(&p2->lr_queue);
+ set_bit(i, &this_cpu(lr_mask));
+ }
+ spin_unlock_irq(&gic.lock);
+
+ if ( !inflight )
+ {
+ spin_lock_irq(&v->arch.vgic.lock);
+ list_del_init(&p->inflight);
+ spin_unlock_irq(&v->arch.vgic.lock);
+ }
if ( p->desc != NULL ) {
/* this is not racy because we can''t receive another irq
of the
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 2e4b11f..b449f45 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -369,6 +369,7 @@ static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int
n)
while ( (i = find_next_bit((const long unsigned int *) &r, 32, i)) <
32 ) {
irq = i + (32 * n);
p = irq_to_pending(v, irq);
+ set_bit(GIC_IRQ_GUEST_ENABLED, &p->status);
if ( !list_empty(&p->inflight) )
gic_set_guest_irq(v, irq, GICH_LR_PENDING, p->priority);
i++;
@@ -672,8 +673,17 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,
int virtual)
spin_lock_irqsave(&v->arch.vgic.lock, flags);
- /* vcpu offline or irq already pending */
- if (test_bit(_VPF_down, &v->pause_flags) ||
!list_empty(&n->inflight))
+ if ( !list_empty(&n->inflight) )
+ {
+ if ( (irq != current->domain->arch.evtchn_irq) ||
+ (!test_bit(GIC_IRQ_GUEST_VISIBLE, &n->status)) )
+ set_bit(GIC_IRQ_GUEST_PENDING, &n->status);
+ spin_unlock_irqrestore(&v->arch.vgic.lock, flags);
+ return;
+ }
+
+ /* vcpu offline */
+ if ( test_bit(_VPF_down, &v->pause_flags) )
{
spin_unlock_irqrestore(&v->arch.vgic.lock, flags);
return;
@@ -682,6 +692,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,
int virtual)
priority = byte_read(rank->ipriority[REG_RANK_INDEX(8, idx)], 0, byte);
n->irq = irq;
+ set_bit(GIC_IRQ_GUEST_PENDING, &n->status);
n->priority = priority;
if (!virtual)
n->desc = irq_to_desc(irq);
@@ -689,7 +700,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,
int virtual)
n->desc = NULL;
/* the irq is enabled */
- if ( rank->ienable & (1 << (irq % 32)) )
+ if ( test_bit(GIC_IRQ_GUEST_ENABLED, &n->status) )
gic_set_guest_irq(v, irq, GICH_LR_PENDING, priority);
list_for_each_entry ( iter, &v->arch.vgic.inflight_irqs, inflight )
diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h
index 8ebee3e..0733c5e 100644
--- a/xen/include/asm-arm/domain.h
+++ b/xen/include/asm-arm/domain.h
@@ -22,6 +22,43 @@ struct vgic_irq_rank {
struct pending_irq
{
int irq;
+ /*
+ * The following two states track the lifecycle of the guest irq.
+ * However because we are not sure and we don''t want to track
+ * whether an irq added to an LR register is PENDING or ACTIVE, the
+ * following states are just an approximation.
+ *
+ * GIC_IRQ_GUEST_PENDING: the irq is asserted
+ *
+ * GIC_IRQ_GUEST_VISIBLE: the irq has been added to an LR register,
+ * therefore the guest is aware of it. From the guest point of view
+ * the irq can be pending (if the guest has not acked the irq yet)
+ * or active (after acking the irq).
+ *
+ * In order for the state machine to be fully accurate, for level
+ * interrupts, we should keep the GIC_IRQ_GUEST_PENDING state until
+ * the guest deactivates the irq. However because we are not sure
+ * when that happens, we simply remove the GIC_IRQ_GUEST_PENDING
+ * state when we add the irq to an LR register. We add it back when
+ * we receive another interrupt notification.
+ * Therefore it is possible to set GIC_IRQ_GUEST_PENDING while the
+ * irq is GIC_IRQ_GUEST_VISIBLE. We could also change the state of
+ * the guest irq in the LR register from active to active and
+ * pending, but for simplicity we simply inject a second irq after
+ * the guest EOIs the first one.
+ *
+ *
+ * An additional state is used to keep track of whether the guest
+ * irq is enabled at the vgicd level:
+ *
+ * GIC_IRQ_GUEST_ENABLED: the guest IRQ is enabled at the VGICD
+ * level (GICD_ICENABLER/GICD_ISENABLER).
+ *
+ */
+#define GIC_IRQ_GUEST_PENDING 0
+#define GIC_IRQ_GUEST_VISIBLE 1
+#define GIC_IRQ_GUEST_ENABLED 2
+ unsigned long status;
struct irq_desc *desc; /* only set it the irq corresponds to a physical irq
*/
uint8_t priority;
/* inflight is used to append instances of pending_irq to
--
1.7.10.4
Stefano Stabellini
2013-Dec-12 18:59 UTC
[PATCH v5 3/6] xen/arm: do not add a second irq to the LRs if one is already present
When the guest re-enable IRQs, do not add guest IRQs to LRs twice.
Suggested-by: Julien Grall <julien.grall@linaro.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/arch/arm/vgic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index b449f45..f2f1702 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -370,7 +370,7 @@ static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int
n)
irq = i + (32 * n);
p = irq_to_pending(v, irq);
set_bit(GIC_IRQ_GUEST_ENABLED, &p->status);
- if ( !list_empty(&p->inflight) )
+ if ( !list_empty(&p->inflight) &&
!test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) )
gic_set_guest_irq(v, irq, GICH_LR_PENDING, p->priority);
i++;
}
--
1.7.10.4
Stefano Stabellini
2013-Dec-12 18:59 UTC
[PATCH v5 4/6] xen/arm: implement gic_irq_enable and gic_irq_disable
Rename gic_irq_startup to gic_irq_enable.
Rename gic_irq_shutdown to gic_irq_disable.
Implement gic_irq_startup and gic_irq_shutdown calling gic_irq_enable
and gic_irq_disable.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
Changes in v2:
- no need to read the current GICD_ISENABLER before writing it.
---
xen/arch/arm/gic.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index 02f1984..b2caced 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -129,19 +129,15 @@ void gic_restore_state(struct vcpu *v)
gic_restore_pending_irqs(v);
}
-static unsigned int gic_irq_startup(struct irq_desc *desc)
+static void gic_irq_enable(struct irq_desc *desc)
{
- uint32_t enabler;
int irq = desc->irq;
/* Enable routing */
- enabler = GICD[GICD_ISENABLER + irq / 32];
- GICD[GICD_ISENABLER + irq / 32] = enabler | (1u << (irq % 32));
-
- return 0;
+ GICD[GICD_ISENABLER + irq / 32] = (1u << (irq % 32));
}
-static void gic_irq_shutdown(struct irq_desc *desc)
+static void gic_irq_disable(struct irq_desc *desc)
{
int irq = desc->irq;
@@ -149,14 +145,15 @@ static void gic_irq_shutdown(struct irq_desc *desc)
GICD[GICD_ICENABLER + irq / 32] = (1u << (irq % 32));
}
-static void gic_irq_enable(struct irq_desc *desc)
+static unsigned int gic_irq_startup(struct irq_desc *desc)
{
-
+ gic_irq_enable(desc);
+ return 0;
}
-static void gic_irq_disable(struct irq_desc *desc)
+static void gic_irq_shutdown(struct irq_desc *desc)
{
-
+ gic_irq_disable(desc);
}
static void gic_irq_ack(struct irq_desc *desc)
--
1.7.10.4
Stefano Stabellini
2013-Dec-12 18:59 UTC
[PATCH v5 5/6] xen/arm: Only enable physical IRQs when the guest asks
From: Julien Grall <julien.grall@linaro.org>
Set/Unset IRQ_DISABLED from gic_irq_enable and gic_irq_disable.
Enable IRQs when the guest requests it, not unconditionally at boot time.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Julien Grall <julien.grall@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
Changes in v2:
- protect startup and shutdown with gic and desc locks.
Changes in v4:
- disable interrupts in gic_irq_enable;
- clear IRQ_DISABLED and dsb() before writing to the GICD register.
---
xen/arch/arm/gic.c | 48 ++++++++++++++++++++++++++++--------------------
xen/arch/arm/vgic.c | 6 ++----
2 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index b2caced..ff83426 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -132,17 +132,29 @@ void gic_restore_state(struct vcpu *v)
static void gic_irq_enable(struct irq_desc *desc)
{
int irq = desc->irq;
+ unsigned long flags;
+ spin_lock_irqsave(&desc->lock, flags);
+ spin_lock(&gic.lock);
+ desc->status &= ~IRQ_DISABLED;
+ dsb();
/* Enable routing */
GICD[GICD_ISENABLER + irq / 32] = (1u << (irq % 32));
+ spin_unlock(&gic.lock);
+ spin_unlock_irqrestore(&desc->lock, flags);
}
static void gic_irq_disable(struct irq_desc *desc)
{
int irq = desc->irq;
+ spin_lock(&desc->lock);
+ spin_lock(&gic.lock);
/* Disable routing */
GICD[GICD_ICENABLER + irq / 32] = (1u << (irq % 32));
+ desc->status |= IRQ_DISABLED;
+ spin_unlock(&gic.lock);
+ spin_unlock(&desc->lock);
}
static unsigned int gic_irq_startup(struct irq_desc *desc)
@@ -247,24 +259,20 @@ static int gic_route_irq(unsigned int irq, bool_t level,
ASSERT(priority <= 0xff); /* Only 8 bits of priority */
ASSERT(irq < gic.lines); /* Can''t route interrupts that
don''t exist */
- spin_lock_irqsave(&desc->lock, flags);
- spin_lock(&gic.lock);
-
if ( desc->action != NULL )
- {
- spin_unlock(&gic.lock);
- spin_unlock(&desc->lock);
return -EBUSY;
- }
-
- desc->handler = &gic_host_irq_type;
/* Disable interrupt */
desc->handler->shutdown(desc);
- gic_set_irq_properties(irq, level, cpu_mask, priority);
+ spin_lock_irqsave(&desc->lock, flags);
+
+ desc->handler = &gic_host_irq_type;
+ spin_lock(&gic.lock);
+ gic_set_irq_properties(irq, level, cpu_mask, priority);
spin_unlock(&gic.lock);
+
spin_unlock_irqrestore(&desc->lock, flags);
return 0;
}
@@ -557,16 +565,13 @@ void __init release_irq(unsigned int irq)
desc = irq_to_desc(irq);
+ desc->handler->shutdown(desc);
+
spin_lock_irqsave(&desc->lock,flags);
action = desc->action;
desc->action = NULL;
- desc->status |= IRQ_DISABLED;
desc->status &= ~IRQ_GUEST;
- spin_lock(&gic.lock);
- desc->handler->shutdown(desc);
- spin_unlock(&gic.lock);
-
spin_unlock_irqrestore(&desc->lock,flags);
/* Wait to make sure it''s not being used on another CPU */
@@ -583,11 +588,8 @@ static int __setup_irq(struct irq_desc *desc, unsigned int
irq,
return -EBUSY;
desc->action = new;
- desc->status &= ~IRQ_DISABLED;
dsb();
- desc->handler->startup(desc);
-
return 0;
}
@@ -600,11 +602,12 @@ int __init setup_dt_irq(const struct dt_irq *irq, struct
irqaction *new)
desc = irq_to_desc(irq->irq);
spin_lock_irqsave(&desc->lock, flags);
-
rc = __setup_irq(desc, irq->irq, new);
-
spin_unlock_irqrestore(&desc->lock, flags);
+ desc->handler->startup(desc);
+
+
return rc;
}
@@ -745,6 +748,7 @@ int gic_route_irq_to_guest(struct domain *d, const struct
dt_irq *irq,
unsigned long flags;
int retval;
bool_t level;
+ struct pending_irq *p;
action = xmalloc(struct irqaction);
if (!action)
@@ -771,6 +775,10 @@ int gic_route_irq_to_guest(struct domain *d, const struct
dt_irq *irq,
goto out;
}
+ /* TODO: do not assume delivery to vcpu0 */
+ p = irq_to_pending(d->vcpu[0], irq->irq);
+ p->desc = desc;
+
out:
spin_unlock(&gic.lock);
spin_unlock_irqrestore(&desc->lock, flags);
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index f2f1702..ad17d1d 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -372,6 +372,8 @@ static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int
n)
set_bit(GIC_IRQ_GUEST_ENABLED, &p->status);
if ( !list_empty(&p->inflight) &&
!test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) )
gic_set_guest_irq(v, irq, GICH_LR_PENDING, p->priority);
+ if ( p->desc != NULL )
+ p->desc->handler->enable(p->desc);
i++;
}
}
@@ -694,10 +696,6 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,
int virtual)
n->irq = irq;
set_bit(GIC_IRQ_GUEST_PENDING, &n->status);
n->priority = priority;
- if (!virtual)
- n->desc = irq_to_desc(irq);
- else
- n->desc = NULL;
/* the irq is enabled */
if ( test_bit(GIC_IRQ_GUEST_ENABLED, &n->status) )
--
1.7.10.4
Stefano Stabellini
2013-Dec-12 18:59 UTC
[PATCH v5 6/6] xen/arm: disable a physical IRQ when the guest disables the corresponding IRQ
In vgic_disable_irqs remove irqs from the lr_pending queue so that they
won''t get automatically injected in the guest on maintenance
interrupts.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Julien Grall <julien.grall@linaro.org>
---
Changes in v2:
- disable IRQs that were previously disabled.
Changes in v5:
- introduce gic_remove_from_queues, call it from vgic_disable_irqs.
---
xen/arch/arm/gic.c | 10 ++++++++++
xen/arch/arm/vgic.c | 19 +++++++++++++++++++
xen/include/asm-arm/gic.h | 1 +
3 files changed, 30 insertions(+)
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index ff83426..e6257a7 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -649,6 +649,16 @@ static inline void gic_add_to_lr_pending(struct vcpu *v,
unsigned int irq,
list_add_tail(&n->lr_queue, &v->arch.vgic.lr_pending);
}
+void gic_remove_from_queues(struct vcpu *v, unsigned int virtual_irq)
+{
+ struct pending_irq *p = irq_to_pending(v, virtual_irq);
+
+ spin_lock(&gic.lock);
+ if ( !list_empty(&p->lr_queue) )
+ list_del_init(&p->lr_queue);
+ spin_unlock(&gic.lock);
+}
+
void gic_set_guest_irq(struct vcpu *v, unsigned int virtual_irq,
unsigned int state, unsigned int priority)
{
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index ad17d1d..90e9707 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -360,6 +360,23 @@ read_as_zero:
return 1;
}
+static void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n)
+{
+ struct pending_irq *p;
+ unsigned int irq;
+ int i = 0;
+
+ while ( (i = find_next_bit((const long unsigned int *) &r, 32, i)) <
32 ) {
+ irq = i + (32 * n);
+ p = irq_to_pending(v, irq);
+ clear_bit(GIC_IRQ_GUEST_ENABLED, &p->status);
+ gic_remove_from_queues(v, irq);
+ if ( p->desc != NULL )
+ p->desc->handler->disable(p->desc);
+ i++;
+ }
+}
+
static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n)
{
struct pending_irq *p;
@@ -490,8 +507,10 @@ static int vgic_distr_mmio_write(struct vcpu *v,
mmio_info_t *info)
rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ICENABLER);
if ( rank == NULL) goto write_ignore;
vgic_lock_rank(v, rank);
+ tr = rank->ienable;
rank->ienable &= ~*r;
vgic_unlock_rank(v, rank);
+ vgic_disable_irqs(v, (*r) & tr, gicd_reg - GICD_ICENABLER);
return 1;
case GICD_ISPENDR ... GICD_ISPENDRN:
diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
index 41f0b3b..87f4298 100644
--- a/xen/include/asm-arm/gic.h
+++ b/xen/include/asm-arm/gic.h
@@ -158,6 +158,7 @@ extern int gic_events_need_delivery(void);
extern void __cpuinit init_maintenance_interrupt(void);
extern void gic_set_guest_irq(struct vcpu *v, unsigned int irq,
unsigned int state, unsigned int priority);
+extern void gic_remove_from_queues(struct vcpu *v, unsigned int virtual_irq);
extern int gic_route_irq_to_guest(struct domain *d,
const struct dt_irq *irq,
const char * devname);
--
1.7.10.4