[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v10 09/10] hw/arm/virt: Check the VCPU PA range in TCG
From: |
Eric Auger |
Subject: |
[Qemu-arm] [PATCH v10 09/10] hw/arm/virt: Check the VCPU PA range in TCG mode |
Date: |
Thu, 28 Feb 2019 16:03:23 +0100 |
We are about to allow the memory map to grow beyond 1TB and
potentially overshoot the VCPU AA64MMFR0.PARANGE.
In aarch64 mode and when highmem is set, let's check the VCPU
PA range is sufficient to address the highest GPA of the memory
map.
Signed-off-by: Eric Auger <address@hidden>
---
hw/arm/virt.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 7a158571b7..a3da75a5ae 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -60,6 +60,7 @@
#include "standard-headers/linux/input.h"
#include "hw/arm/smmuv3.h"
#include "hw/acpi/acpi.h"
+#include "target/arm/internals.h"
#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
@@ -1607,6 +1608,22 @@ static void machvirt_init(MachineState *machine)
fdt_add_timer_nodes(vms);
fdt_add_cpu_nodes(vms);
+ if (!kvm_enabled()) {
+ ARMCPU *cpu = ARM_CPU(first_cpu);
+ bool aarch64 = object_property_get_bool(OBJECT(cpu), "aarch64", NULL);
+
+ if (aarch64 && vms->highmem) {
+ int requested_pa_size, pamax = arm_pamax(cpu);
+
+ requested_pa_size = 64 - clz64(vms->highest_gpa);
+ if (pamax < requested_pa_size) {
+ error_report("VCPU supports less PA bits (%d) than requested "
+ "by the memory map (%d)", pamax,
requested_pa_size);
+ exit(1);
+ }
+ }
+ }
+
memory_region_allocate_system_memory(ram, NULL, "mach-virt.ram",
machine->ram_size);
memory_region_add_subregion(sysmem, vms->memmap[VIRT_MEM].base, ram);
--
2.20.1
- Re: [Qemu-arm] [PATCH v10 03/10] hw/arm/virt: Split the memory map description, (continued)
- [Qemu-arm] [PATCH v10 06/10] vl: Set machine ram_size, maxram_size and ram_slots earlier, Eric Auger, 2019/02/28
- [Qemu-arm] [PATCH v10 05/10] kvm: add kvm_arm_get_max_vm_ipa_size, Eric Auger, 2019/02/28
- [Qemu-arm] [PATCH v10 07/10] hw/arm/virt: Dynamic memory map depending on RAM requirements, Eric Auger, 2019/02/28
- [Qemu-arm] [PATCH v10 08/10] hw/arm/virt: Implement kvm_type function for 4.0 machine, Eric Auger, 2019/02/28
- [Qemu-arm] [PATCH v10 10/10] hw/arm/virt: Bump the 255GB initial RAM limit, Eric Auger, 2019/02/28
- [Qemu-arm] [PATCH v10 09/10] hw/arm/virt: Check the VCPU PA range in TCG mode,
Eric Auger <=