56dbf757e2
Establish all pre-sizing facilities based on cpu_hotplug_enabled field. Note: PPTT is constructed for possible_cpus, so it does not need to pre-sizing it. Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com> Signed-off-by: Salil Mehta <salil.mehta@huawei.com> (cherry picked from commit c01cf3e56182eea0b0a469a91ccbfcaf37c4c5e6)
93 lines
3.2 KiB
Diff
93 lines
3.2 KiB
Diff
From 3063d421cd68937ece290bc02151cc15b7ec33d0 Mon Sep 17 00:00:00 2001
|
|
From: Keqian Zhu <zhukeqian1@huawei.com>
|
|
Date: Fri, 10 Apr 2020 13:55:11 +0800
|
|
Subject: [PATCH] arm/virt: Pre-sizing MADT-GICC GICv3 and Pre-park KVM vCPU
|
|
|
|
Establish all pre-sizing facilities based on cpu_hotplug_enabled
|
|
field.
|
|
|
|
Note: PPTT is constructed for possible_cpus, so it does not need
|
|
to pre-sizing it.
|
|
|
|
Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
|
|
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
|
|
---
|
|
hw/arm/virt-acpi-build.c | 3 +++
|
|
hw/arm/virt.c | 14 ++++++++++++--
|
|
target/arm/kvm.c | 4 ++--
|
|
3 files changed, 17 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
|
|
index a16b54086e..1101161d70 100644
|
|
--- a/hw/arm/virt-acpi-build.c
|
|
+++ b/hw/arm/virt-acpi-build.c
|
|
@@ -859,6 +859,9 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
|
|
build_append_int_noprefix(table_data, vms->gic_version, 1);
|
|
build_append_int_noprefix(table_data, 0, 3); /* Reserved */
|
|
|
|
+ if (vms->cpu_hotplug_enabled) {
|
|
+ num_cpu = ms->smp.max_cpus;
|
|
+ }
|
|
for (i = 0; i < num_cpu; i++) {
|
|
virt_madt_cpu_entry(NULL, i, possible_cpus, table_data, false);
|
|
}
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
index 45a0a045b1..4eb1b44729 100644
|
|
--- a/hw/arm/virt.c
|
|
+++ b/hw/arm/virt.c
|
|
@@ -833,6 +833,9 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem)
|
|
unsigned int smp_cpus = ms->smp.cpus;
|
|
uint32_t nb_redist_regions = 0;
|
|
|
|
+ if (vms->cpu_hotplug_enabled) {
|
|
+ num_cpus = ms->smp.max_cpus;
|
|
+ }
|
|
assert(num_cpus >= smp_cpus);
|
|
|
|
gictype = (type == 3) ? gicv3_class_name() : gic_class_name();
|
|
@@ -2119,8 +2122,15 @@ static void machvirt_init(MachineState *machine)
|
|
Object *cpuobj;
|
|
CPUState *cs;
|
|
|
|
+ if (kvm_enabled() && vms->cpu_hotplug_enabled) {
|
|
+ if (kvm_create_parked_vcpu(n) < 0) {
|
|
+ error_report("mach-virt: Create KVM parked vCPU failed");
|
|
+ exit(1);
|
|
+ }
|
|
+ }
|
|
+
|
|
if (n >= smp_cpus) {
|
|
- break;
|
|
+ continue;
|
|
}
|
|
|
|
cpuobj = object_new(possible_cpus->cpus[n].type);
|
|
@@ -2208,7 +2218,7 @@ static void machvirt_init(MachineState *machine)
|
|
}
|
|
|
|
vms->bootinfo.ram_size = machine->ram_size;
|
|
- vms->bootinfo.nb_cpus = smp_cpus;
|
|
+ vms->bootinfo.nb_cpus = vms->cpu_hotplug_enabled ? max_cpus : smp_cpus;
|
|
vms->bootinfo.board_id = -1;
|
|
vms->bootinfo.loader_start = vms->memmap[VIRT_MEM].base;
|
|
vms->bootinfo.get_dtb = machvirt_dtb;
|
|
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
|
|
index 59d556724f..29ac3f40e0 100644
|
|
--- a/target/arm/kvm.c
|
|
+++ b/target/arm/kvm.c
|
|
@@ -262,9 +262,9 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
|
|
|
|
cap_has_mp_state = kvm_check_extension(s, KVM_CAP_MP_STATE);
|
|
|
|
- if (ms->smp.cpus > 256 &&
|
|
+ if (ms->smp.max_cpus > 256 &&
|
|
!kvm_check_extension(s, KVM_CAP_ARM_IRQ_LINE_LAYOUT_2)) {
|
|
- error_report("Using more than 256 vcpus requires a host kernel "
|
|
+ error_report("Using more than max 256 vcpus requires a host kernel "
|
|
"with KVM_CAP_ARM_IRQ_LINE_LAYOUT_2");
|
|
ret = -EINVAL;
|
|
}
|
|
--
|
|
2.27.0
|
|
|