motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

bios-tables-test: add test for number of cores > 255

Browse source 
The new test is run with a large number of cpus and checks if the
core_count field in smbios_cpu_test (structure type 4) is correct.

Choose q35 as it allows to run with -smp > 255.

Signed-off-by: Julia Suvorova <jusual@redhat.com>
Message-Id: <20220731162141.178443-5-jusual@redhat.com>
Message-Id: <20221011111731.101412-5-jusual@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
This commit is contained in:
Julia Suvorova 2022-10-11 13:17:30 +02:00 • committed by Michael S. Tsirkin
parent 159a0da5b0
commit 2d80b33843
1 changed files with 45 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

58
tests/qtest/bios-tables-test.c
View file

@ -92,6 +92,8 @@ typedef struct {
SmbiosEntryPoint smbios_ep_table; SmbiosEntryPoint smbios_ep_table;
uint16_t smbios_cpu_max_speed; uint16_t smbios_cpu_max_speed;
uint16_t smbios_cpu_curr_speed; uint16_t smbios_cpu_curr_speed;
uint8_t smbios_core_count;
uint16_t smbios_core_count2;
uint8_t *required_struct_types; uint8_t *required_struct_types;
int required_struct_types_len; int required_struct_types_len;
QTestState *qts; QTestState *qts;
@ -631,29 +633,42 @@ static inline bool smbios_single_instance(uint8_t type)
} }
} }
static bool smbios_cpu_test(test_data *data, uint32_t addr) static void smbios_cpu_test(test_data *data, uint32_t addr,
SmbiosEntryPointType ep_type)
{ {
uint16_t expect_speed[2]; uint8_t core_count, expected_core_count = data->smbios_core_count;
uint16_t real; uint16_t speed, expected_speed[2];
uint16_t core_count2, expected_core_count2 = data->smbios_core_count2;
int offset[2]; int offset[2];
int i; int i;
/* Check CPU speed for backward compatibility */ /* Check CPU speed for backward compatibility */
offset[0] = offsetof(struct smbios_type_4, max_speed); offset[0] = offsetof(struct smbios_type_4, max_speed);
offset[1] = offsetof(struct smbios_type_4, current_speed); offset[1] = offsetof(struct smbios_type_4, current_speed);
expect_speed[0] = data->smbios_cpu_max_speed ? : 2000; expected_speed[0] = data->smbios_cpu_max_speed ? : 2000;
expect_speed[1] = data->smbios_cpu_curr_speed ? : 2000; expected_speed[1] = data->smbios_cpu_curr_speed ? : 2000;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
real = qtest_readw(data->qts, addr + offset[i]); speed = qtest_readw(data->qts, addr + offset[i]);
if (real != expect_speed[i]) { g_assert_cmpuint(speed, ==, expected_speed[i]);
fprintf(stderr, "Unexpected SMBIOS CPU speed: real %u expect %u\n",
real, expect_speed[i]);
return false;
}
} }
return true; core_count = qtest_readb(data->qts,
addr + offsetof(struct smbios_type_4, core_count));
if (expected_core_count) {
g_assert_cmpuint(core_count, ==, expected_core_count);
}
if (ep_type == SMBIOS_ENTRY_POINT_TYPE_64) {
core_count2 = qtest_readw(data->qts,
addr + offsetof(struct smbios_type_4, core_count2));
/* Core Count has reached its limit, checking Core Count 2 */
if (expected_core_count == 0xFF && expected_core_count2) {
g_assert_cmpuint(core_count2, ==, expected_core_count2);
}
}
} }
static void test_smbios_structs(test_data *data, SmbiosEntryPointType ep_type) static void test_smbios_structs(test_data *data, SmbiosEntryPointType ep_type)
@ -686,7 +701,7 @@ static void test_smbios_structs(test_data *data, SmbiosEntryPointType ep_type)
set_bit(type, struct_bitmap); set_bit(type, struct_bitmap);
if (type == 4) { if (type == 4) {
g_assert(smbios_cpu_test(data, addr)); smbios_cpu_test(data, addr, ep_type);
} }
/* seek to end of unformatted string area of this struct ("\0\0") */ /* seek to end of unformatted string area of this struct ("\0\0") */
@ -908,6 +923,21 @@ static void test_acpi_q35_tcg(void)
free_test_data(&data); free_test_data(&data);
} }
static void test_acpi_q35_tcg_core_count2(void)
{
test_data data = {
.machine = MACHINE_Q35,
.variant = ".core-count2",
.required_struct_types = base_required_struct_types,
.required_struct_types_len = ARRAY_SIZE(base_required_struct_types),
.smbios_core_count = 0xFF,
.smbios_core_count2 = 275,
};
test_acpi_one("-machine smbios-entry-point-type=64 -smp 275", &data);
free_test_data(&data);
}
static void test_acpi_q35_tcg_bridge(void) static void test_acpi_q35_tcg_bridge(void)
{ {
test_data data; test_data data;
@ -1994,6 +2024,8 @@ int main(int argc, char *argv[])
if (has_kvm) { if (has_kvm) {
qtest_add_func("acpi/q35/kvm/xapic", test_acpi_q35_kvm_xapic); qtest_add_func("acpi/q35/kvm/xapic", test_acpi_q35_kvm_xapic);
qtest_add_func("acpi/q35/kvm/dmar", test_acpi_q35_kvm_dmar); qtest_add_func("acpi/q35/kvm/dmar", test_acpi_q35_kvm_dmar);
qtest_add_func("acpi/q35/core-count2",
test_acpi_q35_tcg_core_count2);
} }
qtest_add_func("acpi/q35/viot", test_acpi_q35_viot); qtest_add_func("acpi/q35/viot", test_acpi_q35_viot);
#ifdef CONFIG_POSIX #ifdef CONFIG_POSIX