Commit 205557ba authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'wireguard-patches-for-5-18-rc6' 

Jason A. Donenfeld says:

====================
wireguard patches for 5.18-rc6

In working on some other problems, I wound up leaning on the WireGuard
CI more than usual and uncovered a few small issues with reliability.
These are fairly low key changes, since they don't impact kernel code
itself.

One change does stick out in particular, though, which is the "make
routing loop test non-fatal" commit. I'm not thrilled about doing this,
but currently [1] remains unsolved, and I'm still working on a real
solution to that (hopefully for 5.19 or 5.20 if I can come up with a
good idea...), so for now that test just prints a big red warning
instead.

[1] https://lore.kernel.org/netdev/YmszSXueTxYOC41G@zx2c4.com/
====================

Link: https://lore.kernel.org/r/20220504202920.72908-1-Jason@zx2c4.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents ad0724b9 3fc1b11e

tools/testing/selftests/wireguard/netns.sh

+23 −11
Original line number Diff line number Diff line
@@ -22,10 +22,12 @@ 
# interfaces in $ns1 and $ns2. See https://www.wireguard.com/netns/ for further

# details on how this is accomplished.

set -e

shopt -s extglob



exec 3>&1

export LANG=C

export WG_HIDE_KEYS=never

NPROC=( /sys/devices/system/cpu/cpu+([0-9]) ); NPROC=${#NPROC[@]}

netns0="wg-test-$$-0"

netns1="wg-test-$$-1"

netns2="wg-test-$$-2"
@@ -143,17 +145,15 @@ tests() { 
	n1 iperf3 -Z -t 3 -b 0 -u -c fd00::2



	# TCP over IPv4, in parallel

	for max in 4 5 50; do

		local pids=( )

		for ((i=0; i < max; ++i)) do

	local pids=( ) i

	for ((i=0; i < NPROC; ++i)) do

		n2 iperf3 -p $(( 5200 + i )) -s -1 -B 192.168.241.2 &

		pids+=( $! ); waitiperf $netns2 $! $(( 5200 + i ))

	done

		for ((i=0; i < max; ++i)) do

	for ((i=0; i < NPROC; ++i)) do

		n1 iperf3 -Z -t 3 -p $(( 5200 + i )) -c 192.168.241.2 &

	done

	wait "${pids[@]}"

	done

}



[[ $(ip1 link show dev wg0) =~ mtu\ ([0-9]+) ]] && orig_mtu="${BASH_REMATCH[1]}"
@@ -280,7 +280,19 @@ read _ _ tx_bytes_before < <(n0 wg show wg1 transfer) 
! n0 ping -W 1 -c 10 -f 192.168.241.2 || false

sleep 1

read _ _ tx_bytes_after < <(n0 wg show wg1 transfer)

(( tx_bytes_after - tx_bytes_before < 70000 ))

if ! (( tx_bytes_after - tx_bytes_before < 70000 )); then

	errstart=$'\x1b[37m\x1b[41m\x1b[1m'

	errend=$'\x1b[0m'

	echo "${errstart}                                                ${errend}"

	echo "${errstart}                   E  R  R  O  R                ${errend}"

	echo "${errstart}                                                ${errend}"

	echo "${errstart} This architecture does not do the right thing  ${errend}"

	echo "${errstart} with cross-namespace routing loops. This test  ${errend}"

	echo "${errstart} has thus technically failed but, as this issue ${errend}"

	echo "${errstart} is as yet unsolved, these tests will continue  ${errend}"

	echo "${errstart} onward. :(                                     ${errend}"

	echo "${errstart}                                                ${errend}"

fi



ip0 link del wg1

ip1 link del wg0

tools/testing/selftests/wireguard/qemu/.gitignore

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

build/

distfiles/

ccache/

tools/testing/selftests/wireguard/qemu/Makefile

+136 −69
Original line number Diff line number Diff line
@@ -4,26 +4,24 @@ 


PWD := $(shell pwd)



CHOST := $(shell gcc -dumpmachine)

HOST_ARCH := $(firstword $(subst -, ,$(CHOST)))

ifneq (,$(ARCH))

CBUILD := $(subst -gcc,,$(lastword $(subst /, ,$(firstword $(wildcard $(foreach bindir,$(subst :, ,$(PATH)),$(bindir)/$(ARCH)-*-gcc))))))

ifeq (,$(CBUILD))

$(error The toolchain for $(ARCH) is not installed)

endif

else

CBUILD := $(CHOST)

ARCH := $(firstword $(subst -, ,$(CBUILD)))

endif



# Set these from the environment to override

KERNEL_PATH ?= $(PWD)/../../../../..

BUILD_PATH ?= $(PWD)/build/$(ARCH)

DISTFILES_PATH ?= $(PWD)/distfiles

NR_CPUS ?= 4

ARCH ?=

CBUILD := $(shell gcc -dumpmachine)

HOST_ARCH := $(firstword $(subst -, ,$(CBUILD)))

ifeq ($(ARCH),)

ARCH := $(HOST_ARCH)

endif



MIRROR := https://download.wireguard.com/qemu-test/distfiles/



KERNEL_BUILD_PATH := $(BUILD_PATH)/kernel$(if $(findstring yes,$(DEBUG_KERNEL)),-debug)

rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))

