From: Christoffer Dall <christoffer.dall@linaro.org> To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Cc: kvm@vger.kernel.org, Marc Zyngier <marc.zyngier@arm.com>, Shih-Wei Li <shihwei@cs.columbia.edu>, Christoffer Dall <cdall@linaro.org> Subject: [PATCH v4 04/20] KVM: arm/arm64: Guard kvm_vgic_map_is_active against !vgic_initialized Date: Fri, 20 Oct 2017 13:49:23 +0200 [thread overview] Message-ID: <20171020114939.12554-5-christoffer.dall@linaro.org> (raw) In-Reply-To: <20171020114939.12554-1-christoffer.dall@linaro.org> From: Christoffer Dall <cdall@linaro.org> If the vgic is not initialized, don't try to grab its spinlocks or traverse its data structures. This is important because we soon have to start considering the active state of a virtual interrupts when doing vcpu_load, which may happen early on before the vgic is initialized. Signed-off-by: Christoffer Dall <cdall@linaro.org> Acked-by: Marc Zyngier <marc.zyngier@arm.com> --- virt/kvm/arm/vgic/vgic.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c index fed717e07938..e1f7dbcfece0 100644 --- a/virt/kvm/arm/vgic/vgic.c +++ b/virt/kvm/arm/vgic/vgic.c @@ -777,6 +777,9 @@ bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, unsigned int virt_irq) struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, virt_irq); bool map_is_active; + if (!vgic_initialized(vcpu->kvm)) + return false; + spin_lock(&irq->irq_lock); map_is_active = irq->hw && irq->active; spin_unlock(&irq->irq_lock); -- 2.14.2
WARNING: multiple messages have this Message-ID (diff)
From: christoffer.dall@linaro.org (Christoffer Dall) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 04/20] KVM: arm/arm64: Guard kvm_vgic_map_is_active against !vgic_initialized Date: Fri, 20 Oct 2017 13:49:23 +0200 [thread overview] Message-ID: <20171020114939.12554-5-christoffer.dall@linaro.org> (raw) In-Reply-To: <20171020114939.12554-1-christoffer.dall@linaro.org> From: Christoffer Dall <cdall@linaro.org> If the vgic is not initialized, don't try to grab its spinlocks or traverse its data structures. This is important because we soon have to start considering the active state of a virtual interrupts when doing vcpu_load, which may happen early on before the vgic is initialized. Signed-off-by: Christoffer Dall <cdall@linaro.org> Acked-by: Marc Zyngier <marc.zyngier@arm.com> --- virt/kvm/arm/vgic/vgic.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c index fed717e07938..e1f7dbcfece0 100644 --- a/virt/kvm/arm/vgic/vgic.c +++ b/virt/kvm/arm/vgic/vgic.c @@ -777,6 +777,9 @@ bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, unsigned int virt_irq) struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, virt_irq); bool map_is_active; + if (!vgic_initialized(vcpu->kvm)) + return false; + spin_lock(&irq->irq_lock); map_is_active = irq->hw && irq->active; spin_unlock(&irq->irq_lock); -- 2.14.2
next prev parent reply other threads:[~2017-10-20 11:49 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-10-20 11:49 [PATCH v4 00/20] KVM: arm/arm64: Optimize arch timer register handling Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-20 11:49 ` [PATCH v4 01/20] irqchip/gic: Deal with broken firmware exposing only 4kB of GICv2 CPU interface Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-20 11:49 ` [PATCH v4 02/20] arm64: Implement arch_counter_get_cntpct to read the physical counter Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-25 13:41 ` Marc Zyngier 2017-10-25 13:41 ` Marc Zyngier 2017-10-20 11:49 ` [PATCH v4 03/20] arm64: Use physical counter for in-kernel reads when booted in EL2 Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-25 13:43 ` Marc Zyngier 2017-10-25 13:43 ` Marc Zyngier 2017-10-20 11:49 ` Christoffer Dall [this message] 2017-10-20 11:49 ` [PATCH v4 04/20] KVM: arm/arm64: Guard kvm_vgic_map_is_active against !vgic_initialized Christoffer Dall 2017-10-20 11:49 ` [PATCH v4 05/20] KVM: arm/arm64: Support calling vgic_update_irq_pending from irq context Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-25 13:45 ` Marc Zyngier 2017-10-25 13:45 ` Marc Zyngier 2017-10-20 11:49 ` [PATCH v4 06/20] KVM: arm/arm64: Check that system supports split eoi/deactivate Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-25 13:47 ` Marc Zyngier 2017-10-25 13:47 ` Marc Zyngier 2017-10-20 11:49 ` [PATCH v4 07/20] KVM: arm/arm64: Make timer_arm and timer_disarm helpers more generic Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-25 13:49 ` Marc Zyngier 2017-10-25 13:49 ` Marc Zyngier 2017-10-20 11:49 ` [PATCH v4 08/20] KVM: arm/arm64: Rename soft timer to bg_timer Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-20 11:49 ` [PATCH v4 09/20] KVM: arm/arm64: Move timer/vgic flush/sync under disabled irq Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-20 11:49 ` [PATCH v4 10/20] KVM: arm/arm64: Use separate timer for phys timer emulation Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-25 13:59 ` Marc Zyngier 2017-10-25 13:59 ` Marc Zyngier 2017-10-20 11:49 ` [PATCH v4 11/20] KVM: arm/arm64: Move timer save/restore out of the hyp code Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-20 11:49 ` [PATCH v4 12/20] genirq: Document vcpu_info usage for percpu_devid interrupts Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-20 11:56 ` Thomas Gleixner 2017-10-20 11:56 ` Thomas Gleixner 2017-10-21 14:29 ` Christoffer Dall 2017-10-21 14:29 ` Christoffer Dall 2017-10-21 14:55 ` Thomas Gleixner 2017-10-21 14:55 ` Thomas Gleixner 2017-10-21 15:30 ` Christoffer Dall 2017-10-21 15:30 ` Christoffer Dall 2017-10-20 11:49 ` [PATCH v4 13/20] KVM: arm/arm64: Set VCPU affinity for virt timer irq Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-20 11:49 ` [PATCH v4 14/20] KVM: arm/arm64: Avoid timer save/restore in vcpu entry/exit Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-25 14:36 ` Marc Zyngier 2017-10-25 14:36 ` Marc Zyngier 2017-11-16 20:30 ` Jintack Lim 2017-11-16 20:30 ` Jintack Lim 2017-11-16 20:32 ` Jintack Lim 2017-11-16 20:32 ` Jintack Lim 2017-11-20 11:15 ` Christoffer Dall 2017-11-20 11:15 ` Christoffer Dall 2017-11-20 16:32 ` Jintack Lim 2017-11-20 16:32 ` Jintack Lim 2017-10-20 11:49 ` [PATCH v4 15/20] KVM: arm/arm64: Support EL1 phys timer register access in set/get reg Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-25 14:38 ` Marc Zyngier 2017-10-25 14:38 ` Marc Zyngier 2017-10-20 11:49 ` [PATCH v4 16/20] KVM: arm/arm64: Use kvm_arm_timer_set/get_reg for guest register traps Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-20 11:49 ` [PATCH v4 17/20] KVM: arm/arm64: Move phys_timer_emulate function Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-20 11:49 ` [PATCH v4 18/20] KVM: arm/arm64: Avoid phys timer emulation in vcpu entry/exit Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-20 11:49 ` [PATCH v4 19/20] KVM: arm/arm64: Get rid of kvm_timer_flush_hwstate Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall 2017-10-20 11:49 ` [PATCH v4 20/20] KVM: arm/arm64: Rework kvm_timer_should_fire Christoffer Dall 2017-10-20 11:49 ` Christoffer Dall
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20171020114939.12554-5-christoffer.dall@linaro.org \ --to=christoffer.dall@linaro.org \ --cc=cdall@linaro.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=shihwei@cs.columbia.edu \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.