From: Zhao Liu <zhao1.liu@linux.intel.com>
To: "Michael S . Tsirkin" <mst@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Ani Sinha <anisinha@redhat.com>
Cc: qemu-devel@nongnu.org, Zhenyu Wang <zhenyu.z.wang@intel.com>,
Zhao Liu <zhao1.liu@intel.com>
Subject: [PATCH v2 2/3] hw/smbios: Fix thread count in type4
Date: Thu, 1 Jun 2023 17:29:51 +0800 [thread overview]
Message-ID: <20230601092952.1114727-3-zhao1.liu@linux.intel.com> (raw)
In-Reply-To: <20230601092952.1114727-1-zhao1.liu@linux.intel.com>
From: Zhao Liu <zhao1.liu@intel.com>
From SMBIOS 3.0 specification, thread count field means:
Thread Count is the total number of threads detected by the BIOS for
this processor socket. It is a processor-wide count, not a
thread-per-core count. [1]
So here we should use threads per socket other than threads per core.
[1] SMBIOS 3.0.0, section 7.5.8, Processor Information - Thread Count
Fixes: c97294ec1b9e ("SMBIOS: Build aggregate smbios tables and entry point")
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
Changes since v1:
* Rename cpus_per_socket to threads_per_socket.
* Add the comment about smp.max_cpus. Thread count and core count will
be calculated in 2 ways and will add a sanity check to ensure we
don't miss any topology level.
---
hw/smbios/smbios.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index d67415d44dd8..faf82d4ae646 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -713,6 +713,7 @@ static void smbios_build_type_4_table(MachineState *ms, unsigned instance)
{
char sock_str[128];
size_t tbl_len = SMBIOS_TYPE_4_LEN_V28;
+ unsigned threads_per_socket;
if (smbios_ep_type == SMBIOS_ENTRY_POINT_TYPE_64) {
tbl_len = SMBIOS_TYPE_4_LEN_V30;
@@ -747,17 +748,20 @@ static void smbios_build_type_4_table(MachineState *ms, unsigned instance)
SMBIOS_TABLE_SET_STR(4, asset_tag_number_str, type4.asset);
SMBIOS_TABLE_SET_STR(4, part_number_str, type4.part);
+ /* smp.max_cpus is the total number of threads for the system. */
+ threads_per_socket = ms->smp.max_cpus / ms->smp.sockets;
+
t->core_count = (ms->smp.cores > 255) ? 0xFF : ms->smp.cores;
t->core_enabled = t->core_count;
- t->thread_count = (ms->smp.threads > 255) ? 0xFF : ms->smp.threads;
+ t->thread_count = (threads_per_socket > 255) ? 0xFF : threads_per_socket;
t->processor_characteristics = cpu_to_le16(0x02); /* Unknown */
t->processor_family2 = cpu_to_le16(0x01); /* Other */
if (tbl_len == SMBIOS_TYPE_4_LEN_V30) {
t->core_count2 = t->core_enabled2 = cpu_to_le16(ms->smp.cores);
- t->thread_count2 = cpu_to_le16(ms->smp.threads);
+ t->thread_count2 = cpu_to_le16(threads_per_socket);
}
SMBIOS_BUILD_TABLE_POST;
--
2.34.1
next prev parent reply other threads:[~2023-06-01 9:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-01 9:29 [PATCH v2 0/3] hw/smbios: Cleanup topology related variables Zhao Liu
2023-06-01 9:29 ` [PATCH v2 1/3] hw/smbios: Fix smbios_smp_sockets caculation Zhao Liu
2023-06-07 14:35 ` Igor Mammedov
2023-06-08 2:48 ` Zhao Liu
2023-06-01 9:29 ` Zhao Liu [this message]
2023-06-07 14:49 ` [PATCH v2 2/3] hw/smbios: Fix thread count in type4 Igor Mammedov
2023-06-08 2:51 ` Zhao Liu
2023-06-08 8:28 ` Igor Mammedov
2023-08-05 5:58 ` Michael Tokarev
2023-08-05 6:00 ` Michael Tokarev
2023-08-07 9:56 ` Igor Mammedov
2023-08-07 10:06 ` Michael Tokarev
2023-08-07 10:11 ` Igor Mammedov
2023-08-07 14:31 ` Zhao Liu
2023-08-09 13:39 ` Igor Mammedov
2023-06-01 9:29 ` [PATCH v2 3/3] hw/smbios: Fix core " Zhao Liu
2023-06-07 14:51 ` Igor Mammedov
2023-06-08 2:52 ` Zhao Liu
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=20230601092952.1114727-3-zhao1.liu@linux.intel.com \
--to=zhao1.liu@linux.intel.com \
--cc=anisinha@redhat.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=zhao1.liu@intel.com \
--cc=zhenyu.z.wang@intel.com \
/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).