| Message ID | 20190920074349.2616-12-tao3.xu@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | Build ACPI Heterogeneous Memory Attribute Table (HMAT) | expand |
On Fri, 20 Sep 2019 15:43:49 +0800 Tao Xu <tao3.xu@intel.com> wrote: > 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.* > > Reviewed-by: Daniel Black <daniel@linux.ibm.com> > Reviewed-by: Jingqi Liu <Jingqi.liu@intel.com> > Suggested-by: Igor Mammedov <imammedo@redhat.com> > Signed-off-by: Tao Xu <tao3.xu@intel.com> > --- > > No changes in V11 and v12. > > Changes in v10: > - Update test case, add "-machine hmat=on" > --- > tests/bios-tables-test.c | 44 ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 44 insertions(+) > > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c > index 9b3d8b0d1b..976788b6fa 100644 > --- a/tests/bios-tables-test.c > +++ b/tests/bios-tables-test.c > @@ -870,6 +870,48 @@ 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(" -machine hmat=on" > + " -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,latency=5ns" > + " -numa hmat-lb,initiator=0,target=0,hierarchy=memory," > + "data-type=access-bandwidth,bandwidth=500M" > + " -numa hmat-lb,initiator=0,target=1,hierarchy=memory," > + "data-type=access-latency,latency=10ns" > + " -numa hmat-lb,initiator=0,target=1,hierarchy=memory," > + "data-type=access-bandwidth,bandwidth=100M" > + " -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" use decimal notation with appropriate suffix for CLI args other than that looks good to me, so above fixed Reviewed-by: Igor Mammedov <imammedo@redhat.com> > + ",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 = { > @@ -914,6 +956,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); > }
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 9b3d8b0d1b..976788b6fa 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -870,6 +870,48 @@ 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(" -machine hmat=on" + " -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,latency=5ns" + " -numa hmat-lb,initiator=0,target=0,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=500M" + " -numa hmat-lb,initiator=0,target=1,hierarchy=memory," + "data-type=access-latency,latency=10ns" + " -numa hmat-lb,initiator=0,target=1,hierarchy=memory," + "data-type=access-bandwidth,bandwidth=100M" + " -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 = { @@ -914,6 +956,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); }