| Message ID | 20190716145121.19578-12-tao3.xu@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | Build ACPI Heterogeneous Memory Attribute Table (HMAT) | expand |
> -----Original Message----- > From: Xu, Tao3 > Sent: Tuesday, July 16, 2019 10:51 PM > To: imammedo@redhat.com; eblake@redhat.com; ehabkost@redhat.com > Cc: Xu, Tao3 <tao3.xu@intel.com>; Liu, Jingqi <jingqi.liu@intel.com>; Williams, Dan J <dan.j.williams@intel.com>; > jonathan.cameron@huawei.com; Du, Fan <fan.du@intel.com>; qemu-devel@nongnu.org > Subject: [PATCH v7 11/11] tests/bios-tables-test: add test cases for ACPI HMAT > > ACPI table HMAT has been introduced, QEMU now builds HMAT tables for Heterogeneous Memory with boot option '-numa node'. > > Add test cases on PC and Q35 machines with 2 numa nodes. > Because HMAT is generated when system enable numa, the following tables need to be added for this test: > tests/acpi-test-data/pc/*.acpihmat > tests/acpi-test-data/pc/HMAT.* > tests/acpi-test-data/q35/*.acpihmat > tests/acpi-test-data/q35/HMAT.* > > Suggested-by: Igor Mammedov <imammedo@redhat.com> > Signed-off-by: Tao Xu <tao3.xu@intel.com> Looks good for me. Reviewed-by: Jingqi Liu <Jingqi.liu@intel.com> Thanks Jingqi Liu > --- > > No changes in v7. > --- > tests/bios-tables-test.c | 43 ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 43 insertions(+) > > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index d863233fe9..27a17921f2 100644 > --- a/tests/bios-tables-test.c > +++ b/tests/bios-tables-test.c > @@ -860,6 +860,47 @@ static void test_acpi_piix4_tcg_dimm_pxm(void) > test_acpi_tcg_dimm_pxm(MACHINE_PC); > } > > +static void test_acpi_tcg_acpi_hmat(const char *machine) { > + test_data data; > + > + memset(&data, 0, sizeof(data)); > + data.machine = machine; > + data.variant = ".acpihmat"; > + test_acpi_one(" -smp 2,sockets=2" > + " -m 128M,slots=2,maxmem=1G" > + " -object memory-backend-ram,size=64M,id=m0" > + " -object memory-backend-ram,size=64M,id=m1" > + " -numa node,nodeid=0,memdev=m0" > + " -numa node,nodeid=1,memdev=m1,initiator=0" > + " -numa cpu,node-id=0,socket-id=0" > + " -numa cpu,node-id=0,socket-id=1" > + " -numa hmat-lb,initiator=0,target=0,hierarchy=memory," > + "data-type=access-latency,base-lat=10,latency=5" > + " -numa hmat-lb,initiator=0,target=0,hierarchy=memory," > + "data-type=access-bandwidth,base-bw=20,bandwidth=5" > + " -numa hmat-lb,initiator=0,target=1,hierarchy=memory," > + "data-type=access-latency,base-lat=10,latency=10" > + " -numa hmat-lb,initiator=0,target=1,hierarchy=memory," > + "data-type=access-bandwidth,base-bw=20,bandwidth=10" > + " -numa hmat-cache,node-id=0,size=0x20000,total=1,level=1" > + ",assoc=direct,policy=write-back,line=8" > + " -numa hmat-cache,node-id=1,size=0x20000,total=1,level=1" > + ",assoc=direct,policy=write-back,line=8", > + &data); > + free_test_data(&data); > +} > + > +static void test_acpi_q35_tcg_acpi_hmat(void) { > + test_acpi_tcg_acpi_hmat(MACHINE_Q35); > +} > + > +static void test_acpi_piix4_tcg_acpi_hmat(void) > +{ > + test_acpi_tcg_acpi_hmat(MACHINE_PC); > +} > + > static void test_acpi_virt_tcg(void) > { > test_data data = { > @@ -904,6 +945,8 @@ int main(int argc, char *argv[]) > qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem); > qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm); > qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm); > + qtest_add_func("acpi/piix4/acpihmat", test_acpi_piix4_tcg_acpi_hmat); > + qtest_add_func("acpi/q35/acpihmat", > + test_acpi_q35_tcg_acpi_hmat); > } else if (strcmp(arch, "aarch64") == 0) { > qtest_add_func("acpi/virt", test_acpi_virt_tcg); > } > -- > 2.20.1
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index d863233fe9..27a17921f2 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -860,6 +860,47 @@ static void test_acpi_piix4_tcg_dimm_pxm(void) test_acpi_tcg_dimm_pxm(MACHINE_PC); } +static void test_acpi_tcg_acpi_hmat(const char *machine) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine = machine; + data.variant = ".acpihmat"; + test_acpi_one(" -smp 2,sockets=2" + " -m 128M,slots=2,maxmem=1G" + " -object memory-backend-ram,size=64M,id=m0" + " -object memory-backend-ram,size=64M,id=m1" + " -numa node,nodeid=0,memdev=m0" + " -numa node,nodeid=1,memdev=m1,initiator=0" + " -numa cpu,node-id=0,socket-id=0" + " -numa cpu,node-id=0,socket-id=1" + " -numa hmat-lb,initiator=0,target=0,hierarchy=memory," + "data-type=access-latency,base-lat=10,latency=5" + " -numa hmat-lb,initiator=0,target=0,hierarchy=memory," + "data-type=access-bandwidth,base-bw=20,bandwidth=5" + " -numa hmat-lb,initiator=0,target=1,hierarchy=memory," + "data-type=access-latency,base-lat=10,latency=10" + " -numa hmat-lb,initiator=0,target=1,hierarchy=memory," + "data-type=access-bandwidth,base-bw=20,bandwidth=10" + " -numa hmat-cache,node-id=0,size=0x20000,total=1,level=1" + ",assoc=direct,policy=write-back,line=8" + " -numa hmat-cache,node-id=1,size=0x20000,total=1,level=1" + ",assoc=direct,policy=write-back,line=8", + &data); + free_test_data(&data); +} + +static void test_acpi_q35_tcg_acpi_hmat(void) +{ + test_acpi_tcg_acpi_hmat(MACHINE_Q35); +} + +static void test_acpi_piix4_tcg_acpi_hmat(void) +{ + test_acpi_tcg_acpi_hmat(MACHINE_PC); +} + static void test_acpi_virt_tcg(void) { test_data data = { @@ -904,6 +945,8 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem); qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm); qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm); + qtest_add_func("acpi/piix4/acpihmat", test_acpi_piix4_tcg_acpi_hmat); + qtest_add_func("acpi/q35/acpihmat", test_acpi_q35_tcg_acpi_hmat); } else if (strcmp(arch, "aarch64") == 0) { qtest_add_func("acpi/virt", test_acpi_virt_tcg); }
ACPI table HMAT has been introduced, QEMU now builds HMAT tables for Heterogeneous Memory with boot option '-numa node'. Add test cases on PC and Q35 machines with 2 numa nodes. Because HMAT is generated when system enable numa, the following tables need to be added for this test: tests/acpi-test-data/pc/*.acpihmat tests/acpi-test-data/pc/HMAT.* tests/acpi-test-data/q35/*.acpihmat tests/acpi-test-data/q35/HMAT.* Suggested-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Tao Xu <tao3.xu@intel.com> --- No changes in v7. --- tests/bios-tables-test.c | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)