| Message ID | 20191107074511.14304-13-tao3.xu@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | Build ACPI Heterogeneous Memory Attribute Table (HMAT) | expand |
On Thu, 7 Nov 2019 15:45:11 +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/data/acpi/pc/APIC.acpihmat > tests/data/acpi/pc/SRAT.acpihmat > tests/data/acpi/pc/HMAT.acpihmat > tests/data/acpi/pc/DSDT.acpihmat > tests/data/acpi/q35/APIC.acpihmat > tests/data/acpi/q35/SRAT.acpihmat > tests/data/acpi/q35/HMAT.acpihmat > tests/data/acpi/q35/DSDT.acpihmat on top of this we need to check that configuring via QAPI works as well. Add an extra test as a separate patch on top, building the same topology (so we could reuse the same reference tables) using set-numa-node/--preconfig. See pc_dynamic_cpu_cfg() and for example how to use set-numa-node over QMP. > Reviewed-by: Igor Mammedov <imammedo@redhat.com> > 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> > --- > > Changes in v15: > - Make tests without breaking CI (Michael) > > Changes in v13: > - Use decimal notation with appropriate suffix for cache size > --- > tests/bios-tables-test-allowed-diff.h | 8 +++++ > tests/bios-tables-test.c | 44 +++++++++++++++++++++++++++ > tests/data/acpi/pc/APIC.acpihmat | 0 > tests/data/acpi/pc/DSDT.acpihmat | 0 > tests/data/acpi/pc/HMAT.acpihmat | 0 > tests/data/acpi/pc/SRAT.acpihmat | 0 > tests/data/acpi/q35/APIC.acpihmat | 0 > tests/data/acpi/q35/DSDT.acpihmat | 0 > tests/data/acpi/q35/HMAT.acpihmat | 0 > tests/data/acpi/q35/SRAT.acpihmat | 0 > 10 files changed, 52 insertions(+) > create mode 100644 tests/data/acpi/pc/APIC.acpihmat > create mode 100644 tests/data/acpi/pc/DSDT.acpihmat > create mode 100644 tests/data/acpi/pc/HMAT.acpihmat > create mode 100644 tests/data/acpi/pc/SRAT.acpihmat > create mode 100644 tests/data/acpi/q35/APIC.acpihmat > create mode 100644 tests/data/acpi/q35/DSDT.acpihmat > create mode 100644 tests/data/acpi/q35/HMAT.acpihmat > create mode 100644 tests/data/acpi/q35/SRAT.acpihmat > > diff --git a/tests/bios-tables-test-allowed-diff.h b/tests/bios-tables-test-allowed-diff.h > index dfb8523c8b..3c9e0c979b 100644 > --- a/tests/bios-tables-test-allowed-diff.h > +++ b/tests/bios-tables-test-allowed-diff.h > @@ -1 +1,9 @@ > /* List of comma-separated changed AML files to ignore */ > +"tests/data/acpi/pc/APIC.acpihmat", > +"tests/data/acpi/pc/SRAT.acpihmat", > +"tests/data/acpi/pc/HMAT.acpihmat", > +"tests/data/acpi/pc/DSDT.acpihmat", > +"tests/data/acpi/q35/APIC.acpihmat", > +"tests/data/acpi/q35/SRAT.acpihmat", > +"tests/data/acpi/q35/HMAT.acpihmat", > +"tests/data/acpi/q35/DSDT.acpihmat", > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c > index 0b33fb265f..96803c1f20 100644 > --- a/tests/bios-tables-test.c > +++ b/tests/bios-tables-test.c > @@ -947,6 +947,48 @@ static void test_acpi_virt_tcg_numamem(void) > > } > > +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=10K,level=1,assoc=direct," > + "policy=write-back,line=8" > + " -numa hmat-cache,node-id=1,size=10K,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 = { > @@ -991,6 +1033,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); > qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem); > diff --git a/tests/data/acpi/pc/APIC.acpihmat b/tests/data/acpi/pc/APIC.acpihmat > new file mode 100644 > index 0000000000..e69de29bb2 > diff --git a/tests/data/acpi/pc/DSDT.acpihmat b/tests/data/acpi/pc/DSDT.acpihmat > new file mode 100644 > index 0000000000..e69de29bb2 > diff --git a/tests/data/acpi/pc/HMAT.acpihmat b/tests/data/acpi/pc/HMAT.acpihmat > new file mode 100644 > index 0000000000..e69de29bb2 > diff --git a/tests/data/acpi/pc/SRAT.acpihmat b/tests/data/acpi/pc/SRAT.acpihmat > new file mode 100644 > index 0000000000..e69de29bb2 > diff --git a/tests/data/acpi/q35/APIC.acpihmat b/tests/data/acpi/q35/APIC.acpihmat > new file mode 100644 > index 0000000000..e69de29bb2 > diff --git a/tests/data/acpi/q35/DSDT.acpihmat b/tests/data/acpi/q35/DSDT.acpihmat > new file mode 100644 > index 0000000000..e69de29bb2 > diff --git a/tests/data/acpi/q35/HMAT.acpihmat b/tests/data/acpi/q35/HMAT.acpihmat > new file mode 100644 > index 0000000000..e69de29bb2 > diff --git a/tests/data/acpi/q35/SRAT.acpihmat b/tests/data/acpi/q35/SRAT.acpihmat > new file mode 100644 > index 0000000000..e69de29bb2
diff --git a/tests/bios-tables-test-allowed-diff.h b/tests/bios-tables-test-allowed-diff.h index dfb8523c8b..3c9e0c979b 100644 --- a/tests/bios-tables-test-allowed-diff.h +++ b/tests/bios-tables-test-allowed-diff.h @@ -1 +1,9 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/pc/APIC.acpihmat", +"tests/data/acpi/pc/SRAT.acpihmat", +"tests/data/acpi/pc/HMAT.acpihmat", +"tests/data/acpi/pc/DSDT.acpihmat", +"tests/data/acpi/q35/APIC.acpihmat", +"tests/data/acpi/q35/SRAT.acpihmat", +"tests/data/acpi/q35/HMAT.acpihmat", +"tests/data/acpi/q35/DSDT.acpihmat", diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 0b33fb265f..96803c1f20 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -947,6 +947,48 @@ static void test_acpi_virt_tcg_numamem(void) } +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=10K,level=1,assoc=direct," + "policy=write-back,line=8" + " -numa hmat-cache,node-id=1,size=10K,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 = { @@ -991,6 +1033,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); qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem); diff --git a/tests/data/acpi/pc/APIC.acpihmat b/tests/data/acpi/pc/APIC.acpihmat new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/pc/DSDT.acpihmat b/tests/data/acpi/pc/DSDT.acpihmat new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/pc/HMAT.acpihmat b/tests/data/acpi/pc/HMAT.acpihmat new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/pc/SRAT.acpihmat b/tests/data/acpi/pc/SRAT.acpihmat new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/q35/APIC.acpihmat b/tests/data/acpi/q35/APIC.acpihmat new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/q35/DSDT.acpihmat b/tests/data/acpi/q35/DSDT.acpihmat new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/q35/HMAT.acpihmat b/tests/data/acpi/q35/HMAT.acpihmat new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/q35/SRAT.acpihmat b/tests/data/acpi/q35/SRAT.acpihmat new file mode 100644 index 0000000000..e69de29bb2
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/data/acpi/pc/APIC.acpihmat tests/data/acpi/pc/SRAT.acpihmat tests/data/acpi/pc/HMAT.acpihmat tests/data/acpi/pc/DSDT.acpihmat tests/data/acpi/q35/APIC.acpihmat tests/data/acpi/q35/SRAT.acpihmat tests/data/acpi/q35/HMAT.acpihmat tests/data/acpi/q35/DSDT.acpihmat Reviewed-by: Igor Mammedov <imammedo@redhat.com> 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> --- Changes in v15: - Make tests without breaking CI (Michael) Changes in v13: - Use decimal notation with appropriate suffix for cache size --- tests/bios-tables-test-allowed-diff.h | 8 +++++ tests/bios-tables-test.c | 44 +++++++++++++++++++++++++++ tests/data/acpi/pc/APIC.acpihmat | 0 tests/data/acpi/pc/DSDT.acpihmat | 0 tests/data/acpi/pc/HMAT.acpihmat | 0 tests/data/acpi/pc/SRAT.acpihmat | 0 tests/data/acpi/q35/APIC.acpihmat | 0 tests/data/acpi/q35/DSDT.acpihmat | 0 tests/data/acpi/q35/HMAT.acpihmat | 0 tests/data/acpi/q35/SRAT.acpihmat | 0 10 files changed, 52 insertions(+) create mode 100644 tests/data/acpi/pc/APIC.acpihmat create mode 100644 tests/data/acpi/pc/DSDT.acpihmat create mode 100644 tests/data/acpi/pc/HMAT.acpihmat create mode 100644 tests/data/acpi/pc/SRAT.acpihmat create mode 100644 tests/data/acpi/q35/APIC.acpihmat create mode 100644 tests/data/acpi/q35/DSDT.acpihmat create mode 100644 tests/data/acpi/q35/HMAT.acpihmat create mode 100644 tests/data/acpi/q35/SRAT.acpihmat