Received: from eggs.gnu.org ([2001:4830:134:3::10]:41485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciPEb-0001TU-UM for qemu-devel@nongnu.org; Mon, 27 Feb 2017 12:37:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ciPEa-0000df-TW for qemu-devel@nongnu.org; Mon, 27 Feb 2017 12:37:17 -0500 From: Andrew Jones Date: Mon, 27 Feb 2017 18:37:06 +0100 Message-Id: <20170227173706.15210-3-drjones@redhat.com> In-Reply-To: <20170227173706.15210-1-drjones@redhat.com> References: <20170227173706.15210-1-drjones@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] arm: kvm: set MPIDR when we can List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-arm@nongnu.org Cc: peter.maydell@linaro.org, christoffer.dall@linaro.org, marc.zyngier@arm.com, imammedo@redhat.com If KVM supports user provided MPIDRs for the vcpus, then provide them. This simplifies management of vcpus as we can be sure of the identity of a vcpu even before it's been instantiated. Cc: Igor Mammedov Signed-off-by: Andrew Jones --- target/arm/cpu.c | 3 +-- target/arm/kvm32.c | 22 ++++++++++++++-------- target/arm/kvm64.c | 22 ++++++++++++++-------- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index f7157dc0e59d..83cd5eefbef8 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -741,8 +741,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) return; } - /* This cpu-id-to-MPIDR affinity is used only for TCG; KVM will override it. - * We don't support setting cluster ID ([16..23]) (known as Aff2 + /* We don't currently support setting cluster ID ([16..23]) (known as Aff2 * in later ARM ARM versions), or any of the higher affinity level fields, * so these bits always RAZ. */ diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c index 069da0c5fd10..5ad732498e5c 100644 --- a/target/arm/kvm32.c +++ b/target/arm/kvm32.c @@ -186,7 +186,6 @@ int kvm_arch_init_vcpu(CPUState *cs) { int ret; uint64_t v; - uint32_t mpidr; struct kvm_one_reg r; ARMCPU *cpu = ARM_CPU(cs); @@ -223,16 +222,23 @@ int kvm_arch_init_vcpu(CPUState *cs) return -EINVAL; } - /* - * When KVM is in use, PSCI is emulated in-kernel and not by qemu. - * Currently KVM has its own idea about MPIDR assignment, so we - * override our defaults with what we get from KVM. - */ - ret = kvm_get_one_reg(cs, ARM_CP15_REG32(ARM_CPU_ID_MPIDR), &mpidr); + if (kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_USER_MPIDR)) { + ret = kvm_set_one_reg(cs, ARM_CP15_REG32(ARM_CPU_ID_MPIDR), + &cpu->mp_affinity); + } else { + /* If we can't set the MPIDR, then KVM will generate one. We must + * update our copy to that one in order to stay synchronized. + */ + uint32_t mpidr; + + ret = kvm_get_one_reg(cs, ARM_CP15_REG32(ARM_CPU_ID_MPIDR), &mpidr); + if (!ret) { + cpu->mp_affinity = mpidr & ARM32_AFFINITY_MASK; + } + } if (ret) { return ret; } - cpu->mp_affinity = mpidr & ARM32_AFFINITY_MASK; return kvm_arm_init_cpreg_list(cpu); } diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index 61111091ad3b..a7d3f876c43b 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -486,7 +486,6 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUClass *ahcc) int kvm_arch_init_vcpu(CPUState *cs) { int ret; - uint64_t mpidr; ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; @@ -524,16 +523,23 @@ int kvm_arch_init_vcpu(CPUState *cs) return ret; } - /* - * When KVM is in use, PSCI is emulated in-kernel and not by qemu. - * Currently KVM has its own idea about MPIDR assignment, so we - * override our defaults with what we get from KVM. - */ - ret = kvm_get_one_reg(cs, ARM64_SYS_REG(ARM_CPU_ID_MPIDR), &mpidr); + if (kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_USER_MPIDR)) { + ret = kvm_set_one_reg(cs, ARM64_SYS_REG(ARM_CPU_ID_MPIDR), + &cpu->mp_affinity); + } else { + /* If we can't set the MPIDR, then KVM will generate one. We must + * update our copy to that one in order to stay synchronized. + */ + uint64_t mpidr; + + ret = kvm_get_one_reg(cs, ARM64_SYS_REG(ARM_CPU_ID_MPIDR), &mpidr); + if (!ret) { + cpu->mp_affinity = mpidr & ARM64_AFFINITY_MASK; + } + } if (ret) { return ret; } - cpu->mp_affinity = mpidr & ARM64_AFFINITY_MASK; kvm_arm_init_debug(cs); -- 2.9.3