Skip to content

Commit d5d9b29

Browse files
zx2c4kuba-moo
authored andcommitted
wireguard: selftests: use newer toolchains to fill out architectures
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>
1 parent 39f02bf commit d5d9b29

9 files changed

Lines changed: 169 additions & 63 deletions

File tree

tools/testing/selftests/wireguard/qemu/Makefile

Lines changed: 110 additions & 59 deletions
Large diffs are not rendered by default.
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
CONFIG_SERIAL_AMBA_PL011=y
22
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
3+
CONFIG_VIRTIO_MENU=y
4+
CONFIG_VIRTIO_MMIO=y
5+
CONFIG_VIRTIO_CONSOLE=y
36
CONFIG_CMDLINE_BOOL=y
4-
CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1"
7+
CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1"
58
CONFIG_FRAME_WARN=1280
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
CONFIG_CPU_BIG_ENDIAN=y
22
CONFIG_SERIAL_AMBA_PL011=y
33
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
4+
CONFIG_VIRTIO_MENU=y
5+
CONFIG_VIRTIO_MMIO=y
6+
CONFIG_VIRTIO_CONSOLE=y
47
CONFIG_CMDLINE_BOOL=y
5-
CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1"
8+
CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1"
69
CONFIG_FRAME_WARN=1280

tools/testing/selftests/wireguard/qemu/arch/arm.config

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ CONFIG_ARCH_VIRT=y
44
CONFIG_THUMB2_KERNEL=n
55
CONFIG_SERIAL_AMBA_PL011=y
66
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
7+
CONFIG_VIRTIO_MENU=y
8+
CONFIG_VIRTIO_MMIO=y
9+
CONFIG_VIRTIO_CONSOLE=y
710
CONFIG_CMDLINE_BOOL=y
8-
CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1"
11+
CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1"
912
CONFIG_FRAME_WARN=1024

tools/testing/selftests/wireguard/qemu/arch/armeb.config

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ CONFIG_ARCH_VIRT=y
44
CONFIG_THUMB2_KERNEL=n
55
CONFIG_SERIAL_AMBA_PL011=y
66
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
7+
CONFIG_VIRTIO_MENU=y
8+
CONFIG_VIRTIO_MMIO=y
9+
CONFIG_VIRTIO_CONSOLE=y
710
CONFIG_CMDLINE_BOOL=y
8-
CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1"
11+
CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1"
912
CONFIG_CPU_BIG_ENDIAN=y
1013
CONFIG_FRAME_WARN=1024
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
CONFIG_PPC64=y
2+
CONFIG_PPC_PSERIES=y
3+
CONFIG_ALTIVEC=y
4+
CONFIG_VSX=y
5+
CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
6+
CONFIG_PPC_RADIX_MMU=y
7+
CONFIG_HVC_CONSOLE=y
8+
CONFIG_CPU_BIG_ENDIAN=y
9+
CONFIG_CMDLINE_BOOL=y
10+
CONFIG_CMDLINE="console=hvc0 wg.success=hvc1"
11+
CONFIG_SECTION_MISMATCH_WARN_ONLY=y
12+
CONFIG_FRAME_WARN=1280
13+
CONFIG_THREAD_SHIFT=14
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
CONFIG_ARCH_RV32I=y
2+
CONFIG_MMU=y
3+
CONFIG_FPU=y
4+
CONFIG_SOC_VIRT=y
5+
CONFIG_SERIAL_8250=y
6+
CONFIG_SERIAL_8250_CONSOLE=y
7+
CONFIG_SERIAL_OF_PLATFORM=y
8+
CONFIG_VIRTIO_MENU=y
9+
CONFIG_VIRTIO_MMIO=y
10+
CONFIG_VIRTIO_CONSOLE=y
11+
CONFIG_CMDLINE="console=ttyS0 wg.success=vport0p1"
12+
CONFIG_CMDLINE_FORCE=y
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
CONFIG_ARCH_RV64I=y
2+
CONFIG_MMU=y
3+
CONFIG_FPU=y
4+
CONFIG_SOC_VIRT=y
5+
CONFIG_SERIAL_8250=y
6+
CONFIG_SERIAL_8250_CONSOLE=y
7+
CONFIG_SERIAL_OF_PLATFORM=y
8+
CONFIG_VIRTIO_MENU=y
9+
CONFIG_VIRTIO_MMIO=y
10+
CONFIG_VIRTIO_CONSOLE=y
11+
CONFIG_CMDLINE="console=ttyS0 wg.success=vport0p1"
12+
CONFIG_CMDLINE_FORCE=y
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
CONFIG_SCLP_VT220_TTY=y
2+
CONFIG_SCLP_VT220_CONSOLE=y
3+
CONFIG_VIRTIO_MENU=y
4+
CONFIG_VIRTIO_CONSOLE=y
5+
CONFIG_S390_GUEST=y
6+
CONFIG_CMDLINE="console=ttysclp0 wg.success=vport0p1"

0 commit comments

Comments
 (0)