Hi Marc,
I've managed to look at some more of the vgic code, so here is some more
feedback. I've still not got to the end of the series, but there's light at
the end of the tunnel...
On Sat, Nov 10, 2012 at 03:45:05PM +0000, Christoffer Dall wrote:
> From: Marc Zyngier <marc.zyngier@xxxxxxx>
>
> Add VGIC virtual CPU interface code, picking pending interrupts
> from the distributor and stashing them in the VGIC control interface
> list registers.
>
> Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx>
> Signed-off-by: Christoffer Dall <c.dall@xxxxxxxxxxxxxxxxxxxxxx>
> ---
> arch/arm/include/asm/kvm_vgic.h | 41 +++++++
> arch/arm/kvm/vgic.c | 226 +++++++++++++++++++++++++++++++++++++++
> 2 files changed, 266 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/include/asm/kvm_vgic.h b/arch/arm/include/asm/kvm_vgic.h
> index 9e60b1d..7229324 100644
> --- a/arch/arm/include/asm/kvm_vgic.h
> +++ b/arch/arm/include/asm/kvm_vgic.h
> @@ -193,8 +193,45 @@ struct vgic_dist {
> };
>
> struct vgic_cpu {
> +#ifdef CONFIG_KVM_ARM_VGIC
> + /* per IRQ to LR mapping */
> + u8 vgic_irq_lr_map[VGIC_NR_IRQS];
per IRQ?
> +
> + /* Pending interrupts on this VCPU */
> + DECLARE_BITMAP( pending, VGIC_NR_IRQS);
> +
> + /* Bitmap of used/free list registers */
> + DECLARE_BITMAP( lr_used, 64);
> +
> + /* Number of list registers on this CPU */
> + int nr_lr;
> +
> + /* CPU vif control registers for world switch */
> + u32 vgic_hcr;
> + u32 vgic_vmcr;
> + u32 vgic_misr; /* Saved only */
> + u32 vgic_eisr[2]; /* Saved only */
> + u32 vgic_elrsr[2]; /* Saved only */
> + u32 vgic_apr;
> + u32 vgic_lr[64]; /* A15 has only 4... */
> +#endif
> };
Looks like we should have a #define for the maximum number of list registers,
so we keep vgic_lr and lr_user in sync.
>
> +#define VGIC_HCR_EN (1 << 0)
> +#define VGIC_HCR_UIE (1 << 1)
> +
> +#define VGIC_LR_VIRTUALID (0x3ff << 0)
> +#define VGIC_LR_PHYSID_CPUID (7 << 10)
> +#define VGIC_LR_STATE (3 << 28)
> +#define VGIC_LR_PENDING_BIT (1 << 28)
> +#define VGIC_LR_ACTIVE_BIT (1 << 29)
> +#define VGIC_LR_EOI (1 << 19)
> +
> +#define VGIC_MISR_EOI (1 << 0)
> +#define VGIC_MISR_U (1 << 1)
> +
> +#define LR_EMPTY 0xff
> +
Could stick these in asm/hardware/gic.h. I know they're not used by the gic
driver, but they're the same piece of architecture so it's probably worth
keeping in one place.
You'd probably also want a s/VGIC/GICH/
> struct kvm;
> struct kvm_vcpu;
> struct kvm_run;
> @@ -202,9 +239,13 @@ struct kvm_exit_mmio;
>
> #ifdef CONFIG_KVM_ARM_VGIC
> int kvm_vgic_set_addr(struct kvm *kvm, unsigned long type, u64 addr);
> +void kvm_vgic_sync_to_cpu(struct kvm_vcpu *vcpu);
> +void kvm_vgic_sync_from_cpu(struct kvm_vcpu *vcpu);
> +int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu);
> bool vgic_handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *run,
> struct kvm_exit_mmio *mmio);
>
> +#define irqchip_in_kernel(k) (!!((k)->arch.vgic.vctrl_base))
> #else
> static inline int kvm_vgic_hyp_init(void)
> {
> diff --git a/arch/arm/kvm/vgic.c b/arch/arm/kvm/vgic.c
> index 82feee8..d7cdec5 100644
> --- a/arch/arm/kvm/vgic.c
> +++ b/arch/arm/kvm/vgic.c
> @@ -587,7 +587,25 @@ static void vgic_dispatch_sgi(struct kvm_vcpu *vcpu, u32 reg)
>
> static int compute_pending_for_cpu(struct kvm_vcpu *vcpu)
> {
> - return 0;
> + struct vgic_dist *dist = &vcpu->kvm->arch.vgic;
> + unsigned long *pending, *enabled, *pend;
> + int vcpu_id;
> +
> + vcpu_id = vcpu->vcpu_id;
> + pend = vcpu->arch.vgic_cpu.pending;
> +
> + pending = vgic_bitmap_get_cpu_map(&dist->irq_state, vcpu_id);
> + enabled = vgic_bitmap_get_cpu_map(&dist->irq_enabled, vcpu_id);
> + bitmap_and(pend, pending, enabled, 32);
pend and pending! vcpu_pending and dist_pending?
> +
> + pending = vgic_bitmap_get_shared_map(&dist->irq_state);
> + enabled = vgic_bitmap_get_shared_map(&dist->irq_enabled);
> + bitmap_and(pend + 1, pending, enabled, VGIC_NR_SHARED_IRQS);
> + bitmap_and(pend + 1, pend + 1,
> + vgic_bitmap_get_shared_map(&dist->irq_spi_target[vcpu_id]),
> + VGIC_NR_SHARED_IRQS);
> +
> + return (find_first_bit(pend, VGIC_NR_IRQS) < VGIC_NR_IRQS);
> }
>
> /*
> @@ -613,6 +631,212 @@ static void vgic_update_state(struct kvm *kvm)
> }
> }
>
> +#define LR_PHYSID(lr) (((lr) & VGIC_LR_PHYSID_CPUID) >> 10)
Is VGIC_LR_PHYSID_CPUID wide enough for this? The CPUID is only 3 bits, but
the interrupt ID could be larger. Or do you not supported hardware interrupt
forwarding? (in which case, LR_PHYSID is a misleading name).
> +#define MK_LR_PEND(src, irq) (VGIC_LR_PENDING_BIT | ((src) << 10) | (irq))
> +/*
> + * Queue an interrupt to a CPU virtual interface. Return true on success,
> + * or false if it wasn't possible to queue it.
> + */
> +static bool vgic_queue_irq(struct kvm_vcpu *vcpu, u8 sgi_source_id, int irq)
> +{
> + struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
> + struct vgic_dist *dist = &vcpu->kvm->arch.vgic;
> + int lr, is_level;
> +
> + /* Sanitize the input... */
> + BUG_ON(sgi_source_id & ~7);
sgi_source_id > MAX_SGI_SOURCES (or whatever we end up having for the SGI
and PPI limits).
> + BUG_ON(sgi_source_id && irq > 15);
irq > MAX_PPI_SOURCES
> + BUG_ON(irq >= VGIC_NR_IRQS);
> +
> + kvm_debug("Queue IRQ%d\n", irq);
> +
> + lr = vgic_cpu->vgic_irq_lr_map[irq];
> + is_level = !vgic_irq_is_edge(dist, irq);
> +
> + /* Do we have an active interrupt for the same CPUID? */
> + if (lr != LR_EMPTY &&
> + (LR_PHYSID(vgic_cpu->vgic_lr[lr]) == sgi_source_id)) {
Ok, so this does return the source.
> + kvm_debug("LR%d piggyback for IRQ%d %x\n", lr, irq, vgic_cpu->vgic_lr[lr]);
> + BUG_ON(!test_bit(lr, vgic_cpu->lr_used));
> + vgic_cpu->vgic_lr[lr] |= VGIC_LR_PENDING_BIT;
> + if (is_level)
> + vgic_cpu->vgic_lr[lr] |= VGIC_LR_EOI;
> + return true;
> + }
> +
> + /* Try to use another LR for this interrupt */
> + lr = find_first_bit((unsigned long *)vgic_cpu->vgic_elrsr,
> + vgic_cpu->nr_lr);
> + if (lr >= vgic_cpu->nr_lr)
> + return false;
> +
> + kvm_debug("LR%d allocated for IRQ%d %x\n", lr, irq, sgi_source_id);
> + vgic_cpu->vgic_lr[lr] = MK_LR_PEND(sgi_source_id, irq);
> + if (is_level)
> + vgic_cpu->vgic_lr[lr] |= VGIC_LR_EOI;
> +
> + vgic_cpu->vgic_irq_lr_map[irq] = lr;
> + clear_bit(lr, (unsigned long *)vgic_cpu->vgic_elrsr);
> + set_bit(lr, vgic_cpu->lr_used);
> +
> + return true;
> +}
I can't help but feel that this could be made cleaner by moving the
level-specific EOI handling out into a separate function.
> +
> +/*
> + * Fill the list registers with pending interrupts before running the
> + * guest.
> + */
> +static void __kvm_vgic_sync_to_cpu(struct kvm_vcpu *vcpu)
> +{
> + struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
> + struct vgic_dist *dist = &vcpu->kvm->arch.vgic;
> + unsigned long *pending;
> + int i, c, vcpu_id;
> + int overflow = 0;
> +
> + vcpu_id = vcpu->vcpu_id;
> +
> + /*
> + * We may not have any pending interrupt, or the interrupts
> + * may have been serviced from another vcpu. In all cases,
> + * move along.
> + */
> + if (!kvm_vgic_vcpu_pending_irq(vcpu)) {
> + pr_debug("CPU%d has no pending interrupt\n", vcpu_id);
> + goto epilog;
> + }
> +
> + /* SGIs */
> + pending = vgic_bitmap_get_cpu_map(&dist->irq_state, vcpu_id);
> + for_each_set_bit(i, vgic_cpu->pending, 16) {
> + unsigned long sources;
> +
> + sources = dist->irq_sgi_sources[vcpu_id][i];
> + for_each_set_bit(c, &sources, 8) {
> + if (!vgic_queue_irq(vcpu, c, i)) {
> + overflow = 1;
> + continue;
> + }
If there are multiple sources, why do you need to queue the interrupt
multiple times? I would have thought it could be collapsed into one.
> +
> + clear_bit(c, &sources);
> + }
> +
> + if (!sources)
> + clear_bit(i, pending);
What does this signify and how does it happen? An SGI without a source
sounds pretty weird...
> +
> + dist->irq_sgi_sources[vcpu_id][i] = sources;
> + }
> +
> + /* PPIs */
> + for_each_set_bit_from(i, vgic_cpu->pending, 32) {
> + if (!vgic_queue_irq(vcpu, 0, i)) {
> + overflow = 1;
> + continue;
> + }
> +
> + clear_bit(i, pending);
You could lose the `continue' and stick the clear_bit in an else clause
(same for SGIs and SPIs).
> + }
> +
> +
> + /* SPIs */
> + pending = vgic_bitmap_get_shared_map(&dist->irq_state);
> + for_each_set_bit_from(i, vgic_cpu->pending, VGIC_NR_IRQS) {
> + if (vgic_bitmap_get_irq_val(&dist->irq_active, 0, i))
> + continue; /* level interrupt, already queued */
> +
> + if (!vgic_queue_irq(vcpu, 0, i)) {
> + overflow = 1;
> + continue;
> + }
> +
> + /* Immediate clear on edge, set active on level */
> + if (vgic_irq_is_edge(dist, i)) {
> + clear_bit(i - 32, pending);
> + clear_bit(i, vgic_cpu->pending);
> + } else {
> + vgic_bitmap_set_irq_val(&dist->irq_active, 0, i, 1);
> + }
> + }
Hmm, more of this edge/level handling trying to use the same code and it
not really working.
> +
> +epilog:
> + if (overflow)
> + vgic_cpu->vgic_hcr |= VGIC_HCR_UIE;
> + else {
> + vgic_cpu->vgic_hcr &= ~VGIC_HCR_UIE;
> + /*
> + * We're about to run this VCPU, and we've consumed
> + * everything the distributor had in store for
> + * us. Claim we don't have anything pending. We'll
> + * adjust that if needed while exiting.
> + */
> + clear_bit(vcpu_id, &dist->irq_pending_on_cpu);
> + }
> +}
> +
> +/*
> + * Sync back the VGIC state after a guest run. We do not really touch
> + * the distributor here (the irq_pending_on_cpu bit is safe to set),
> + * so there is no need for taking its lock.
> + */
> +static void __kvm_vgic_sync_from_cpu(struct kvm_vcpu *vcpu)
> +{
> + struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
> + struct vgic_dist *dist = &vcpu->kvm->arch.vgic;
> + int lr, pending;
> +
> + /* Clear mappings for empty LRs */
> + for_each_set_bit(lr, (unsigned long *)vgic_cpu->vgic_elrsr,
> + vgic_cpu->nr_lr) {
> + int irq;
> +
> + if (!test_and_clear_bit(lr, vgic_cpu->lr_used))
> + continue;
> +
> + irq = vgic_cpu->vgic_lr[lr] & VGIC_LR_VIRTUALID;
> +
> + BUG_ON(irq >= VGIC_NR_IRQS);
> + vgic_cpu->vgic_irq_lr_map[irq] = LR_EMPTY;
> + }
> +
> + /* Check if we still have something up our sleeve... */
> + pending = find_first_zero_bit((unsigned long *)vgic_cpu->vgic_elrsr,
> + vgic_cpu->nr_lr);
Does this rely on timeliness of maintenance interrupts with respect to
EOIs in the guest? i.e. if a maintenance interrupt is delayed (I can't
see anything in the spec stating that they're synchronous) and you end up
taking one here, will you accidentally re-pend the interrupt?
> + if (pending < vgic_cpu->nr_lr) {
> + set_bit(vcpu->vcpu_id, &dist->irq_pending_on_cpu);
> + smp_mb();
What's this barrier for?
Will
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
