Skip to contentSkip to conversation

tests: acpi: ARM testing support

PATCH In review Igor Mammedov 3 participants 6 messages Jun 3, 2019 – Jun 4, 2019

lore
Share & tools
lore
#0 lore raw

v6 cover tests: acpi: ARM testing support

Changelog:
- from v4:
* uefi support has been merged already, but only ARM part wasn't due to test failing on ARM 32 bit host. It turned out that's aarch64 TCG issue on 32-bit ARM host. Blacklist aarch64 test on 32 bit ARM host for now.

Series adds reference tables and a ACPI test case for arm/virt machine

CC Laszlo Ersek <[email protected]>
CC "Michael S. Tsirkin" <[email protected]>
CC Gonglei <[email protected]>
CC Philippe Mathieu-Daudé <[email protected]>
CC Shannon Zhao <[email protected]>
CC Wei Yang <[email protected]>
CC Andrew Jones <[email protected]>
CC Shameer Kolothum <[email protected]>
CC Ben Warren <[email protected]>

Igor Mammedov (2):
tests: add expected ACPI tables for arm/virt board
tests: acpi: add simple arm/virt testcase

 tests/Makefile.include                  |   4 ++++
 tests/bios-tables-test.c                |  18 ++++++++++++++++++
 tests/data/acpi/rebuild-expected-aml.sh |   2 +-
 tests/data/acpi/virt/APIC               | Bin 0 -> 168 bytes
 tests/data/acpi/virt/DSDT               | Bin 0 -> 18476 bytes
 tests/data/acpi/virt/FACP               | Bin 0 -> 268 bytes
 tests/data/acpi/virt/GTDT               | Bin 0 -> 96 bytes
 tests/data/acpi/virt/MCFG               | Bin 0 -> 60 bytes
 tests/data/acpi/virt/SPCR               | Bin 0 -> 80 bytes
 9 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 tests/data/acpi/virt/APIC
 create mode 100644 tests/data/acpi/virt/DSDT
 create mode 100644 tests/data/acpi/virt/FACP
 create mode 100644 tests/data/acpi/virt/GTDT
 create mode 100644 tests/data/acpi/virt/MCFG
 create mode 100644 tests/data/acpi/virt/SPCR
Signature · 1 line
2.7.4
#1 lore raw

PATCH v6 1/2 tests: add expected ACPI tables for arm/virt board

---
this patch is ahead fo "tests: acpi: add simple arm/virt testcase" to keep 'make check' working during bisection and not to pollute code with binary blobs which are not reviewable.

 tests/data/acpi/virt/APIC | Bin 0 -> 168 bytes
 tests/data/acpi/virt/DSDT | Bin 0 -> 18476 bytes
 tests/data/acpi/virt/FACP | Bin 0 -> 268 bytes
 tests/data/acpi/virt/GTDT | Bin 0 -> 96 bytes
 tests/data/acpi/virt/MCFG | Bin 0 -> 60 bytes
 tests/data/acpi/virt/SPCR | Bin 0 -> 80 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/data/acpi/virt/APIC
 create mode 100644 tests/data/acpi/virt/DSDT
 create mode 100644 tests/data/acpi/virt/FACP
 create mode 100644 tests/data/acpi/virt/GTDT
 create mode 100644 tests/data/acpi/virt/MCFG
 create mode 100644 tests/data/acpi/virt/SPCR
tests/data/acpi/virt/APIC new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..797dfde2841c51b7e72065602e99ce1714347f0d
GIT binary patch
tests/data/acpi/virt/DSDT new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..20e85c7f89f645c69935c615c07084e221419960
GIT binary patch
tests/data/acpi/virt/FACP new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..27de99f51bfe846b1f8796ace49d83f5b33a1aed
GIT binary patch
tests/data/acpi/virt/GTDT new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..10107a65e958ff6495bb8c17d63d0539690f59f6
GIT binary patch
tests/data/acpi/virt/MCFG new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..e8987e1af0ec3829770bf4fe11fab02b06160dd2
GIT binary patch
tests/data/acpi/virt/SPCR new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..377271a0e7817cc21a28c02123a89facad63604f
GIT binary patch
Signature · 1 line
2.7.4
#2 lore raw

