From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:51519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0kcH-0001bZ-7g for qemu-devel@nongnu.org; Mon, 04 Mar 2019 05:14:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0kcG-00009Y-Au for qemu-devel@nongnu.org; Mon, 04 Mar 2019 05:14:37 -0500 From: Eric Auger Date: Mon, 4 Mar 2019 11:13:34 +0100 Message-Id: <20190304101339.25970-6-eric.auger@redhat.com> In-Reply-To: <20190304101339.25970-1-eric.auger@redhat.com> References: <20190304101339.25970-1-eric.auger@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v12 05/10] kvm: add kvm_arm_get_max_vm_ipa_size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, shameerali.kolothum.thodi@huawei.com, imammedo@redhat.com, david@redhat.com Cc: dgilbert@redhat.com, david@gibson.dropbear.id.au, drjones@redhat.com, pbonzini@redhat.com Add the kvm_arm_get_max_vm_ipa_size() helper that returns the number of bits in the IPA address space supported by KVM. This capability needs to be known to create the VM with a specific IPA max size (kvm_type passed along KVM_CREATE_VM ioctl. Signed-off-by: Eric Auger Reviewed-by: Igor Mammedov --- v10 -> v11: - added Igor's R-b v6 -> v7: - s/kvm_arm_get_max_vm_phys_shift/kvm_arm_get_max_vm_ipa_size - reword the comment v4 -> v5: - return 40 if the host does not support the capability v3 -> v4: - s/s/ms in kvm_arm_get_max_vm_phys_shift function comment - check KVM_CAP_ARM_VM_IPA_SIZE extension v1 -> v2: - put this in ARM specific code --- target/arm/kvm.c | 10 ++++++++++ target/arm/kvm_arm.h | 13 +++++++++++++ 2 files changed, 23 insertions(+) diff --git a/target/arm/kvm.c b/target/arm/kvm.c index e00ccf9c98..79a79f0190 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -18,6 +18,7 @@ #include "qemu/error-report.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" +#include "sysemu/kvm_int.h" #include "kvm_arm.h" #include "cpu.h" #include "trace.h" @@ -162,6 +163,15 @@ void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu) env->features =3D arm_host_cpu_features.features; } =20 +int kvm_arm_get_max_vm_ipa_size(MachineState *ms) +{ + KVMState *s =3D KVM_STATE(ms->accelerator); + int ret; + + ret =3D kvm_check_extension(s, KVM_CAP_ARM_VM_IPA_SIZE); + return ret > 0 ? ret : 40; +} + int kvm_arch_init(MachineState *ms, KVMState *s) { /* For ARM interrupt delivery is always asynchronous, diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 6393455b1d..2a07333c61 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -207,6 +207,14 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeature= s *ahcf); */ void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu); =20 +/** + * kvm_arm_get_max_vm_ipa_size - Returns the number of bits in the + * IPA address space supported by KVM + * + * @ms: Machine state handle + */ +int kvm_arm_get_max_vm_ipa_size(MachineState *ms); + /** * kvm_arm_sync_mpstate_to_kvm * @cpu: ARMCPU @@ -239,6 +247,11 @@ static inline void kvm_arm_set_cpu_features_from_hos= t(ARMCPU *cpu) cpu->host_cpu_probe_failed =3D true; } =20 +static inline int kvm_arm_get_max_vm_ipa_size(MachineState *ms) +{ + return -ENOENT; +} + static inline int kvm_arm_vgic_probe(void) { return 0; --=20 2.20.1