[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH v3a 14/39] ARM: new VGIC: Add GICv2 world switch backend
On 27/03/18 20:41, Stefano Stabellini wrote: > On Tue, 27 Mar 2018, Andre Przywara wrote: >> Hi, >> >> On 27/03/18 00:22, Stefano Stabellini wrote: >>> On Thu, 22 Mar 2018, Andre Przywara wrote: >>>> Processing maintenance interrupts and accessing the list registers >>>> are dependent on the host's GIC version. >>>> Introduce vgic-v2.c to contain GICv2 specific functions. >>>> Implement the GICv2 specific code for syncing the emulation state >>>> into the VGIC registers. >>>> This also adds the hook to let Xen setup the host GIC addresses. >>>> >>>> This is based on Linux commit 140b086dd197, written by Marc Zyngier. >>>> >>>> Signed-off-by: Andre Przywara <andre.przywara@xxxxxxxxxx> >>>> --- >>>> Changelog v3 ... v3a: >>>> - take hardware IRQ lock in vgic_v2_fold_lr_state() >>>> - fix last remaining u32 usage >>>> - print message when using new VGIC >>>> - add TODO about racy _IRQ_INPROGRESS setting >>>> >>>> Changelog v2 ... v3: >>>> - remove no longer needed asm/io.h header >>>> - replace 0/1 with false/true for bool's >>>> - clear _IRQ_INPROGRESS bit when retiring hardware mapped IRQ >>>> - fix indentation and w/s issues >>>> >>>> Changelog v1 ... v2: >>>> - remove v2 specific underflow function (now generic) >>>> - re-add Linux code to properly handle acked level IRQs >>>> >>>> xen/arch/arm/vgic/vgic-v2.c | 259 >>>> ++++++++++++++++++++++++++++++++++++++++++++ >>>> xen/arch/arm/vgic/vgic.c | 6 + >>>> xen/arch/arm/vgic/vgic.h | 9 ++ >>>> 3 files changed, 274 insertions(+) >>>> create mode 100644 xen/arch/arm/vgic/vgic-v2.c >>>> >>>> diff --git a/xen/arch/arm/vgic/vgic-v2.c b/xen/arch/arm/vgic/vgic-v2.c >>>> new file mode 100644 >>>> index 0000000000..1773503cfb >>>> --- /dev/null >>>> +++ b/xen/arch/arm/vgic/vgic-v2.c >>>> @@ -0,0 +1,259 @@ >>>> +/* >>>> + * Copyright (C) 2015, 2016 ARM Ltd. >>>> + * Imported from Linux ("new" KVM VGIC) and heavily adapted to Xen. >>>> + * >>>> + * This program is free software; you can redistribute it and/or modify >>>> + * it under the terms of the GNU General Public License version 2 as >>>> + * published by the Free Software Foundation. >>>> + * >>>> + * This program is distributed in the hope that it will be useful, >>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >>>> + * GNU General Public License for more details. >>>> + * >>>> + * You should have received a copy of the GNU General Public License >>>> + * along with this program. If not, see <http://www.gnu.org/licenses/>. >>>> + */ >>>> + >>>> +#include <asm/new_vgic.h> >>>> +#include <asm/bug.h> >>>> +#include <asm/gic.h> >>>> +#include <xen/sched.h> >>>> +#include <xen/sizes.h> >>>> + >>>> +#include "vgic.h" >>>> + >>>> +static struct { >>>> + bool enabled; >>>> + paddr_t dbase; /* Distributor interface address */ >>>> + paddr_t cbase; /* CPU interface address & size */ >>>> + paddr_t csize; >>>> + paddr_t vbase; /* Virtual CPU interface address */ >>>> + >>>> + /* Offset to add to get an 8kB contiguous region if GIC is aliased */ >>>> + uint32_t aliased_offset; >>>> +} gic_v2_hw_data; >>>> + >>>> +void vgic_v2_setup_hw(paddr_t dbase, paddr_t cbase, paddr_t csize, >>>> + paddr_t vbase, uint32_t aliased_offset) >>>> +{ >>>> + gic_v2_hw_data.enabled = true; >>>> + gic_v2_hw_data.dbase = dbase; >>>> + gic_v2_hw_data.cbase = cbase; >>>> + gic_v2_hw_data.csize = csize; >>>> + gic_v2_hw_data.vbase = vbase; >>>> + gic_v2_hw_data.aliased_offset = aliased_offset; >>>> + >>>> + printk("Using the new VGIC implementation.\n"); >>>> +} >>>> + >>>> +/* >>>> + * transfer the content of the LRs back into the corresponding ap_list: >>>> + * - active bit is transferred as is >>>> + * - pending bit is >>>> + * - transferred as is in case of edge sensitive IRQs >>>> + * - set to the line-level (resample time) for level sensitive IRQs >>>> + */ >>>> +void vgic_v2_fold_lr_state(struct vcpu *vcpu) >>>> +{ >>>> + struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic; >>>> + unsigned int used_lrs = vcpu->arch.vgic.used_lrs; >>>> + unsigned long flags; >>>> + unsigned int lr; >>>> + >>>> + if ( !used_lrs ) /* No LRs used, so nothing to sync back here. */ >>>> + return; >>>> + >>>> + gic_hw_ops->update_hcr_status(GICH_HCR_UIE, false); >>>> + >>>> + for ( lr = 0; lr < used_lrs; lr++ ) >>>> + { >>>> + struct gic_lr lr_val; >>>> + uint32_t intid; >>>> + struct vgic_irq *irq; >>>> + struct irq_desc *desc = NULL; >>>> + bool have_desc_lock = false; >>>> + >>>> + gic_hw_ops->read_lr(lr, &lr_val); >>>> + >>>> + /* >>>> + * TODO: Possible optimization to avoid reading LRs: >>>> + * Read the ELRSR to find out which of our LRs have been cleared >>>> + * by the guest. We just need to know the IRQ number for those, >>>> which >>>> + * we could save in an array when populating the LRs. >>>> + * This trades one MMIO access (ELRSR) for possibly more than one >>>> (LRs), >>>> + * but requires some more code to save the IRQ number and to >>>> handle >>>> + * those finished IRQs according to the algorithm below. >>>> + * We need some numbers to justify this: chances are that we don't >>>> + * have many LRs in use most of the time, so we might not save >>>> much. >>>> + */ >>>> + gic_hw_ops->clear_lr(lr); >>>> + >>>> + intid = lr_val.virq; >>>> + irq = vgic_get_irq(vcpu->domain, vcpu, intid); >>>> + >>>> + local_irq_save(flags); >>> >>> Shouldn't we disable interrupts earlier, maybe at the beginning of the >>> function? Is it not a problem if we take an interrupt a couple of lines >>> above with the read_lr and clear_lr that we do? >> >> In contrast to the existing VGIC we only touch the LRs when entering or >> leaving the hypervisor, not in-between. So if an hardware IRQ fires >> in-between, the handler will not touch any LRs. So I don't see any >> problem with leaving interrupts enabled. > > Nice! Now that you wrote the series and you know exactly how the code > works, I would love to see an update on the design doc to write down > stuff like this. (You don't have to do it as part of this series, as a > follow up would be fine.) Yes, that was my plan anyway. >>>> + spin_lock(&irq->irq_lock); >>>> + >>>> + /* The locking order forces us to drop and re-take the locks >>>> here. */ >>>> + if ( irq->hw ) >>>> + { >>>> + spin_unlock(&irq->irq_lock); >>>> + >>>> + desc = irq_to_desc(irq->hwintid); >>>> + spin_lock(&desc->lock); >>>> + spin_lock(&irq->irq_lock); >>>> + >>>> + /* This h/w IRQ should still be assigned to the virtual IRQ. >>>> */ >>>> + ASSERT(irq->hw && desc->irq == irq->hwintid); >>>> + >>>> + have_desc_lock = true; >>>> + } >>> >>> I agree with Julien that this looks very fragile. Instead, I think it >>> would be best to always take the desc lock (if irq->hw) before the >>> irq_lock earlier in this function. >> >> Well, how is this going work in a race free manner? To get the >> corresponding hardware interrupt, we have to lookup irq->hw and >> irq->hwintid, which is racy when done without holding the lock. >> >>> That way, we don't have to deal with >>> this business of unlocking and relocking. Do you see any problems with >>> it? We don't change irq->hw at run time, so it looks OK to me. >> >> Yeah, I see the point that irq->hw and irq->hwintid are somewhat >> "write-once" members. But that is a bit fragile assumption, I expect >> this actually to change over time. And then it will be hard to chase >> down all places were we relied on this assumption. > > Yeah, we already make this assumption in other places. I would add a > single-line TODO comment on top so that we can easily grep for it. OK. >> So I'd rather code >> this in a sane way, so that we don't have to worry about. >> Keep in mind, taking uncontended locks is rather cheap, and those locks >> here probably are very much so. > > Yeah but the code looks alien :-) I would prefer to take the desc->lock > earlier with a simple TODO comment. Otherwise, I would be also happy to > see other ways to solve this issue. > > >>>> + /* >>>> + * If a hardware mapped IRQ has been handled for good, we need to >>>> + * clear the _IRQ_INPROGRESS bit to allow handling of new IRQs. >>>> + * >>>> + * TODO: This is probably racy, but is so already in the existing >>>> + * VGIC. A fix does not seem to be trivial. >>>> + */ >>>> + if ( irq->hw && !lr_val.active && !lr_val.pending ) >>>> + clear_bit(_IRQ_INPROGRESS, &desc->status); >>> >>> I'll reply here to Julien's comment: >>> >>>> I realize the current vGIC is doing exactly the same thing. But this is >>>> racy. >>>> >>>> Imagine the interrupt is firing on another pCPU (I wasn't able to rule out >>>> this even when the interrupt is following the vCPU), that pCPU may set >>>> _IRQ_INPROGRESS before this >>>> is cleared here. >>> >>> The assumption in the old vgic was that this scenario was not possible. >>> vgic_migrate_irq would avoid changing physical interrupt affinity if a >>> virtual interrupt was currently in an LR (see xen/arch/arm/vgic.c:L298). >>> Instead, it would set the irq as GIC_IRQ_GUEST_MIGRATING, then at the >>> time of clearing the LR we would change the physical irq affinity (see >>> xen/arch/arm/gic-vgic.c:L240). >>> >>> I think we would need a similar mechanism here to protect ourselves from >>> races. Is there something equivalent in the new vgic? >> >> I am not sure this is exactly covering your concerns, but I think we are >> pretty good with our "two vCPU approach" (irq->vcpu and >> irq->target_vcpu). So the affinity can change at any point at will, it >> won't affect this current interrupt. We handle migration explicitly in >> vgic_prune_ap_list(). > > Yeah, I like the new approach, it is well done. Kudos to Marc and > Christoffer and to you for porting it to Xen so well. I don't think we > need any extra-infrastructure for dealing with the _IRQ_INPROGRESS > issue. > > >> My gut feeling is that mirroring the physical active state in the >> _IRQ_INPROGRESS bit is a bad idea, as it's duplicating state and is >> racy, by it's very nature. >> The only purpose of this bit seems to be that once an IRQ is no longer >> connected to a guest - either because the domain is going to die or the >> IRQ being explicitly disconnected (which doesn't happen anymore?), we >> need to possibly deactivate the hardware side of that, right? >> I wonder if that can be achieved by probing the actual active state in >> the distributor instead? This should be the the authoritative state anyway. >> And this is done very rarely, so we don't care about the performance, do we? > > Today, the purpose of _IRQ_INPROGRESS is to have a common way to deal > with physical interrupts targeting Xen and targeting guests. It is > common across architectures. Ah, true, so it might be not a good idea to get rid of it, then. > I agree it is not very useful for guest > interrupts, but it is useful for hypervisor interrupts. > > We could consider avoiding _IRQ_INPROGRESS altogether for guest > interrupts on ARM and using it only for hypervisor interrupts (do not > set _IRQ_INPROGRESS for guest interrupts at all). I cannot see a problem > with that right now, please double check I am not missing anything. Mmh, but wouldn't that kill a hardware mapped IRQ when the domain dies while the IRQ is still handled by the guest? Because no-one will ever deactivate this on the host side then, so new IRQs will be masked forever? I thought this was one of the main use cases for this flag. > Otherwise, I think it would make sense to just make sure that when we > clear irq->vcpu, we also clear _IRQ_INPROGRESS consistently. Like we do > today. > > Either way, it shouldn't be too hard to fix this issue. Alright, will try to come up with something tomorrow. Cheers, Andre _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxxxxxxxxx https://lists.xenproject.org/mailman/listinfo/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |