| Message ID | 20190612084104.34984-5-like.xu@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Introduce cpu die topology and enable CPUID.1F for i386 | expand |
On Wed, Jun 12, 2019 at 04:40:59PM +0800, Like Xu wrote: > In new sockets/dies/cores/threads model, the apicid of logical cpu could > imply die level info of guest cpu topology thus x86_apicid_from_cpu_idx() > need to be refactored with #dies value, so does apicid_*_offset(). > > To keep semantic compatibility, the legacy pkg_offset which helps to > generate CPUIDs such as 0x3 for L3 cache should be mapping to die_offset. > > Signed-off-by: Like Xu <like.xu@linux.intel.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > --- > hw/i386/pc.c | 29 ++++++++++----- > include/hw/i386/topology.h | 76 +++++++++++++++++++++++++++----------- > target/i386/cpu.c | 13 ++++--- > 3 files changed, 81 insertions(+), 37 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 6e774c6c8e..b4dbd1064d 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -933,10 +933,11 @@ void enable_compat_apic_id_mode(void) > static uint32_t x86_cpu_apic_id_from_index(MachineState *ms, > unsigned int cpu_index) > { > + PCMachineState *pcms = PC_MACHINE(ms); > uint32_t correct_id; > static bool warned; > > - correct_id = x86_apicid_from_cpu_idx(ms->smp.cores, > + correct_id = x86_apicid_from_cpu_idx(pcms->smp_dies, ms->smp.cores, > ms->smp.threads, cpu_index); > if (compat_apic_id_mode) { > if (cpu_index != correct_id && !warned && !qtest_enabled()) { > @@ -2355,18 +2356,21 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, > topo.die_id = cpu->die_id; > topo.core_id = cpu->core_id; > topo.smt_id = cpu->thread_id; > - cpu->apic_id = apicid_from_topo_ids(smp_cores, smp_threads, &topo); > + cpu->apic_id = apicid_from_topo_ids(pcms->smp_dies, smp_cores, > + smp_threads, &topo); > } > > cpu_slot = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, &idx); > if (!cpu_slot) { > MachineState *ms = MACHINE(pcms); > > - x86_topo_ids_from_apicid(cpu->apic_id, smp_cores, smp_threads, &topo); > - error_setg(errp, "Invalid CPU [socket: %u, core: %u, thread: %u] with" > - " APIC ID %" PRIu32 ", valid index range 0:%d", > - topo.pkg_id, topo.core_id, topo.smt_id, cpu->apic_id, > - ms->possible_cpus->len - 1); > + x86_topo_ids_from_apicid(cpu->apic_id, pcms->smp_dies, > + smp_cores, smp_threads, &topo); > + error_setg(errp, > + "Invalid CPU [socket: %u, die: %u, core: %u, thread: %u] with" > + " APIC ID %" PRIu32 ", valid index range 0:%d", > + topo.pkg_id, topo.die_id, topo.core_id, topo.smt_id, > + cpu->apic_id, ms->possible_cpus->len - 1); > return; > } > > @@ -2382,7 +2386,8 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, > /* 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); > + x86_topo_ids_from_apicid(cpu->apic_id, pcms->smp_dies, > + 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); > @@ -2679,10 +2684,12 @@ pc_cpu_index_to_props(MachineState *ms, unsigned cpu_index) > static int64_t pc_get_default_cpu_node_id(const MachineState *ms, int idx) > { > X86CPUTopoInfo topo; > + PCMachineState *pcms = PC_MACHINE(ms); > > assert(idx < ms->possible_cpus->len); > x86_topo_ids_from_apicid(ms->possible_cpus->cpus[idx].arch_id, > - ms->smp.cores, ms->smp.threads, &topo); > + pcms->smp_dies, ms->smp.cores, > + ms->smp.threads, &topo); > return topo.pkg_id % nb_numa_nodes; > } > > @@ -2690,6 +2697,7 @@ static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms) > { > int i; > unsigned int max_cpus = ms->smp.max_cpus; > + PCMachineState *pcms = PC_MACHINE(ms); > > if (ms->possible_cpus) { > /* > @@ -2710,7 +2718,8 @@ static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms) > ms->possible_cpus->cpus[i].vcpus_count = 1; > ms->possible_cpus->cpus[i].arch_id = x86_cpu_apic_id_from_index(ms, i); > x86_topo_ids_from_apicid(ms->possible_cpus->cpus[i].arch_id, > - ms->smp.cores, ms->smp.threads, &topo); > + pcms->smp_dies, ms->smp.cores, > + ms->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_die_id = true; > diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h > index c9fb41588e..4ff5b2da6c 100644 > --- a/include/hw/i386/topology.h > +++ b/include/hw/i386/topology.h > @@ -63,88 +63,120 @@ static unsigned apicid_bitwidth_for_count(unsigned count) > > /* Bit width of the SMT_ID (thread ID) field on the APIC ID > */ > -static inline unsigned apicid_smt_width(unsigned nr_cores, unsigned nr_threads) > +static inline unsigned apicid_smt_width(unsigned nr_dies, > + unsigned nr_cores, > + unsigned nr_threads) > { > return apicid_bitwidth_for_count(nr_threads); > } > > /* Bit width of the Core_ID field > */ > -static inline unsigned apicid_core_width(unsigned nr_cores, unsigned nr_threads) > +static inline unsigned apicid_core_width(unsigned nr_dies, > + unsigned nr_cores, > + unsigned nr_threads) > { > return apicid_bitwidth_for_count(nr_cores); > } > > +/* Bit width of the Die_ID field */ > +static inline unsigned apicid_die_width(unsigned nr_dies, > + unsigned nr_cores, > + unsigned nr_threads) > +{ > + return apicid_bitwidth_for_count(nr_dies); > +} > + > /* Bit offset of the Core_ID field > */ > -static inline unsigned apicid_core_offset(unsigned nr_cores, > +static inline unsigned apicid_core_offset(unsigned nr_dies, > + unsigned nr_cores, > unsigned nr_threads) > { > - return apicid_smt_width(nr_cores, nr_threads); > + return apicid_smt_width(nr_dies, nr_cores, nr_threads); > +} > + > +/* Bit offset of the Die_ID field */ > +static inline unsigned apicid_die_offset(unsigned nr_dies, > + unsigned nr_cores, > + unsigned nr_threads) > +{ > + return apicid_core_offset(nr_dies, nr_cores, nr_threads) + > + apicid_core_width(nr_dies, nr_cores, nr_threads); > } > > /* Bit offset of the Pkg_ID (socket ID) field > */ > -static inline unsigned apicid_pkg_offset(unsigned nr_cores, unsigned nr_threads) > +static inline unsigned apicid_pkg_offset(unsigned nr_dies, > + unsigned nr_cores, > + unsigned nr_threads) > { > - return apicid_core_offset(nr_cores, nr_threads) + > - apicid_core_width(nr_cores, nr_threads); > + return apicid_die_offset(nr_dies, nr_cores, nr_threads) + > + apicid_die_width(nr_dies, nr_cores, nr_threads); > } > > /* Make APIC ID for the CPU based on Pkg_ID, Core_ID, SMT_ID > * > * 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_cores, > +static inline apic_id_t apicid_from_topo_ids(unsigned nr_dies, > + unsigned nr_cores, > unsigned nr_threads, > const X86CPUTopoInfo *topo) > { > - return (topo->pkg_id << apicid_pkg_offset(nr_cores, nr_threads)) | > - (topo->core_id << apicid_core_offset(nr_cores, nr_threads)) | > + return (topo->pkg_id << apicid_pkg_offset(nr_dies, nr_cores, nr_threads)) | > + (topo->die_id << apicid_die_offset(nr_dies, nr_cores, nr_threads)) | > + (topo->core_id << apicid_core_offset(nr_dies, nr_cores, nr_threads)) | > topo->smt_id; > } > > /* Calculate thread/core/package IDs for a specific topology, > * based on (contiguous) CPU index > */ > -static inline void x86_topo_ids_from_idx(unsigned nr_cores, > +static inline void x86_topo_ids_from_idx(unsigned nr_dies, > + unsigned nr_cores, > unsigned nr_threads, > unsigned cpu_index, > X86CPUTopoInfo *topo) > { > - unsigned core_index = cpu_index / nr_threads; > + topo->pkg_id = cpu_index / (nr_dies * nr_cores * nr_threads); > + topo->die_id = cpu_index / (nr_cores * nr_threads) % nr_dies; > + topo->core_id = cpu_index / nr_threads % nr_cores; > topo->smt_id = cpu_index % nr_threads; > - topo->core_id = core_index % nr_cores; > - topo->pkg_id = core_index / nr_cores; > } > > /* Calculate thread/core/package IDs for a specific topology, > * based on APIC ID > */ > static inline void x86_topo_ids_from_apicid(apic_id_t apicid, > + unsigned nr_dies, > unsigned nr_cores, > unsigned nr_threads, > X86CPUTopoInfo *topo) > { > topo->smt_id = apicid & > - ~(0xFFFFFFFFUL << apicid_smt_width(nr_cores, nr_threads)); > - topo->core_id = (apicid >> apicid_core_offset(nr_cores, nr_threads)) & > - ~(0xFFFFFFFFUL << apicid_core_width(nr_cores, nr_threads)); > - topo->pkg_id = apicid >> apicid_pkg_offset(nr_cores, nr_threads); > - topo->die_id = 0; > + ~(0xFFFFFFFFUL << apicid_smt_width(nr_dies, nr_cores, nr_threads)); > + topo->core_id = > + (apicid >> apicid_core_offset(nr_dies, nr_cores, nr_threads)) & > + ~(0xFFFFFFFFUL << apicid_core_width(nr_dies, nr_cores, nr_threads)); > + topo->die_id = > + (apicid >> apicid_die_offset(nr_dies, nr_cores, nr_threads)) & > + ~(0xFFFFFFFFUL << apicid_die_width(nr_dies, nr_cores, nr_threads)); > + topo->pkg_id = apicid >> apicid_pkg_offset(nr_dies, nr_cores, nr_threads); > } > > /* Make APIC ID for the CPU 'cpu_index' > * > * 'cpu_index' is a sequential, contiguous ID for the CPU. > */ > -static inline apic_id_t x86_apicid_from_cpu_idx(unsigned nr_cores, > +static inline apic_id_t x86_apicid_from_cpu_idx(unsigned nr_dies, > + unsigned nr_cores, > unsigned nr_threads, > unsigned cpu_index) > { > X86CPUTopoInfo topo; > - x86_topo_ids_from_idx(nr_cores, nr_threads, cpu_index, &topo); > - return apicid_from_topo_ids(nr_cores, nr_threads, &topo); > + x86_topo_ids_from_idx(nr_dies, nr_cores, nr_threads, cpu_index, &topo); > + return apicid_from_topo_ids(nr_dies, nr_cores, nr_threads, &topo); > } > > #endif /* HW_I386_TOPOLOGY_H */ > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > index 0fc543096f..09e20a2c3b 100644 > --- a/target/i386/cpu.c > +++ b/target/i386/cpu.c > @@ -4245,7 +4245,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, > { > X86CPU *cpu = env_archcpu(env); > CPUState *cs = env_cpu(env); > - uint32_t pkg_offset; > + uint32_t die_offset; > uint32_t limit; > uint32_t signature[3]; > > @@ -4334,10 +4334,11 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, > eax, ebx, ecx, edx); > break; > case 3: /* L3 cache info */ > - pkg_offset = apicid_pkg_offset(cs->nr_cores, cs->nr_threads); > + die_offset = apicid_die_offset(env->nr_dies, > + cs->nr_cores, cs->nr_threads); > if (cpu->enable_l3_cache) { > encode_cache_cpuid4(env->cache_info_cpuid4.l3_cache, > - (1 << pkg_offset), cs->nr_cores, > + (1 << die_offset), cs->nr_cores, > eax, ebx, ecx, edx); > break; > } > @@ -4419,12 +4420,14 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, > > switch (count) { > case 0: > - *eax = apicid_core_offset(cs->nr_cores, cs->nr_threads); > + *eax = apicid_core_offset(env->nr_dies, > + cs->nr_cores, cs->nr_threads); > *ebx = cs->nr_threads; > *ecx |= CPUID_TOPOLOGY_LEVEL_SMT; > break; > case 1: > - *eax = apicid_pkg_offset(cs->nr_cores, cs->nr_threads); > + *eax = apicid_pkg_offset(env->nr_dies, > + cs->nr_cores, cs->nr_threads); > *ebx = cs->nr_cores * cs->nr_threads; > *ecx |= CPUID_TOPOLOGY_LEVEL_CORE; > break; > -- > 2.21.0 >
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 6e774c6c8e..b4dbd1064d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -933,10 +933,11 @@ void enable_compat_apic_id_mode(void) static uint32_t x86_cpu_apic_id_from_index(MachineState *ms, unsigned int cpu_index) { + PCMachineState *pcms = PC_MACHINE(ms); uint32_t correct_id; static bool warned; - correct_id = x86_apicid_from_cpu_idx(ms->smp.cores, + correct_id = x86_apicid_from_cpu_idx(pcms->smp_dies, ms->smp.cores, ms->smp.threads, cpu_index); if (compat_apic_id_mode) { if (cpu_index != correct_id && !warned && !qtest_enabled()) { @@ -2355,18 +2356,21 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, topo.die_id = cpu->die_id; topo.core_id = cpu->core_id; topo.smt_id = cpu->thread_id; - cpu->apic_id = apicid_from_topo_ids(smp_cores, smp_threads, &topo); + cpu->apic_id = apicid_from_topo_ids(pcms->smp_dies, smp_cores, + smp_threads, &topo); } cpu_slot = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, &idx); if (!cpu_slot) { MachineState *ms = MACHINE(pcms); - x86_topo_ids_from_apicid(cpu->apic_id, smp_cores, smp_threads, &topo); - error_setg(errp, "Invalid CPU [socket: %u, core: %u, thread: %u] with" - " APIC ID %" PRIu32 ", valid index range 0:%d", - topo.pkg_id, topo.core_id, topo.smt_id, cpu->apic_id, - ms->possible_cpus->len - 1); + x86_topo_ids_from_apicid(cpu->apic_id, pcms->smp_dies, + smp_cores, smp_threads, &topo); + error_setg(errp, + "Invalid CPU [socket: %u, die: %u, core: %u, thread: %u] with" + " APIC ID %" PRIu32 ", valid index range 0:%d", + topo.pkg_id, topo.die_id, topo.core_id, topo.smt_id, + cpu->apic_id, ms->possible_cpus->len - 1); return; } @@ -2382,7 +2386,8 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, /* 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); + x86_topo_ids_from_apicid(cpu->apic_id, pcms->smp_dies, + 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); @@ -2679,10 +2684,12 @@ pc_cpu_index_to_props(MachineState *ms, unsigned cpu_index) static int64_t pc_get_default_cpu_node_id(const MachineState *ms, int idx) { X86CPUTopoInfo topo; + PCMachineState *pcms = PC_MACHINE(ms); assert(idx < ms->possible_cpus->len); x86_topo_ids_from_apicid(ms->possible_cpus->cpus[idx].arch_id, - ms->smp.cores, ms->smp.threads, &topo); + pcms->smp_dies, ms->smp.cores, + ms->smp.threads, &topo); return topo.pkg_id % nb_numa_nodes; } @@ -2690,6 +2697,7 @@ static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms) { int i; unsigned int max_cpus = ms->smp.max_cpus; + PCMachineState *pcms = PC_MACHINE(ms); if (ms->possible_cpus) { /* @@ -2710,7 +2718,8 @@ static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms) ms->possible_cpus->cpus[i].vcpus_count = 1; ms->possible_cpus->cpus[i].arch_id = x86_cpu_apic_id_from_index(ms, i); x86_topo_ids_from_apicid(ms->possible_cpus->cpus[i].arch_id, - ms->smp.cores, ms->smp.threads, &topo); + pcms->smp_dies, ms->smp.cores, + ms->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_die_id = true; diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h index c9fb41588e..4ff5b2da6c 100644 --- a/include/hw/i386/topology.h +++ b/include/hw/i386/topology.h @@ -63,88 +63,120 @@ static unsigned apicid_bitwidth_for_count(unsigned count) /* Bit width of the SMT_ID (thread ID) field on the APIC ID */ -static inline unsigned apicid_smt_width(unsigned nr_cores, unsigned nr_threads) +static inline unsigned apicid_smt_width(unsigned nr_dies, + unsigned nr_cores, + unsigned nr_threads) { return apicid_bitwidth_for_count(nr_threads); } /* Bit width of the Core_ID field */ -static inline unsigned apicid_core_width(unsigned nr_cores, unsigned nr_threads) +static inline unsigned apicid_core_width(unsigned nr_dies, + unsigned nr_cores, + unsigned nr_threads) { return apicid_bitwidth_for_count(nr_cores); } +/* Bit width of the Die_ID field */ +static inline unsigned apicid_die_width(unsigned nr_dies, + unsigned nr_cores, + unsigned nr_threads) +{ + return apicid_bitwidth_for_count(nr_dies); +} + /* Bit offset of the Core_ID field */ -static inline unsigned apicid_core_offset(unsigned nr_cores, +static inline unsigned apicid_core_offset(unsigned nr_dies, + unsigned nr_cores, unsigned nr_threads) { - return apicid_smt_width(nr_cores, nr_threads); + return apicid_smt_width(nr_dies, nr_cores, nr_threads); +} + +/* Bit offset of the Die_ID field */ +static inline unsigned apicid_die_offset(unsigned nr_dies, + unsigned nr_cores, + unsigned nr_threads) +{ + return apicid_core_offset(nr_dies, nr_cores, nr_threads) + + apicid_core_width(nr_dies, nr_cores, nr_threads); } /* Bit offset of the Pkg_ID (socket ID) field */ -static inline unsigned apicid_pkg_offset(unsigned nr_cores, unsigned nr_threads) +static inline unsigned apicid_pkg_offset(unsigned nr_dies, + unsigned nr_cores, + unsigned nr_threads) { - return apicid_core_offset(nr_cores, nr_threads) + - apicid_core_width(nr_cores, nr_threads); + return apicid_die_offset(nr_dies, nr_cores, nr_threads) + + apicid_die_width(nr_dies, nr_cores, nr_threads); } /* Make APIC ID for the CPU based on Pkg_ID, Core_ID, SMT_ID * * 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_cores, +static inline apic_id_t apicid_from_topo_ids(unsigned nr_dies, + unsigned nr_cores, unsigned nr_threads, const X86CPUTopoInfo *topo) { - return (topo->pkg_id << apicid_pkg_offset(nr_cores, nr_threads)) | - (topo->core_id << apicid_core_offset(nr_cores, nr_threads)) | + return (topo->pkg_id << apicid_pkg_offset(nr_dies, nr_cores, nr_threads)) | + (topo->die_id << apicid_die_offset(nr_dies, nr_cores, nr_threads)) | + (topo->core_id << apicid_core_offset(nr_dies, nr_cores, nr_threads)) | topo->smt_id; } /* Calculate thread/core/package IDs for a specific topology, * based on (contiguous) CPU index */ -static inline void x86_topo_ids_from_idx(unsigned nr_cores, +static inline void x86_topo_ids_from_idx(unsigned nr_dies, + unsigned nr_cores, unsigned nr_threads, unsigned cpu_index, X86CPUTopoInfo *topo) { - unsigned core_index = cpu_index / nr_threads; + topo->pkg_id = cpu_index / (nr_dies * nr_cores * nr_threads); + topo->die_id = cpu_index / (nr_cores * nr_threads) % nr_dies; + topo->core_id = cpu_index / nr_threads % nr_cores; topo->smt_id = cpu_index % nr_threads; - topo->core_id = core_index % nr_cores; - topo->pkg_id = core_index / nr_cores; } /* Calculate thread/core/package IDs for a specific topology, * based on APIC ID */ static inline void x86_topo_ids_from_apicid(apic_id_t apicid, + unsigned nr_dies, unsigned nr_cores, unsigned nr_threads, X86CPUTopoInfo *topo) { topo->smt_id = apicid & - ~(0xFFFFFFFFUL << apicid_smt_width(nr_cores, nr_threads)); - topo->core_id = (apicid >> apicid_core_offset(nr_cores, nr_threads)) & - ~(0xFFFFFFFFUL << apicid_core_width(nr_cores, nr_threads)); - topo->pkg_id = apicid >> apicid_pkg_offset(nr_cores, nr_threads); - topo->die_id = 0; + ~(0xFFFFFFFFUL << apicid_smt_width(nr_dies, nr_cores, nr_threads)); + topo->core_id = + (apicid >> apicid_core_offset(nr_dies, nr_cores, nr_threads)) & + ~(0xFFFFFFFFUL << apicid_core_width(nr_dies, nr_cores, nr_threads)); + topo->die_id = + (apicid >> apicid_die_offset(nr_dies, nr_cores, nr_threads)) & + ~(0xFFFFFFFFUL << apicid_die_width(nr_dies, nr_cores, nr_threads)); + topo->pkg_id = apicid >> apicid_pkg_offset(nr_dies, nr_cores, nr_threads); } /* Make APIC ID for the CPU 'cpu_index' * * 'cpu_index' is a sequential, contiguous ID for the CPU. */ -static inline apic_id_t x86_apicid_from_cpu_idx(unsigned nr_cores, +static inline apic_id_t x86_apicid_from_cpu_idx(unsigned nr_dies, + unsigned nr_cores, unsigned nr_threads, unsigned cpu_index) { X86CPUTopoInfo topo; - x86_topo_ids_from_idx(nr_cores, nr_threads, cpu_index, &topo); - return apicid_from_topo_ids(nr_cores, nr_threads, &topo); + x86_topo_ids_from_idx(nr_dies, nr_cores, nr_threads, cpu_index, &topo); + return apicid_from_topo_ids(nr_dies, nr_cores, nr_threads, &topo); } #endif /* HW_I386_TOPOLOGY_H */ diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 0fc543096f..09e20a2c3b 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4245,7 +4245,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, { X86CPU *cpu = env_archcpu(env); CPUState *cs = env_cpu(env); - uint32_t pkg_offset; + uint32_t die_offset; uint32_t limit; uint32_t signature[3]; @@ -4334,10 +4334,11 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, eax, ebx, ecx, edx); break; case 3: /* L3 cache info */ - pkg_offset = apicid_pkg_offset(cs->nr_cores, cs->nr_threads); + die_offset = apicid_die_offset(env->nr_dies, + cs->nr_cores, cs->nr_threads); if (cpu->enable_l3_cache) { encode_cache_cpuid4(env->cache_info_cpuid4.l3_cache, - (1 << pkg_offset), cs->nr_cores, + (1 << die_offset), cs->nr_cores, eax, ebx, ecx, edx); break; } @@ -4419,12 +4420,14 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, switch (count) { case 0: - *eax = apicid_core_offset(cs->nr_cores, cs->nr_threads); + *eax = apicid_core_offset(env->nr_dies, + cs->nr_cores, cs->nr_threads); *ebx = cs->nr_threads; *ecx |= CPUID_TOPOLOGY_LEVEL_SMT; break; case 1: - *eax = apicid_pkg_offset(cs->nr_cores, cs->nr_threads); + *eax = apicid_pkg_offset(env->nr_dies, + cs->nr_cores, cs->nr_threads); *ebx = cs->nr_cores * cs->nr_threads; *ecx |= CPUID_TOPOLOGY_LEVEL_CORE; break;
In new sockets/dies/cores/threads model, the apicid of logical cpu could imply die level info of guest cpu topology thus x86_apicid_from_cpu_idx() need to be refactored with #dies value, so does apicid_*_offset(). To keep semantic compatibility, the legacy pkg_offset which helps to generate CPUIDs such as 0x3 for L3 cache should be mapping to die_offset. Signed-off-by: Like Xu <like.xu@linux.intel.com> --- hw/i386/pc.c | 29 ++++++++++----- include/hw/i386/topology.h | 76 +++++++++++++++++++++++++++----------- target/i386/cpu.c | 13 ++++--- 3 files changed, 81 insertions(+), 37 deletions(-)