PATCH v6 2/2 tests: acpi: add simple arm/virt testcase

In reply to Igor Mammedov

adds simple arm/virt test case that starts guest with bios-tables-test.aarch64.iso.qcow2 boot image which initializes UefiTestSupport* structure in RAM once guest is booted.

* see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper

---
v6:
* Since aarch64 TCG is broken on 32 bit arm host, blacklist it till it's fixed
* add aarch64 to rebuild script list
v4:
* force test to use TCG accelerator
v3:
* use firmware blobs directly from pc-bios directory
* use bios-tables-test.aarch64.iso.qcow2 as test boot image
* drop leftover qtest-uefi-images-aarch64 iMakefile rule from previos version (Laszlo)
* add Makefile rule to include bios-tables-test into check-qtest-aarch64 target
v2:
* specify in test_data where board's RAM starts and RAM size

 tests/Makefile.include                  |  4 ++++
 tests/bios-tables-test.c                | 18 ++++++++++++++++++
 tests/data/acpi/rebuild-expected-aml.sh |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
tests/Makefile.include +4 -0
index 1865f6b..2334969 100644
@@ -267,6 +267,10 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
 check-qtest-aarch64-y = tests/numa-test$(EXESUF)
 check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
 check-qtest-aarch64-y += tests/migration-test$(EXESUF)
+# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test unconditional
+ifneq ($(ARCH),arm)
+check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
+endif
 
 check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
 
tests/bios-tables-test.c +18 -0
index 28d7d42..1242d63 100644
@@ -830,6 +830,22 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
     test_acpi_tcg_dimm_pxm(MACHINE_PC);
 }
 
+static void test_acpi_virt_tcg(void)
+{
+    test_data data = {
+        .machine = "virt",
+        .accel = "tcg",
+        .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
+        .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+        .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
+        .ram_start = 0x40000000ULL,
+        .scan_len = 128ULL * 1024 * 1024,
+    };
+
+    test_acpi_one("-cpu cortex-a57", &data);
+    free_test_data(&data);
+}
+
 int main(int argc, char *argv[])
 {
     const char *arch = qtest_get_arch();
@@ -858,6 +874,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);
+    } else if (strcmp(arch, "aarch64") == 0) {
+        qtest_add_func("acpi/virt", test_acpi_virt_tcg);
     }
     ret = g_test_run();
     boot_sector_cleanup(disk);
tests/data/acpi/rebuild-expected-aml.sh +1 -1
index ff7e622..d285321 100755
@@ -12,7 +12,7 @@
 # This work is licensed under the terms of the GNU GPLv2.
 # See the COPYING.LIB file in the top-level directory.
 
-qemu_bins="x86_64-softmmu/qemu-system-x86_64"
+qemu_bins="x86_64-softmmu/qemu-system-x86_64 aarch64-softmmu/qemu-system-aarch64"
 
 if [ ! -e "tests/bios-tables-test" ]; then
     echo "Test: bios-tables-test is required! Run make check before this script."
Signature · 1 line
2.7.4
Reviewed-by on v6 2/2
#3 lore raw

Re: [Qemu-devel] [PATCH v6 2/2] tests: acpi: add simple arm/virt testcase

Quoted 35 lines · Igor Mammedov

adds simple arm/virt test case that starts guest with bios-tables-test.aarch64.iso.qcow2 boot image which initializes UefiTestSupport* structure in RAM once guest is booted.

* see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper

---
v6:
* Since aarch64 TCG is broken on 32 bit arm host, blacklist it till it's fixed
* add aarch64 to rebuild script list
v4:
* force test to use TCG accelerator
v3:
* use firmware blobs directly from pc-bios directory
* use bios-tables-test.aarch64.iso.qcow2 as test boot image
* drop leftover qtest-uefi-images-aarch64 iMakefile rule from previos version (Laszlo)
* add Makefile rule to include bios-tables-test into check-qtest-aarch64 target
v2:
* specify in test_data where board's RAM starts and RAM size

 tests/Makefile.include                  |  4 ++++
 tests/bios-tables-test.c                | 18 ++++++++++++++++++
 tests/data/acpi/rebuild-expected-aml.sh |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
