| Message ID | 20230527134326.1855997-1-romain.naour@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | support/testing/tests/package/test_kexec.py: fix kexec test for qemu 5.2 | expand |
Hi Romain,
I successfully tested this patch on branch master at commit c765ac9
with the following commands:
Using the local host qemu v7.2.1:
support/testing/run-tests \
-d dl -o output_folder \
tests.package.test_kexec
...
OK
Using the Buildroot docker image:
utils/docker-run support/testing/run-tests \
-d dl -o output_folder \
tests.package.test_kexec
...
OK
Thank you for the fix!
On 27/05/2023 15:43, Romain Naour wrote:
> The commit f69c972ae61 (support/testing/tests/package/test_kexec.py:
> new runtime test) was tested locally with a qemu version (>= 7.x) more
> recent than the one available in our buidroot/base Docker image (5.2).
> As a consequence, that test fails to run in gitlab-ci as reported by
> [1].
>
> Remove "dtb-kaslr-seed=off" from the Qemu command line and pass
> a custom devicetree to qemu virt machine. This devicetree is
> based on qemu aarch64 5.2 dts with kaslr-seed set 0.
>
> The qemu aarch64 devicetree has been exported [2] and updated with the
> following method:
>
> qemu-system-aarch64 -machine virt -machine
> dumpdtb=qemu-aarch64-virt-5.2-machine.dtb
> dtc -I dtb qemu-aarch64-virt-5.2-machine.dtb >
> qemu-aarch64-virt-5.2-machine.dts
> edit the dts and replace kaslr-seed parameter by "kaslr-seed = <0
> 0>;"
>
> As soon as our buidroot/base Docker image is updated and a newer qemu
> version
> is available, we can safely revert this change and use the initial
> method.
>
> Fixes:
> https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819092
>
> [1] http://lists.busybox.net/pipermail/buildroot/2023-May/668091.html
> [2]
> https://u-boot.readthedocs.io/en/latest/develop/devicetree/dt_qemu.html#obtaining-the-qemu-devicetree
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Signed-off-by: Julien Olivain <ju.o@free.fr>
Tested-by: Julien Olivain <ju.o@free.fr>
> ---
> support/testing/tests/package/test_kexec.py | 15 +-
> .../qemu-aarch64-virt-5.2-machine.dts | 373 ++++++++++++++++++
> 2 files changed, 384 insertions(+), 4 deletions(-)
> create mode 100644
> support/testing/tests/package/test_kexec/qemu-aarch64-virt-5.2-machine.dts
>
> diff --git a/support/testing/tests/package/test_kexec.py
> b/support/testing/tests/package/test_kexec.py
> index 77e383373e..51d43b0572 100644
> --- a/support/testing/tests/package/test_kexec.py
> +++ b/support/testing/tests/package/test_kexec.py
> @@ -24,6 +24,8 @@ class TestKexec(infra.basetest.BRTest):
> BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
>
> BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config"
> BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}"
> + BR2_LINUX_KERNEL_DTS_SUPPORT=y
> + BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="{}"
> BR2_LINUX_KERNEL_INSTALL_TARGET=y
> BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
> BR2_PACKAGE_KEXEC=y
> @@ -31,20 +33,25 @@ class TestKexec(infra.basetest.BRTest):
> BR2_TARGET_ROOTFS_EXT2_4=y
> # BR2_TARGET_ROOTFS_TAR is not set
> """.format(
> -
> infra.filepath("tests/package/test_kexec/linux-kexec.fragment")
> +
> infra.filepath("tests/package/test_kexec/linux-kexec.fragment"),
> +
> infra.filepath("tests/package/test_kexec/qemu-aarch64-virt-5.2-machine.dts")
> )
>
> def test_run(self):
> hda = os.path.join(self.builddir, "images", "rootfs.ext4")
> kern = os.path.join(self.builddir, "images", "Image")
> + dtb = os.path.join(self.builddir, "images",
> "qemu-aarch64-virt-5.2-machine.dtb")
> # Notes:
> # Sufficient memory is needed to load the kernel: having at
> # least 512MB works. kexec could silently fail if not enough
> # memory is present. KASLR needs to be disabled for the test:
> - # we pass "nokaslr" to kernel bootargs, and also pass
> - # "dtb-kaslr-seed=off" to qemu virt machine.
> + # we pass "nokaslr" to kernel bootargs, and also pass a custom
> + # devicetree to qemu virt machine. This devicetree is based on
> + # qemu aarch64 5.2 dts with kaslr-seed set 0.
> + # With newer qemu >= 7.0 we can disable KASLR from the qemu
> + # command line using "dtb-kaslr-seed=off".
> bootargs = ["root=/dev/vda console=ttyAMA0 nokaslr"]
> - qemu_opts = ["-M", "virt,dtb-kaslr-seed=off", "-cpu",
> "cortex-a57", "-m", "512M",
> + qemu_opts = ["-M", "virt", "-dtb", dtb, "-cpu", "cortex-a57",
> "-m", "512M",
> "-drive", f"file={hda},if=virtio,format=raw"]
> self.emulator.boot(arch="aarch64",
> kernel=kern,
> diff --git
> a/support/testing/tests/package/test_kexec/qemu-aarch64-virt-5.2-machine.dts
> b/support/testing/tests/package/test_kexec/qemu-aarch64-virt-5.2-machine.dts
> new file mode 100644
> index 0000000000..ad96a51c40
> --- /dev/null
> +++
> b/support/testing/tests/package/test_kexec/qemu-aarch64-virt-5.2-machine.dts
> @@ -0,0 +1,373 @@
> +/dts-v1/;
> +
> +/ {
> + interrupt-parent = <0x8001>;
> + #size-cells = <0x02>;
> + #address-cells = <0x02>;
> + compatible = "linux,dummy-virt";
> +
> + psci {
> + migrate = <0x84000005>;
> + cpu_on = <0x84000003>;
> + cpu_off = <0x84000002>;
> + cpu_suspend = <0x84000001>;
> + method = "hvc";
> + compatible = "arm,psci-0.2\0arm,psci";
> + };
> +
> + memory@40000000 {
> + reg = <0x00 0x40000000 0x00 0x8000000>;
> + device_type = "memory";
> + };
> +
> + platform@c000000 {
> + interrupt-parent = <0x8001>;
> + ranges = <0x00 0x00 0xc000000 0x2000000>;
> + #address-cells = <0x01>;
> + #size-cells = <0x01>;
> + compatible = "qemu,platform\0simple-bus";
> + };
> +
> + fw-cfg@9020000 {
> + dma-coherent;
> + reg = <0x00 0x9020000 0x00 0x18>;
> + compatible = "qemu,fw-cfg-mmio";
> + };
> +
> + virtio_mmio@a000000 {
> + dma-coherent;
> + interrupts = <0x00 0x10 0x01>;
> + reg = <0x00 0xa000000 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a000200 {
> + dma-coherent;
> + interrupts = <0x00 0x11 0x01>;
> + reg = <0x00 0xa000200 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a000400 {
> + dma-coherent;
> + interrupts = <0x00 0x12 0x01>;
> + reg = <0x00 0xa000400 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a000600 {
> + dma-coherent;
> + interrupts = <0x00 0x13 0x01>;
> + reg = <0x00 0xa000600 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a000800 {
> + dma-coherent;
> + interrupts = <0x00 0x14 0x01>;
> + reg = <0x00 0xa000800 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a000a00 {
> + dma-coherent;
> + interrupts = <0x00 0x15 0x01>;
> + reg = <0x00 0xa000a00 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a000c00 {
> + dma-coherent;
> + interrupts = <0x00 0x16 0x01>;
> + reg = <0x00 0xa000c00 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a000e00 {
> + dma-coherent;
> + interrupts = <0x00 0x17 0x01>;
> + reg = <0x00 0xa000e00 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a001000 {
> + dma-coherent;
> + interrupts = <0x00 0x18 0x01>;
> + reg = <0x00 0xa001000 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a001200 {
> + dma-coherent;
> + interrupts = <0x00 0x19 0x01>;
> + reg = <0x00 0xa001200 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a001400 {
> + dma-coherent;
> + interrupts = <0x00 0x1a 0x01>;
> + reg = <0x00 0xa001400 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a001600 {
> + dma-coherent;
> + interrupts = <0x00 0x1b 0x01>;
> + reg = <0x00 0xa001600 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a001800 {
> + dma-coherent;
> + interrupts = <0x00 0x1c 0x01>;
> + reg = <0x00 0xa001800 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a001a00 {
> + dma-coherent;
> + interrupts = <0x00 0x1d 0x01>;
> + reg = <0x00 0xa001a00 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a001c00 {
> + dma-coherent;
> + interrupts = <0x00 0x1e 0x01>;
> + reg = <0x00 0xa001c00 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a001e00 {
> + dma-coherent;
> + interrupts = <0x00 0x1f 0x01>;
> + reg = <0x00 0xa001e00 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a002000 {
> + dma-coherent;
> + interrupts = <0x00 0x20 0x01>;
> + reg = <0x00 0xa002000 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a002200 {
> + dma-coherent;
> + interrupts = <0x00 0x21 0x01>;
> + reg = <0x00 0xa002200 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a002400 {
> + dma-coherent;
> + interrupts = <0x00 0x22 0x01>;
> + reg = <0x00 0xa002400 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a002600 {
> + dma-coherent;
> + interrupts = <0x00 0x23 0x01>;
> + reg = <0x00 0xa002600 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a002800 {
> + dma-coherent;
> + interrupts = <0x00 0x24 0x01>;
> + reg = <0x00 0xa002800 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a002a00 {
> + dma-coherent;
> + interrupts = <0x00 0x25 0x01>;
> + reg = <0x00 0xa002a00 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a002c00 {
> + dma-coherent;
> + interrupts = <0x00 0x26 0x01>;
> + reg = <0x00 0xa002c00 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a002e00 {
> + dma-coherent;
> + interrupts = <0x00 0x27 0x01>;
> + reg = <0x00 0xa002e00 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a003000 {
> + dma-coherent;
> + interrupts = <0x00 0x28 0x01>;
> + reg = <0x00 0xa003000 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a003200 {
> + dma-coherent;
> + interrupts = <0x00 0x29 0x01>;
> + reg = <0x00 0xa003200 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a003400 {
> + dma-coherent;
> + interrupts = <0x00 0x2a 0x01>;
> + reg = <0x00 0xa003400 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a003600 {
> + dma-coherent;
> + interrupts = <0x00 0x2b 0x01>;
> + reg = <0x00 0xa003600 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a003800 {
> + dma-coherent;
> + interrupts = <0x00 0x2c 0x01>;
> + reg = <0x00 0xa003800 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a003a00 {
> + dma-coherent;
> + interrupts = <0x00 0x2d 0x01>;
> + reg = <0x00 0xa003a00 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a003c00 {
> + dma-coherent;
> + interrupts = <0x00 0x2e 0x01>;
> + reg = <0x00 0xa003c00 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + virtio_mmio@a003e00 {
> + dma-coherent;
> + interrupts = <0x00 0x2f 0x01>;
> + reg = <0x00 0xa003e00 0x00 0x200>;
> + compatible = "virtio,mmio";
> + };
> +
> + gpio-keys {
> + #address-cells = <0x01>;
> + #size-cells = <0x00>;
> + compatible = "gpio-keys";
> +
> + poweroff {
> + gpios = <0x8003 0x03 0x00>;
> + linux,code = <0x74>;
> + label = "GPIO Key Poweroff";
> + };
> + };
> +
> + pl061@9030000 {
> + phandle = <0x8003>;
> + clock-names = "apb_pclk";
> + clocks = <0x8000>;
> + interrupts = <0x00 0x07 0x04>;
> + gpio-controller;
> + #gpio-cells = <0x02>;
> + compatible = "arm,pl061\0arm,primecell";
> + reg = <0x00 0x9030000 0x00 0x1000>;
> + };
> +
> + pcie@10000000 {
> + interrupt-map-mask = <0x1800 0x00 0x00 0x07>;
> + interrupt-map = <0x00 0x00 0x00 0x01 0x8001 0x00 0x00 0x00 0x03 0x04
> 0x00 0x00 0x00 0x02 0x8001 0x00 0x00 0x00 0x04 0x04 0x00 0x00 0x00 0x03
> 0x8001 0x00 0x00 0x00 0x05 0x04 0x00 0x00 0x00 0x04 0x8001 0x00 0x00
> 0x00 0x06 0x04 0x800 0x00 0x00 0x01 0x8001 0x00 0x00 0x00 0x04 0x04
> 0x800 0x00 0x00 0x02 0x8001 0x00 0x00 0x00 0x05 0x04 0x800 0x00 0x00
> 0x03 0x8001 0x00 0x00 0x00 0x06 0x04 0x800 0x00 0x00 0x04 0x8001 0x00
> 0x00 0x00 0x03 0x04 0x1000 0x00 0x00 0x01 0x8001 0x00 0x00 0x00 0x05
> 0x04 0x1000 0x00 0x00 0x02 0x8001 0x00 0x00 0x00 0x06 0x04 0x1000 0x00
> 0x00 0x03 0x8001 0x00 0x00 0x00 0x03 0x04 0x1000 0x00 0x00 0x04 0x8001
> 0x00 0x00 0x00 0x04 0x04 0x1800 0x00 0x00 0x01 0x8001 0x00 0x00 0x00
> 0x06 0x04 0x1800 0x00 0x00 0x02 0x8001 0x00 0x00 0x00 0x03 0x04 0x1800
> 0x00 0x00 0x03 0x8001 0x00 0x00 0x00 0x04 0x04 0x1800 0x00 0x00 0x04
> 0x8001 0x00 0x00 0x00 0x05 0x04>;
> + #interrupt-cells = <0x01>;
> + ranges = <0x1000000 0x00 0x00 0x00 0x3eff0000 0x00 0x10000 0x2000000
> 0x00 0x10000000 0x00 0x10000000 0x00 0x2eff0000 0x3000000 0x80 0x00
> 0x80 0x00 0x80 0x00>;
> + reg = <0x40 0x10000000 0x00 0x10000000>;
> + msi-parent = <0x8002>;
> + dma-coherent;
> + bus-range = <0x00 0xff>;
> + linux,pci-domain = <0x00>;
> + #size-cells = <0x02>;
> + #address-cells = <0x03>;
> + device_type = "pci";
> + compatible = "pci-host-ecam-generic";
> + };
> +
> + pl031@9010000 {
> + clock-names = "apb_pclk";
> + clocks = <0x8000>;
> + interrupts = <0x00 0x02 0x04>;
> + reg = <0x00 0x9010000 0x00 0x1000>;
> + compatible = "arm,pl031\0arm,primecell";
> + };
> +
> + pl011@9000000 {
> + clock-names = "uartclk\0apb_pclk";
> + clocks = <0x8000 0x8000>;
> + interrupts = <0x00 0x01 0x04>;
> + reg = <0x00 0x9000000 0x00 0x1000>;
> + compatible = "arm,pl011\0arm,primecell";
> + };
> +
> + pmu {
> + };
> +
> + intc@8000000 {
> + phandle = <0x8001>;
> + reg = <0x00 0x8000000 0x00 0x10000 0x00 0x8010000 0x00 0x10000>;
> + compatible = "arm,cortex-a15-gic";
> + ranges;
> + #size-cells = <0x02>;
> + #address-cells = <0x02>;
> + interrupt-controller;
> + #interrupt-cells = <0x03>;
> +
> + v2m@8020000 {
> + phandle = <0x8002>;
> + reg = <0x00 0x8020000 0x00 0x1000>;
> + msi-controller;
> + compatible = "arm,gic-v2m-frame";
> + };
> + };
> +
> + flash@0 {
> + bank-width = <0x04>;
> + reg = <0x00 0x00 0x00 0x4000000 0x00 0x4000000 0x00 0x4000000>;
> + compatible = "cfi-flash";
> + };
> +
> + cpus {
> + #size-cells = <0x00>;
> + #address-cells = <0x01>;
> +
> + cpu@0 {
> + reg = <0x00>;
> + compatible = "arm,cortex-a15";
> + device_type = "cpu";
> + };
> + };
> +
> + timer {
> + interrupts = <0x01 0x0d 0x104 0x01 0x0e 0x104 0x01 0x0b 0x104 0x01
> 0x0a 0x104>;
> + always-on;
> + compatible = "arm,armv7-timer";
> + };
> +
> + apb-pclk {
> + phandle = <0x8000>;
> + clock-output-names = "clk24mhz";
> + clock-frequency = <0x16e3600>;
> + #clock-cells = <0x00>;
> + compatible = "fixed-clock";
> + };
> +
> + chosen {
> + stdout-path = "/pl011@9000000";
> + /* Buildroot specific: KASLR needs to be disabled for the Kexec
> test. */
> + kaslr-seed = <0 0>;
> + };
> +};
Best regards,
Julien.
On 27/05/2023 15:43, Romain Naour wrote: > The commit f69c972ae61 (support/testing/tests/package/test_kexec.py: > new runtime test) was tested locally with a qemu version (>= 7.x) more > recent than the one available in our buidroot/base Docker image (5.2). > As a consequence, that test fails to run in gitlab-ci as reported by [1]. > > Remove "dtb-kaslr-seed=off" from the Qemu command line and pass > a custom devicetree to qemu virt machine. This devicetree is > based on qemu aarch64 5.2 dts with kaslr-seed set 0. > > The qemu aarch64 devicetree has been exported [2] and updated with the > following method: > > qemu-system-aarch64 -machine virt -machine dumpdtb=qemu-aarch64-virt-5.2-machine.dtb > dtc -I dtb qemu-aarch64-virt-5.2-machine.dtb > qemu-aarch64-virt-5.2-machine.dts > edit the dts and replace kaslr-seed parameter by "kaslr-seed = <0 0>;" > > As soon as our buidroot/base Docker image is updated and a newer qemu version > is available, we can safely revert this change and use the initial method. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819092 > > [1] http://lists.busybox.net/pipermail/buildroot/2023-May/668091.html > [2] https://u-boot.readthedocs.io/en/latest/develop/devicetree/dt_qemu.html#obtaining-the-qemu-devicetree > > Signed-off-by: Romain Naour <romain.naour@gmail.com> > Cc: Signed-off-by: Julien Olivain <ju.o@free.fr> Applied to master, thanks. Regards, Arnout [snip]
diff --git a/support/testing/tests/package/test_kexec.py b/support/testing/tests/package/test_kexec.py index 77e383373e..51d43b0572 100644 --- a/support/testing/tests/package/test_kexec.py +++ b/support/testing/tests/package/test_kexec.py @@ -24,6 +24,8 @@ class TestKexec(infra.basetest.BRTest): BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" + BR2_LINUX_KERNEL_DTS_SUPPORT=y + BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="{}" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_KEXEC=y @@ -31,20 +33,25 @@ class TestKexec(infra.basetest.BRTest): BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set """.format( - infra.filepath("tests/package/test_kexec/linux-kexec.fragment") + infra.filepath("tests/package/test_kexec/linux-kexec.fragment"), + infra.filepath("tests/package/test_kexec/qemu-aarch64-virt-5.2-machine.dts") ) def test_run(self): hda = os.path.join(self.builddir, "images", "rootfs.ext4") kern = os.path.join(self.builddir, "images", "Image") + dtb = os.path.join(self.builddir, "images", "qemu-aarch64-virt-5.2-machine.dtb") # Notes: # Sufficient memory is needed to load the kernel: having at # least 512MB works. kexec could silently fail if not enough # memory is present. KASLR needs to be disabled for the test: - # we pass "nokaslr" to kernel bootargs, and also pass - # "dtb-kaslr-seed=off" to qemu virt machine. + # we pass "nokaslr" to kernel bootargs, and also pass a custom + # devicetree to qemu virt machine. This devicetree is based on + # qemu aarch64 5.2 dts with kaslr-seed set 0. + # With newer qemu >= 7.0 we can disable KASLR from the qemu + # command line using "dtb-kaslr-seed=off". bootargs = ["root=/dev/vda console=ttyAMA0 nokaslr"] - qemu_opts = ["-M", "virt,dtb-kaslr-seed=off", "-cpu", "cortex-a57", "-m", "512M", + qemu_opts = ["-M", "virt", "-dtb", dtb, "-cpu", "cortex-a57", "-m", "512M", "-drive", f"file={hda},if=virtio,format=raw"] self.emulator.boot(arch="aarch64", kernel=kern, diff --git a/support/testing/tests/package/test_kexec/qemu-aarch64-virt-5.2-machine.dts b/support/testing/tests/package/test_kexec/qemu-aarch64-virt-5.2-machine.dts new file mode 100644 index 0000000000..ad96a51c40 --- /dev/null +++ b/support/testing/tests/package/test_kexec/qemu-aarch64-virt-5.2-machine.dts @@ -0,0 +1,373 @@ +/dts-v1/; + +/ { + interrupt-parent = <0x8001>; + #size-cells = <0x02>; + #address-cells = <0x02>; + compatible = "linux,dummy-virt"; + + psci { + migrate = <0x84000005>; + cpu_on = <0x84000003>; + cpu_off = <0x84000002>; + cpu_suspend = <0x84000001>; + method = "hvc"; + compatible = "arm,psci-0.2\0arm,psci"; + }; + + memory@40000000 { + reg = <0x00 0x40000000 0x00 0x8000000>; + device_type = "memory"; + }; + + platform@c000000 { + interrupt-parent = <0x8001>; + ranges = <0x00 0x00 0xc000000 0x2000000>; + #address-cells = <0x01>; + #size-cells = <0x01>; + compatible = "qemu,platform\0simple-bus"; + }; + + fw-cfg@9020000 { + dma-coherent; + reg = <0x00 0x9020000 0x00 0x18>; + compatible = "qemu,fw-cfg-mmio"; + }; + + virtio_mmio@a000000 { + dma-coherent; + interrupts = <0x00 0x10 0x01>; + reg = <0x00 0xa000000 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a000200 { + dma-coherent; + interrupts = <0x00 0x11 0x01>; + reg = <0x00 0xa000200 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a000400 { + dma-coherent; + interrupts = <0x00 0x12 0x01>; + reg = <0x00 0xa000400 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a000600 { + dma-coherent; + interrupts = <0x00 0x13 0x01>; + reg = <0x00 0xa000600 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a000800 { + dma-coherent; + interrupts = <0x00 0x14 0x01>; + reg = <0x00 0xa000800 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a000a00 { + dma-coherent; + interrupts = <0x00 0x15 0x01>; + reg = <0x00 0xa000a00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a000c00 { + dma-coherent; + interrupts = <0x00 0x16 0x01>; + reg = <0x00 0xa000c00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a000e00 { + dma-coherent; + interrupts = <0x00 0x17 0x01>; + reg = <0x00 0xa000e00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001000 { + dma-coherent; + interrupts = <0x00 0x18 0x01>; + reg = <0x00 0xa001000 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001200 { + dma-coherent; + interrupts = <0x00 0x19 0x01>; + reg = <0x00 0xa001200 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001400 { + dma-coherent; + interrupts = <0x00 0x1a 0x01>; + reg = <0x00 0xa001400 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001600 { + dma-coherent; + interrupts = <0x00 0x1b 0x01>; + reg = <0x00 0xa001600 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001800 { + dma-coherent; + interrupts = <0x00 0x1c 0x01>; + reg = <0x00 0xa001800 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001a00 { + dma-coherent; + interrupts = <0x00 0x1d 0x01>; + reg = <0x00 0xa001a00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001c00 { + dma-coherent; + interrupts = <0x00 0x1e 0x01>; + reg = <0x00 0xa001c00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a001e00 { + dma-coherent; + interrupts = <0x00 0x1f 0x01>; + reg = <0x00 0xa001e00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002000 { + dma-coherent; + interrupts = <0x00 0x20 0x01>; + reg = <0x00 0xa002000 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002200 { + dma-coherent; + interrupts = <0x00 0x21 0x01>; + reg = <0x00 0xa002200 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002400 { + dma-coherent; + interrupts = <0x00 0x22 0x01>; + reg = <0x00 0xa002400 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002600 { + dma-coherent; + interrupts = <0x00 0x23 0x01>; + reg = <0x00 0xa002600 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002800 { + dma-coherent; + interrupts = <0x00 0x24 0x01>; + reg = <0x00 0xa002800 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002a00 { + dma-coherent; + interrupts = <0x00 0x25 0x01>; + reg = <0x00 0xa002a00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002c00 { + dma-coherent; + interrupts = <0x00 0x26 0x01>; + reg = <0x00 0xa002c00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a002e00 { + dma-coherent; + interrupts = <0x00 0x27 0x01>; + reg = <0x00 0xa002e00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003000 { + dma-coherent; + interrupts = <0x00 0x28 0x01>; + reg = <0x00 0xa003000 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003200 { + dma-coherent; + interrupts = <0x00 0x29 0x01>; + reg = <0x00 0xa003200 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003400 { + dma-coherent; + interrupts = <0x00 0x2a 0x01>; + reg = <0x00 0xa003400 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003600 { + dma-coherent; + interrupts = <0x00 0x2b 0x01>; + reg = <0x00 0xa003600 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003800 { + dma-coherent; + interrupts = <0x00 0x2c 0x01>; + reg = <0x00 0xa003800 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003a00 { + dma-coherent; + interrupts = <0x00 0x2d 0x01>; + reg = <0x00 0xa003a00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003c00 { + dma-coherent; + interrupts = <0x00 0x2e 0x01>; + reg = <0x00 0xa003c00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + virtio_mmio@a003e00 { + dma-coherent; + interrupts = <0x00 0x2f 0x01>; + reg = <0x00 0xa003e00 0x00 0x200>; + compatible = "virtio,mmio"; + }; + + gpio-keys { + #address-cells = <0x01>; + #size-cells = <0x00>; + compatible = "gpio-keys"; + + poweroff { + gpios = <0x8003 0x03 0x00>; + linux,code = <0x74>; + label = "GPIO Key Poweroff"; + }; + }; + + pl061@9030000 { + phandle = <0x8003>; + clock-names = "apb_pclk"; + clocks = <0x8000>; + interrupts = <0x00 0x07 0x04>; + gpio-controller; + #gpio-cells = <0x02>; + compatible = "arm,pl061\0arm,primecell"; + reg = <0x00 0x9030000 0x00 0x1000>; + }; + + pcie@10000000 { + interrupt-map-mask = <0x1800 0x00 0x00 0x07>; + interrupt-map = <0x00 0x00 0x00 0x01 0x8001 0x00 0x00 0x00 0x03 0x04 0x00 0x00 0x00 0x02 0x8001 0x00 0x00 0x00 0x04 0x04 0x00 0x00 0x00 0x03 0x8001 0x00 0x00 0x00 0x05 0x04 0x00 0x00 0x00 0x04 0x8001 0x00 0x00 0x00 0x06 0x04 0x800 0x00 0x00 0x01 0x8001 0x00 0x00 0x00 0x04 0x04 0x800 0x00 0x00 0x02 0x8001 0x00 0x00 0x00 0x05 0x04 0x800 0x00 0x00 0x03 0x8001 0x00 0x00 0x00 0x06 0x04 0x800 0x00 0x00 0x04 0x8001 0x00 0x00 0x00 0x03 0x04 0x1000 0x00 0x00 0x01 0x8001 0x00 0x00 0x00 0x05 0x04 0x1000 0x00 0x00 0x02 0x8001 0x00 0x00 0x00 0x06 0x04 0x1000 0x00 0x00 0x03 0x8001 0x00 0x00 0x00 0x03 0x04 0x1000 0x00 0x00 0x04 0x8001 0x00 0x00 0x00 0x04 0x04 0x1800 0x00 0x00 0x01 0x8001 0x00 0x00 0x00 0x06 0x04 0x1800 0x00 0x00 0x02 0x8001 0x00 0x00 0x00 0x03 0x04 0x1800 0x00 0x00 0x03 0x8001 0x00 0x00 0x00 0x04 0x04 0x1800 0x00 0x00 0x04 0x8001 0x00 0x00 0x00 0x05 0x04>; + #interrupt-cells = <0x01>; + ranges = <0x1000000 0x00 0x00 0x00 0x3eff0000 0x00 0x10000 0x2000000 0x00 0x10000000 0x00 0x10000000 0x00 0x2eff0000 0x3000000 0x80 0x00 0x80 0x00 0x80 0x00>; + reg = <0x40 0x10000000 0x00 0x10000000>; + msi-parent = <0x8002>; + dma-coherent; + bus-range = <0x00 0xff>; + linux,pci-domain = <0x00>; + #size-cells = <0x02>; + #address-cells = <0x03>; + device_type = "pci"; + compatible = "pci-host-ecam-generic"; + }; + + pl031@9010000 { + clock-names = "apb_pclk"; + clocks = <0x8000>; + interrupts = <0x00 0x02 0x04>; + reg = <0x00 0x9010000 0x00 0x1000>; + compatible = "arm,pl031\0arm,primecell"; + }; + + pl011@9000000 { + clock-names = "uartclk\0apb_pclk"; + clocks = <0x8000 0x8000>; + interrupts = <0x00 0x01 0x04>; + reg = <0x00 0x9000000 0x00 0x1000>; + compatible = "arm,pl011\0arm,primecell"; + }; + + pmu { + }; + + intc@8000000 { + phandle = <0x8001>; + reg = <0x00 0x8000000 0x00 0x10000 0x00 0x8010000 0x00 0x10000>; + compatible = "arm,cortex-a15-gic"; + ranges; + #size-cells = <0x02>; + #address-cells = <0x02>; + interrupt-controller; + #interrupt-cells = <0x03>; + + v2m@8020000 { + phandle = <0x8002>; + reg = <0x00 0x8020000 0x00 0x1000>; + msi-controller; + compatible = "arm,gic-v2m-frame"; + }; + }; + + flash@0 { + bank-width = <0x04>; + reg = <0x00 0x00 0x00 0x4000000 0x00 0x4000000 0x00 0x4000000>; + compatible = "cfi-flash"; + }; + + cpus { + #size-cells = <0x00>; + #address-cells = <0x01>; + + cpu@0 { + reg = <0x00>; + compatible = "arm,cortex-a15"; + device_type = "cpu"; + }; + }; + + timer { + interrupts = <0x01 0x0d 0x104 0x01 0x0e 0x104 0x01 0x0b 0x104 0x01 0x0a 0x104>; + always-on; + compatible = "arm,armv7-timer"; + }; + + apb-pclk { + phandle = <0x8000>; + clock-output-names = "clk24mhz"; + clock-frequency = <0x16e3600>; + #clock-cells = <0x00>; + compatible = "fixed-clock"; + }; + + chosen { + stdout-path = "/pl011@9000000"; + /* Buildroot specific: KASLR needs to be disabled for the Kexec test. */ + kaslr-seed = <0 0>; + }; +};
The commit f69c972ae61 (support/testing/tests/package/test_kexec.py: new runtime test) was tested locally with a qemu version (>= 7.x) more recent than the one available in our buidroot/base Docker image (5.2). As a consequence, that test fails to run in gitlab-ci as reported by [1]. Remove "dtb-kaslr-seed=off" from the Qemu command line and pass a custom devicetree to qemu virt machine. This devicetree is based on qemu aarch64 5.2 dts with kaslr-seed set 0. The qemu aarch64 devicetree has been exported [2] and updated with the following method: qemu-system-aarch64 -machine virt -machine dumpdtb=qemu-aarch64-virt-5.2-machine.dtb dtc -I dtb qemu-aarch64-virt-5.2-machine.dtb > qemu-aarch64-virt-5.2-machine.dts edit the dts and replace kaslr-seed parameter by "kaslr-seed = <0 0>;" As soon as our buidroot/base Docker image is updated and a newer qemu version is available, we can safely revert this change and use the initial method. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819092 [1] http://lists.busybox.net/pipermail/buildroot/2023-May/668091.html [2] https://u-boot.readthedocs.io/en/latest/develop/devicetree/dt_qemu.html#obtaining-the-qemu-devicetree Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Signed-off-by: Julien Olivain <ju.o@free.fr> --- support/testing/tests/package/test_kexec.py | 15 +- .../qemu-aarch64-virt-5.2-machine.dts | 373 ++++++++++++++++++ 2 files changed, 384 insertions(+), 4 deletions(-) create mode 100644 support/testing/tests/package/test_kexec/qemu-aarch64-virt-5.2-machine.dts