[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/18] pc: set APIC ID based on socket/core/threa
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v2 07/18] pc: set APIC ID based on socket/core/thread ids if it's not been set yet |
Date: |
Fri, 24 Jun 2016 18:05:55 +0200 |
CPU added with device_add help won't have APIC ID set,
so set it according to socket/core/thread ids provided
with device_add command.
Signed-off-by: Igor Mammedov <address@hidden>
---
v2:
- add validity checks for socket-id/core-id/thread-id values
---
hw/i386/pc.c | 44 +++++++++++++++++++++++++++++++++++++++++---
1 file changed, 41 insertions(+), 3 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index eaa4b59..0a65caf 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1763,14 +1763,52 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
int idx;
+ CPUArchId *cpu_slot;
X86CPUTopoInfo topo;
X86CPU *cpu = X86_CPU(dev);
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
- CPUArchId *cpu_slot = pc_find_cpu_slot(pcms, CPU(dev), &idx);
+ /* if APIC ID is not set, set it based on socket/core/thread properties */
+ if (cpu->apic_id == UNASSIGNED_APIC_ID) {
+ int max_socket = (max_cpus - 1) / smp_threads / smp_cores;
+
+ if (cpu->socket_id < 0) {
+ error_setg(errp, "CPU socket-id is not set");
+ return;
+ } else if (cpu->socket_id > max_socket) {
+ error_setg(errp, "Invalid CPU socket-id: %d must be in range 0:%d",
+ cpu->socket_id, max_socket);
+ return;
+ }
+ if (cpu->core_id < 0) {
+ error_setg(errp, "CPU core-id is not set");
+ return;
+ } else if (cpu->core_id > (smp_cores - 1)) {
+ error_setg(errp, "Invalid CPU core-id: %d must be in range 0:%d",
+ cpu->core_id, smp_cores - 1);
+ return;
+ }
+ if (cpu->thread_id < 0) {
+ error_setg(errp, "CPU thread-id is not set");
+ return;
+ } else if (cpu->thread_id > (smp_threads - 1)) {
+ error_setg(errp, "Invalid CPU thread-id: %d must be in range 0:%d",
+ cpu->thread_id, smp_threads - 1);
+ return;
+ }
+
+ topo.pkg_id = cpu->socket_id;
+ topo.core_id = cpu->core_id;
+ topo.smt_id = cpu->thread_id;
+ cpu->apic_id = apicid_from_topo_ids(smp_cores, smp_threads, &topo);
+ }
+
+ cpu_slot = pc_find_cpu_slot(pcms, CPU(dev), &idx);
if (!cpu_slot) {
- error_setg(errp, "Invalid CPU index with APIC ID (%" PRIu32
- "), valid range 0:%d", cpu->apic_id,
+ x86_topo_ids_from_apicid(cpu->apic_id, smp_cores, smp_threads, &topo);
+ error_setg(errp, "Invalid CPU[socket: %d, core: %d, thread: %d] with"
+ " APIC ID (%" PRIu32 "), valid index range 0:%d",
+ topo.pkg_id, topo.core_id, topo.smt_id, cpu->apic_id,
pcms->possible_cpus->len - 1);
return;
}
--
1.8.3.1
- [Qemu-devel] [PATCH v2 00/18] pc: add CPU hot-add/hot-remove with device_add/device_del, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 02/18] pc: add x86_topo_ids_from_apicid(), Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 03/18] pc: extract CPU lookup into a separate function, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 01/18] target-i386: cpu: use uint32_t for X86CPU.apic_id, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 06/18] target-i386: add socket/core/thread properties to X86CPU, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 04/18] pc: cpu: consolidate apic-id validity checks in pc_cpu_pre_plug(), Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 07/18] pc: set APIC ID based on socket/core/thread ids if it's not been set yet,
Igor Mammedov <=
- [Qemu-devel] [PATCH v2 05/18] target-i386: cpu: replace custom apic-id setter/getter with static property, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 09/18] pc: delay setting number of boot CPUs to machine_done time, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 11/18] pc: cpu: allow device_add to be used with x86 cpu, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 10/18] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug(), Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 12/18] apic: move MAX_APICS check to 'apic' class, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 08/18] pc: implement query-hotpluggable-cpus callback, Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 13/18] apic: drop APICCommonState.idx and use APIC ID as index in local_apics[], Igor Mammedov, 2016/06/24
- [Qemu-devel] [PATCH v2 14/18] (kvm)apic: add unrealize callbacks, Igor Mammedov, 2016/06/24