mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-30 07:13:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

pc: calculate topology only once when possible_cpus is initialised

Browse Source 
Fill in CpuInstanceProperties once at board init time and
just copy them whenever query_hotpluggable_cpus() is called.
It will keep topology info always available without need
to recalculate it every time it's needed.
Considering it has NUMA node id, it will be used to keep
NUMA node to cpu mapping instead of numa_info[i].node_cpu
bitmasks.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Igor Mammedov 2017-02-09 12:08:34 +01:00 committed by David Gibson
parent c96a1c0ba6
commit c67ae9333c
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/i386/pc.c
View File

@ -2268,7 +2268,17 @@ static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms)
sizeof(CPUArchId) * max_cpus); sizeof(CPUArchId) * max_cpus);
ms->possible_cpus->len = max_cpus; ms->possible_cpus->len = max_cpus;
for (i = 0; i < ms->possible_cpus->len; i++) { for (i = 0; i < ms->possible_cpus->len; i++) {
X86CPUTopoInfo topo;
ms->possible_cpus->cpus[i].arch_id = x86_cpu_apic_id_from_index(i); ms->possible_cpus->cpus[i].arch_id = x86_cpu_apic_id_from_index(i);
x86_topo_ids_from_apicid(ms->possible_cpus->cpus[i].arch_id,
smp_cores, smp_threads, &topo);
ms->possible_cpus->cpus[i].props.has_socket_id = true;
ms->possible_cpus->cpus[i].props.socket_id = topo.pkg_id;
ms->possible_cpus->cpus[i].props.has_core_id = true;
ms->possible_cpus->cpus[i].props.core_id = topo.core_id;
ms->possible_cpus->cpus[i].props.has_thread_id = true;
ms->possible_cpus->cpus[i].props.thread_id = topo.smt_id;
} }
return ms->possible_cpus; return ms->possible_cpus;
} }
@ -2285,23 +2295,13 @@ static HotpluggableCPUList *pc_query_hotpluggable_cpus(MachineState *machine)
cpu_type = object_class_get_name(OBJECT_CLASS(CPU_GET_CLASS(cpu))); cpu_type = object_class_get_name(OBJECT_CLASS(CPU_GET_CLASS(cpu)));
for (i = 0; i < machine->possible_cpus->len; i++) { for (i = 0; i < machine->possible_cpus->len; i++) {
X86CPUTopoInfo topo;
HotpluggableCPUList *list_item = g_new0(typeof(*list_item), 1); HotpluggableCPUList *list_item = g_new0(typeof(*list_item), 1);
HotpluggableCPU *cpu_item = g_new0(typeof(*cpu_item), 1); HotpluggableCPU *cpu_item = g_new0(typeof(*cpu_item), 1);
CpuInstanceProperties *cpu_props = g_new0(typeof(*cpu_props), 1);
const uint32_t apic_id = machine->possible_cpus->cpus[i].arch_id;
x86_topo_ids_from_apicid(apic_id, smp_cores, smp_threads, &topo);
cpu_item->type = g_strdup(cpu_type); cpu_item->type = g_strdup(cpu_type);
cpu_item->vcpus_count = 1; cpu_item->vcpus_count = 1;
cpu_props->has_socket_id = true; cpu_item->props = g_memdup(&machine->possible_cpus->cpus[i].props,
cpu_props->socket_id = topo.pkg_id; sizeof(*cpu_item->props));
cpu_props->has_core_id = true;
cpu_props->core_id = topo.core_id;
cpu_props->has_thread_id = true;
cpu_props->thread_id = topo.smt_id;
cpu_item->props = cpu_props;
cpu = machine->possible_cpus->cpus[i].cpu; cpu = machine->possible_cpus->cpus[i].cpu;
if (cpu) { if (cpu) {

2
include/hw/boards.h
View File

@ -46,9 +46,11 @@ void machine_register_compat_props(MachineState *machine);
* CPUArchId: * CPUArchId:
* @arch_id - architecture-dependent CPU ID of present or possible CPU * @arch_id - architecture-dependent CPU ID of present or possible CPU
* @cpu - pointer to corresponding CPU object if it's present on NULL otherwise * @cpu - pointer to corresponding CPU object if it's present on NULL otherwise
* @props - CPU object properties, initialized by board
*/ */
typedef struct { typedef struct {
uint64_t arch_id; uint64_t arch_id;
CpuInstanceProperties props;
struct CPUState *cpu; struct CPUState *cpu;
} CPUArchId; } CPUArchId;