From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKmyV-0004lg-5b for qemu-devel@nongnu.org; Tue, 04 Mar 2014 05:53:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKmyQ-0006rL-Ib for qemu-devel@nongnu.org; Tue, 04 Mar 2014 05:53:27 -0500 Received: from [222.73.24.84] (port=17034 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKmyP-0006m6-UQ for qemu-devel@nongnu.org; Tue, 04 Mar 2014 05:53:22 -0500 From: Chen Fan Date: Tue, 4 Mar 2014 18:50:24 +0800 Message-Id: <0b227e7e367d94b94af123b79a114ae61f7ad17a.1393929947.git.chen.fan.fnst@cn.fujitsu.com> In-Reply-To: References: Subject: [Qemu-devel] [RFC v2 1/2] i386: introduce "struct X86TopoInfo" for saving cpu topology information List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: chen.fan.fnst@cn.fujitsu.com, qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Eduardo Habkost Signed-off-by: Chen Fan --- hw/i386/pc.c | 13 +++++++++---- target-i386/cpu.c | 16 ++++++++++++++++ target-i386/cpu.h | 4 ++++ target-i386/topology.h | 7 +++++++ 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 348b15f..a4d539e 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -927,11 +927,12 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level) } } -static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id, +static X86CPU *pc_new_cpu(const char *cpu_model, X86TopoInfo *topo, DeviceState *icc_bridge, Error **errp) { X86CPU *cpu; Error *local_err = NULL; + int64_t apic_id = x86_cpu_apic_id_from_index(topo->cpu_index); cpu = cpu_x86_create(cpu_model, icc_bridge, &local_err); if (local_err != NULL) { @@ -956,6 +957,7 @@ void pc_hot_add_cpu(const int64_t id, Error **errp) { DeviceState *icc_bridge; int64_t apic_id = x86_cpu_apic_id_from_index(id); + X86TopoInfo *topo; if (id < 0) { error_setg(errp, "Invalid CPU id: %" PRIi64, id); @@ -976,7 +978,9 @@ void pc_hot_add_cpu(const int64_t id, Error **errp) icc_bridge = DEVICE(object_resolve_path_type("icc-bridge", TYPE_ICC_BRIDGE, NULL)); - pc_new_cpu(current_cpu_model, apic_id, icc_bridge, errp); + topo = x86_cpu_topo_from_index(id); + pc_new_cpu(current_cpu_model, topo, icc_bridge, errp); + g_free(topo); } void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) @@ -996,8 +1000,9 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) current_cpu_model = cpu_model; for (i = 0; i < smp_cpus; i++) { - cpu = pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i), - icc_bridge, &error); + X86TopoInfo *topo = x86_cpu_topo_from_index(i); + cpu = pc_new_cpu(cpu_model, topo, icc_bridge, &error); + g_free(topo); if (error) { error_report("%s", error_get_pretty(error)); error_free(error); diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 0e8812a..1858a66 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2609,6 +2609,22 @@ uint32_t x86_cpu_apic_id_from_index(unsigned int cpu_index) } } +X86TopoInfo *x86_cpu_topo_from_index(unsigned int cpu_index) +{ + unsigned pkg_id, core_id, smt_id; + X86TopoInfo *x86TopoInfo; + + x86TopoInfo = g_malloc0(sizeof(X86TopoInfo)); + x86_topo_ids_from_idx(smp_cores, smp_threads, cpu_index, + &pkg_id, &core_id, &smt_id); + x86TopoInfo->pkg_id = pkg_id; + x86TopoInfo->core_id = core_id; + x86TopoInfo->smt_id = smt_id; + x86TopoInfo->cpu_index = cpu_index; + + return x86TopoInfo; +} + static void x86_cpu_initfn(Object *obj) { CPUState *cs = CPU(obj); diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 1b94f0f..1647394 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1283,6 +1283,10 @@ const char *get_register_name_32(unsigned int reg); uint32_t x86_cpu_apic_id_from_index(unsigned int cpu_index); void enable_compat_apic_id_mode(void); +#include "topology.h" + +X86TopoInfo *x86_cpu_topo_from_index(unsigned int cpu_index); + #define APIC_DEFAULT_ADDRESS 0xfee00000 #define APIC_SPACE_SIZE 0x100000 diff --git a/target-i386/topology.h b/target-i386/topology.h index 07a6c5f..6f4886d 100644 --- a/target-i386/topology.h +++ b/target-i386/topology.h @@ -131,4 +131,11 @@ static inline apic_id_t x86_apicid_from_cpu_idx(unsigned nr_cores, return apicid_from_topo_ids(nr_cores, nr_threads, pkg_id, core_id, smt_id); } +typedef struct X86TopoInfo { + unsigned smt_id; + unsigned core_id; + unsigned pkg_id; + unsigned cpu_index; +} X86TopoInfo; + #endif /* TARGET_I386_TOPOLOGY_H */ -- 1.8.1.4