From: Marc Zyngier <marc.zyngier@arm.com> To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: Andre Przywara <Andre.Przywara@arm.com> Subject: [PATCH v4 25/26] KVM: arm/arm64: GICv4: Prevent heterogenous systems from using GICv4 Date: Fri, 6 Oct 2017 16:34:00 +0100 [thread overview] Message-ID: <20171006153401.5481-26-marc.zyngier@arm.com> (raw) In-Reply-To: <20171006153401.5481-1-marc.zyngier@arm.com> The GICv4 architecture doesn't prevent CPUs implementing GICv4 to cohabit with CPUs limited to GICv3 in the same system. This is mad (the scheduler would have to be made aware of the v4 capability), and we're certainly not going to support this any time soon. So let's check that all online CPUs are GICv4 capable, and disable the functionnality if not. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- include/linux/irqchip/arm-gic-v3.h | 2 ++ virt/kvm/arm/vgic/vgic-v3.c | 27 +++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h index 1ea576c8126f..dfa4a51643d6 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -532,6 +532,8 @@ #define ICH_VTR_SEIS_MASK (1 << ICH_VTR_SEIS_SHIFT) #define ICH_VTR_A3V_SHIFT 21 #define ICH_VTR_A3V_MASK (1 << ICH_VTR_A3V_SHIFT) +#define ICH_VTR_nV4_SHIFT 20 +#define ICH_VTR_nV4_MASK (1 << ICH_VTR_nV4_SHIFT) #define ICC_IAR1_EL1_SPURIOUS 0x3ff diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c index 405733678c2f..da99df50a818 100644 --- a/virt/kvm/arm/vgic/vgic-v3.c +++ b/virt/kvm/arm/vgic/vgic-v3.c @@ -466,9 +466,19 @@ static int __init early_gicv4_enable(char *buf) } early_param("kvm-arm.vgic_v4_enable", early_gicv4_enable); +static void vgic_check_v4_cpuif(void *param) +{ + u32 ich_vtr_el2 = kvm_call_hyp(__vgic_v3_get_ich_vtr_el2); + bool *v4 = param; + + *v4 = !(ich_vtr_el2 & ICH_VTR_nV4_MASK); + if (!*v4) + kvm_info("CPU%d is not GICv4 capable\n", smp_processor_id()); +} + /** * vgic_v3_probe - probe for a GICv3 compatible interrupt controller in DT - * @node: pointer to the DT node + * @info: pointer to the firmware-agnostic GIC information * * Returns 0 if a GICv3 has been found, returns an error code otherwise */ @@ -485,8 +495,21 @@ int vgic_v3_probe(const struct gic_kvm_info *info) kvm_vgic_global_state.can_emulate_gicv2 = false; kvm_vgic_global_state.ich_vtr_el2 = ich_vtr_el2; - /* GICv4 support? */ + /* + * GICv4 support? We need to check on all CPUs in case of some + * extremely creative form of big-little brain damage... + */ if (info->has_v4) { + int cpu; + + for_each_online_cpu(cpu) { + bool enable; + + smp_call_function_single(cpu, vgic_check_v4_cpuif, + &enable, 1); + gicv4_enable = gicv4_enable && enable; + } + kvm_vgic_global_state.has_gicv4 = gicv4_enable; kvm_info("GICv4 support %sabled\n", gicv4_enable ? "en" : "dis"); -- 2.14.1
WARNING: multiple messages have this Message-ID (diff)
From: marc.zyngier@arm.com (Marc Zyngier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 25/26] KVM: arm/arm64: GICv4: Prevent heterogenous systems from using GICv4 Date: Fri, 6 Oct 2017 16:34:00 +0100 [thread overview] Message-ID: <20171006153401.5481-26-marc.zyngier@arm.com> (raw) In-Reply-To: <20171006153401.5481-1-marc.zyngier@arm.com> The GICv4 architecture doesn't prevent CPUs implementing GICv4 to cohabit with CPUs limited to GICv3 in the same system. This is mad (the scheduler would have to be made aware of the v4 capability), and we're certainly not going to support this any time soon. So let's check that all online CPUs are GICv4 capable, and disable the functionnality if not. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- include/linux/irqchip/arm-gic-v3.h | 2 ++ virt/kvm/arm/vgic/vgic-v3.c | 27 +++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h index 1ea576c8126f..dfa4a51643d6 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -532,6 +532,8 @@ #define ICH_VTR_SEIS_MASK (1 << ICH_VTR_SEIS_SHIFT) #define ICH_VTR_A3V_SHIFT 21 #define ICH_VTR_A3V_MASK (1 << ICH_VTR_A3V_SHIFT) +#define ICH_VTR_nV4_SHIFT 20 +#define ICH_VTR_nV4_MASK (1 << ICH_VTR_nV4_SHIFT) #define ICC_IAR1_EL1_SPURIOUS 0x3ff diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c index 405733678c2f..da99df50a818 100644 --- a/virt/kvm/arm/vgic/vgic-v3.c +++ b/virt/kvm/arm/vgic/vgic-v3.c @@ -466,9 +466,19 @@ static int __init early_gicv4_enable(char *buf) } early_param("kvm-arm.vgic_v4_enable", early_gicv4_enable); +static void vgic_check_v4_cpuif(void *param) +{ + u32 ich_vtr_el2 = kvm_call_hyp(__vgic_v3_get_ich_vtr_el2); + bool *v4 = param; + + *v4 = !(ich_vtr_el2 & ICH_VTR_nV4_MASK); + if (!*v4) + kvm_info("CPU%d is not GICv4 capable\n", smp_processor_id()); +} + /** * vgic_v3_probe - probe for a GICv3 compatible interrupt controller in DT - * @node: pointer to the DT node + * @info: pointer to the firmware-agnostic GIC information * * Returns 0 if a GICv3 has been found, returns an error code otherwise */ @@ -485,8 +495,21 @@ int vgic_v3_probe(const struct gic_kvm_info *info) kvm_vgic_global_state.can_emulate_gicv2 = false; kvm_vgic_global_state.ich_vtr_el2 = ich_vtr_el2; - /* GICv4 support? */ + /* + * GICv4 support? We need to check on all CPUs in case of some + * extremely creative form of big-little brain damage... + */ if (info->has_v4) { + int cpu; + + for_each_online_cpu(cpu) { + bool enable; + + smp_call_function_single(cpu, vgic_check_v4_cpuif, + &enable, 1); + gicv4_enable = gicv4_enable && enable; + } + kvm_vgic_global_state.has_gicv4 = gicv4_enable; kvm_info("GICv4 support %sabled\n", gicv4_enable ? "en" : "dis"); -- 2.14.1
next prev parent reply other threads:[~2017-10-06 15:34 UTC|newest] Thread overview: 117+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-10-06 15:33 [PATCH v4 00/26] KVM/ARM: Add support for GICv4 Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-06 15:33 ` [PATCH v4 01/26] KVM: arm/arm64: register irq bypass consumer on ARM/ARM64 Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-06 15:33 ` [PATCH v4 02/26] KVM: arm/arm64: vgic: restructure kvm_vgic_(un)map_phys_irq Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-25 14:44 ` Christoffer Dall 2017-10-25 14:44 ` Christoffer Dall 2017-10-26 13:05 ` Marc Zyngier 2017-10-26 13:05 ` Marc Zyngier 2017-10-06 15:33 ` [PATCH v4 03/26] KVM: arm: Select ARM_GIC_V3 and ARM_GIC_V3_ITS Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-06 15:33 ` [PATCH v4 04/26] KVM: arm/arm64: vgic: Move kvm_vgic_destroy call around Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-06 15:33 ` [PATCH v4 05/26] KVM: arm/arm64: vITS: Add MSI translation helpers Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-06 15:33 ` [PATCH v4 06/26] KVM: arm/arm64: vITS: Add a helper to update the affinity of an LPI Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-25 14:50 ` Christoffer Dall 2017-10-25 14:50 ` Christoffer Dall 2017-10-06 15:33 ` [PATCH v4 07/26] KVM: arm/arm64: GICv4: Add property field and per-VM predicate Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-25 14:54 ` Christoffer Dall 2017-10-25 14:54 ` Christoffer Dall 2017-10-06 15:33 ` [PATCH v4 08/26] KVM: arm/arm64: GICv4: Add init/teardown of the per-VM vPE irq domain Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-25 15:46 ` Christoffer Dall 2017-10-25 15:46 ` Christoffer Dall 2017-10-06 15:33 ` [PATCH v4 09/26] KVM: arm/arm64: GICv4: Wire mapping/unmapping of VLPIs in VFIO irq bypass Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-25 15:58 ` Christoffer Dall 2017-10-25 15:58 ` Christoffer Dall 2017-10-06 15:33 ` [PATCH v4 10/26] KVM: arm/arm64: GICv4: Handle INT command applied to a VLPI Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-06 15:33 ` [PATCH v4 11/26] KVM: arm/arm64: GICv4: Unmap VLPI when freeing an LPI Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-06 15:33 ` [PATCH v4 12/26] KVM: arm/arm64: GICv4: Propagate affinity changes to the physical ITS Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-25 16:22 ` Christoffer Dall 2017-10-25 16:22 ` Christoffer Dall 2017-10-06 15:33 ` [PATCH v4 13/26] KVM: arm/arm64: GICv4: Handle CLEAR applied to a VLPI Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-06 15:33 ` [PATCH v4 14/26] KVM: arm/arm64: GICv4: Handle MOVALL applied to a vPE Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-25 16:27 ` Christoffer Dall 2017-10-25 16:27 ` Christoffer Dall 2017-10-06 15:33 ` [PATCH v4 15/26] KVM: arm/arm64: GICv4: Propagate property updates to VLPIs Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-06 15:33 ` [PATCH v4 16/26] KVM: arm/arm64: GICv4: Handle INVALL applied to a vPE Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-06 15:33 ` [PATCH v4 17/26] KVM: arm/arm64: GICv4: Propagate VLPI properties at map time Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-25 16:48 ` Christoffer Dall 2017-10-25 16:48 ` Christoffer Dall 2017-10-25 17:01 ` Marc Zyngier 2017-10-25 17:01 ` Marc Zyngier 2017-10-26 8:21 ` Marc Zyngier 2017-10-26 8:21 ` Marc Zyngier 2017-10-06 15:33 ` [PATCH v4 18/26] KVM: arm/arm64: GICv4: Use pending_last as a scheduling hint Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-06 15:33 ` [PATCH v4 19/26] KVM: arm/arm64: GICv4: Add doorbell interrupt handling Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-26 14:28 ` Christoffer Dall 2017-10-26 14:28 ` Christoffer Dall 2017-10-26 15:25 ` Christoffer Dall 2017-10-26 15:25 ` Christoffer Dall 2017-10-06 15:33 ` [PATCH v4 20/26] KVM: arm/arm64: GICv4: Use the doorbell interrupt as an unblocking source Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-06 15:33 ` [PATCH v4 21/26] KVM: arm/arm64: GICv4: Hook vPE scheduling into vgic flush/sync Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-26 15:24 ` Christoffer Dall 2017-10-26 15:24 ` Christoffer Dall 2017-10-06 15:33 ` [PATCH v4 22/26] KVM: arm/arm64: GICv4: Enable virtual cpuif if VLPIs can be delivered Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-06 15:33 ` [PATCH v4 23/26] KVM: arm/arm64: GICv4: Prevent a VM using GICv4 from being saved Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-26 15:28 ` Christoffer Dall 2017-10-26 15:28 ` Christoffer Dall 2017-10-27 13:56 ` Marc Zyngier 2017-10-27 13:56 ` Marc Zyngier 2017-10-30 6:48 ` Christoffer Dall 2017-10-30 6:48 ` Christoffer Dall 2017-10-06 15:33 ` [PATCH v4 24/26] KVM: arm/arm64: GICv4: Enable VLPI support Marc Zyngier 2017-10-06 15:33 ` Marc Zyngier 2017-10-06 15:34 ` Marc Zyngier [this message] 2017-10-06 15:34 ` [PATCH v4 25/26] KVM: arm/arm64: GICv4: Prevent heterogenous systems from using GICv4 Marc Zyngier 2017-10-26 15:31 ` Christoffer Dall 2017-10-26 15:31 ` Christoffer Dall 2017-10-26 15:48 ` Mark Rutland 2017-10-26 15:48 ` Mark Rutland 2017-10-27 6:57 ` Marc Zyngier 2017-10-27 6:57 ` Marc Zyngier 2017-10-27 6:57 ` Marc Zyngier 2017-10-27 7:37 ` Mark Rutland 2017-10-27 7:37 ` Mark Rutland 2017-10-27 7:59 ` Marc Zyngier 2017-10-27 7:59 ` Marc Zyngier 2017-10-27 7:59 ` Marc Zyngier 2017-10-27 8:04 ` Mark Rutland 2017-10-27 8:04 ` Mark Rutland 2017-10-27 8:31 ` Marc Zyngier 2017-10-27 8:31 ` Marc Zyngier 2017-10-27 8:31 ` Marc Zyngier 2017-10-29 2:16 ` Christoffer Dall 2017-10-29 2:16 ` Christoffer Dall 2017-10-06 15:34 ` [PATCH v4 26/26] KVM: arm/arm64: GICv4: Theory of operations Marc Zyngier 2017-10-06 15:34 ` Marc Zyngier 2017-10-26 15:32 ` Christoffer Dall 2017-10-26 15:32 ` Christoffer Dall 2017-10-08 16:45 ` [PATCH v4 00/26] KVM/ARM: Add support for GICv4 Shanker Donthineni 2017-10-08 16:45 ` Shanker Donthineni 2017-10-09 17:52 ` Konrad Rzeszutek Wilk 2017-10-09 17:52 ` Konrad Rzeszutek Wilk 2017-10-09 18:02 ` Marc Zyngier 2017-10-09 18:02 ` Marc Zyngier 2017-10-19 15:48 ` [PATCH v4 27/26] KVM: arm/arm64: GICv4: Prevent userspace from changing doorbell affinity Marc Zyngier 2017-10-19 15:48 ` Marc Zyngier
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=20171006153401.5481-26-marc.zyngier@arm.com \ --to=marc.zyngier@arm.com \ --cc=Andre.Przywara@arm.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ /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.