WIREGUARD_SOURCES := $(call rwildcard,$(KERNEL_PATH)/drivers/net/wireguard/,*)



default: qemu



# variable name, tarball project name, version, tarball extension, default URI base
@@ -36,42 +34,33 @@ $(call file_download,$$($(1)_NAME)$(4),$(5),$(6)) 
endef



define file_download =

$(DISTFILES_PATH)/$(1):

$(DISTFILES_PATH)/$(1): | $(4)

	mkdir -p $(DISTFILES_PATH)

	flock -x $$@.lock -c '[ -f $$@ ] && exit 0; wget -O $$@.tmp $(MIRROR)$(1) || wget -O $$@.tmp $(2)$(1) || rm -f $$@.tmp; [ -f $$@.tmp ] || exit 1; if echo "$(3)  $$@.tmp" | sha256sum -c -; then mv $$@.tmp $$@; else rm -f $$@.tmp; exit 71; fi'

	flock -x $$@.lock -c '[ -f $$@ ] && exit 0; wget -O $$@.tmp $(MIRROR)$(1) || wget -O $$@.tmp $(2)$(1) || rm -f $$@.tmp; [ -f $$@.tmp ] || exit 1; if ([ -n "$(4)" ] && sed -n "s#^\([a-f0-9]\{64\}\)  \($(1)\)\$$$$#\1  $(DISTFILES_PATH)/\2.tmp#p" "$(4)" || echo "$(3)  $$@.tmp") | sha256sum -c -; then mv $$@.tmp $$@; else rm -f $$@.tmp; exit 71; fi'

endef



