[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/28] target-i386: Add socket/core/thread properties
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 11/28] target-i386: Add socket/core/thread properties to X86CPU |
Date: |
Tue, 19 Jul 2016 14:22:39 -0300 |
From: Igor Mammedov <address@hidden>
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>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
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 0ecf90f..2ca1350 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1798,6 +1798,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);
@@ -1815,6 +1816,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, "property socket-id: %u doesn't match set apic-id:"
+ " 0x%x (socket-id: %u)", cpu->socket_id, cpu->apic_id,
topo.pkg_id);
+ return;
+ }
+ cpu->socket_id = topo.pkg_id;
+
+ if (cpu->core_id != -1 && cpu->core_id != topo.core_id) {
+ error_setg(errp, "property core-id: %u doesn't match set apic-id:"
+ " 0x%x (core-id: %u)", cpu->core_id, cpu->apic_id, topo.core_id);
+ return;
+ }
+ cpu->core_id = topo.core_id;
+
+ if (cpu->thread_id != -1 && cpu->thread_id != topo.smt_id) {
+ error_setg(errp, "property thread-id: %u doesn't match set apic-id:"
+ " 0x%x (thread-id: %u)", cpu->thread_id, cpu->apic_id,
topo.smt_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 a91b5bb..a2d7182 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -3318,8 +3318,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 4d8748f..7c9eaea 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -1222,6 +1222,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)
--
2.5.5
- [Qemu-devel] [PULL 01/28] target-i386: Provide TCG_PHYS_ADDR_BITS, (continued)
- [Qemu-devel] [PULL 01/28] target-i386: Provide TCG_PHYS_ADDR_BITS, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 02/28] target-i386: Allow physical address bits to be set, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 03/28] target-i386: Mask mtrr mask based on CPU physical address limits, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 05/28] target-i386: Use uint32_t for X86CPU.apic_id, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 04/28] target-i386: Fill high bits of mtrr mask, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 06/28] pc: Add x86_topo_ids_from_apicid(), Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 07/28] target-i386: Set physical address bits based on host, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 09/28] pc: cpu: Consolidate apic-id validity checks in pc_cpu_pre_plug(), Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 08/28] pc: Extract CPU lookup into a separate function, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 10/28] target-i386: Replace custom apic-id setter/getter with static property, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 11/28] target-i386: Add socket/core/thread properties to X86CPU,
Eduardo Habkost <=
- [Qemu-devel] [PULL 12/28] target-i386: Add support for UMIP and RDPID CPUID bits, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 13/28] target-i386: cpu: Do not ignore error and fix apic parent, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 14/28] target-i386: Fix apic object leak when CPU is deleted, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 15/28] pc: Set APIC ID based on socket/core/thread ids if it's not been set yet, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 17/28] pc: Register created initial and hotpluged CPUs in one place pc_cpu_plug(), Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 16/28] pc: Delay setting number of boot CPUs to machine_done time, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 18/28] pc: Forbid BSP removal, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 19/28] pc: Enforce adding CPUs contiguously and removing them in opposite order, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 20/28] pc: cpu: Allow device_add to be used with x86 cpu, Eduardo Habkost, 2016/07/19
- [Qemu-devel] [PULL 21/28] pc: Implement query-hotpluggable-cpus callback, Eduardo Habkost, 2016/07/19