tests/Makefile.include +0 -0
index 1865f6b..2334969 100644

tests/Makefile.include check-qtest-arm-y += tests/hexloader-test$(EXESUF) · line 270

Quoted 4 lines
tests/Makefile.include +1 -0
@@ -267,6 +267,10 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
 check-qtest-aarch64-y = tests/numa-test$(EXESUF)
 check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
 check-qtest-aarch64-y += tests/migration-test$(EXESUF)
+# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test unconditional

I think you could also capture the following link here, in a comment:

# https://bugs.launchpad.net/qemu/+bug/1830872

tests/Makefile.include check-qtest-arm-y += tests/hexloader-test$(EXESUF) · line 271

Quoted 1 line
tests/Makefile.include +1 -0
+ifneq ($(ARCH),arm)

Can we exclude all 32-bit host arches, not just ARM? The discussion in LP#1830872 indicates aarch64-on-i386 can fail too (not this specific guest payload FWIW, but the "tests/memory" test).

Other than that:

Thanks,
Laszlo

Quoted 55 lines
tests/Makefile.include +2 -0
+check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
+endif
 
 check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
 
tests/bios-tables-test.c +18 -0
index 28d7d42..1242d63 100644
@@ -830,6 +830,22 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
     test_acpi_tcg_dimm_pxm(MACHINE_PC);
 }
 
+static void test_acpi_virt_tcg(void)
+{
+    test_data data = {
+        .machine = "virt",
+        .accel = "tcg",
+        .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
+        .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+        .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
+        .ram_start = 0x40000000ULL,
+        .scan_len = 128ULL * 1024 * 1024,
+    };
+
+    test_acpi_one("-cpu cortex-a57", &data);
+    free_test_data(&data);
+}
+
 int main(int argc, char *argv[])
 {
     const char *arch = qtest_get_arch();
@@ -858,6 +874,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);
+    } else if (strcmp(arch, "aarch64") == 0) {
+        qtest_add_func("acpi/virt", test_acpi_virt_tcg);
     }
     ret = g_test_run();
     boot_sector_cleanup(disk);
tests/data/acpi/rebuild-expected-aml.sh +1 -1
index ff7e622..d285321 100755
@@ -12,7 +12,7 @@
 # This work is licensed under the terms of the GNU GPLv2.
 # See the COPYING.LIB file in the top-level directory.
 
-qemu_bins="x86_64-softmmu/qemu-system-x86_64"
+qemu_bins="x86_64-softmmu/qemu-system-x86_64 aarch64-softmmu/qemu-system-aarch64"
 
 if [ ! -e "tests/bios-tables-test" ]; then
     echo "Test: bios-tables-test is required! Run make check before this script."
#4 lore raw

Re: [Qemu-devel] [PATCH v6 2/2] tests: acpi: add simple arm/virt testcase

Quoted 43 lines · On Mon, 3 Jun 2019 18:08:12 +0200 Laszlo Ersek <[email protected]> wrote:
Quoted 35 lines · Igor Mammedov

adds simple arm/virt test case that starts guest with bios-tables-test.aarch64.iso.qcow2 boot image which initializes UefiTestSupport* structure in RAM once guest is booted.

* see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper

---
v6:
* Since aarch64 TCG is broken on 32 bit arm host, blacklist it till it's fixed
* add aarch64 to rebuild script list
v4:
* force test to use TCG accelerator
v3:
* use firmware blobs directly from pc-bios directory
* use bios-tables-test.aarch64.iso.qcow2 as test boot image
* drop leftover qtest-uefi-images-aarch64 iMakefile rule from previos version (Laszlo)
* add Makefile rule to include bios-tables-test into check-qtest-aarch64 target
v2:
* specify in test_data where board's RAM starts and RAM size

 tests/Makefile.include                  |  4 ++++
 tests/bios-tables-test.c                | 18 ++++++++++++++++++
 tests/data/acpi/rebuild-expected-aml.sh |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
