From nobody Tue May 14 06:32:43 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D5A7101C2 for ; Mon, 12 Feb 2024 09:24:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707729867; cv=none; b=j/BCxc54hu5WL0i6glkFyOHPGHoyim0X4dM1+80dbUYMpJD6m7NFFLMEPKHuJ/TXwY7n+wMEZUqRiJNevHizv1A8wT82+JXYnJ0xSXhCsIjce3DvvgmDVFKpsvMHvbp3hwRyiraUD2fMa4V5Av0YJpCF+jAnxuy8IXwZ/grddQA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707729867; c=relaxed/simple; bh=ZKklBZCw6SI+RLi6NiMlv4OHsZ/COeNoUaOgAI9phY4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=djysGyGmr07RpaLS842ySH7fwjtGEmnFCauy+P8NgHPcNWCQxkErgUfuLWeWmhE4rV5G/sKBvAEaAmlfLDzyK3r5/UeQq+zZHyZ0Es3JkYsBzag6VzHnd+r5qq56TLeHitfTwldsV5lwfIkiEVc9rqrOLq/NEFws8sqcZhaA75M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=U/IouUDI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="U/IouUDI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DC00C433F1; Mon, 12 Feb 2024 09:24:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707729866; bh=ZKklBZCw6SI+RLi6NiMlv4OHsZ/COeNoUaOgAI9phY4=; h=From:To:Cc:Subject:Date:From; b=U/IouUDIhmieRgveBjBuv5pPY/9os/faSmeW7Tcme3BTRE801JnD9KnD6l6bLMVUK o01uKIDAGv0x7ypLjq+zsR4+MRstoIgRs4FfxaqDzpiu/alm5gb+0VmV2tPipWcrl0 FnEUobQsWnDsMBvSR1Dl5LDNAvNotNOh0g0dmPOw2Fk+QoZwmK3B/68XGm8vVeUNGc KurtMIzY16mRdiYnSFL4ci+8MjWAV4qiTTixi8FEQBm86b76Fw6A/nbn0lXtuJCwW4 pBmXauTWWSIOM8mYdzG29O4lMzbbRcDPwSAWWxnmXeI1l3qHQNAemmO97o3AZhnwbJ eMQ5poiom3POA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH virtme-docker v5] tests: add bpftests support Date: Mon, 12 Feb 2024 17:24:21 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch builds bpf tests after building other mptcp selftests in btf mode: cd tools/testing/selftests/bpf && make And add run_bpftest_all to run bpftests: ./test_progs -t mptcp ./test_progs-no_alu32 -t mptcp Now mptcp bpf selftests can be tested in this way: docker run ... auto-btf run_loop run_bpftest_all in .virtme-exec-run Disable IA32_EMULATION config to fix this error: ./include/linux/if.h:28:10: fatal error: sys/socket.h: no such file or directory Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/406 Signed-off-by: Geliang Tang --- v5: - drop mptcp_progs.sh script, use test_progs* directly. v4: - test mode in run_bpftest_all RESEND: - Update email only. v3: - depends on "bpf, btf: Add DEBUG_INFO_BTF checks for __register_bpf_struct_ops", which I sent to BPF ML. - cleanup. v2: - drop links for 'test_progs, bpf_testmod.ko'. - rename bpf_selftest.sh to mptcp_progs.sh. - fix bugs in run_loop. --- entrypoint.sh | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/entrypoint.sh b/entrypoint.sh index 95ff0f9..3a2a87c 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -87,6 +87,8 @@ VIRTME_RUN_EXPECT=3D"${VIRTME_SCRIPTS_DIR}/virtme.expect" =20 SELFTESTS_DIR=3D"${INPUT_SELFTESTS_DIR:-tools/testing/selftests/net/mptcp}" SELFTESTS_CONFIG=3D"${SELFTESTS_DIR}/config" +BPFTESTS_DIR=3D"${INPUT_BPFTESTS_DIR:-tools/testing/selftests/bpf}" +BPFTESTS_CONFIG=3D"${BPFTESTS_DIR}/config" =20 export CCACHE_MAXSIZE=3D"${INPUT_CCACHE_MAXSIZE}" export CCACHE_DIR=3D"${VIRTME_WORKDIR}/ccache" @@ -316,6 +318,12 @@ gen_kconfig() { local mode kconfig=3D() # We need more debug info but it is slow to generate if [ "${mode}" =3D "btf" ]; then kconfig+=3D(-e DEBUG_INFO_BTF) + # Extra options are needed for bpftests + ./scripts/kconfig/merge_config.sh -m "${VIRTME_KCONFIG}" "${BPFTESTS_CON= FIG}" + kconfig+=3D(-e DEBUG_INFO_BTF_MODULES -e MODULE_ALLOW_BTF_MISMATCH) + # Fix ./include/linux/if.h:28:10: fatal error: + # sys/socket.h: no such file or directory + kconfig+=3D(-d IA32_EMULATION) elif is_ci || [ "${mode}" !=3D "debsym" ]; then kconfig+=3D(-e DEBUG_INFO_REDUCED -e DEBUG_INFO_SPLIT) fi @@ -428,6 +436,15 @@ build_selftests() { _make_o KHDR_INCLUDES=3D"-I${VIRTME_BUILD_DIR}/include" -C "${SELFTESTS_D= IR}" } =20 +build_bpftests() { + if [ "${INPUT_BUILD_SKIP_BPFTESTS}" =3D 1 ]; then + printinfo "Skip bpftests build" + return 0 + fi + + _make_o KHDR_INCLUDES=3D"-I${VIRTME_BUILD_DIR}/include" -C "${BPFTESTS_DI= R}" +} + build_packetdrill() { local old_pwd kversion kver_maj kver_min branch if [ "${INPUT_BUILD_SKIP_PACKETDRILL}" =3D 1 ]; then printinfo "Skip Packetdrill build" @@ -515,6 +532,9 @@ prepare() { local mode no_tap=3D1 printinfo "Prepare the environment" =20 build_selftests + if [ "${mode}" =3D "btf" ]; then + build_bpftests + fi build_packetdrill prepare_hosts_file =20 @@ -772,11 +792,45 @@ run_packetdrill_all() { local pktd_dir rc=3D0 return \${rc} } =20 +# \$1: output tap file; rest: command to launch +_run_bpftest_one_tap() { + cd "${KERNEL_SRC}/${BPFTESTS_DIR}" + _tap "\${@}" +} + +# \$1: script file; rest: command to launch +run_bpftest_one() { local sf tap + sf=3D\$(basename \${1}) + tap=3Dbpftest_\${sf} + shift + + _can_run "\${tap}" || return 0 + + _run_bpftest_one_tap "${RESULTS_DIR}/\${tap}" "./\${sf}" "\${@}" +} + +run_bpftest_all() { + if [ "${mode}" =3D "btf" ]; then + local sf rc=3D0 + + for sf in "${KERNEL_SRC}/${BPFTESTS_DIR}/"test_progs*; do + if [ -x "\${sf}" ]; then + run_bpftest_one "\${sf}" "-t" "mptcp" || rc=3D\${?} + fi + done + + return \${rc} + else + echo "skip bpftest, only run it in btf mode" + fi +} + run_all() { run_kunit_all run_selftest_all run_mptcp_connect_mmap run_packetdrill_all + run_bpftest_all } =20 has_call_trace() { --=20 2.40.1