[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC 02/52] hw/smbios: Fix thread count in type4
From: |
Zhao Liu |
Subject: |
[RFC 02/52] hw/smbios: Fix thread count in type4 |
Date: |
Mon, 13 Feb 2023 17:49:45 +0800 |
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
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Ani Sinha <ani@anisinha.ca>
Fixes: c97294e (SMBIOS: Build aggregate smbios tables and entry point)
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
hw/smbios/smbios.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 993e8d899b9a..5e6d4584edbb 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 cpus_per_socket = ms->smp.max_cpus / ms->smp.sockets;
if (smbios_ep_type == SMBIOS_ENTRY_POINT_TYPE_64) {
tbl_len = SMBIOS_TYPE_4_LEN_V30;
@@ -752,8 +753,8 @@ static void smbios_build_type_4_table(MachineState *ms,
unsigned instance)
t->core_count2 = t->core_enabled2 = cpu_to_le16(ms->smp.cores);
- t->thread_count = (ms->smp.threads > 255) ? 0xFF : ms->smp.threads;
- t->thread_count2 = cpu_to_le16(ms->smp.threads);
+ t->thread_count = (cpus_per_socket > 255) ? 0xFF : cpus_per_socket;
+ t->thread_count2 = cpu_to_le16(cpus_per_socket);
t->processor_characteristics = cpu_to_le16(0x02); /* Unknown */
t->processor_family2 = cpu_to_le16(0x01); /* Other */
--
2.34.1
- [RFC 00/52] Introduce hybrid CPU topology, Zhao Liu, 2023/02/13
- [RFC 01/52] hw/smbios: Fix smbios_smp_sockets caculation, Zhao Liu, 2023/02/13
- [RFC 02/52] hw/smbios: Fix thread count in type4,
Zhao Liu <=
- [RFC 03/52] hw/smbios: Fix core count in type4, Zhao Liu, 2023/02/13
- [RFC 04/52] i386/WHPX: Fix error message when fail to set ProcessorCount, Zhao Liu, 2023/02/13
- [RFC 05/52] hw/core/machine: Rename machine-smp.c to machine-topo.c, Zhao Liu, 2023/02/13
- [RFC 06/52] hw/cpu: Introduce hybrid CPU topology, Zhao Liu, 2023/02/13