From: Igor Mammedov <imammedo@redhat.com>
To: Babu Moger <babu.moger@amd.com>
Cc: ehabkost@redhat.com, mst@redhat.com, qemu-devel@nongnu.org,
pbonzini@redhat.com, rth@twiddle.net
Subject: Re: [PATCH v6 08/10] Revert "hw/i386: Update structures to save the number of nodes per package"
Date: Tue, 1 Sep 2020 14:21:18 +0200 [thread overview]
Message-ID: <20200901142118.645937d6@imammedo-mac> (raw)
In-Reply-To: <159889937478.21294.4192291354416942986.stgit@naples-babu.amd.com>
On Mon, 31 Aug 2020 13:42:54 -0500
Babu Moger <babu.moger@amd.com> wrote:
> This reverts commit c24a41bb53c0854d22c96b30d57cfcaa543c409d.
>
> Remove the EPYC specific apicid decoding and use the generic
> default decoding.
>
> Signed-off-by: Babu Moger <babu.moger@amd.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> hw/i386/pc.c | 1 -
> hw/i386/x86.c | 1 -
> include/hw/i386/topology.h | 1 -
> target/i386/cpu.c | 1 -
> target/i386/cpu.h | 1 -
> tests/test-x86-cpuid.c | 40 ++++++++++++++++++++--------------------
> 6 files changed, 20 insertions(+), 25 deletions(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 0677d6a272..d11daacc23 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1501,7 +1501,6 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
> init_topo_info(&topo_info, x86ms);
>
> env->nr_dies = x86ms->smp_dies;
> - env->nr_nodes = topo_info.nodes_per_pkg;
>
> /*
> * If APIC ID is not set,
> diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> index 727c4a0f1d..c1954db152 100644
> --- a/hw/i386/x86.c
> +++ b/hw/i386/x86.c
> @@ -62,7 +62,6 @@ inline void init_topo_info(X86CPUTopoInfo *topo_info,
> {
> MachineState *ms = MACHINE(x86ms);
>
> - topo_info->nodes_per_pkg = ms->numa_state->num_nodes / ms->smp.sockets;
> topo_info->dies_per_pkg = x86ms->smp_dies;
> topo_info->cores_per_die = ms->smp.cores;
> topo_info->threads_per_core = ms->smp.threads;
> diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h
> index b9593b9905..81573f6cfd 100644
> --- a/include/hw/i386/topology.h
> +++ b/include/hw/i386/topology.h
> @@ -53,7 +53,6 @@ typedef struct X86CPUTopoIDs {
> } X86CPUTopoIDs;
>
> typedef struct X86CPUTopoInfo {
> - unsigned nodes_per_pkg;
> unsigned dies_per_pkg;
> unsigned cores_per_die;
> unsigned threads_per_core;
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index 256bfa669f..ba4667b33c 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -7023,7 +7023,6 @@ static void x86_cpu_initfn(Object *obj)
> FeatureWord w;
>
> env->nr_dies = 1;
> - env->nr_nodes = 1;
> cpu_set_cpustate_pointers(cpu);
>
> object_property_add(obj, "family", "int",
> diff --git a/target/i386/cpu.h b/target/i386/cpu.h
> index 5ff8ad8427..d3097be6a5 100644
> --- a/target/i386/cpu.h
> +++ b/target/i386/cpu.h
> @@ -1629,7 +1629,6 @@ typedef struct CPUX86State {
> TPRAccess tpr_access_type;
>
> unsigned nr_dies;
> - unsigned nr_nodes;
> } CPUX86State;
>
> struct kvm_msrs;
> diff --git a/tests/test-x86-cpuid.c b/tests/test-x86-cpuid.c
> index 049030a50e..bfabc0403a 100644
> --- a/tests/test-x86-cpuid.c
> +++ b/tests/test-x86-cpuid.c
> @@ -31,12 +31,12 @@ 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 */
> - topo_info = (X86CPUTopoInfo) {0, 1, 1, 1};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 0);
> g_assert_cmpuint(apicid_core_width(&topo_info), ==, 0);
> g_assert_cmpuint(apicid_die_width(&topo_info), ==, 0);
>
> - topo_info = (X86CPUTopoInfo) {0, 1, 1, 1};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1};
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 0), ==, 0);
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1), ==, 1);
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2), ==, 2);
> @@ -45,39 +45,39 @@ static void test_topo_bits(void)
>
> /* Test field width calculation for multiple values
> */
> - topo_info = (X86CPUTopoInfo) {0, 1, 1, 2};
> + topo_info = (X86CPUTopoInfo) {1, 1, 2};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 1);
> - topo_info = (X86CPUTopoInfo) {0, 1, 1, 3};
> + topo_info = (X86CPUTopoInfo) {1, 1, 3};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 2);
> - topo_info = (X86CPUTopoInfo) {0, 1, 1, 4};
> + topo_info = (X86CPUTopoInfo) {1, 1, 4};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 2);
>
> - topo_info = (X86CPUTopoInfo) {0, 1, 1, 14};
> + topo_info = (X86CPUTopoInfo) {1, 1, 14};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
> - topo_info = (X86CPUTopoInfo) {0, 1, 1, 15};
> + topo_info = (X86CPUTopoInfo) {1, 1, 15};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
> - topo_info = (X86CPUTopoInfo) {0, 1, 1, 16};
> + topo_info = (X86CPUTopoInfo) {1, 1, 16};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
> - topo_info = (X86CPUTopoInfo) {0, 1, 1, 17};
> + topo_info = (X86CPUTopoInfo) {1, 1, 17};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 5);
>
>
> - topo_info = (X86CPUTopoInfo) {0, 1, 30, 2};
> + topo_info = (X86CPUTopoInfo) {1, 30, 2};
> g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
> - topo_info = (X86CPUTopoInfo) {0, 1, 31, 2};
> + topo_info = (X86CPUTopoInfo) {1, 31, 2};
> g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
> - topo_info = (X86CPUTopoInfo) {0, 1, 32, 2};
> + topo_info = (X86CPUTopoInfo) {1, 32, 2};
> g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
> - topo_info = (X86CPUTopoInfo) {0, 1, 33, 2};
> + topo_info = (X86CPUTopoInfo) {1, 33, 2};
> g_assert_cmpuint(apicid_core_width(&topo_info), ==, 6);
>
> - topo_info = (X86CPUTopoInfo) {0, 1, 30, 2};
> + topo_info = (X86CPUTopoInfo) {1, 30, 2};
> g_assert_cmpuint(apicid_die_width(&topo_info), ==, 0);
> - topo_info = (X86CPUTopoInfo) {0, 2, 30, 2};
> + topo_info = (X86CPUTopoInfo) {2, 30, 2};
> g_assert_cmpuint(apicid_die_width(&topo_info), ==, 1);
> - topo_info = (X86CPUTopoInfo) {0, 3, 30, 2};
> + topo_info = (X86CPUTopoInfo) {3, 30, 2};
> g_assert_cmpuint(apicid_die_width(&topo_info), ==, 2);
> - topo_info = (X86CPUTopoInfo) {0, 4, 30, 2};
> + topo_info = (X86CPUTopoInfo) {4, 30, 2};
> g_assert_cmpuint(apicid_die_width(&topo_info), ==, 2);
>
> /* build a weird topology and see if IDs are calculated correctly
> @@ -85,18 +85,18 @@ static void test_topo_bits(void)
>
> /* This will use 2 bits for thread ID and 3 bits for core ID
> */
> - topo_info = (X86CPUTopoInfo) {0, 1, 6, 3};
> + topo_info = (X86CPUTopoInfo) {1, 6, 3};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 2);
> g_assert_cmpuint(apicid_core_offset(&topo_info), ==, 2);
> g_assert_cmpuint(apicid_die_offset(&topo_info), ==, 5);
> g_assert_cmpuint(apicid_pkg_offset(&topo_info), ==, 5);
>
> - topo_info = (X86CPUTopoInfo) {0, 1, 6, 3};
> + topo_info = (X86CPUTopoInfo) {1, 6, 3};
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 0), ==, 0);
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1), ==, 1);
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2), ==, 2);
>
> - topo_info = (X86CPUTopoInfo) {0, 1, 6, 3};
> + topo_info = (X86CPUTopoInfo) {1, 6, 3};
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1 * 3 + 0), ==,
> (1 << 2) | 0);
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1 * 3 + 1), ==,
>
next prev parent reply other threads:[~2020-09-01 12:22 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-31 18:42 [PATCH v6 00/10] Remove EPYC mode apicid decode and use generic decode Babu Moger
2020-08-31 18:42 ` [PATCH v6 01/10] Revert "i386: Fix pkg_id offset for EPYC cpu models" Babu Moger
2020-09-01 12:11 ` Igor Mammedov
2020-08-31 18:42 ` [PATCH v6 02/10] Revert "target/i386: Enable new apic id encoding for EPYC based cpus models" Babu Moger
2020-09-01 12:12 ` Igor Mammedov
2020-08-31 18:42 ` [PATCH v6 03/10] Revert "hw/i386: Move arch_id decode inside x86_cpus_init" Babu Moger
2020-09-01 12:13 ` Igor Mammedov
2020-08-31 18:42 ` [PATCH v6 04/10] Revert "i386: Introduce use_epyc_apic_id_encoding in X86CPUDefinition" Babu Moger
2020-09-01 12:14 ` Igor Mammedov
2020-08-31 18:42 ` [PATCH v6 05/10] Revert "hw/i386: Introduce apicid functions inside X86MachineState" Babu Moger
2020-09-01 12:15 ` Igor Mammedov
2020-08-31 18:42 ` [PATCH v6 06/10] Revert "target/i386: Cleanup and use the EPYC mode topology functions" Babu Moger
2020-09-01 12:15 ` Igor Mammedov
2020-08-31 18:42 ` [PATCH v6 07/10] Revert "hw/386: Add EPYC mode topology decoding functions" Babu Moger
2020-09-01 12:15 ` Igor Mammedov
2020-08-31 18:42 ` [PATCH v6 08/10] Revert "hw/i386: Update structures to save the number of nodes per package" Babu Moger
2020-09-01 12:21 ` Igor Mammedov [this message]
2020-08-31 18:43 ` [PATCH v6 09/10] i386: Simplify CPUID_8000_001E for AMD Babu Moger
2020-09-01 11:52 ` Igor Mammedov
2020-09-01 14:45 ` Babu Moger
2020-08-31 18:43 ` [PATCH v6 10/10] " Babu Moger
2020-09-01 11:58 ` Igor Mammedov
2020-09-18 21:38 ` Eduardo Habkost
2020-09-18 21:41 ` Babu Moger
2020-09-01 13:33 ` [PATCH v6 00/10] Remove EPYC mode apicid decode and use generic decode Eduardo Habkost
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=20200901142118.645937d6@imammedo-mac \
--to=imammedo@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.