[kvmtool PATCH v4 24/24] kvmtool: arm: Add support for creating VM with PA size
From: suzuki.poulose@arm.com (Suzuki K Poulose)
Date: 2018-07-18 09:19:07
Also in:
kvm, kvmarm
Subsystem:
the rest · Maintainer:
Linus Torvalds
Specify the physical size for the VM encoded in the vm type. Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> --- arm/include/arm-common/kvm-arch.h | 6 +++++- arm/kvm.c | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/arm/include/arm-common/kvm-arch.h b/arm/include/arm-common/kvm-arch.h
index b29b4b1..d77f3ac 100644
--- a/arm/include/arm-common/kvm-arch.h
+++ b/arm/include/arm-common/kvm-arch.h@@ -44,7 +44,11 @@ #define KVM_IRQ_OFFSET GIC_SPI_IRQ_BASE -#define KVM_VM_TYPE 0 +extern unsigned long kvm_arm_type; +extern void kvm__arch_init_hyp(struct kvm *kvm); + +#define KVM_VM_TYPE kvm_arm_type +#define kvm__arch_init_hyp kvm__arch_init_hyp #define VIRTIO_DEFAULT_TRANS(kvm) \ ((kvm)->cfg.arch.virtio_trans_pci ? VIRTIO_PCI : VIRTIO_MMIO)
diff --git a/arm/kvm.c b/arm/kvm.c
index 5701d41..b7c3382 100644
--- a/arm/kvm.c
+++ b/arm/kvm.c@@ -11,6 +11,8 @@ #include <linux/kvm.h> #include <linux/sizes.h> +unsigned long kvm_arm_type; + struct kvm_ext kvm_req_ext[] = { { DEFINE_KVM_EXT(KVM_CAP_IRQCHIP) }, { DEFINE_KVM_EXT(KVM_CAP_ONE_REG) },
@@ -18,6 +20,26 @@ struct kvm_ext kvm_req_ext[] = { { 0, 0 }, }; +#ifndef KVM_CAP_ARM_VM_MAX_PHYS_SHIFT +#define KVM_CAP_ARM_VM_MAX_PHYS_SHIFT 156 +#endif + +void kvm__arch_init_hyp(struct kvm *kvm) +{ + int max_ipa; + + if (!kvm->cfg.arch.phys_shift || kvm->cfg.arch.phys_shift == 40) + return; + max_ipa = ioctl(kvm->sys_fd, + KVM_CHECK_EXTENSION, KVM_CAP_ARM_VM_MAX_PHYS_SHIFT); + if (!max_ipa) + die("Kernel doesn't support IPA size configuration\n"); + if (kvm->cfg.arch.phys_shift > max_ipa) + die("Requested PA size (%u) is not supported by the host (%ubits)\n", + kvm->cfg.arch.phys_shift, max_ipa); + kvm_arm_type = kvm->cfg.arch.phys_shift; +} + bool kvm__arch_cpu_supports_vm(void) { /* The KVM capability check is enough. */
--
2.7.4