[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/18] target-i386: add socket/core/thread proper
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v2 06/18] target-i386: add socket/core/thread properties to X86CPU |
Date: |
Fri, 24 Jun 2016 18:05:54 +0200 |
these properties will be used by as address where to plug
CPU with help -device/device_add commands.
Signed-off-by: Igor Mammedov <address@hidden>
---
v2:
- rename socket/core/thread properties to socket-id/core-id/thread-id
- add mismatch checks for apic_id and socket-id/core-id/thread-id
in case both are set
---
hw/i386/pc.c | 29 +++++++++++++++++++++++++++++
target-i386/cpu.c | 6 ++++++
target-i386/cpu.h | 4 ++++
3 files changed, 39 insertions(+)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index db792e6..eaa4b59 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1763,6 +1763,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
int idx;
+ X86CPUTopoInfo topo;
X86CPU *cpu = X86_CPU(dev);
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
CPUArchId *cpu_slot = pc_find_cpu_slot(pcms, CPU(dev), &idx);
@@ -1780,6 +1781,34 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
cpu->apic_id);
return;
}
+
+ /* if 'address' properties socket-id/core-id/thread-id are not set, set
them
+ * so that query_hotpluggable_cpus would show correct values
+ */
+ /* TODO: move socket_id/core_id/thread_id checks into x86_cpu_realizefn()
+ * once -smp refactoring is complete and there will be CPU private
+ * CPUState::nr_cores and CPUState::nr_threads fields instead of globals */
+ x86_topo_ids_from_apicid(cpu->apic_id, smp_cores, smp_threads, &topo);
+ if (cpu->socket_id != -1 && cpu->socket_id != topo.pkg_id) {
+ error_setg(errp, "CPU socket-id: %d mismatch with apic-id: %u",
+ cpu->socket_id, cpu->apic_id);
+ return;
+ }
+ cpu->socket_id = topo.pkg_id;
+
+ if (cpu->core_id != -1 && cpu->core_id != topo.core_id) {
+ error_setg(errp, "CPU core-id: %d mismatch with apic-id: %u",
+ cpu->core_id, cpu->apic_id);
+ return;
+ }
+ cpu->core_id = topo.core_id;
+
+ if (cpu->thread_id != -1 && cpu->thread_id != topo.smt_id) {
+ error_setg(errp, "CPU thread-id: %d mismatch with apic-id: %u",
+ cpu->thread_id, cpu->apic_id);
+ return;
+ }
+ cpu->thread_id = topo.smt_id;
}
static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 9294b3d..1ec40a0 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -3164,8 +3164,14 @@ static Property x86_cpu_properties[] = {
#ifdef CONFIG_USER_ONLY
/* apic_id = 0 by default for *-user, see commit 9886e834 */
DEFINE_PROP_UINT32("apic-id", X86CPU, apic_id, 0),
+ DEFINE_PROP_INT32("thread-id", X86CPU, thread_id, 0),
+ DEFINE_PROP_INT32("core-id", X86CPU, core_id, 0),
+ DEFINE_PROP_INT32("socket-id", X86CPU, socket_id, 0),
#else
DEFINE_PROP_UINT32("apic-id", X86CPU, apic_id, UNASSIGNED_APIC_ID),
+ DEFINE_PROP_INT32("thread-id", X86CPU, thread_id, -1),
+ DEFINE_PROP_INT32("core-id", X86CPU, core_id, -1),
+ DEFINE_PROP_INT32("socket-id", X86CPU, socket_id, -1),
#endif
DEFINE_PROP_BOOL("pmu", X86CPU, enable_pmu, false),
{ .name = "hv-spinlocks", .info = &qdev_prop_spinlocks },
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 8b09cfa..e110633 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -1190,6 +1190,10 @@ struct X86CPU {
Notifier machine_done;
struct kvm_msrs *kvm_msr_buf;
+
+ int32_t socket_id;
+ int32_t core_id;
+ int32_t thread_id;
};
static inline X86CPU *x86_env_get_cpu(CPUX86State *env)
--
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 <=
- [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, 2016/06/24
- [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