Skip to content

Commit

Permalink
wireguard: selftests: use newer toolchains to fill out architectures
Browse files Browse the repository at this point in the history
Rather than relying on the system to have cross toolchains available,
simply download musl.cc's ones and use that libc.so, and then we use it
to fill in a few missing platforms, such as riscv64, riscv64, powerpc64,
and s390x.

Since riscv doesn't have a second serial port in its device description,
we have to use virtio's vport. This is actually the same situation on
ARM, but we were previously hacking QEMU up to work around this, which
required a custom QEMU. Instead just do the vport trick on ARM too.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Jason A. Donenfeld authored and Jakub Kicinski committed May 5, 2022
1 parent 39f02bf commit d5d9b29
Show file tree
Hide file tree
Showing 9 changed files with 169 additions and 63 deletions.
169 changes: 110 additions & 59 deletions tools/testing/selftests/wireguard/qemu/Makefile

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion tools/testing/selftests/wireguard/qemu/arch/aarch64.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_VIRTIO_MENU=y
CONFIG_VIRTIO_MMIO=y
CONFIG_VIRTIO_CONSOLE=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1"
CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1"
CONFIG_FRAME_WARN=1280
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
CONFIG_CPU_BIG_ENDIAN=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_VIRTIO_MENU=y
CONFIG_VIRTIO_MMIO=y
CONFIG_VIRTIO_CONSOLE=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1"
CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1"
CONFIG_FRAME_WARN=1280
5 changes: 4 additions & 1 deletion tools/testing/selftests/wireguard/qemu/arch/arm.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ CONFIG_ARCH_VIRT=y
CONFIG_THUMB2_KERNEL=n
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_VIRTIO_MENU=y
CONFIG_VIRTIO_MMIO=y
CONFIG_VIRTIO_CONSOLE=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1"
CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1"
CONFIG_FRAME_WARN=1024
5 changes: 4 additions & 1 deletion tools/testing/selftests/wireguard/qemu/arch/armeb.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ CONFIG_ARCH_VIRT=y
CONFIG_THUMB2_KERNEL=n
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_VIRTIO_MENU=y
CONFIG_VIRTIO_MMIO=y
CONFIG_VIRTIO_CONSOLE=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1"
CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1"
CONFIG_CPU_BIG_ENDIAN=y
CONFIG_FRAME_WARN=1024
13 changes: 13 additions & 0 deletions tools/testing/selftests/wireguard/qemu/arch/powerpc64.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
CONFIG_PPC64=y
CONFIG_PPC_PSERIES=y
CONFIG_ALTIVEC=y
CONFIG_VSX=y
CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
CONFIG_PPC_RADIX_MMU=y
CONFIG_HVC_CONSOLE=y
CONFIG_CPU_BIG_ENDIAN=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="console=hvc0 wg.success=hvc1"
CONFIG_SECTION_MISMATCH_WARN_ONLY=y
CONFIG_FRAME_WARN=1280
CONFIG_THREAD_SHIFT=14
12 changes: 12 additions & 0 deletions tools/testing/selftests/wireguard/qemu/arch/riscv32.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
CONFIG_ARCH_RV32I=y
CONFIG_MMU=y
CONFIG_FPU=y
CONFIG_SOC_VIRT=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_VIRTIO_MENU=y
CONFIG_VIRTIO_MMIO=y
CONFIG_VIRTIO_CONSOLE=y
CONFIG_CMDLINE="console=ttyS0 wg.success=vport0p1"
CONFIG_CMDLINE_FORCE=y
12 changes: 12 additions & 0 deletions tools/testing/selftests/wireguard/qemu/arch/riscv64.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
CONFIG_ARCH_RV64I=y
CONFIG_MMU=y
CONFIG_FPU=y
CONFIG_SOC_VIRT=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_VIRTIO_MENU=y
CONFIG_VIRTIO_MMIO=y
CONFIG_VIRTIO_CONSOLE=y
CONFIG_CMDLINE="console=ttyS0 wg.success=vport0p1"
CONFIG_CMDLINE_FORCE=y
6 changes: 6 additions & 0 deletions tools/testing/selftests/wireguard/qemu/arch/s390x.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CONFIG_SCLP_VT220_TTY=y
CONFIG_SCLP_VT220_CONSOLE=y
CONFIG_VIRTIO_MENU=y
CONFIG_VIRTIO_CONSOLE=y
CONFIG_S390_GUEST=y
CONFIG_CMDLINE="console=ttysclp0 wg.success=vport0p1"

0 comments on commit d5d9b29

Please sign in to comment.