diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2024-06-07 16:57:47 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2024-10-03 18:21:45 +0200 |
| commit | 9211bf87a9554b06afbc5ea7beed851495c6b893 (patch) | |
| tree | 57c13dd0f7c5d9db0e9c471f093050bc409d1b2c | |
| parent | wireguard: selftests: upgrade deps, toolchains, and add loongarch (diff) | |
| download | linux-rng-9211bf87a9554b06afbc5ea7beed851495c6b893.tar.xz linux-rng-9211bf87a9554b06afbc5ea7beed851495c6b893.zip | |
wireguard: selftests: re-use/ab-use test harness to run vDSO tests
This isn't intended for upstream. I'm used to testing things this way,
so it's handy for me to do the vDSO work this way too.
Intentionally no sign-off. Don't use this commit anywhere. For my own
usage only.
| -rwxr-xr-x | tools/testing/selftests/wireguard/netns.sh | 8 | ||||
| -rw-r--r-- | tools/testing/selftests/wireguard/qemu/Makefile | 5 | ||||
| -rw-r--r-- | tools/testing/selftests/wireguard/qemu/kernel.config | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/tools/testing/selftests/wireguard/netns.sh b/tools/testing/selftests/wireguard/netns.sh index 405ff262ca93..165f35e18010 100755 --- a/tools/testing/selftests/wireguard/netns.sh +++ b/tools/testing/selftests/wireguard/netns.sh @@ -1,4 +1,12 @@ #!/bin/bash +set -ex + +/vdso_test_getrandom +/vdso_test_getrandom bench-single +/vdso_test_chacha +/droppable +exit 0 + # SPDX-License-Identifier: GPL-2.0 # # Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. diff --git a/tools/testing/selftests/wireguard/qemu/Makefile b/tools/testing/selftests/wireguard/qemu/Makefile index 1e5fbc9a89ff..def756f00324 100644 --- a/tools/testing/selftests/wireguard/qemu/Makefile +++ b/tools/testing/selftests/wireguard/qemu/Makefile @@ -337,6 +337,9 @@ $(BUILD_PATH)/init-cpio-spec.txt: $(TOOLCHAIN_PATH)/.installed $(BUILD_PATH)/ini echo "slink /bin/ping6 ping 777 0 0" >> $@ echo "dir /lib 755 0 0" >> $@ echo "file /lib/libc.so $(TOOLCHAIN_PATH)/$(CHOST)/lib/libc.so 755 0 0" >> $@ + echo "file /vdso_test_getrandom $(KERNEL_BUILD_PATH)/vdso_test_getrandom 755 0 0" >> $@ + echo "file /vdso_test_chacha $(KERNEL_BUILD_PATH)/vdso_test_chacha 755 0 0" >> $@ + echo "file /droppable $(KERNEL_BUILD_PATH)/droppable 755 0 0" >> $@ echo "slink $$($(CHOST)-readelf -p .interp '$(BUILD_PATH)/init'| grep -o '/lib/.*') libc.so 777 0 0" >> $@ $(KERNEL_BUILD_PATH)/.config: $(TOOLCHAIN_PATH)/.installed kernel.config arch/$(ARCH).config @@ -349,6 +352,8 @@ $(KERNEL_BUILD_PATH)/.config: $(TOOLCHAIN_PATH)/.installed kernel.config arch/$( $(if $(findstring yes,$(DEBUG_KERNEL)),cp debug.config $(KERNEL_BUILD_PATH) && cd $(KERNEL_BUILD_PATH) && ARCH=$(KERNEL_ARCH) $(KERNEL_PATH)/scripts/kconfig/merge_config.sh -n $(KERNEL_BUILD_PATH)/.config debug.config,) $(KERNEL_BZIMAGE): $(TOOLCHAIN_PATH)/.installed $(KERNEL_BUILD_PATH)/.config $(BUILD_PATH)/init-cpio-spec.txt $(IPERF_PATH)/src/iperf3 $(IPUTILS_PATH)/ping $(BASH_PATH)/bash $(IPROUTE2_PATH)/misc/ss $(IPROUTE2_PATH)/ip/ip $(IPTABLES_PATH)/iptables/xtables-legacy-multi $(NMAP_PATH)/ncat/ncat $(WIREGUARD_TOOLS_PATH)/src/wg $(BUILD_PATH)/init + $(MAKE) -C $(KERNEL_PATH)/tools/testing/selftests/vDSO OUTPUT=$(KERNEL_BUILD_PATH) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) V=1 $(KERNEL_BUILD_PATH)/vdso_test_getrandom $(KERNEL_BUILD_PATH)/vdso_test_chacha + $(MAKE) -C $(KERNEL_PATH)/tools/testing/selftests/mm OUTPUT=$(KERNEL_BUILD_PATH) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) V=1 $(KERNEL_BUILD_PATH)/droppable $(MAKE) -C $(KERNEL_PATH) O=$(KERNEL_BUILD_PATH) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) .PHONY: $(KERNEL_BZIMAGE) diff --git a/tools/testing/selftests/wireguard/qemu/kernel.config b/tools/testing/selftests/wireguard/qemu/kernel.config index f314d3789f17..994aecc7308b 100644 --- a/tools/testing/selftests/wireguard/qemu/kernel.config +++ b/tools/testing/selftests/wireguard/qemu/kernel.config @@ -8,6 +8,7 @@ CONFIG_VETH=y CONFIG_MULTIUSER=y CONFIG_NAMESPACES=y CONFIG_NET_NS=y +CONFIG_TIME_NS=y CONFIG_UNIX=y CONFIG_INET=y CONFIG_IPV6=y |