$(eval $(call tar_download,MUSL,musl,1.2.0,.tar.gz,https://musl.libc.org/releases/,c6de7b191139142d3f9a7b5b702c9cae1b5ee6e7f57e582da9328629408fd4e8))

$(eval $(call tar_download,IPERF,iperf,3.7,.tar.gz,https://downloads.es.net/pub/iperf/,d846040224317caf2f75c843d309a950a7db23f9b44b94688ccbe557d6d1710c))

$(eval $(call tar_download,BASH,bash,5.0,.tar.gz,https://ftp.gnu.org/gnu/bash/,b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d))

$(eval $(call tar_download,IPROUTE2,iproute2,5.6.0,.tar.xz,https://www.kernel.org/pub/linux/utils/net/iproute2/,1b5b0e25ce6e23da7526ea1da044e814ad85ba761b10dd29c2b027c056b04692))

$(eval $(call tar_download,IPTABLES,iptables,1.8.4,.tar.bz2,https://www.netfilter.org/projects/iptables/files/,993a3a5490a544c2cbf2ef15cf7e7ed21af1845baf228318d5c36ef8827e157c))

$(eval $(call tar_download,NMAP,nmap,7.80,.tar.bz2,https://nmap.org/dist/,fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa))

$(eval $(call tar_download,IPERF,iperf,3.11,.tar.gz,https://downloads.es.net/pub/iperf/,de8cb409fad61a0574f4cb07eb19ce1159707403ac2dc01b5d175e91240b7e5f))

$(eval $(call tar_download,BASH,bash,5.1.16,.tar.gz,https://ftp.gnu.org/gnu/bash/,5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558))

$(eval $(call tar_download,IPROUTE2,iproute2,5.17.0,.tar.gz,https://www.kernel.org/pub/linux/utils/net/iproute2/,bda331d5c4606138892f23a565d78fca18919b4d508a0b7ca8391c2da2db68b9))

$(eval $(call tar_download,IPTABLES,iptables,1.8.7,.tar.bz2,https://www.netfilter.org/projects/iptables/files/,c109c96bb04998cd44156622d36f8e04b140701ec60531a10668cfdff5e8d8f0))

$(eval $(call tar_download,NMAP,nmap,7.92,.tgz,https://nmap.org/dist/,064183ea642dc4c12b1ab3b5358ce1cef7d2e7e11ffa2849f16d339f5b717117))

$(eval $(call tar_download,IPUTILS,iputils,s20190709,.tar.gz,https://github.com/iputils/iputils/archive/s20190709.tar.gz/#,a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a))

$(eval $(call tar_download,WIREGUARD_TOOLS,wireguard-tools,1.0.20200206,.tar.xz,https://git.zx2c4.com/wireguard-tools/snapshot/,f5207248c6a3c3e3bfc9ab30b91c1897b00802ed861e1f9faaed873366078c64))



KERNEL_BUILD_PATH := $(BUILD_PATH)/kernel$(if $(findstring yes,$(DEBUG_KERNEL)),-debug)

rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))

WIREGUARD_SOURCES := $(call rwildcard,$(KERNEL_PATH)/drivers/net/wireguard/,*)



export CFLAGS ?= -O3 -pipe

export LDFLAGS ?=

export CPPFLAGS := -I$(BUILD_PATH)/include

$(eval $(call tar_download,WIREGUARD_TOOLS,wireguard-tools,1.0.20210914,.tar.xz,https://git.zx2c4.com/wireguard-tools/snapshot/,97ff31489217bb265b7ae850d3d0f335ab07d2652ba1feec88b734bc96bd05ac))



export CFLAGS := -O3 -pipe

ifeq ($(HOST_ARCH),$(ARCH))

CROSS_COMPILE_FLAG := --host=$(CHOST)

CFLAGS += -march=native

STRIP := strip

else

$(info Cross compilation: building for $(CBUILD) using $(CHOST))

CROSS_COMPILE_FLAG := --build=$(CBUILD) --host=$(CHOST)

export CROSS_COMPILE=$(CBUILD)-

STRIP := $(CBUILD)-strip

endif

export LDFLAGS :=

export CPPFLAGS :=



QEMU_VPORT_RESULT :=

ifeq ($(ARCH),aarch64)

CHOST := aarch64-linux-musl

QEMU_ARCH := aarch64

KERNEL_ARCH := arm64

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/arch/arm64/boot/Image

QEMU_VPORT_RESULT := virtio-serial-device

ifeq ($(HOST_ARCH),$(ARCH))

QEMU_MACHINE := -cpu host -machine virt,gic_version=host,accel=kvm

else
@@ -79,9 +68,11 @@ QEMU_MACHINE := -cpu cortex-a53 -machine virt 
CFLAGS += -march=armv8-a -mtune=cortex-a53

endif

else ifeq ($(ARCH),aarch64_be)

CHOST := aarch64_be-linux-musl

QEMU_ARCH := aarch64

KERNEL_ARCH := arm64

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/arch/arm64/boot/Image

QEMU_VPORT_RESULT := virtio-serial-device

ifeq ($(HOST_ARCH),$(ARCH))

QEMU_MACHINE := -cpu host -machine virt,gic_version=host,accel=kvm

else
@@ -89,9 +80,11 @@ QEMU_MACHINE := -cpu cortex-a53 -machine virt 
CFLAGS += -march=armv8-a -mtune=cortex-a53

endif

else ifeq ($(ARCH),arm)

CHOST := arm-linux-musleabi

QEMU_ARCH := arm

KERNEL_ARCH := arm

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/arch/arm/boot/zImage

QEMU_VPORT_RESULT := virtio-serial-device

ifeq ($(HOST_ARCH),$(ARCH))

QEMU_MACHINE := -cpu host -machine virt,gic_version=host,accel=kvm

else
@@ -99,9 +92,11 @@ QEMU_MACHINE := -cpu cortex-a15 -machine virt 
CFLAGS += -march=armv7-a -mtune=cortex-a15 -mabi=aapcs-linux

endif

else ifeq ($(ARCH),armeb)

CHOST := armeb-linux-musleabi

QEMU_ARCH := arm

KERNEL_ARCH := arm

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/arch/arm/boot/zImage

QEMU_VPORT_RESULT := virtio-serial-device

ifeq ($(HOST_ARCH),$(ARCH))

QEMU_MACHINE := -cpu host -machine virt,gic_version=host,accel=kvm

else
@@ -110,6 +105,7 @@ CFLAGS += -march=armv7-a -mabi=aapcs-linux # We don't pass -mtune=cortex-a15 due 
LDFLAGS += -Wl,--be8

endif

else ifeq ($(ARCH),x86_64)

CHOST := x86_64-linux-musl

QEMU_ARCH := x86_64

KERNEL_ARCH := x86_64

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/arch/x86/boot/bzImage
@@ -120,6 +116,7 @@ QEMU_MACHINE := -cpu Skylake-Server -machine q35 
CFLAGS += -march=skylake-avx512

endif

else ifeq ($(ARCH),i686)

CHOST := i686-linux-musl

QEMU_ARCH := i386

KERNEL_ARCH := x86

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/arch/x86/boot/bzImage
@@ -130,6 +127,7 @@ QEMU_MACHINE := -cpu coreduo -machine q35 
CFLAGS += -march=prescott

endif

else ifeq ($(ARCH),mips64)

CHOST := mips64-linux-musl

QEMU_ARCH := mips64

KERNEL_ARCH := mips

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/vmlinux
@@ -141,6 +139,7 @@ QEMU_MACHINE := -cpu MIPS64R2-generic -machine malta -smp 1 
CFLAGS += -march=mips64r2 -EB

endif

else ifeq ($(ARCH),mips64el)

CHOST := mips64el-linux-musl

QEMU_ARCH := mips64el

KERNEL_ARCH := mips

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/vmlinux
@@ -152,6 +151,7 @@ QEMU_MACHINE := -cpu MIPS64R2-generic -machine malta -smp 1 
CFLAGS += -march=mips64r2 -EL

endif

else ifeq ($(ARCH),mips)

CHOST := mips-linux-musl

QEMU_ARCH := mips

KERNEL_ARCH := mips

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/vmlinux
@@ -163,6 +163,7 @@ QEMU_MACHINE := -cpu 24Kf -machine malta -smp 1 
CFLAGS += -march=mips32r2 -EB

endif

else ifeq ($(ARCH),mipsel)

CHOST := mipsel-linux-musl

QEMU_ARCH := mipsel

KERNEL_ARCH := mips

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/vmlinux
@@ -173,7 +174,18 @@ else 
QEMU_MACHINE := -cpu 24Kf -machine malta -smp 1

CFLAGS += -march=mips32r2 -EL

endif

else ifeq ($(ARCH),powerpc64)

CHOST := powerpc64-linux-musl

QEMU_ARCH := ppc64

KERNEL_ARCH := powerpc

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/vmlinux

ifeq ($(HOST_ARCH),$(ARCH))

QEMU_MACHINE := -cpu host,accel=kvm -machine pseries

else

QEMU_MACHINE := -machine pseries

endif

else ifeq ($(ARCH),powerpc64le)

CHOST := powerpc64le-linux-musl

QEMU_ARCH := ppc64

KERNEL_ARCH := powerpc

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/vmlinux
@@ -182,8 +194,8 @@ QEMU_MACHINE := -cpu host,accel=kvm -machine pseries 
else

QEMU_MACHINE := -machine pseries

endif

CFLAGS += -mcpu=powerpc64le -mlong-double-64

else ifeq ($(ARCH),powerpc)

CHOST := powerpc-linux-musl

QEMU_ARCH := ppc

KERNEL_ARCH := powerpc

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/arch/powerpc/boot/uImage
@@ -192,26 +204,79 @@ QEMU_MACHINE := -cpu host,accel=kvm -machine ppce500 
else

QEMU_MACHINE := -machine ppce500

endif

CFLAGS += -mcpu=powerpc -mlong-double-64 -msecure-plt

else ifeq ($(ARCH),m68k)

CHOST := m68k-linux-musl

QEMU_ARCH := m68k

KERNEL_ARCH := m68k

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/vmlinux

KERNEL_CMDLINE := $(shell sed -n 's/CONFIG_CMDLINE=\(.*\)/\1/p' arch/m68k.config)

ifeq ($(HOST_ARCH),$(ARCH))

QEMU_MACHINE := -cpu host,accel=kvm -machine q800 -smp 1 -append $(KERNEL_CMDLINE)

QEMU_MACHINE := -cpu host,accel=kvm -machine q800 -append $(KERNEL_CMDLINE)

else

QEMU_MACHINE := -machine q800 -smp 1 -append $(KERNEL_CMDLINE)

endif

else ifeq ($(ARCH),riscv64)

CHOST := riscv64-linux-musl

QEMU_ARCH := riscv64

KERNEL_ARCH := riscv

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/arch/riscv/boot/Image

QEMU_VPORT_RESULT := virtio-serial-device

ifeq ($(HOST_ARCH),$(ARCH))

QEMU_MACHINE := -cpu host,accel=kvm -machine virt

else

QEMU_MACHINE := -cpu rv64 -machine virt

endif

else ifeq ($(ARCH),riscv32)

CHOST := riscv32-linux-musl

QEMU_ARCH := riscv32

KERNEL_ARCH := riscv

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/arch/riscv/boot/Image

QEMU_VPORT_RESULT := virtio-serial-device

ifeq ($(HOST_ARCH),$(ARCH))

QEMU_MACHINE := -cpu host,accel=kvm -machine virt

else

QEMU_MACHINE := -cpu rv32 -machine virt

endif

else ifeq ($(ARCH),s390x)

CHOST := s390x-linux-musl

QEMU_ARCH := s390x

KERNEL_ARCH := s390

KERNEL_BZIMAGE := $(KERNEL_BUILD_PATH)/arch/s390/boot/bzImage

KERNEL_CMDLINE := $(shell sed -n 's/CONFIG_CMDLINE=\(.*\)/\1/p' arch/s390x.config)

QEMU_VPORT_RESULT := virtio-serial-ccw

ifeq ($(HOST_ARCH),$(ARCH))

QEMU_MACHINE := -cpu host,accel=kvm -machine s390-ccw-virtio -append $(KERNEL_CMDLINE)

else

QEMU_MACHINE := -machine s390-ccw-virtio -append $(KERNEL_CMDLINE)

endif

else

$(error I only build: x86_64, i686, arm, armeb, aarch64, aarch64_be, mips, mipsel, mips64, mips64el, powerpc64le, powerpc, m68k)

$(error I only build: x86_64, i686, arm, armeb, aarch64, aarch64_be, mips, mipsel, mips64, mips64el, powerpc64, powerpc64le, powerpc, m68k, riscv64, riscv32, s390x)

endif



TOOLCHAIN_FILENAME := $(CHOST)-cross.tgz

TOOLCHAIN_TAR := $(DISTFILES_PATH)/$(TOOLCHAIN_FILENAME)

TOOLCHAIN_PATH := $(BUILD_PATH)/$(CHOST)-cross

TOOLCHAIN_DIR := https://download.wireguard.com/qemu-test/toolchains/20211123/

$(eval $(call file_download,toolchain-sha256sums-20211123,$(TOOLCHAIN_DIR)SHA256SUMS#,83da033fd8c798df476c21d9612da2dfb896ec62fbed4ceec5eefc0e56b3f0c8))

$(eval $(call file_download,$(TOOLCHAIN_FILENAME),$(TOOLCHAIN_DIR),,$(DISTFILES_PATH)/toolchain-sha256sums-20211123))



STRIP := $(CHOST)-strip

CROSS_COMPILE_FLAG := --build=$(CBUILD) --host=$(CHOST)

$(info Building for $(CHOST) using $(CBUILD))

export CROSS_COMPILE := $(CHOST)-

export PATH := $(TOOLCHAIN_PATH)/bin:$(PATH)

export CC := $(CHOST)-gcc

CCACHE_PATH := $(shell which ccache 2>/dev/null)

ifneq ($(CCACHE_PATH),)

export KBUILD_BUILD_TIMESTAMP := Fri Jun  5 15:58:00 CEST 2015

export PATH := $(TOOLCHAIN_PATH)/bin/ccache:$(PATH)

export CCACHE_SLOPPINESS := file_macro,time_macros

export CCACHE_DIR ?= $(PWD)/ccache

endif



REAL_CC := $(CBUILD)-gcc

MUSL_CC := $(BUILD_PATH)/musl-gcc

export CC := $(MUSL_CC)

USERSPACE_DEPS := $(MUSL_CC) $(BUILD_PATH)/include/.installed $(BUILD_PATH)/include/linux/.installed

USERSPACE_DEPS := $(TOOLCHAIN_PATH)/.installed $(TOOLCHAIN_PATH)/$(CHOST)/include/linux/.installed



comma := ,

build: $(KERNEL_BZIMAGE)

qemu: $(KERNEL_BZIMAGE)

	rm -f $(BUILD_PATH)/result
@@ -222,13 +287,14 @@ qemu: $(KERNEL_BZIMAGE) 
		$(QEMU_MACHINE) \

		-m $$(grep -q CONFIG_DEBUG_KMEMLEAK=y $(KERNEL_BUILD_PATH)/.config && echo 1G || echo 256M) \

		-serial stdio \

		-serial file:$(BUILD_PATH)/result \

		-chardev file,path=$(BUILD_PATH)/result,id=result \

		$(if $(QEMU_VPORT_RESULT),-device $(QEMU_VPORT_RESULT) -device virtserialport$(comma)chardev=result,-serial chardev:result) \

		-no-reboot \

		-monitor none \

		-kernel $<

	grep -Fq success $(BUILD_PATH)/result



$(BUILD_PATH)/init-cpio-spec.txt:

$(BUILD_PATH)/init-cpio-spec.txt: $(TOOLCHAIN_PATH)/.installed $(BUILD_PATH)/init

	mkdir -p $(BUILD_PATH)

	echo "file /init $(BUILD_PATH)/init 755 0 0" > $@

	echo "file /init.sh $(PWD)/../netns.sh 755 0 0" >> $@
@@ -246,10 +312,10 @@ $(BUILD_PATH)/init-cpio-spec.txt: 
	echo "slink /bin/iptables xtables-legacy-multi 777 0 0" >> $@

	echo "slink /bin/ping6 ping 777 0 0" >> $@

	echo "dir /lib 755 0 0" >> $@

	echo "file /lib/libc.so $(MUSL_PATH)/lib/libc.so 755 0 0" >> $@

	echo "slink /lib/ld-linux.so.1 libc.so 777 0 0" >> $@

	echo "file /lib/libc.so $(TOOLCHAIN_PATH)/$(CHOST)/lib/libc.so 755 0 0" >> $@

	echo "slink $$($(CHOST)-readelf -p .interp '$(BUILD_PATH)/init'| grep -o '/lib/.*') libc.so 777 0 0" >> $@



$(KERNEL_BUILD_PATH)/.config: kernel.config arch/$(ARCH).config

$(KERNEL_BUILD_PATH)/.config: $(TOOLCHAIN_PATH)/.installed kernel.config arch/$(ARCH).config

	mkdir -p $(KERNEL_BUILD_PATH)

	cp kernel.config $(KERNEL_BUILD_PATH)/minimal.config

	printf 'CONFIG_NR_CPUS=$(NR_CPUS)\nCONFIG_INITRAMFS_SOURCE="$(BUILD_PATH)/init-cpio-spec.txt"\n' >> $(KERNEL_BUILD_PATH)/minimal.config
@@ -258,29 +324,24 @@ $(KERNEL_BUILD_PATH)/.config: kernel.config arch/$(ARCH).config 
	cd $(KERNEL_BUILD_PATH) && ARCH=$(KERNEL_ARCH) $(KERNEL_PATH)/scripts/kconfig/merge_config.sh -n $(KERNEL_BUILD_PATH)/.config $(KERNEL_BUILD_PATH)/minimal.config

	$(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): $(KERNEL_BUILD_PATH)/.config $(BUILD_PATH)/init-cpio-spec.txt $(MUSL_PATH)/lib/libc.so $(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 ../netns.sh $(WIREGUARD_SOURCES)

$(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 ../netns.sh $(WIREGUARD_SOURCES)

	$(MAKE) -C $(KERNEL_PATH) O=$(KERNEL_BUILD_PATH) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE)



$(BUILD_PATH)/include/linux/.installed: | $(KERNEL_BUILD_PATH)/.config

	$(MAKE) -C $(KERNEL_PATH) O=$(KERNEL_BUILD_PATH) INSTALL_HDR_PATH=$(BUILD_PATH) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) headers_install

$(TOOLCHAIN_PATH)/$(CHOST)/include/linux/.installed: | $(KERNEL_BUILD_PATH)/.config $(TOOLCHAIN_PATH)/.installed

	rm -rf $(TOOLCHAIN_PATH)/$(CHOST)/include/linux

	$(MAKE) -C $(KERNEL_PATH) O=$(KERNEL_BUILD_PATH) INSTALL_HDR_PATH=$(TOOLCHAIN_PATH)/$(CHOST) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) headers_install

	touch $@



$(MUSL_PATH)/lib/libc.so: $(MUSL_TAR)

$(TOOLCHAIN_PATH)/.installed: $(TOOLCHAIN_TAR)

	mkdir -p $(BUILD_PATH)

	flock -s $<.lock tar -C $(BUILD_PATH) -xf $<

	cd $(MUSL_PATH) && CC=$(REAL_CC) ./configure --prefix=/ --disable-static --build=$(CBUILD)

	$(MAKE) -C $(MUSL_PATH)

	$(STRIP) -s $@



$(BUILD_PATH)/include/.installed: $(MUSL_PATH)/lib/libc.so

	$(MAKE) -C $(MUSL_PATH) DESTDIR=$(BUILD_PATH) install-headers

	$(STRIP) -s $(TOOLCHAIN_PATH)/$(CHOST)/lib/libc.so

ifneq ($(CCACHE_PATH),)

	mkdir -p $(TOOLCHAIN_PATH)/bin/ccache

	ln -s $(CCACHE_PATH) $(TOOLCHAIN_PATH)/bin/ccache/$(CC)

endif

	touch $@



$(MUSL_CC): $(MUSL_PATH)/lib/libc.so

	sh $(MUSL_PATH)/tools/musl-gcc.specs.sh $(BUILD_PATH)/include $(MUSL_PATH)/lib /lib/ld-linux.so.1 > $(BUILD_PATH)/musl-gcc.specs

	printf '#!/bin/sh\nexec "$(REAL_CC)" --specs="$(BUILD_PATH)/musl-gcc.specs" "$$@"\n' > $(BUILD_PATH)/musl-gcc

	chmod +x $(BUILD_PATH)/musl-gcc



$(IPERF_PATH)/.installed: $(IPERF_TAR)

	mkdir -p $(BUILD_PATH)

	flock -s $<.lock tar -C $(BUILD_PATH) -xf $<
@@ -289,6 +350,7 @@ $(IPERF_PATH)/.installed: $(IPERF_TAR) 
	touch $@



$(IPERF_PATH)/src/iperf3: | $(IPERF_PATH)/.installed $(USERSPACE_DEPS)

	cd $(IPERF_PATH) && autoreconf -fi

	cd $(IPERF_PATH) && CFLAGS="$(CFLAGS) -D_GNU_SOURCE" ./configure --prefix=/ $(CROSS_COMPILE_FLAG) --enable-static --disable-shared --with-openssl=no

	$(MAKE) -C $(IPERF_PATH)

	$(STRIP) -s $@
@@ -304,7 +366,7 @@ $(WIREGUARD_TOOLS_PATH)/src/wg: | $(WIREGUARD_TOOLS_PATH)/.installed $(USERSPACE 


$(BUILD_PATH)/init: init.c | $(USERSPACE_DEPS)

	mkdir -p $(BUILD_PATH)

	$(MUSL_CC) -o $@ $(CFLAGS) $(LDFLAGS) -std=gnu11 $<

	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) -std=gnu11 $<

	$(STRIP) -s $@



$(IPUTILS_PATH)/.installed: $(IPUTILS_TAR)
@@ -323,15 +385,15 @@ $(BASH_PATH)/.installed: $(BASH_TAR) 
	touch $@



$(BASH_PATH)/bash: | $(BASH_PATH)/.installed $(USERSPACE_DEPS)

	cd $(BASH_PATH) && ./configure --prefix=/ $(CROSS_COMPILE_FLAG) --without-bash-malloc --disable-debugger --disable-help-builtin --disable-history --disable-multibyte --disable-progcomp --disable-readline --disable-mem-scramble

	cd $(BASH_PATH) && ./configure --prefix=/ $(CROSS_COMPILE_FLAG) --without-bash-malloc --disable-debugger --disable-help-builtin --disable-history --disable-progcomp --disable-readline --disable-mem-scramble

	$(MAKE) -C $(BASH_PATH)

	$(STRIP) -s $@



$(IPROUTE2_PATH)/.installed: $(IPROUTE2_TAR)

	mkdir -p $(BUILD_PATH)

	flock -s $<.lock tar -C $(BUILD_PATH) -xf $<

	printf 'CC:=$(CC)\nPKG_CONFIG:=pkg-config\nTC_CONFIG_XT:=n\nTC_CONFIG_ATM:=n\nTC_CONFIG_IPSET:=n\nIP_CONFIG_SETNS:=y\nHAVE_ELF:=n\nHAVE_MNL:=n\nHAVE_BERKELEY_DB:=n\nHAVE_LATEX:=n\nHAVE_PDFLATEX:=n\nCFLAGS+=-DHAVE_SETNS\n' > $(IPROUTE2_PATH)/config.mk

	printf 'lib: snapshot\n\t$$(MAKE) -C lib\nip/ip: lib\n\t$$(MAKE) -C ip ip\nmisc/ss: lib\n\t$$(MAKE) -C misc ss\n' >> $(IPROUTE2_PATH)/Makefile

	printf 'CC:=$(CC)\nPKG_CONFIG:=pkg-config\nTC_CONFIG_XT:=n\nTC_CONFIG_ATM:=n\nTC_CONFIG_IPSET:=n\nIP_CONFIG_SETNS:=y\nHAVE_ELF:=n\nHAVE_MNL:=n\nHAVE_BERKELEY_DB:=n\nHAVE_LATEX:=n\nHAVE_PDFLATEX:=n\nCFLAGS+=-DHAVE_SETNS -DHAVE_HANDLE_AT\n' > $(IPROUTE2_PATH)/config.mk

	printf 'libutil.a.done:\n\tflock -x $$@.lock $$(MAKE) -C lib\n\ttouch $$@\nip/ip: libutil.a.done\n\t$$(MAKE) -C ip ip\nmisc/ss: libutil.a.done\n\t$$(MAKE) -C misc ss\n' >> $(IPROUTE2_PATH)/Makefile

	touch $@



$(IPROUTE2_PATH)/ip/ip: | $(IPROUTE2_PATH)/.installed $(USERSPACE_DEPS)
@@ -370,8 +432,13 @@ clean: 
distclean: clean

	rm -rf $(DISTFILES_PATH)



cacheclean: clean

ifneq ($(CCACHE_DIR),)

	rm -rf $(CCACHE_DIR)

endif



menuconfig: $(KERNEL_BUILD_PATH)/.config

	$(MAKE) -C $(KERNEL_PATH) O=$(KERNEL_BUILD_PATH) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) menuconfig



.PHONY: qemu build clean distclean menuconfig

.PHONY: qemu build clean distclean cacheclean menuconfig

.DELETE_ON_ERROR:

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

+4 −1
Original line number Diff line number Diff line 
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 panic_on_warn=1"

CONFIG_FRAME_WARN=1280

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

+4 −1
Original line number Diff line number Diff line 
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 panic_on_warn=1"

CONFIG_FRAME_WARN=1280