[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 06/16] tests: bios-tables-test: Add test for smbios type4 core
From: |
Zhao Liu |
Subject: |
[PATCH v2 06/16] tests: bios-tables-test: Add test for smbios type4 core count |
Date: |
Thu, 28 Sep 2023 20:59:33 +0800 |
From: Zhao Liu <zhao1.liu@intel.com>
This tests the commit 196ea60a734c3 ("hw/smbios: Fix core count in
type4").
In smbios_build_type_4_table() (hw/smbios/smbios.c), if the number of
cores in the socket is not more than 255, then smbios type4 table
encodes cores per socket into the core count field.
So for the topology in this case, there're the following considerations:
1. cores per socket should be not more than 255 to ensure we could cover
the core count field.
2. The original bug was that cores per socket was miscalculated, so now
we should include as many topology levels as possible (mutiple
sockets & dies, no module since x86 hasn't supported it) to cover
more general topology scenarios, to ensure that the cores per socket
encoded in the core count field is correct.
Based on these considerations, select the topology with multiple sockets
and dies:
-smp 54,sockets=2,dies=3,cores=3,threads=3
The expected core count = cores per socket = cores (3) * dies (3) = 9.
Suggested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
Changes since v1:
* Added description of the consideration for topology selection of this
case in commit message. (Igor)
---
tests/qtest/bios-tables-test.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index e14ca136e8ed..57143ad875a2 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -999,6 +999,23 @@ static void test_acpi_q35_tcg_type4_count(void)
free_test_data(&data);
}
+static void test_acpi_q35_tcg_core_count(void)
+{
+ test_data data = {
+ .machine = MACHINE_Q35,
+ .variant = ".core-count",
+ .required_struct_types = base_required_struct_types,
+ .required_struct_types_len = ARRAY_SIZE(base_required_struct_types),
+ .smbios_core_count = 9,
+ .smbios_core_count2 = 9,
+ };
+
+ test_acpi_one("-machine smbios-entry-point-type=64 "
+ "-smp 54,sockets=2,dies=3,cores=3,threads=3",
+ &data);
+ free_test_data(&data);
+}
+
static void test_acpi_q35_tcg_core_count2(void)
{
test_data data = {
@@ -2166,6 +2183,8 @@ int main(int argc, char *argv[])
qtest_add_func("acpi/q35/kvm/dmar", test_acpi_q35_kvm_dmar);
qtest_add_func("acpi/q35/type4-count",
test_acpi_q35_tcg_type4_count);
+ qtest_add_func("acpi/q35/core-count",
+ test_acpi_q35_tcg_core_count);
qtest_add_func("acpi/q35/core-count2",
test_acpi_q35_tcg_core_count2);
}
--
2.34.1
- [PATCH v2 00/16] tests: Add CPU topology related smbios test cases, Zhao Liu, 2023/09/28
- [PATCH v2 02/16] tests: bios-tables-test: Prepare the ACPI table change for smbios type4 count test, Zhao Liu, 2023/09/28
- [PATCH v2 01/16] tests: test-smp-parse: Add the test for cores/threads per socket helpers, Zhao Liu, 2023/09/28
- [PATCH v2 03/16] tests: bios-tables-test: Add test for smbios type4 count, Zhao Liu, 2023/09/28
- [PATCH v2 04/16] tests: bios-tables-test: Add ACPI table binaries for smbios type4 count test, Zhao Liu, 2023/09/28
- [PATCH v2 05/16] tests: bios-tables-test: Prepare the ACPI table change for smbios type4 core count test, Zhao Liu, 2023/09/28
- [PATCH v2 06/16] tests: bios-tables-test: Add test for smbios type4 core count,
Zhao Liu <=
- [PATCH v2 07/16] tests: bios-tables-test: Add ACPI table binaries for smbios type4 core count test, Zhao Liu, 2023/09/28
- [PATCH v2 08/16] tests: bios-tables-test: Prepare the ACPI table change for smbios type4 core count2 test, Zhao Liu, 2023/09/28
- [PATCH v2 09/16] tests: bios-tables-test: Extend smbios core count2 test to cover general topology, Zhao Liu, 2023/09/28
- [PATCH v2 10/16] tests: bios-tables-test: Update ACPI table binaries for smbios core count2 test, Zhao Liu, 2023/09/28
- [PATCH v2 11/16] tests: bios-tables-test: Prepare the ACPI table change for smbios type4 thread count test, Zhao Liu, 2023/09/28
- [PATCH v2 12/16] tests: bios-tables-test: Add test for smbios type4 thread count, Zhao Liu, 2023/09/28
- [PATCH v2 14/16] tests: bios-tables-test: Prepare the ACPI table change for smbios type4 thread count2 test, Zhao Liu, 2023/09/28
- [PATCH v2 16/16] tests: bios-tables-test: Add ACPI table binaries for smbios type4 thread count2 test, Zhao Liu, 2023/09/28
- [PATCH v2 13/16] tests: bios-tables-test: Add ACPI table binaries for smbios type4 thread count test, Zhao Liu, 2023/09/28
- [PATCH v2 15/16] tests: bios-tables-test: Add test for smbios type4 thread count2, Zhao Liu, 2023/09/28