|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v5 4/6] xen/arm: inflight irqs during migration
We need to take special care when migrating irqs that are already
inflight from one vcpu to another. See "The effect of changes to an
GICD_ITARGETSR", part of chapter 4.3.12 of the ARM Generic Interrupt
Controller Architecture Specification.
The main issue from the Xen point of view is that the lr_pending and
inflight lists are per-vcpu. The lock we take to protect them is also
per-vcpu.
In order to avoid issues, we set a new flag GIC_IRQ_GUEST_MIGRATING, so
that we can recognize when we receive an irq while the previous one is
still inflight (given that we are only dealing with hardware interrupts
here, it just means that its LR hasn't been cleared yet on the old vcpu).
If GIC_IRQ_GUEST_MIGRATING is set, we only set GIC_IRQ_GUEST_QUEUED and
interrupt the old vcpu. When clearing the LR on the old vcpu, we take
special care of injecting the interrupt into the new vcpu. To do that we
need to release the old vcpu lock before taking the new vcpu lock.
Using barriers and test_bit on GIC_IRQ_GUEST_MIGRATING, make sure that
vgic_migrate_irq can run at the same time as gic_update_one_lr on
different cpus with consistent results.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
Changes in v5:
- pass unsigned long to find_next_bit for alignment on aarch64;
- call vgic_get_target_vcpu instead of gic_add_to_lr_pending to add the
irq in the right inflight queue;
- add barrier and bit tests to make sure that vgic_migrate_irq and
gic_update_one_lr can run simultaneously on different cpus without
issues;
- rework the loop to identify the new vcpu when ITARGETSR is written;
- use find_first_bit instead of find_next_bit.
---
xen/arch/arm/gic.c | 25 ++++++++++++++--
xen/arch/arm/vgic.c | 66 +++++++++++++++++++++++++++++++++++++-----
xen/include/asm-arm/domain.h | 4 +++
3 files changed, 85 insertions(+), 10 deletions(-)
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index 5e502df..8ed242e 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -677,10 +677,31 @@ static void gic_update_one_lr(struct vcpu *v, int i)
clear_bit(GIC_IRQ_GUEST_ACTIVE, &p->status);
p->lr = GIC_INVALID_LR;
if ( test_bit(GIC_IRQ_GUEST_ENABLED, &p->status) &&
- test_bit(GIC_IRQ_GUEST_QUEUED, &p->status) )
+ test_bit(GIC_IRQ_GUEST_QUEUED, &p->status) &&
+ !test_bit(GIC_IRQ_GUEST_MIGRATING, &p->status) )
gic_raise_guest_irq(v, irq, p->priority);
- else
+ else {
list_del_init(&p->inflight);
+
+ /* inflight is cleared before clearing
+ * GIC_IRQ_GUEST_MIGRATING */
+ dsb(sy);
+ if ( test_and_clear_bit(GIC_IRQ_GUEST_MIGRATING, &p->status) &&
+ test_bit(GIC_IRQ_GUEST_QUEUED, &p->status) )
+ {
+ struct vcpu *v_target;
+
+ /* It is safe to temporarily drop the lock because we
+ * are finished dealing with this LR. We'll take the
+ * lock before reading the next. */
+ spin_unlock(&v->arch.vgic.lock);
+ /* vgic_get_target_vcpu takes the rank lock, ensuring
+ * consistency with other itarget changes. */
+ v_target = vgic_get_target_vcpu(v, irq);
+ vgic_vcpu_inject_irq(v_target, irq);
+ spin_lock(&v->arch.vgic.lock);
+ }
+ }
}
}
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 4d655af..e640de9 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -395,6 +395,25 @@ static struct vcpu *_vgic_get_target_vcpu(struct vcpu *v,
unsigned int irq)
return v_target;
}
+static void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int
irq)
+{
+ unsigned long flags;
+ struct pending_irq *p = irq_to_pending(old, irq);
+
+ /* nothing to do for virtual interrupts */
+ if ( p->desc == NULL )
+ return;
+
+ /* migration already in progress, no need to do anything */
+ if ( test_bit(GIC_IRQ_GUEST_MIGRATING, &p->status) )
+ return;
+
+ spin_lock_irqsave(&old->arch.vgic.lock, flags);
+ if ( !list_empty(&p->inflight) )
+ set_bit(GIC_IRQ_GUEST_MIGRATING, &p->status);
+ spin_unlock_irqrestore(&old->arch.vgic.lock, flags);
+}
+
struct vcpu *vgic_get_target_vcpu(struct vcpu *v, unsigned int irq)
{
struct vcpu *v_target;
@@ -543,6 +562,8 @@ static int vgic_distr_mmio_write(struct vcpu *v,
mmio_info_t *info)
int offset = (int)(info->gpa - v->domain->arch.vgic.dbase);
int gicd_reg = REG(offset);
uint32_t tr;
+ unsigned long trl;
+ int i;
switch ( gicd_reg )
{
@@ -626,22 +647,45 @@ static int vgic_distr_mmio_write(struct vcpu *v,
mmio_info_t *info)
rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR);
if ( rank == NULL) goto write_ignore;
/* 8-bit vcpu mask for this domain */
- tr = (1 << v->domain->max_vcpus) - 1;
- tr = tr | (tr << 8) | (tr << 16) | (tr << 24);
- tr &= *r;
+ trl = (1 << v->domain->max_vcpus) - 1;
+ if ( dabt.size == 2 )
+ trl = trl | (trl << 8) | (trl << 16) | (trl << 24);
+ else
+ trl = (trl << (8 * (offset & 0x3)));
+ trl &= *r;
/* ignore zero writes */
- if ( !tr )
+ if ( !trl )
goto write_ignore;
if ( dabt.size == 2 &&
- !((tr & 0xff) && (tr & (0xff << 8)) &&
- (tr & (0xff << 16)) && (tr & (0xff << 24))))
+ !((trl & 0xff) && (trl & (0xff << 8)) &&
+ (trl & (0xff << 16)) && (trl & (0xff << 24))))
goto write_ignore;
vgic_lock_rank(v, rank);
+ i = 0;
+ while ( (i = find_next_bit((const unsigned long *)&trl, 32, i)) < 32 )
+ {
+ unsigned int irq, target, old_target;
+ unsigned long old_target_mask;
+ struct vcpu *v_target, *v_old;
+
+ target = i % 8;
+ old_target_mask = byte_read(rank->itargets[REG_RANK_INDEX(8,
gicd_reg - GICD_ITARGETSR)], 0, i/8);
+ old_target = find_first_bit((const unsigned long *)
&old_target_mask, 8);
+
+ if ( target != old_target )
+ {
+ irq = offset + (i / 8);
+ v_target = v->domain->vcpu[target];
+ v_old = v->domain->vcpu[old_target];
+ vgic_migrate_irq(v_old, v_target, irq);
+ }
+ i += 8 - target;
+ }
if ( dabt.size == 2 )
- rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR)] = tr;
+ rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR)] = trl;
else
byte_write(&rank->itargets[REG_RANK_INDEX(8, gicd_reg -
GICD_ITARGETSR)],
- tr, offset);
+ trl, offset);
vgic_unlock_rank(v, rank);
return 1;
@@ -779,6 +823,12 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq)
spin_lock_irqsave(&v->arch.vgic.lock, flags);
+ if ( test_bit(GIC_IRQ_GUEST_MIGRATING, &n->status) )
+ {
+ set_bit(GIC_IRQ_GUEST_QUEUED, &n->status);
+ goto out;
+ }
+
if ( !list_empty(&n->inflight) )
{
set_bit(GIC_IRQ_GUEST_QUEUED, &n->status);
diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h
index d689675..743c020 100644
--- a/xen/include/asm-arm/domain.h
+++ b/xen/include/asm-arm/domain.h
@@ -54,11 +54,15 @@ struct pending_irq
* GIC_IRQ_GUEST_ENABLED: the guest IRQ is enabled at the VGICD
* level (GICD_ICENABLER/GICD_ISENABLER).
*
+ * GIC_IRQ_GUEST_MIGRATING: the irq is being migrated to a different
+ * vcpu.
+ *
*/
#define GIC_IRQ_GUEST_QUEUED 0
#define GIC_IRQ_GUEST_ACTIVE 1
#define GIC_IRQ_GUEST_VISIBLE 2
#define GIC_IRQ_GUEST_ENABLED 3
+#define GIC_IRQ_GUEST_MIGRATING 4
unsigned long status;
struct irq_desc *desc; /* only set it the irq corresponds to a physical
irq */
int irq;
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |