tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

selftests/bpf: Remove with_addr.sh and with_tunnels.sh

Those two scripts were used by test_flow_dissector.sh to setup/cleanup
the network topology before/after the tests. test_flow_dissector.sh
have been deleted by commit 63b37657c5fd ("selftests/bpf: remove
test_flow_dissector.sh") so they aren't used anywhere now.

Remove the two unused scripts and their Makefile entries.

Signed-off-by: Bastien Curutchet (eBPF Foundation) <bastien.curutchet@bootlin.com>
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Link: https://patch.msgid.link/20250204-with-v1-1-387a42118cd4@bootlin.com

authored by

Bastien Curutchet (eBPF Foundation) and committed by
Martin KaFai Lau 9b6cdaf2 ea145d53

+2 -92
+2 -2
tools/testing/selftests/bpf/Makefile
··· 117 117 test_xsk.sh \ 118 118 test_xdp_features.sh 119 119 120 - TEST_PROGS_EXTENDED := with_addr.sh \ 121 - with_tunnels.sh ima_setup.sh verify_sig_setup.sh \ 120 + TEST_PROGS_EXTENDED := \ 121 + ima_setup.sh verify_sig_setup.sh \ 122 122 test_xdp_vlan.sh test_bpftool.py 123 123 124 124 TEST_KMODS := bpf_testmod.ko bpf_test_no_cfi.ko bpf_test_modorder_x.ko \
-54
tools/testing/selftests/bpf/with_addr.sh
··· 1 - #!/bin/bash 2 - # SPDX-License-Identifier: GPL-2.0 3 - # 4 - # add private ipv4 and ipv6 addresses to loopback 5 - 6 - readonly V6_INNER='100::a/128' 7 - readonly V4_INNER='192.168.0.1/32' 8 - 9 - if getopts ":s" opt; then 10 - readonly SIT_DEV_NAME='sixtofourtest0' 11 - readonly V6_SIT='2::/64' 12 - readonly V4_SIT='172.17.0.1/32' 13 - shift 14 - fi 15 - 16 - fail() { 17 - echo "error: $*" 1>&2 18 - exit 1 19 - } 20 - 21 - setup() { 22 - ip -6 addr add "${V6_INNER}" dev lo || fail 'failed to setup v6 address' 23 - ip -4 addr add "${V4_INNER}" dev lo || fail 'failed to setup v4 address' 24 - 25 - if [[ -n "${V6_SIT}" ]]; then 26 - ip link add "${SIT_DEV_NAME}" type sit remote any local any \ 27 - || fail 'failed to add sit' 28 - ip link set dev "${SIT_DEV_NAME}" up \ 29 - || fail 'failed to bring sit device up' 30 - ip -6 addr add "${V6_SIT}" dev "${SIT_DEV_NAME}" \ 31 - || fail 'failed to setup v6 SIT address' 32 - ip -4 addr add "${V4_SIT}" dev "${SIT_DEV_NAME}" \ 33 - || fail 'failed to setup v4 SIT address' 34 - fi 35 - 36 - sleep 2 # avoid race causing bind to fail 37 - } 38 - 39 - cleanup() { 40 - if [[ -n "${V6_SIT}" ]]; then 41 - ip -4 addr del "${V4_SIT}" dev "${SIT_DEV_NAME}" 42 - ip -6 addr del "${V6_SIT}" dev "${SIT_DEV_NAME}" 43 - ip link del "${SIT_DEV_NAME}" 44 - fi 45 - 46 - ip -4 addr del "${V4_INNER}" dev lo 47 - ip -6 addr del "${V6_INNER}" dev lo 48 - } 49 - 50 - trap cleanup EXIT 51 - 52 - setup 53 - "$@" 54 - exit "$?"
-36
tools/testing/selftests/bpf/with_tunnels.sh
··· 1 - #!/bin/bash 2 - # SPDX-License-Identifier: GPL-2.0 3 - # 4 - # setup tunnels for flow dissection test 5 - 6 - readonly SUFFIX="test_$(mktemp -u XXXX)" 7 - CONFIG="remote 127.0.0.2 local 127.0.0.1 dev lo" 8 - 9 - setup() { 10 - ip link add "ipip_${SUFFIX}" type ipip ${CONFIG} 11 - ip link add "gre_${SUFFIX}" type gre ${CONFIG} 12 - ip link add "sit_${SUFFIX}" type sit ${CONFIG} 13 - 14 - echo "tunnels before test:" 15 - ip tunnel show 16 - 17 - ip link set "ipip_${SUFFIX}" up 18 - ip link set "gre_${SUFFIX}" up 19 - ip link set "sit_${SUFFIX}" up 20 - } 21 - 22 - 23 - cleanup() { 24 - ip tunnel del "ipip_${SUFFIX}" 25 - ip tunnel del "gre_${SUFFIX}" 26 - ip tunnel del "sit_${SUFFIX}" 27 - 28 - echo "tunnels after test:" 29 - ip tunnel show 30 - } 31 - 32 - trap cleanup EXIT 33 - 34 - setup 35 - "$@" 36 - exit "$?"