Skip to contentSkip to conversation

x86: Set maximum APIC ID to KVM prior to vCPU creation

PATCH Superseded Zeng Guang 2 participants 2 messages May 20, 2022 KVM

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Zeng Guang

author
#0 lore raw

PATCH 1/1 x86: Set maximum APIC ID to KVM prior to vCPU creation

Specify maximum possible APIC ID assigned for current VM session prior to the creation of vCPUs. KVM need set up VM-scoped data structure indexed by the APIC ID, e.g. Posted-Interrupt Descriptor table to support Intel IPI virtualization.

It can be achieved by calling KVM_ENABLE_CAP for KVM_CAP_MAX_VCPU_ID capability once KVM has already enabled it. Otherwise, simply prompts that KVM doesn't support this capability yet.

---
 hw/i386/x86.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
hw/i386/x86.c +8 -1
index 4cf107baea..ff74492325 100644
@@ -106,7 +106,7 @@ out:
 
 void x86_cpus_init(X86MachineState *x86ms, int default_cpu_version)
 {
-    int i;
+    int i, ret;
     const CPUArchIdList *possible_cpus;
     MachineState *ms = MACHINE(x86ms);
     MachineClass *mc = MACHINE_GET_CLASS(x86ms);
@@ -123,6 +123,13 @@ void x86_cpus_init(X86MachineState *x86ms, int default_cpu_version)
      */
     x86ms->apic_id_limit = x86_cpu_apic_id_from_index(x86ms,
                                                       ms->smp.max_cpus - 1) + 1;
+
+    ret = kvm_vm_enable_cap(kvm_state, KVM_CAP_MAX_VCPU_ID,
+                            0, x86ms->apic_id_limit);
+    if (ret < 0) {
+        error_report("kvm: Set max vcpu id not supported: %s", strerror(-ret));
+    }
+
     possible_cpus = mc->possible_cpu_arch_ids(ms);
     for (i = 0; i < ms->smp.cpus; i++) {
         x86_cpu_new(x86ms, possible_cpus->cpus[i].arch_id, &error_fatal);
Signature · 1 line
2.27.0
#1 lore raw
Quoted 28 lines · Zeng Guang

Specify maximum possible APIC ID assigned for current VM session prior to the creation of vCPUs. KVM need set up VM-scoped data structure indexed by the APIC ID, e.g. Posted-Interrupt Descriptor table to support Intel IPI virtualization.

It can be achieved by calling KVM_ENABLE_CAP for KVM_CAP_MAX_VCPU_ID capability once KVM has already enabled it. Otherwise, simply prompts that KVM doesn't support this capability yet.

---
hw/i386/x86.c | 9 ++++++++-

1 file changed, 8 insertions(+), 1 deletion(-)
hw/i386/x86.c +1 -1
index 4cf107baea..ff74492325 100644
@@ -106,7 +106,7 @@ out:
 
 void x86_cpus_init(X86MachineState *x86ms, int default_cpu_version)
 {
-    int i;
+    int i, ret;
    const CPUArchIdList *possible_cpus;
    MachineState *ms = MACHINE(x86ms);
    MachineClass *mc = MACHINE_GET_CLASS(x86ms);

hw/i386/x86.c void x86_cpus_init(X86MachineState *x86ms, int default_cpu_version) · line 131

Quoted 9 lines
hw/i386/x86.c +6 -0
@@ -123,6 +123,13 @@ void x86_cpus_init(X86MachineState *x86ms, int default_cpu_version)
     */
    x86ms->apic_id_limit = x86_cpu_apic_id_from_index(x86ms,
                                                      ms->smp.max_cpus - 1) + 1;
+
+    ret = kvm_vm_enable_cap(kvm_state, KVM_CAP_MAX_VCPU_ID,
+                            0, x86ms->apic_id_limit);
+    if (ret < 0) {
+        error_report("kvm: Set max vcpu id not supported: %s", strerror(-ret));
+    }

This piece of code is specific to KVM. Please move it to kvm-all.c and invoke a wrapper function here. As kvm accelerator isn't necessarily enabled, the function call should be guarded by kvm_enabled().

And I think the error message can be omitted because the failure doesn't impact functionality; just a few more pages will be allocated by KVM.