Commit 8c0bb89e authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'selftests/bpf: minor fixups' 



Li Zhijian says:

====================
Fix a few issues reported by 0Day/LKP during runing selftests/bpf.

Changelog:
V2:
- folded previous similar standalone patch to [1/5], and add acked tag
  from Song Liu
- add acked tag to [2/5], [3/5] from Song Liu
- [4/5]: move test_bpftool.py to TEST_PROGS_EXTENDED, files in TEST_GEN_PROGS_EXTENDED
are generated by make. Otherwise, it will break out-of-tree install:
'make O=/kselftest-build SKIP_TARGETS= V=1 -C tools/testing/selftests install INSTALL_PATH=/kselftest-install'
- [5/5]: new patch
====================

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents a6258837 00e11160

tools/testing/selftests/bpf/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ TEST_PROGS := test_kmod.sh \ 


TEST_PROGS_EXTENDED := with_addr.sh \

	with_tunnels.sh \

	test_xdp_vlan.sh

	test_xdp_vlan.sh test_bpftool.py



# Compile but not part of 'make run_tests'

TEST_GEN_PROGS_EXTENDED = test_sock_addr test_skb_cgroup_id_user \
@@ -187,6 +187,8 @@ $(OUTPUT)/runqslower: $(BPFOBJ) | $(DEFAULT_BPFTOOL) 
		    BPFOBJ=$(BPFOBJ) BPF_INCLUDE=$(INCLUDE_DIR) &&	\

		    cp $(SCRATCH_DIR)/runqslower $@



TEST_GEN_PROGS_EXTENDED += $(DEFAULT_BPFTOOL)



$(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): $(OUTPUT)/test_stub.o $(BPFOBJ)



$(OUTPUT)/test_dev_cgroup: cgroup_helpers.c

tools/testing/selftests/bpf/test_bpftool.sh

+6 −0
Original line number Diff line number Diff line
@@ -2,4 +2,10 @@ 
# SPDX-License-Identifier: GPL-2.0

# Copyright (c) 2020 SUSE LLC.



# 'make -C tools/testing/selftests/bpf install' will install to SCRIPT_DIR

SCRIPT_DIR=$(dirname $(realpath $0))



# 'make -C tools/testing/selftests/bpf' will install to BPFTOOL_INSTALL_PATH

BPFTOOL_INSTALL_PATH="$SCRIPT_DIR"/tools/sbin

export PATH=$SCRIPT_DIR:$BPFTOOL_INSTALL_PATH:$PATH

python3 -m unittest -v test_bpftool.TestBpftool

tools/testing/selftests/bpf/test_bpftool_build.sh

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ KDIR_ROOT_DIR=$(realpath $PWD/$SCRIPT_REL_DIR/../../../../) 
cd $KDIR_ROOT_DIR

if [ ! -e tools/bpf/bpftool/Makefile ]; then

	echo -e "skip:    bpftool files not found!\n"

	exit 0

	exit 4 # KSFT_SKIP=4

fi



ERROR=0

tools/testing/selftests/bpf/test_doc_build.sh

+8 −2
Original line number Diff line number Diff line
@@ -4,11 +4,17 @@ set -e 


# Assume script is located under tools/testing/selftests/bpf/. We want to start

# build attempts from the top of kernel repository.

SCRIPT_REL_PATH=$(realpath --relative-to=$PWD $0)

SCRIPT_REL_PATH=$(realpath $0)

SCRIPT_REL_DIR=$(dirname $SCRIPT_REL_PATH)

KDIR_ROOT_DIR=$(realpath $PWD/$SCRIPT_REL_DIR/../../../../)

KDIR_ROOT_DIR=$(realpath $SCRIPT_REL_DIR/../../../../)

SCRIPT_REL_DIR=$(dirname $(realpath --relative-to=$KDIR_ROOT_DIR $SCRIPT_REL_PATH))

cd $KDIR_ROOT_DIR



if [ ! -e $PWD/$SCRIPT_REL_DIR/Makefile ]; then

	echo -e "skip:    bpftool files not found!\n"

	exit 4 # KSFT_SKIP=4

fi



for tgt in docs docs-clean; do

	make -s -C $PWD/$SCRIPT_REL_DIR $tgt;

done

tools/testing/selftests/bpf/test_maps.c

+1 −1
Original line number Diff line number Diff line
@@ -985,7 +985,7 @@ static void test_sockmap(unsigned int tasks, void *data) 


		FD_ZERO(&w);

		FD_SET(sfd[3], &w);

		to.tv_sec = 1;

		to.tv_sec = 30;

		to.tv_usec = 0;

		s = select(sfd[3] + 1, &w, NULL, NULL, &to);

		if (s == -1) {