From: Igor Mammedov <imammedo@redhat.com>
To: Babu Moger <babu.moger@amd.com>
Cc: ehabkost@redhat.com, mst@redhat.com, armbru@redhat.com,
qemu-devel@nongnu.org, pbonzini@redhat.com, rth@twiddle.net
Subject: Re: [PATCH v3 01/18] hw/i386: Rename X86CPUTopoInfo structure to X86CPUTopoIDs
Date: Mon, 3 Feb 2020 16:08:16 +0100 [thread overview]
Message-ID: <20200203160816.50d0409c@redhat.com> (raw)
In-Reply-To: <157541982144.46157.2428083754645928332.stgit@naples-babu.amd.com>
On Tue, 03 Dec 2019 18:37:01 -0600
Babu Moger <babu.moger@amd.com> wrote:
> Rename few data structures related to X86 topology. X86CPUTopoIDs will
> have individual arch ids. Next patch introduces X86CPUTopoInfo which will
> have all topology information(like cores, threads etc..).
On what commit series was based on?
(it doesn't apply to master anymore)
> Signed-off-by: Babu Moger <babu.moger@amd.com>
> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> hw/i386/pc.c | 60 ++++++++++++++++++++++----------------------
> include/hw/i386/topology.h | 40 +++++++++++++++--------------
> 2 files changed, 50 insertions(+), 50 deletions(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 51b72439b4..5bd2ffccb7 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -2212,7 +2212,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
> int idx;
> CPUState *cs;
> CPUArchId *cpu_slot;
> - X86CPUTopoInfo topo;
> + X86CPUTopoIDs topo_ids;
> X86CPU *cpu = X86_CPU(dev);
> CPUX86State *env = &cpu->env;
> MachineState *ms = MACHINE(hotplug_dev);
> @@ -2277,12 +2277,12 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
> return;
> }
>
> - topo.pkg_id = cpu->socket_id;
> - topo.die_id = cpu->die_id;
> - topo.core_id = cpu->core_id;
> - topo.smt_id = cpu->thread_id;
> + topo_ids.pkg_id = cpu->socket_id;
> + topo_ids.die_id = cpu->die_id;
> + topo_ids.core_id = cpu->core_id;
> + topo_ids.smt_id = cpu->thread_id;
> cpu->apic_id = apicid_from_topo_ids(pcms->smp_dies, smp_cores,
> - smp_threads, &topo);
> + smp_threads, &topo_ids);
> }
>
> cpu_slot = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, &idx);
> @@ -2290,11 +2290,11 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
> MachineState *ms = MACHINE(pcms);
>
> x86_topo_ids_from_apicid(cpu->apic_id, pcms->smp_dies,
> - smp_cores, smp_threads, &topo);
> + smp_cores, smp_threads, &topo_ids);
> 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,
> + topo_ids.pkg_id, topo_ids.die_id, topo_ids.core_id, topo_ids.smt_id,
> cpu->apic_id, ms->possible_cpus->len - 1);
> return;
> }
> @@ -2312,34 +2312,34 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
> * 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, pcms->smp_dies,
> - smp_cores, smp_threads, &topo);
> - if (cpu->socket_id != -1 && cpu->socket_id != topo.pkg_id) {
> + smp_cores, smp_threads, &topo_ids);
> + 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:"
> - " 0x%x (socket-id: %u)", cpu->socket_id, cpu->apic_id, topo.pkg_id);
> + " 0x%x (socket-id: %u)", cpu->socket_id, cpu->apic_id, topo_ids.pkg_id);
> return;
> }
> - cpu->socket_id = topo.pkg_id;
> + cpu->socket_id = topo_ids.pkg_id;
>
> - if (cpu->die_id != -1 && cpu->die_id != topo.die_id) {
> + if (cpu->die_id != -1 && cpu->die_id != topo_ids.die_id) {
> error_setg(errp, "property die-id: %u doesn't match set apic-id:"
> - " 0x%x (die-id: %u)", cpu->die_id, cpu->apic_id, topo.die_id);
> + " 0x%x (die-id: %u)", cpu->die_id, cpu->apic_id, topo_ids.die_id);
> return;
> }
> - cpu->die_id = topo.die_id;
> + cpu->die_id = topo_ids.die_id;
>
> - if (cpu->core_id != -1 && cpu->core_id != topo.core_id) {
> + if (cpu->core_id != -1 && cpu->core_id != topo_ids.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);
> + " 0x%x (core-id: %u)", cpu->core_id, cpu->apic_id, topo_ids.core_id);
> return;
> }
> - cpu->core_id = topo.core_id;
> + cpu->core_id = topo_ids.core_id;
>
> - if (cpu->thread_id != -1 && cpu->thread_id != topo.smt_id) {
> + if (cpu->thread_id != -1 && cpu->thread_id != topo_ids.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);
> + " 0x%x (thread-id: %u)", cpu->thread_id, cpu->apic_id, topo_ids.smt_id);
> return;
> }
> - cpu->thread_id = topo.smt_id;
> + cpu->thread_id = topo_ids.smt_id;
>
> if (hyperv_feat_enabled(cpu, HYPERV_FEAT_VPINDEX) &&
> !kvm_hv_vpindex_settable()) {
> @@ -2692,14 +2692,14 @@ 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;
> + X86CPUTopoIDs topo_ids;
> PCMachineState *pcms = PC_MACHINE(ms);
>
> assert(idx < ms->possible_cpus->len);
> x86_topo_ids_from_apicid(ms->possible_cpus->cpus[idx].arch_id,
> pcms->smp_dies, ms->smp.cores,
> - ms->smp.threads, &topo);
> - return topo.pkg_id % ms->numa_state->num_nodes;
> + ms->smp.threads, &topo_ids);
> + return topo_ids.pkg_id % ms->numa_state->num_nodes;
> }
>
> static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms)
> @@ -2721,24 +2721,24 @@ static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms)
> sizeof(CPUArchId) * max_cpus);
> ms->possible_cpus->len = max_cpus;
> for (i = 0; i < ms->possible_cpus->len; i++) {
> - X86CPUTopoInfo topo;
> + X86CPUTopoIDs topo_ids;
>
> ms->possible_cpus->cpus[i].type = ms->cpu_type;
> ms->possible_cpus->cpus[i].vcpus_count = 1;
> ms->possible_cpus->cpus[i].arch_id = x86_cpu_apic_id_from_index(pcms, i);
> x86_topo_ids_from_apicid(ms->possible_cpus->cpus[i].arch_id,
> pcms->smp_dies, ms->smp.cores,
> - ms->smp.threads, &topo);
> + ms->smp.threads, &topo_ids);
> 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.socket_id = topo_ids.pkg_id;
> if (pcms->smp_dies > 1) {
> ms->possible_cpus->cpus[i].props.has_die_id = true;
> - ms->possible_cpus->cpus[i].props.die_id = topo.die_id;
> + ms->possible_cpus->cpus[i].props.die_id = topo_ids.die_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.core_id = topo_ids.core_id;
> ms->possible_cpus->cpus[i].props.has_thread_id = true;
> - ms->possible_cpus->cpus[i].props.thread_id = topo.smt_id;
> + ms->possible_cpus->cpus[i].props.thread_id = topo_ids.smt_id;
> }
> return ms->possible_cpus;
> }
> diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h
> index 4ff5b2da6c..6c184f3115 100644
> --- a/include/hw/i386/topology.h
> +++ b/include/hw/i386/topology.h
> @@ -45,12 +45,12 @@
> */
> typedef uint32_t apic_id_t;
>
> -typedef struct X86CPUTopoInfo {
> +typedef struct X86CPUTopoIDs {
> unsigned pkg_id;
> unsigned die_id;
> unsigned core_id;
> unsigned smt_id;
> -} X86CPUTopoInfo;
> +} X86CPUTopoIDs;
>
> /* Return the bit width needed for 'count' IDs
> */
> @@ -122,12 +122,12 @@ static inline unsigned apicid_pkg_offset(unsigned nr_dies,
> static inline apic_id_t apicid_from_topo_ids(unsigned nr_dies,
> unsigned nr_cores,
> unsigned nr_threads,
> - const X86CPUTopoInfo *topo)
> + const X86CPUTopoIDs *topo_ids)
> {
> - 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;
> + return (topo_ids->pkg_id << apicid_pkg_offset(nr_dies, nr_cores, nr_threads)) |
> + (topo_ids->die_id << apicid_die_offset(nr_dies, nr_cores, nr_threads)) |
> + (topo_ids->core_id << apicid_core_offset(nr_dies, nr_cores, nr_threads)) |
> + topo_ids->smt_id;
> }
>
> /* Calculate thread/core/package IDs for a specific topology,
> @@ -137,12 +137,12 @@ static inline void x86_topo_ids_from_idx(unsigned nr_dies,
> unsigned nr_cores,
> unsigned nr_threads,
> unsigned cpu_index,
> - X86CPUTopoInfo *topo)
> + X86CPUTopoIDs *topo_ids)
> {
> - 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_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->core_id = cpu_index / nr_threads % nr_cores;
> + topo_ids->smt_id = cpu_index % nr_threads;
> }
>
> /* Calculate thread/core/package IDs for a specific topology,
> @@ -152,17 +152,17 @@ static inline void x86_topo_ids_from_apicid(apic_id_t apicid,
> unsigned nr_dies,
> unsigned nr_cores,
> unsigned nr_threads,
> - X86CPUTopoInfo *topo)
> + X86CPUTopoIDs *topo_ids)
> {
> - topo->smt_id = apicid &
> + topo_ids->smt_id = apicid &
> ~(0xFFFFFFFFUL << apicid_smt_width(nr_dies, nr_cores, nr_threads));
> - topo->core_id =
> + topo_ids->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 =
> + topo_ids->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);
> + topo_ids->pkg_id = apicid >> apicid_pkg_offset(nr_dies, nr_cores, nr_threads);
> }
>
> /* Make APIC ID for the CPU 'cpu_index'
> @@ -174,9 +174,9 @@ static inline apic_id_t x86_apicid_from_cpu_idx(unsigned nr_dies,
> unsigned nr_threads,
> unsigned cpu_index)
> {
> - X86CPUTopoInfo 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);
> + X86CPUTopoIDs topo_ids;
> + x86_topo_ids_from_idx(nr_dies, nr_cores, nr_threads, cpu_index, &topo_ids);
> + return apicid_from_topo_ids(nr_dies, nr_cores, nr_threads, &topo_ids);
> }
>
> #endif /* HW_I386_TOPOLOGY_H */
>
>
next prev parent reply other threads:[~2020-02-03 15:09 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-04 0:36 [PATCH v3 00/18] APIC ID fixes for AMD EPYC CPU models Babu Moger
2019-12-04 0:37 ` [PATCH v3 01/18] hw/i386: Rename X86CPUTopoInfo structure to X86CPUTopoIDs Babu Moger
2020-02-03 15:08 ` Igor Mammedov [this message]
2020-02-03 18:25 ` Babu Moger
2019-12-04 0:37 ` [PATCH v3 02/18] hw/i386: Introduce X86CPUTopoInfo to contain topology info Babu Moger
2020-01-28 15:44 ` Igor Mammedov
2019-12-04 0:37 ` [PATCH v3 03/18] hw/i386: Consolidate topology functions Babu Moger
2020-01-28 15:46 ` Igor Mammedov
2019-12-04 0:37 ` [PATCH v3 04/18] hw/i386: Introduce initialize_topo_info to initialize X86CPUTopoInfo Babu Moger
2020-01-28 15:49 ` Igor Mammedov
2020-01-28 16:42 ` Babu Moger
2019-12-04 0:37 ` [PATCH v3 05/18] machine: Add SMP Sockets in CpuTopology Babu Moger
2019-12-04 0:37 ` [PATCH v3 06/18] hw/core: Add core complex id in X86CPU topology Babu Moger
2020-01-28 16:27 ` Igor Mammedov
2020-01-28 16:44 ` Babu Moger
2020-01-28 16:31 ` Eric Blake
2020-01-28 16:44 ` Babu Moger
2019-12-04 0:37 ` [PATCH v3 07/18] machine: Add a new function init_apicid_fn in MachineClass Babu Moger
2020-01-28 16:29 ` Igor Mammedov
2020-01-28 19:45 ` Babu Moger
2020-01-28 20:12 ` Eduardo Habkost
2020-01-29 9:14 ` Igor Mammedov
2020-01-29 16:17 ` Babu Moger
2020-02-03 15:17 ` Igor Mammedov
2020-02-03 21:49 ` Babu Moger
2020-02-04 7:38 ` Igor Mammedov
2020-01-29 16:32 ` Babu Moger
2020-01-29 16:51 ` Eduardo Habkost
2020-01-29 17:05 ` Babu Moger
2019-12-04 0:37 ` [PATCH v3 08/18] hw/i386: Update structures for nodes_per_pkg Babu Moger
2019-12-04 0:37 ` [PATCH v3 09/18] i386: Add CPUX86Family type in CPUX86State Babu Moger
2019-12-04 0:38 ` [PATCH v3 10/18] hw/386: Add EPYC mode topology decoding functions Babu Moger
2019-12-04 0:38 ` [PATCH v3 11/18] i386: Cleanup and use the EPYC mode topology functions Babu Moger
2019-12-04 0:38 ` [PATCH v3 12/18] numa: Split the numa initialization Babu Moger
2019-12-04 0:38 ` [PATCH v3 13/18] hw/i386: Introduce apicid_from_cpu_idx in PCMachineState Babu Moger
2019-12-04 0:38 ` [PATCH v3 14/18] hw/i386: Introduce topo_ids_from_apicid handler PCMachineState Babu Moger
2019-12-04 0:38 ` [PATCH v3 15/18] hw/i386: Introduce apic_id_from_topo_ids handler in PCMachineState Babu Moger
2019-12-04 0:38 ` [PATCH v3 16/18] hw/i386: Introduce EPYC mode function handlers Babu Moger
2020-01-28 20:04 ` Eduardo Habkost
2020-01-28 21:48 ` Babu Moger
2020-01-29 16:41 ` Eduardo Habkost
2019-12-04 0:38 ` [PATCH v3 17/18] i386: Fix pkg_id offset for epyc mode Babu Moger
2019-12-04 0:39 ` [PATCH v3 18/18] tests: Update the Unit tests Babu Moger
2020-02-03 14:59 ` [PATCH v3 00/18] APIC ID fixes for AMD EPYC CPU models Igor Mammedov
2020-02-03 19:31 ` Babu Moger
2020-02-04 8:02 ` Igor Mammedov
2020-02-04 19:08 ` Babu Moger
2020-02-05 9:38 ` Igor Mammedov
2020-02-05 16:10 ` Babu Moger
2020-02-05 16:56 ` Igor Mammedov
2020-02-05 19:07 ` Babu Moger
2020-02-06 13:08 ` Igor Mammedov
2020-02-06 15:32 ` Babu Moger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200203160816.50d0409c@redhat.com \
--to=imammedo@redhat.com \
--cc=armbru@redhat.com \
--cc=babu.moger@amd.com \
--cc=ehabkost@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).