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

bpf, selftests: delete xfrm tunnel when test exits.

Make the printting of bpf xfrm tunnel better and
cleanup xfrm state and policy when xfrm test finishes.

Signed-off-by: William Tu <u9012063@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

authored by

William Tu and committed by
Daniel Borkmann
26bf8a89 36ffdbc0

+13 -11
+13 -11
tools/testing/selftests/bpf/test_tunnel.sh
··· 608 608 test_xfrm_tunnel() 609 609 { 610 610 config_device 611 - #tcpdump -nei veth1 ip & 612 - output=$(mktemp) 613 - cat /sys/kernel/debug/tracing/trace_pipe | tee $output & 614 - setup_xfrm_tunnel 611 + > /sys/kernel/debug/tracing/trace 612 + setup_xfrm_tunnel 615 613 tc qdisc add dev veth1 clsact 616 614 tc filter add dev veth1 proto ip ingress bpf da obj test_tunnel_kern.o \ 617 615 sec xfrm_get_state 618 616 ip netns exec at_ns0 ping $PING_ARG 10.1.1.200 619 617 sleep 1 620 - grep "reqid 1" $output 618 + grep "reqid 1" /sys/kernel/debug/tracing/trace 621 619 check_err $? 622 - grep "spi 0x1" $output 620 + grep "spi 0x1" /sys/kernel/debug/tracing/trace 623 621 check_err $? 624 - grep "remote ip 0xac100164" $output 622 + grep "remote ip 0xac100164" /sys/kernel/debug/tracing/trace 625 623 check_err $? 626 624 cleanup 627 625 628 626 if [ $ret -ne 0 ]; then 629 - echo -e ${RED}"FAIL: xfrm tunnel"${NC} 630 - return 1 631 - fi 632 - echo -e ${GREEN}"PASS: xfrm tunnel"${NC} 627 + echo -e ${RED}"FAIL: xfrm tunnel"${NC} 628 + return 1 629 + fi 630 + echo -e ${GREEN}"PASS: xfrm tunnel"${NC} 633 631 } 634 632 635 633 attach_bpf() ··· 655 657 ip link del ip6geneve11 2> /dev/null 656 658 ip link del erspan11 2> /dev/null 657 659 ip link del ip6erspan11 2> /dev/null 660 + ip xfrm policy delete dir out src 10.1.1.200/32 dst 10.1.1.100/32 2> /dev/null 661 + ip xfrm policy delete dir in src 10.1.1.100/32 dst 10.1.1.200/32 2> /dev/null 662 + ip xfrm state delete src 172.16.1.100 dst 172.16.1.200 proto esp spi 0x1 2> /dev/null 663 + ip xfrm state delete src 172.16.1.200 dst 172.16.1.100 proto esp spi 0x2 2> /dev/null 658 664 } 659 665 660 666 cleanup_exit()