From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKfUn-00025y-7F for qemu-devel@nongnu.org; Wed, 06 Jul 2016 01:35:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKfUi-0004IN-U4 for qemu-devel@nongnu.org; Wed, 06 Jul 2016 01:35:36 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:47799) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKfUi-0004HM-Ln for qemu-devel@nongnu.org; Wed, 06 Jul 2016 01:35:32 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u665XYnx026755 for ; Wed, 6 Jul 2016 01:35:31 -0400 Received: from e23smtp04.au.ibm.com (e23smtp04.au.ibm.com [202.81.31.146]) by mx0a-001b2d01.pphosted.com with ESMTP id 240nf1sn00-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 06 Jul 2016 01:35:31 -0400 Received: from localhost by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 6 Jul 2016 15:35:29 +1000 From: Sam Bobroff Date: Wed, 6 Jul 2016 15:35:23 +1000 In-Reply-To: References: In-Reply-To: References: Message-Id: Subject: [Qemu-devel] [PATCH v2 3/3] spapr: Set ibm, pa-features HTM from KVM_CAP_PPC_HTM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: david@gibson.dropbear.id.au Cc: anton@au1.ibm.com, mikey@neuling.org, aik@ozlabs.ru, mpe@ellerman.id.au, agraf@suse.de, qemu-devel@nongnu.org, paulus@samba.org, qemu-ppc@nongnu.org, linuxppc-dev@lists.ozlabs.org Advertise HTM support in ibm, pa-features if KVM indicates support when queried via a new capability (KVM_CAP_PPC_HTM). If KVM returns false for the capability (which may indicate that the host kernel doesn't support the capability itself) attempt to determine availability using a fallback method based on KVM being KVM-HV and HTM being available to the QEMU process. Signed-off-by: Sam Bobroff --- v2: * Improve readability of HTM bit set code. * Move the test for KVM into kvmppc_get_htm_support(). hw/ppc/spapr.c | 3 +++ target-ppc/kvm.c | 29 +++++++++++++++++++++++++++++ target-ppc/kvm_ppc.h | 6 ++++++ 3 files changed, 38 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 704aae7..843fbe7 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -712,6 +712,9 @@ static void spapr_populate_cpu_dt(CPUState *cs, void *fdt, int offset, } else /* env->mmu_model == POWERPC_MMU_2_07 */ { pa_features = pa_features_207; pa_size = sizeof(pa_features_207); + if (kvmppc_get_htm_support(env)) { + pa_features[24] |= 0x80; + } } if (env->ci_large_pages) { pa_features[3] |= 0x20; diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 884d564..9d13446 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -20,6 +20,7 @@ #include #include +#include "elf.h" #include "qemu-common.h" #include "qemu/error-report.h" @@ -1976,6 +1977,34 @@ uint32_t kvmppc_get_dfp(void) return kvmppc_read_int_cpu_dt("ibm,dfp"); } +bool kvmppc_get_htm_support(CPUPPCState *env) +{ + PowerPCCPU *cpu = ppc_env_get_cpu(env); + CPUState *cs = CPU(cpu); + + if (!kvm_enabled()) { + return false; + } + if (kvm_vm_check_extension(cs->kvm_state, KVM_CAP_PPC_HTM)) { + return true; + } + /* + * Fallback test for host kernels that don't yet support KVM_CAP_PPC_HTM. + * This will be unnecessary when KVM_API_VERSION is incremented (to 13 or + * above) because that will remove the ambiguity between the host kernel + * lacking support for KVM_CAP_PPC_HTM and it having support but reporting + * HTM as unavailable (both of which return 0, above). + */ + if (kvm_vm_check_extension(cs->kvm_state, KVM_CAP_PPC_GET_PVINFO)) { + /* Assume this means PR KVM, so no TM. */ + return false; + } else { + /* Assume this means HV KVM, propagate whatever host userspace sees. */ + unsigned long hwcap2 = qemu_getauxval(AT_HWCAP2); + return !!(hwcap2 & PPC_FEATURE2_HAS_HTM); + } +} + static int kvmppc_get_pvinfo(CPUPPCState *env, struct kvm_ppc_pvinfo *pvinfo) { PowerPCCPU *cpu = ppc_env_get_cpu(env); diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h index 20bfb59..b01c717 100644 --- a/target-ppc/kvm_ppc.h +++ b/target-ppc/kvm_ppc.h @@ -17,6 +17,7 @@ uint32_t kvmppc_get_tbfreq(void); uint64_t kvmppc_get_clockfreq(void); uint32_t kvmppc_get_vmx(void); uint32_t kvmppc_get_dfp(void); +bool kvmppc_get_htm_support(CPUPPCState *env); bool kvmppc_get_host_model(char **buf); bool kvmppc_get_host_serial(char **buf); int kvmppc_get_hasidle(CPUPPCState *env); @@ -90,6 +91,11 @@ static inline uint32_t kvmppc_get_dfp(void) return 0; } +static inline bool kvmppc_get_htm_support(KVMState *kvm_state) +{ + return false; +} + static inline int kvmppc_get_hasidle(CPUPPCState *env) { return 0; -- 2.1.0