test

travis-ci/vmtest/build_pahole.sh

@@ -4,21 +4,20 @@ set -eu
 
 source $(cd $(dirname $0) && pwd)/helpers.sh
 
+travis_fold start build_pahole "Building pahole"
+
 CWD=$(pwd)
 REPO_PATH=$1
-PAHOLE_ORIGIN=${PAHOLE_ORIGIN:-https://git.kernel.org/pub/scm/devel/pahole/pahole.git}
-PAHOLE_BRANCH=${PAHOLE_BRANCH:-master}
-
-travis_fold start build_pahole "Building pahole ${PAHOLE_ORIGIN} ${PAHOLE_BRANCH}"
+PAHOLE_ORIGIN=https://git.kernel.org/pub/scm/devel/pahole/pahole.git
 
 mkdir -p ${REPO_PATH}
 cd ${REPO_PATH}
 git init
 git remote add origin ${PAHOLE_ORIGIN}
 git fetch origin
-git checkout ${PAHOLE_BRANCH}
+git checkout master
 
-# temporary work-around to bump pahole to 1.22 before it is officially released
+# temporary fix up for pahole until official 1.22 release
 sed -i 's/DDWARVES_MINOR_VERSION=21/DDWARVES_MINOR_VERSION=22/' CMakeLists.txt
 
 mkdir -p build

travis-ci/vmtest/build_selftests.sh

@@ -6,14 +6,12 @@ source $(cd $(dirname $0) && pwd)/helpers.sh
 
 travis_fold start prepare_selftests "Building selftests"
 
-sudo apt-get -y install python-docutils # for rst2man
-
 LLVM_VER=14
 LIBBPF_PATH="${REPO_ROOT}"
 
 PREPARE_SELFTESTS_SCRIPT=${VMTEST_ROOT}/prepare_selftests-${KERNEL}.sh
 if [ -f "${PREPARE_SELFTESTS_SCRIPT}" ]; then
-	(cd "${REPO_ROOT}/${REPO_PATH}/tools/testing/selftests/bpf" && ${PREPARE_SELFTESTS_SCRIPT})
+	(cd "${REPO_ROOT}/tools/testing/selftests/bpf" && ${PREPARE_SELFTESTS_SCRIPT})
 fi
 
 if [[ "${KERNEL}" = 'LATEST' ]]; then
@@ -28,10 +26,10 @@ make \
 	LLVM_STRIP=llvm-strip-${LLVM_VER} \
 	VMLINUX_BTF="${VMLINUX_BTF}" \
 	VMLINUX_H=${VMLINUX_H} \
-	-C "${REPO_ROOT}/${REPO_PATH}/tools/testing/selftests/bpf" \
-	-j $((4*$(nproc))) >/dev/null
+	-C "${REPO_ROOT}/tools/testing/selftests/bpf" \
+	-j $((2*$(nproc)))
 mkdir ${LIBBPF_PATH}/selftests
-cp -R "${REPO_ROOT}/${REPO_PATH}/tools/testing/selftests/bpf" \
+cp -R "${REPO_ROOT}/tools/testing/selftests/bpf" \
 	${LIBBPF_PATH}/selftests
 cd ${LIBBPF_PATH}
 rm selftests/bpf/.gitignore

travis-ci/vmtest/checkout_latest_kernel.sh

@@ -8,22 +8,12 @@ CWD=$(pwd)
 LIBBPF_PATH=$(pwd)
 REPO_PATH=$1
 
-KERNEL_ORIGIN=${KERNEL_ORIGIN:-https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git}
-KERNEL_BRANCH=${KERNEL_BRANCH:-CHECKPOINT}
-if [[ "${KERNEL_BRANCH}" = 'CHECKPOINT' ]]; then
-  echo "using CHECKPOINT sha1"
-  LINUX_SHA=$(cat ${LIBBPF_PATH}/CHECKPOINT-COMMIT)
-else
-  echo "using ${KERNEL_BRANCH} sha1"
-  LINUX_SHA=$(git ls-remote ${KERNEL_ORIGIN} ${KERNEL_BRANCH} | awk '{print $1}')
-fi
-SNAPSHOT_URL=${KERNEL_ORIGIN}/snapshot/bpf-next-${LINUX_SHA}.tar.gz
+BPF_NEXT_ORIGIN=https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
+LINUX_SHA=$(cat ${LIBBPF_PATH}/CHECKPOINT-COMMIT)
+SNAPSHOT_URL=https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/snapshot/bpf-next-${LINUX_SHA}.tar.gz
 
 echo REPO_PATH = ${REPO_PATH}
-
-echo KERNEL_ORIGIN = ${KERNEL_ORIGIN}
 echo LINUX_SHA = ${LINUX_SHA}
-echo SNAPSHOT_URL = ${SNAPSHOT_URL}
 
 if [ ! -d "${REPO_PATH}" ]; then
 	echo
@@ -32,14 +22,15 @@ if [ ! -d "${REPO_PATH}" ]; then
 	mkdir -p $(dirname "${REPO_PATH}")
 	cd $(dirname "${REPO_PATH}")
 	# attempt to fetch desired bpf-next repo snapshot
-	if wget -nv ${SNAPSHOT_URL} && tar xf bpf-next-${LINUX_SHA}.tar.gz --totals ; then
+	if wget ${SNAPSHOT_URL} ; then
+		tar xf bpf-next-${LINUX_SHA}.tar.gz
 		mv bpf-next-${LINUX_SHA} $(basename ${REPO_PATH})
 	else
 		# but fallback to git fetch approach if that fails
-		mkdir -p $(basename ${REPO_PATH})
-		cd $(basename ${REPO_PATH})
+		mkdir -p ${REPO_PATH}
+		cd ${REPO_PATH}
 		git init
-		git remote add bpf-next ${KERNEL_ORIGIN}
+		git remote add bpf-next ${BPF_NEXT_ORIGIN}
 		# try shallow clone first
 		git fetch --depth 32 bpf-next
 		# check if desired SHA exists

travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0

@@ -1,57 +1,42 @@
 # PERMANENTLY DISABLED
 align			# verifier output format changed
-atomics			# new atomic operations (v5.12+)
-atomic_bounds		# new atomic operations (v5.12+)
-bind_perm		# changed semantics of return values (v5.12+)
 bpf_iter		# bpf_iter support is missing
 bpf_obj_id		# bpf_link support missing for GET_OBJ_INFO, GET_FD_BY_ID, etc
 bpf_tcp_ca		# STRUCT_OPS is missing
+
+# latest Clang generates code that fails to verify
+bpf_verif_scale
+#bpf_verif_scale/strobemeta.o
+#bpf_verif_scale/strobemeta_nounroll1.o
+#bpf_verif_scale/strobemeta_nounroll2.o
 btf_map_in_map		# inner map leak fixed in 5.8
-btf_skc_cls_ingress	# v5.10+ functionality
+
 cg_storage_multi	# v5.9+ functionality
 cgroup_attach_multi	# BPF_F_REPLACE_PROG missing
 cgroup_link		# LINK_CREATE is missing
 cgroup_skb_sk_lookup	# bpf_sk_lookup_tcp() helper is missing
-check_mtu		# missing BPF helper (v5.12+)
 cls_redirect		# bpf_csum_level() helper is missing
 connect_force_port	# cgroup/get{peer,sock}name{4,6} support is missing
 d_path			# v5.10+ feature
 enable_stats		# BPF_ENABLE_STATS support is missing
 fentry_fexit		# bpf_prog_test_tracing missing
 fentry_test		# bpf_prog_test_tracing missing
 fexit_bpf2bpf		# freplace is missing
-fexit_sleep		# relies on bpf_trampoline fix in 5.12+
 fexit_test		# bpf_prog_test_tracing missing
 flow_dissector		# bpf_link-based flow dissector is in 5.8+
 flow_dissector_reattach
-for_each		# v5.12+
-get_func_ip_test	# v5.15+
 get_stack_raw_tp	# exercising BPF verifier bug causing infinite loop
-hash_large_key		# v5.11+
-ima			# v5.11+
 kfree_skb		# 32-bit pointer arith in test_pkt_access
 ksyms			# __start_BTF has different name
-kfunc_call		# v5.13+
 link_pinning		# bpf_link is missing
-linked_vars		# v5.13+
 load_bytes_relative	# new functionality in 5.8
-lookup_and_delete	# v5.14+
-map_init		# per-CPU LRU missing
 map_ptr			# test uses BPF_MAP_TYPE_RINGBUF, added in 5.8
-metadata		# v5.10+
-migrate_reuseport	# v5.14+
 mmap			# 5.5 kernel is too permissive with re-mmaping
 modify_return		# fmod_ret support is missing
-module_attach		# module BTF support missing (v5.11+)
-netcnt
 ns_current_pid_tgid	# bpf_get_ns_current_pid_tgid() helper is missing
-pe_preserve_elems	# v5.10+
 perf_branches		# bpf_read_branch_records() helper is missing
 pkt_access		# 32-bit pointer arith in test_pkt_access
-probe_read_user_str	# kernel bug with garbage bytes at the end
 prog_run_xattr		# 32-bit pointer arith in test_pkt_access
-raw_tp_test_run		# v5.10+
-recursion		# v5.12+
 ringbuf			# BPF_MAP_TYPE_RINGBUF is supported in 5.8+
 
 # bug in verifier w/ tracking references
@@ -61,48 +46,24 @@ reference_tracking
 select_reuseport	# UDP support is missing
 send_signal		# bpf_send_signal_thread() helper is missing
 sk_assign		# bpf_sk_assign helper missing
-sk_lookup		# v5.9+
-sk_storage_tracing	# missing bpf_sk_storage_get() helper
-skb_ctx			# ctx_{size, }_{in, out} in BPF_PROG_TEST_RUN is missing
 skb_helpers		# helpers added in 5.8+
-snprintf		# v5.13+
-snprintf_btf		# v5.10+
-sock_fields		# v5.10+
-socket_cookie		# v5.12+
 sockmap_basic		# uses new socket fields, 5.8+
 sockmap_listen		# no listen socket supportin SOCKMAP
 sockopt_sk
-stacktrace_build_id	# v5.9+
-stack_var_off		# v5.12+
-syscall			# v5.14+
-task_local_storage	# v5.12+
+sk_lookup		# v5.9+
+skb_ctx			# ctx_{size, }_{in, out} in BPF_PROG_TEST_RUN is missing
 tcp_hdr_options		# v5.10+, new TCP header options feature in BPF
-tcpbpf_user		# LINK_CREATE is missing
-tc_redirect		# v5.14+
 test_bpffs		# v5.10+, new CONFIG_BPF_PRELOAD=y and CONFIG_BPF_PRELOAD_UMG=y|m
-test_bprm_opts		# v5.11+
 test_global_funcs	# kernel doesn't support BTF linkage=global on FUNCs
 test_local_storage	# v5.10+ feature
 test_lsm		# no BPF_LSM support
 test_overhead		# no fmod_ret support
-test_profiler		# needs verifier logic improvements from v5.10+
-test_skb_pkt_end	# v5.11+
-timer			# v5.15+
-timer_mim		# v5.15+
-trace_ext		# v5.10+
-trace_printk		# v5.14+
-trampoline_count	# v5.12+ have lower allowed limits
 udp_limit		# no cgroup/sock_release BPF program type (5.9+)
 varlen			# verifier bug fixed in later kernels
 vmlinux			# hrtimer_nanosleep() signature changed incompatibly
 xdp_adjust_tail		# new XDP functionality added in 5.8
 xdp_attach		# IFLA_XDP_EXPECTED_FD support is missing
 xdp_bpf2bpf		# freplace is missing
-xdp_context_test_run	# v5.15+
 xdp_cpumap_attach	# v5.9+
 xdp_devmap_attach	# new feature in 5.8
 xdp_link		# v5.9+
-
-# SUBTESTS FAILING (block entire test until blocking subtests works properly)
-btf			# "size check test", "func (Non zero vlen)"
-tailcalls		# tailcall_bpf2bpf_1, tailcall_bpf2bpf_2, tailcall_bpf2bpf_3

travis-ci/vmtest/configs/blacklist/BLACKLIST-latest

@@ -1 +1,2 @@
-# TEMPORARY
+# TEMPORARY
+tc_bpf

travis-ci/vmtest/configs/latest.config

@@ -2,14 +2,14 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/x86 5.9.0-rc1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 8.2.1 20180801 (Red Hat 8.2.1-2)"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 8.3.1 20191121 (Red Hat 8.3.1-5)"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80201
+CONFIG_GCC_VERSION=80301
 CONFIG_LD_VERSION=230000000
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -2846,6 +2846,8 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
+# CONFIG_KASAN is not set
 # end of Memory Debugging
 
 # CONFIG_DEBUG_SHIRQ is not set

travis-ci/vmtest/configs/whitelist/WHITELIST-4.9.0

@@ -1,4 +1,4 @@
-# btf_dump -- need to disable data dump sub-tests
+btf_dump
 core_retro
 cpu_mask
 hashmap

travis-ci/vmtest/diffs/0001-find_vma.diff

@@ -0,0 +1,13 @@
+diff --git a/mm/mmap.c b/mm/mmap.c
+index 88dcc5c25225..8c78b85475b1 100644
+--- a/mm/mmap.c
++++ b/mm/mmap.c
+@@ -2275,7 +2275,7 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
+ 	struct rb_node *rb_node;
+ 	struct vm_area_struct *vma;
+
+-	mmap_assert_locked(mm);
++	VM_BUG_ON_MM(!rwsem_is_locked(&mm->mmap_lock), mm);
+ 	/* Check the cache first. */
+ 	vma = vmacache_find(mm, addr);
+ 	if (likely(vma))

travis-ci/vmtest/diffs/0002-x86-setup-Explicitly-include-acpi.h.diff

@@ -0,0 +1,56 @@
+From ea7b4244b3656ca33b19a950f092b5bbc718b40c Mon Sep 17 00:00:00 2001
+From: Nathan Chancellor <nathan@kernel.org>
+Date: Wed, 1 Sep 2021 09:07:01 -0700
+Subject: [PATCH] x86/setup: Explicitly include acpi.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+After commit 342f43af70db ("iscsi_ibft: fix crash due to KASLR physical
+memory remapping") x86_64_defconfig shows the following errors:
+
+  arch/x86/kernel/setup.c: In function ‘setup_arch’:
+  arch/x86/kernel/setup.c:916:13: error: implicit declaration of function ‘acpi_mps_check’ [-Werror=implicit-function-declaration]
+    916 |         if (acpi_mps_check()) {
+        |             ^~~~~~~~~~~~~~
+  arch/x86/kernel/setup.c:1110:9: error: implicit declaration of function ‘acpi_table_upgrade’ [-Werror=implicit-function-declaration]
+   1110 |         acpi_table_upgrade();
+        |         ^~~~~~~~~~~~~~~~~~
+  [... more acpi noise ...]
+
+acpi.h was being implicitly included from iscsi_ibft.h in this
+configuration so the removal of that header means these functions have
+no definition or declaration.
+
+In most other configurations, <linux/acpi.h> continued to be included
+through at least <linux/tboot.h> if CONFIG_INTEL_TXT was enabled, and
+there were probably other implicit include paths too.
+
+Add acpi.h explicitly so there is no more error, and so that we don't
+continue to depend on these unreliable implicit include paths.
+
+Tested-by: Matthieu Baerts <matthieu.baerts@tessares.net>
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+Cc: Maurizio Lombardi <mlombard@redhat.com>
+Cc: Mike Rapoport <rppt@linux.ibm.com>
+Cc: Konrad Rzeszutek Wilk <konrad@kernel.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ arch/x86/kernel/setup.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
+index 63b20536c8d2..79f164141116 100644
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -5,6 +5,7 @@
+  * This file contains the setup_arch() code, which handles the architecture-dependent
+  * parts of early kernel initialization.
+  */
++#include <linux/acpi.h>
+ #include <linux/console.h>
+ #include <linux/crash_dump.h>
+ #include <linux/dma-map-ops.h>
+-- 
+2.30.2
+

travis-ci/vmtest/mkrootfs.sh

@@ -81,7 +81,6 @@ packages=(
 	binutils
 	elfutils
 	glibc
-	iproute2
 	# selftests test_verifier dependencies.
 	libcap
 )
@@ -102,6 +101,15 @@ rm -rf "$root/usr/share/{doc,help,man,texinfo}"
 
 chroot "${root}" /bin/busybox --install
 
+cat > "$root/etc/fstab" << "EOF"
+dev /dev devtmpfs rw,nosuid 0 0
+proc /proc proc rw,nosuid,nodev,noexec 0 0
+sys /sys sysfs rw,nosuid,nodev,noexec 0 0
+debugfs /sys/kernel/debug debugfs mode=755,realtime 0 0
+bpffs /sys/fs/bpf bpf realtime 0 0
+EOF
+chmod 644 "$root/etc/fstab"
+
 cat > "$root/etc/inittab" << "EOF"
 ::sysinit:/etc/init.d/rcS
 ::ctrlaltdel:/sbin/reboot
@@ -115,38 +123,20 @@ mkdir -m 755 "$root/etc/init.d" "$root/etc/rcS.d"
 cat > "$root/etc/rcS.d/S10-mount" << "EOF"
 #!/bin/sh
 
-set -eux
-
-/bin/mount proc /proc -t proc
-
-# Mount devtmpfs if not mounted
-if [[ -z $(/bin/mount -l -t devtmpfs) ]]; then
-	/bin/mount devtmpfs /dev -t devtmpfs
-fi
-
-/bin/mount sysfs /sys -t sysfs
-/bin/mount bpffs /sys/fs/bpf -t bpf
-/bin/mount debugfs /sys/kernel/debug -t debugfs
-
-echo 'Listing currently mounted file systems'
-/bin/mount
+/bin/mount -a
 EOF
 chmod 755 "$root/etc/rcS.d/S10-mount"
 
 cat > "$root/etc/rcS.d/S40-network" << "EOF"
 #!/bin/sh
 
-set -eux
-
 ip link set lo up
 EOF
 chmod 755 "$root/etc/rcS.d/S40-network"
 
 cat > "$root/etc/init.d/rcS" << "EOF"
 #!/bin/sh
 
-set -eux
-
 for path in /etc/rcS.d/S*; do
 	[ -x "$path" ] && "$path"
 done