[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 08/18] hw/arm/virt: Implement kvm_type function f
From: |
Eric Auger |
Subject: |
[Qemu-devel] [PATCH v9 08/18] hw/arm/virt: Implement kvm_type function for 4.0 machine |
Date: |
Tue, 26 Feb 2019 21:44:29 +0100 |
This patch implements the machine class kvm_type() callback.
It returns the number of bits requested to implement the whole GPA
range including the RAM and IO regions located beyond.
The returned value in passed though the KVM_CREATE_VM ioctl and
this allows KVM to set the stage2 tables dynamically.
To compute the highest GPA used in the memory map, kvm_type()
must freeze the memory map by calling virt_set_memmap().
Signed-off-by: Eric Auger <address@hidden>
---
v7 -> v8:
- remove vmc->no_extended_memmap and vms->extended_memmap
v6 -> v7:
- Introduce RAMBASE and rename add LEGACY_ prefix in that patch
- use local variables with explicit names in virt_set_memmap:
device_memory_base, device_memory_size
- add an extended_memmap field in the class
v5 -> v6:
- add some comments
- high IO region cannot start before 256GiB
---
hw/arm/virt.c | 39 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 38 insertions(+), 1 deletion(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index b29b2a460b..b445a13467 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1443,7 +1443,13 @@ static void machvirt_init(MachineState *machine)
bool firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0);
bool aarch64 = true;
- virt_set_memmap(vms);
+ /*
+ * In accelerated mode, the memory map is computed in kvm_type()
+ * to create a VM with the right number of IPA bits.
+ */
+ if (!kvm_enabled()) {
+ virt_set_memmap(vms);
+ }
/* We can probe only here because during property set
* KVM is not available yet
@@ -1832,6 +1838,36 @@ static HotplugHandler
*virt_machine_get_hotplug_handler(MachineState *machine,
return NULL;
}
+/*
+ * for arm64 kvm_type [7-0] encodes the requested number of bits
+ * in the IPA address space
+ */
+static int virt_kvm_type(MachineState *ms, const char *type_str)
+{
+ VirtMachineState *vms = VIRT_MACHINE(ms);
+ int max_vm_pa_size = kvm_arm_get_max_vm_ipa_size(ms);
+ int requested_pa_size;
+
+ /* we freeze the memory map to compute the highest gpa */
+ virt_set_memmap(vms);
+
+ requested_pa_size = 64 - clz64(vms->highest_gpa);
+
+ if (requested_pa_size > max_vm_pa_size) {
+ error_report("-m and ,maxmem option values "
+ "require an IPA range (%d bits) larger than "
+ "the one supported by the host (%d bits)",
+ requested_pa_size, max_vm_pa_size);
+ exit(1);
+ }
+ /*
+ * By default we return 0 which corresponds to an implicit legacy
+ * 40b IPA setting. Otherwise we return the actual requested PA
+ * logsize
+ */
+ return requested_pa_size > 40 ? requested_pa_size : 0;
+}
+
static void virt_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -1856,6 +1892,7 @@ static void virt_machine_class_init(ObjectClass *oc, void
*data)
mc->cpu_index_to_instance_props = virt_cpu_index_to_props;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15");
mc->get_default_cpu_node_id = virt_get_default_cpu_node_id;
+ mc->kvm_type = virt_kvm_type;
assert(!mc->get_hotplug_handler);
mc->get_hotplug_handler = virt_machine_get_hotplug_handler;
hc->plug = virt_machine_device_plug_cb;
--
2.20.1
- [Qemu-devel] [PATCH v9 00/18] ARM virt: Initial RAM expansion and PCDIMM/NVDIMM support, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 02/18] hw/arm/virt: Rename highmem IO regions, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 01/18] hw/arm/boot: introduce fdt_add_memory_node helper, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 03/18] hw/arm/virt: Split the memory map description, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 04/18] hw/boards: Add a MachineState parameter to kvm_type callback, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 05/18] kvm: add kvm_arm_get_max_vm_ipa_size, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 06/18] vl: Set machine ram_size, maxram_size and ram_slots earlier, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 07/18] hw/arm/virt: Dynamic memory map depending on RAM requirements, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 08/18] hw/arm/virt: Implement kvm_type function for 4.0 machine,
Eric Auger <=
- [Qemu-devel] [PATCH v9 09/18] hw/arm/virt: Check the VCPU PA range in TCG mode, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 10/18] hw/arm/virt: Bump the 255GB initial RAM limit, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 11/18] hw/arm/virt: Add memory hotplug framework, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 13/18] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 12/18] hw/arm/boot: Expose the PC-DIMM nodes in the DT, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 14/18] nvdimm: Use configurable ACPI IO base and size, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 15/18] machine: Move acpi_nvdimm_state into struct MachineState, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 16/18] hw/arm/virt: Add nvdimm hot-plug infrastructure, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 17/18] hw/arm/boot: Expose the pmem nodes in the DT, Eric Auger, 2019/02/26
- [Qemu-devel] [PATCH v9 18/18] hw/arm/virt: Allow nvdimm instantiation, Eric Auger, 2019/02/26