tests/Makefile.include +0 -0
index 1865f6b..2334969 100644

tests/Makefile.include check-qtest-arm-y += tests/hexloader-test$(EXESUF) · line 270

Quoted 4 lines
tests/Makefile.include +1 -0
@@ -267,6 +267,10 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
 check-qtest-aarch64-y = tests/numa-test$(EXESUF)
 check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
 check-qtest-aarch64-y += tests/migration-test$(EXESUF)
+# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test unconditional  

I think you could also capture the following link here, in a comment:

Quoted 1 line

# https://bugs.launchpad.net/qemu/+bug/1830872

Michael,
could you fix it up on commit?
or we could merge v4
[PATCH v4 13/15] tests: acpi: add simple arm/virt testcase
which is the same modulo this blacklisting hunk, if
[RFC PATCH] cputlb: use uint64_t for interim values for unaligned load
fix is used as prerequisite.

Quoted 6 lines

tests/Makefile.include check-qtest-arm-y += tests/hexloader-test$(EXESUF) · line 271

Quoted 2 lines
tests/Makefile.include +1 -0
+ifneq ($(ARCH),arm)  

Can we exclude all 32-bit host arches, not just ARM? The discussion in LP#1830872 indicates aarch64-on-i386 can fail too (not this specific guest payload FWIW, but the "tests/memory" test).

I'd guess it's topic for a separate discussion (considering bios-tables-test isn't affected it's probably not upto me to pull this trigger).

Quoted 4 lines

Other than that:

Thanks!

Quoted 61 lines

Thanks,
Laszlo

Quoted 55 lines
tests/Makefile.include +2 -0
+check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
+endif
 
 check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
 
tests/bios-tables-test.c +18 -0
index 28d7d42..1242d63 100644
@@ -830,6 +830,22 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
     test_acpi_tcg_dimm_pxm(MACHINE_PC);
 }
 
+static void test_acpi_virt_tcg(void)
+{
+    test_data data = {
+        .machine = "virt",
+        .accel = "tcg",
+        .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
+        .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+        .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
+        .ram_start = 0x40000000ULL,
+        .scan_len = 128ULL * 1024 * 1024,
+    };
+
+    test_acpi_one("-cpu cortex-a57", &data);
+    free_test_data(&data);
+}
+
 int main(int argc, char *argv[])
 {
     const char *arch = qtest_get_arch();
@@ -858,6 +874,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);
+    } else if (strcmp(arch, "aarch64") == 0) {
+        qtest_add_func("acpi/virt", test_acpi_virt_tcg);
     }
     ret = g_test_run();
     boot_sector_cleanup(disk);
tests/data/acpi/rebuild-expected-aml.sh +1 -1
index ff7e622..d285321 100755
@@ -12,7 +12,7 @@
 # This work is licensed under the terms of the GNU GPLv2.
 # See the COPYING.LIB file in the top-level directory.
 
-qemu_bins="x86_64-softmmu/qemu-system-x86_64"
+qemu_bins="x86_64-softmmu/qemu-system-x86_64 aarch64-softmmu/qemu-system-aarch64"
 
 if [ ! -e "tests/bios-tables-test" ]; then
     echo "Test: bios-tables-test is required! Run make check before this script."
#5 lore raw

Re: [Qemu-devel] [PATCH v6 2/2] tests: acpi: add simple arm/virt testcase

Quoted 46 lines · Igor Mammedov
Quoted 43 lines · On Mon, 3 Jun 2019 18:08:12 +0200 Laszlo Ersek <[email protected]> wrote:
Quoted 35 lines · Igor Mammedov

adds simple arm/virt test case that starts guest with bios-tables-test.aarch64.iso.qcow2 boot image which initializes UefiTestSupport* structure in RAM once guest is booted.

* see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper

