ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/i386: Introduce X86CPUTopoInfo to contain topology info 

This is an effort to re-arrange few data structure for better readability.

1. Add X86CPUTopoInfo which will have all the topology informations
   required to build the cpu topology. There is no functional changes.

2. Introduce init_topo_info to initialize X86CPUTopoInfo members from
   X86MachineState.

3. Update x86 unit tests for new calling convention with parameter X86CPUTopoInfo

There is no functional changes.

Signed-off-by: Babu Moger <babu.moger@amd.com>
Message-Id: <158396717251.58170.4499717831243474938.stgit@naples-babu.amd.com>
This commit is contained in:
Babu Moger 2020-03-11 17:52:52 -05:00 committed by Eduardo Habkost
parent 781c67ca55
commit 53a5e7bddf
5 changed files with 81 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/i386/pc.c
View File

@ -1513,6 +1513,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
X86MachineState *x86ms = X86_MACHINE(pcms); X86MachineState *x86ms = X86_MACHINE(pcms);
unsigned int smp_cores = ms->smp.cores; unsigned int smp_cores = ms->smp.cores;
unsigned int smp_threads = ms->smp.threads; unsigned int smp_threads = ms->smp.threads;
X86CPUTopoInfo topo_info;
if(!object_dynamic_cast(OBJECT(cpu), ms->cpu_type)) { if(!object_dynamic_cast(OBJECT(cpu), ms->cpu_type)) {
error_setg(errp, "Invalid CPU type, expected cpu type: '%s'", error_setg(errp, "Invalid CPU type, expected cpu type: '%s'",
@ -1520,6 +1521,8 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
return; return;
} }
init_topo_info(&topo_info, x86ms);
env->nr_dies = x86ms->smp_dies; env->nr_dies = x86ms->smp_dies;
/* /*
@ -1575,16 +1578,14 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
topo_ids.die_id = cpu->die_id; topo_ids.die_id = cpu->die_id;
topo_ids.core_id = cpu->core_id; topo_ids.core_id = cpu->core_id;
topo_ids.smt_id = cpu->thread_id; topo_ids.smt_id = cpu->thread_id;
cpu->apic_id = apicid_from_topo_ids(x86ms->smp_dies, smp_cores, cpu->apic_id = apicid_from_topo_ids(&topo_info, &topo_ids);
smp_threads, &topo_ids);
} }
cpu_slot = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, &idx); cpu_slot = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, &idx);
if (!cpu_slot) { if (!cpu_slot) {
MachineState *ms = MACHINE(pcms); MachineState *ms = MACHINE(pcms);
x86_topo_ids_from_apicid(cpu->apic_id, x86ms->smp_dies, x86_topo_ids_from_apicid(cpu->apic_id, &topo_info, &topo_ids);
smp_cores, smp_threads, &topo_ids);
error_setg(errp, error_setg(errp,
"Invalid CPU [socket: %u, die: %u, core: %u, thread: %u] with" "Invalid CPU [socket: %u, die: %u, core: %u, thread: %u] with"
" APIC ID %" PRIu32 ", valid index range 0:%d", " APIC ID %" PRIu32 ", valid index range 0:%d",
@ -1605,8 +1606,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
/* TODO: move socket_id/core_id/thread_id checks into x86_cpu_realizefn() /* TODO: move socket_id/core_id/thread_id checks into x86_cpu_realizefn()
* once -smp refactoring is complete and there will be CPU private * once -smp refactoring is complete and there will be CPU private
* CPUState::nr_cores and CPUState::nr_threads fields instead of globals */ * CPUState::nr_cores and CPUState::nr_threads fields instead of globals */
x86_topo_ids_from_apicid(cpu->apic_id, x86ms->smp_dies, x86_topo_ids_from_apicid(cpu->apic_id, &topo_info, &topo_ids);
smp_cores, smp_threads, &topo_ids);
if (cpu->socket_id != -1 && cpu->socket_id != topo_ids.pkg_id) { if (cpu->socket_id != -1 && cpu->socket_id != topo_ids.pkg_id) {
error_setg(errp, "property socket-id: %u doesn't match set apic-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, " 0x%x (socket-id: %u)", cpu->socket_id, cpu->apic_id,

32
hw/i386/x86.c
View File

@ -57,6 +57,16 @@
/* Physical Address of PVH entry point read from kernel ELF NOTE */ /* Physical Address of PVH entry point read from kernel ELF NOTE */
static size_t pvh_start_addr; static size_t pvh_start_addr;
inline void init_topo_info(X86CPUTopoInfo *topo_info,
const X86MachineState *x86ms)
{
MachineState *ms = MACHINE(x86ms);
topo_info->dies_per_pkg = x86ms->smp_dies;
topo_info->cores_per_die = ms->smp.cores;
topo_info->threads_per_core = ms->smp.threads;
}
/* /*
* Calculates initial APIC ID for a specific CPU index * Calculates initial APIC ID for a specific CPU index
* *
@ -68,13 +78,14 @@ static size_t pvh_start_addr;
uint32_t x86_cpu_apic_id_from_index(X86MachineState *x86ms, uint32_t x86_cpu_apic_id_from_index(X86MachineState *x86ms,
unsigned int cpu_index) unsigned int cpu_index)
{ {
MachineState *ms = MACHINE(x86ms);
X86MachineClass *x86mc = X86_MACHINE_GET_CLASS(x86ms); X86MachineClass *x86mc = X86_MACHINE_GET_CLASS(x86ms);
X86CPUTopoInfo topo_info;
uint32_t correct_id; uint32_t correct_id;
static bool warned; static bool warned;
correct_id = x86_apicid_from_cpu_idx(x86ms->smp_dies, ms->smp.cores, init_topo_info(&topo_info, x86ms);
ms->smp.threads, cpu_index);
correct_id = x86_apicid_from_cpu_idx(&topo_info, cpu_index);
if (x86mc->compat_apic_id_mode) { if (x86mc->compat_apic_id_mode) {
if (cpu_index != correct_id && !warned && !qtest_enabled()) { if (cpu_index != correct_id && !warned && !qtest_enabled()) {
error_report("APIC IDs set in compatibility mode, " error_report("APIC IDs set in compatibility mode, "
@ -145,19 +156,22 @@ int64_t x86_get_default_cpu_node_id(const MachineState *ms, int idx)
{ {
X86CPUTopoIDs topo_ids; X86CPUTopoIDs topo_ids;
X86MachineState *x86ms = X86_MACHINE(ms); X86MachineState *x86ms = X86_MACHINE(ms);
X86CPUTopoInfo topo_info;
init_topo_info(&topo_info, x86ms);
assert(idx < ms->possible_cpus->len); assert(idx < ms->possible_cpus->len);
x86_topo_ids_from_apicid(ms->possible_cpus->cpus[idx].arch_id, x86_topo_ids_from_apicid(ms->possible_cpus->cpus[idx].arch_id,
x86ms->smp_dies, ms->smp.cores, &topo_info, &topo_ids);
ms->smp.threads, &topo_ids);
return topo_ids.pkg_id % ms->numa_state->num_nodes; return topo_ids.pkg_id % ms->numa_state->num_nodes;
} }
const CPUArchIdList *x86_possible_cpu_arch_ids(MachineState *ms) const CPUArchIdList *x86_possible_cpu_arch_ids(MachineState *ms)
{ {
X86MachineState *x86ms = X86_MACHINE(ms); X86MachineState *x86ms = X86_MACHINE(ms);
int i;
unsigned int max_cpus = ms->smp.max_cpus; unsigned int max_cpus = ms->smp.max_cpus;
X86CPUTopoInfo topo_info;
int i;
if (ms->possible_cpus) { if (ms->possible_cpus) {
/* /*
@ -171,6 +185,9 @@ const CPUArchIdList *x86_possible_cpu_arch_ids(MachineState *ms)
ms->possible_cpus = g_malloc0(sizeof(CPUArchIdList) + ms->possible_cpus = g_malloc0(sizeof(CPUArchIdList) +
sizeof(CPUArchId) * max_cpus); sizeof(CPUArchId) * max_cpus);
ms->possible_cpus->len = max_cpus; ms->possible_cpus->len = max_cpus;
init_topo_info(&topo_info, x86ms);
for (i = 0; i < ms->possible_cpus->len; i++) { for (i = 0; i < ms->possible_cpus->len; i++) {
X86CPUTopoIDs topo_ids; X86CPUTopoIDs topo_ids;
@ -179,8 +196,7 @@ const CPUArchIdList *x86_possible_cpu_arch_ids(MachineState *ms)
ms->possible_cpus->cpus[i].arch_id = ms->possible_cpus->cpus[i].arch_id =
x86_cpu_apic_id_from_index(x86ms, i); x86_cpu_apic_id_from_index(x86ms, i);
x86_topo_ids_from_apicid(ms->possible_cpus->cpus[i].arch_id, x86_topo_ids_from_apicid(ms->possible_cpus->cpus[i].arch_id,
x86ms->smp_dies, ms->smp.cores, &topo_info, &topo_ids);
ms->smp.threads, &topo_ids);
ms->possible_cpus->cpus[i].props.has_socket_id = true; ms->possible_cpus->cpus[i].props.has_socket_id = true;
ms->possible_cpus->cpus[i].props.socket_id = topo_ids.pkg_id; ms->possible_cpus->cpus[i].props.socket_id = topo_ids.pkg_id;
if (x86ms->smp_dies > 1) { if (x86ms->smp_dies > 1) {

38
include/hw/i386/topology.h
View File

@ -52,6 +52,12 @@ typedef struct X86CPUTopoIDs {
unsigned smt_id; unsigned smt_id;
} X86CPUTopoIDs; } X86CPUTopoIDs;
typedef struct X86CPUTopoInfo {
unsigned dies_per_pkg;
unsigned cores_per_die;
unsigned threads_per_core;
} X86CPUTopoInfo;
/* Return the bit width needed for 'count' IDs /* Return the bit width needed for 'count' IDs
*/ */
static unsigned apicid_bitwidth_for_count(unsigned count) static unsigned apicid_bitwidth_for_count(unsigned count)
@ -119,11 +125,13 @@ static inline unsigned apicid_pkg_offset(unsigned nr_dies,
* *
* The caller must make sure core_id < nr_cores and smt_id < nr_threads. * The caller must make sure core_id < nr_cores and smt_id < nr_threads.
*/ */
static inline apic_id_t apicid_from_topo_ids(unsigned nr_dies, static inline apic_id_t apicid_from_topo_ids(X86CPUTopoInfo *topo_info,
unsigned nr_cores,
unsigned nr_threads,
const X86CPUTopoIDs *topo_ids) const X86CPUTopoIDs *topo_ids)
{ {
unsigned nr_dies = topo_info->dies_per_pkg;
unsigned nr_cores = topo_info->cores_per_die;
unsigned nr_threads = topo_info->threads_per_core;
return (topo_ids->pkg_id << return (topo_ids->pkg_id <<
apicid_pkg_offset(nr_dies, nr_cores, nr_threads)) | apicid_pkg_offset(nr_dies, nr_cores, nr_threads)) |
(topo_ids->die_id << (topo_ids->die_id <<
@ -136,12 +144,14 @@ static inline apic_id_t apicid_from_topo_ids(unsigned nr_dies,
/* Calculate thread/core/package IDs for a specific topology, /* Calculate thread/core/package IDs for a specific topology,
* based on (contiguous) CPU index * based on (contiguous) CPU index
*/ */
static inline void x86_topo_ids_from_idx(unsigned nr_dies, static inline void x86_topo_ids_from_idx(X86CPUTopoInfo *topo_info,
unsigned nr_cores,
unsigned nr_threads,
unsigned cpu_index, unsigned cpu_index,
X86CPUTopoIDs *topo_ids) X86CPUTopoIDs *topo_ids)
{ {
unsigned nr_dies = topo_info->dies_per_pkg;
unsigned nr_cores = topo_info->cores_per_die;
unsigned nr_threads = topo_info->threads_per_core;
topo_ids->pkg_id = cpu_index / (nr_dies * nr_cores * nr_threads); topo_ids->pkg_id = cpu_index / (nr_dies * nr_cores * nr_threads);
topo_ids->die_id = cpu_index / (nr_cores * nr_threads) % nr_dies; topo_ids->die_id = cpu_index / (nr_cores * nr_threads) % nr_dies;
topo_ids->core_id = cpu_index / nr_threads % nr_cores; topo_ids->core_id = cpu_index / nr_threads % nr_cores;
@ -152,11 +162,13 @@ static inline void x86_topo_ids_from_idx(unsigned nr_dies,
* based on APIC ID * based on APIC ID
*/ */
static inline void x86_topo_ids_from_apicid(apic_id_t apicid, static inline void x86_topo_ids_from_apicid(apic_id_t apicid,
unsigned nr_dies, X86CPUTopoInfo *topo_info,
unsigned nr_cores,
unsigned nr_threads,
X86CPUTopoIDs *topo_ids) X86CPUTopoIDs *topo_ids)
{ {
unsigned nr_dies = topo_info->dies_per_pkg;
unsigned nr_cores = topo_info->cores_per_die;
unsigned nr_threads = topo_info->threads_per_core;
topo_ids->smt_id = apicid & topo_ids->smt_id = apicid &
~(0xFFFFFFFFUL << apicid_smt_width(nr_dies, nr_cores, nr_threads)); ~(0xFFFFFFFFUL << apicid_smt_width(nr_dies, nr_cores, nr_threads));
topo_ids->core_id = topo_ids->core_id =
@ -173,14 +185,12 @@ static inline void x86_topo_ids_from_apicid(apic_id_t apicid,
* *
* 'cpu_index' is a sequential, contiguous ID for the CPU. * 'cpu_index' is a sequential, contiguous ID for the CPU.
*/ */
static inline apic_id_t x86_apicid_from_cpu_idx(unsigned nr_dies, static inline apic_id_t x86_apicid_from_cpu_idx(X86CPUTopoInfo *topo_info,
unsigned nr_cores,
unsigned nr_threads,
unsigned cpu_index) unsigned cpu_index)
{ {
X86CPUTopoIDs topo_ids; X86CPUTopoIDs topo_ids;
x86_topo_ids_from_idx(nr_dies, nr_cores, nr_threads, cpu_index, &topo_ids); x86_topo_ids_from_idx(topo_info, cpu_index, &topo_ids);
return apicid_from_topo_ids(nr_dies, nr_cores, nr_threads, &topo_ids); return apicid_from_topo_ids(topo_info, &topo_ids);
} }
#endif /* HW_I386_TOPOLOGY_H */ #endif /* HW_I386_TOPOLOGY_H */

3
include/hw/i386/x86.h
View File

@ -21,6 +21,7 @@
#include "exec/hwaddr.h" #include "exec/hwaddr.h"
#include "qemu/notify.h" #include "qemu/notify.h"
#include "hw/i386/topology.h"
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/nmi.h" #include "hw/nmi.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
@ -82,6 +83,8 @@ typedef struct {
#define X86_MACHINE_CLASS(class) \ #define X86_MACHINE_CLASS(class) \
OBJECT_CLASS_CHECK(X86MachineClass, class, TYPE_X86_MACHINE) OBJECT_CLASS_CHECK(X86MachineClass, class, TYPE_X86_MACHINE)
void init_topo_info(X86CPUTopoInfo *topo_info, const X86MachineState *x86ms);
uint32_t x86_cpu_apic_id_from_index(X86MachineState *pcms, uint32_t x86_cpu_apic_id_from_index(X86MachineState *pcms,
unsigned int cpu_index); unsigned int cpu_index);

43
tests/test-x86-cpuid.c
View File

@ -28,15 +28,18 @@
static void test_topo_bits(void) static void test_topo_bits(void)
{ {
X86CPUTopoInfo topo_info = {0};
/* simple tests for 1 thread per core, 1 core per die, 1 die per package */ /* simple tests for 1 thread per core, 1 core per die, 1 die per package */
g_assert_cmpuint(apicid_smt_width(1, 1, 1), ==, 0); g_assert_cmpuint(apicid_smt_width(1, 1, 1), ==, 0);
g_assert_cmpuint(apicid_core_width(1, 1, 1), ==, 0); g_assert_cmpuint(apicid_core_width(1, 1, 1), ==, 0);
g_assert_cmpuint(apicid_die_width(1, 1, 1), ==, 0); g_assert_cmpuint(apicid_die_width(1, 1, 1), ==, 0);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 1, 1, 0), ==, 0); topo_info = (X86CPUTopoInfo) {1, 1, 1};
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 1, 1, 1), ==, 1); g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 0), ==, 0);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 1, 1, 2), ==, 2); g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1), ==, 1);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 1, 1, 3), ==, 3); g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2), ==, 2);
g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 3), ==, 3);
/* Test field width calculation for multiple values /* Test field width calculation for multiple values
@ -71,36 +74,38 @@ static void test_topo_bits(void)
g_assert_cmpuint(apicid_die_offset(1, 6, 3), ==, 5); g_assert_cmpuint(apicid_die_offset(1, 6, 3), ==, 5);
g_assert_cmpuint(apicid_pkg_offset(1, 6, 3), ==, 5); g_assert_cmpuint(apicid_pkg_offset(1, 6, 3), ==, 5);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 0), ==, 0); topo_info = (X86CPUTopoInfo) {1, 6, 3};
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 1), ==, 1); g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 0), ==, 0);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 2), ==, 2); g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1), ==, 1);
g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2), ==, 2);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 1 * 3 + 0), ==, topo_info = (X86CPUTopoInfo) {1, 6, 3};
g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1 * 3 + 0), ==,
(1 << 2) | 0); (1 << 2) | 0);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 1 * 3 + 1), ==, g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1 * 3 + 1), ==,
(1 << 2) | 1); (1 << 2) | 1);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 1 * 3 + 2), ==, g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1 * 3 + 2), ==,
(1 << 2) | 2); (1 << 2) | 2);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 2 * 3 + 0), ==, g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2 * 3 + 0), ==,
(2 << 2) | 0); (2 << 2) | 0);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 2 * 3 + 1), ==, g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2 * 3 + 1), ==,
(2 << 2) | 1); (2 << 2) | 1);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 2 * 3 + 2), ==, g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2 * 3 + 2), ==,
(2 << 2) | 2); (2 << 2) | 2);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 5 * 3 + 0), ==, g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 5 * 3 + 0), ==,
(5 << 2) | 0); (5 << 2) | 0);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 5 * 3 + 1), ==, g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 5 * 3 + 1), ==,
(5 << 2) | 1); (5 << 2) | 1);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 5 * 3 + 2), ==, g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 5 * 3 + 2), ==,
(5 << 2) | 2); (5 << 2) | 2);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info,
1 * 6 * 3 + 0 * 3 + 0), ==, (1 << 5)); 1 * 6 * 3 + 0 * 3 + 0), ==, (1 << 5));
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info,
1 * 6 * 3 + 1 * 3 + 1), ==, (1 << 5) | (1 << 2) | 1); 1 * 6 * 3 + 1 * 3 + 1), ==, (1 << 5) | (1 << 2) | 1);
g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info,
3 * 6 * 3 + 5 * 3 + 2), ==, (3 << 5) | (5 << 2) | 2); 3 * 6 * 3 + 5 * 3 + 2), ==, (3 << 5) | (5 << 2) | 2);
} }