---
v6:
* Since aarch64 TCG is broken on 32 bit arm host, blacklist it till it's fixed
* add aarch64 to rebuild script list
v4:
* force test to use TCG accelerator
v3:
* use firmware blobs directly from pc-bios directory
* use bios-tables-test.aarch64.iso.qcow2 as test boot image
* drop leftover qtest-uefi-images-aarch64 iMakefile rule from previos version (Laszlo)
* add Makefile rule to include bios-tables-test into check-qtest-aarch64 target
v2:
* specify in test_data where board's RAM starts and RAM size

 tests/Makefile.include                  |  4 ++++
 tests/bios-tables-test.c                | 18 ++++++++++++++++++
 tests/data/acpi/rebuild-expected-aml.sh |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
tests/Makefile.include +0 -0
index 1865f6b..2334969 100644

tests/Makefile.include check-qtest-arm-y += tests/hexloader-test$(EXESUF) · line 270

Quoted 4 lines
tests/Makefile.include +1 -0
@@ -267,6 +267,10 @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
 check-qtest-aarch64-y = tests/numa-test$(EXESUF)
 check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
 check-qtest-aarch64-y += tests/migration-test$(EXESUF)
+# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test unconditional  

I think you could also capture the following link here, in a comment:

Quoted 3 lines
Quoted 1 line

# https://bugs.launchpad.net/qemu/+bug/1830872

Michael,
could you fix it up on commit?

I prefer just seeing a fixed up patch.

Quoted 82 lines

or we could merge v4
[PATCH v4 13/15] tests: acpi: add simple arm/virt testcase
which is the same modulo this blacklisting hunk, if
[RFC PATCH] cputlb: use uint64_t for interim values for unaligned load
fix is used as prerequisite.

Quoted 6 lines

tests/Makefile.include check-qtest-arm-y += tests/hexloader-test$(EXESUF) · line 271

Quoted 2 lines
tests/Makefile.include +1 -0
+ifneq ($(ARCH),arm)  

Can we exclude all 32-bit host arches, not just ARM? The discussion in LP#1830872 indicates aarch64-on-i386 can fail too (not this specific guest payload FWIW, but the "tests/memory" test).

I'd guess it's topic for a separate discussion (considering bios-tables-test isn't affected it's probably not upto me to pull this trigger).

Quoted 4 lines

Other than that:

Thanks!

Quoted 61 lines

Thanks,
Laszlo

Quoted 55 lines
tests/Makefile.include +2 -0
+check-qtest-aarch64-y += tests/bios-tables-test$(EXESUF)
+endif
 
 check-qtest-microblazeel-y += $(check-qtest-microblaze-y)
 
tests/bios-tables-test.c +18 -0
index 28d7d42..1242d63 100644
@@ -830,6 +830,22 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
     test_acpi_tcg_dimm_pxm(MACHINE_PC);
 }
 
+static void test_acpi_virt_tcg(void)
+{
+    test_data data = {
+        .machine = "virt",
+        .accel = "tcg",
+        .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
+        .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+        .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
+        .ram_start = 0x40000000ULL,
+        .scan_len = 128ULL * 1024 * 1024,
+    };
+
+    test_acpi_one("-cpu cortex-a57", &data);
+    free_test_data(&data);
+}
+
 int main(int argc, char *argv[])
 {
     const char *arch = qtest_get_arch();
@@ -858,6 +874,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);
+    } else if (strcmp(arch, "aarch64") == 0) {
+        qtest_add_func("acpi/virt", test_acpi_virt_tcg);
     }
     ret = g_test_run();
     boot_sector_cleanup(disk);
tests/data/acpi/rebuild-expected-aml.sh +1 -1
index ff7e622..d285321 100755
@@ -12,7 +12,7 @@
 # This work is licensed under the terms of the GNU GPLv2.
 # See the COPYING.LIB file in the top-level directory.
 
-qemu_bins="x86_64-softmmu/qemu-system-x86_64"
+qemu_bins="x86_64-softmmu/qemu-system-x86_64 aarch64-softmmu/qemu-system-aarch64"
 
 if [ ! -e "tests/bios-tables-test" ]; then
     echo "Test: bios-tables-test is required! Run make check before this script."