* [PATCH bpf 1/4] selftests/bpf/xdp_redirect_multi: put the logs to tmp folder
2021-10-27 3:35 [PATCH bpf 0/4] Fix some issues for selftest test_xdp_redirect_multi.sh Hangbin Liu
@ 2021-10-27 3:35 ` Hangbin Liu
2021-10-27 3:35 ` [PATCH bpf 2/4] selftests/bpf/xdp_redirect_multi: use arping to accurate the arp number Hangbin Liu
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Hangbin Liu @ 2021-10-27 3:35 UTC (permalink / raw)
To: netdev
Cc: bpf, Alexei Starovoitov, Daniel Borkmann, Jesper Dangaard Brouer,
linux-kselftest, David S . Miller, Jiri Benc, Hangbin Liu
The xdp_redirect_multi test logs are created in selftest folder and not
cleaned after test. Let's creat a tmp dir and remove the logs after
testing.
Suggested-by: Jiri Benc <jbenc@redhat.com>
Fixes: d23292476297 ("selftests/bpf: Add xdp_redirect_multi test")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
---
.../selftests/bpf/test_xdp_redirect_multi.sh | 35 ++++++++++---------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh b/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
index 1538373157e3..b20b96ba72ef 100755
--- a/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
+++ b/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
@@ -31,6 +31,7 @@ IFACES=""
DRV_MODE="xdpgeneric xdpdrv xdpegress"
PASS=0
FAIL=0
+LOG_DIR=$(mktemp -d)
test_pass()
{
@@ -100,17 +101,17 @@ do_egress_tests()
local mode=$1
# mac test
- ip netns exec ns2 tcpdump -e -i veth0 -nn -l -e &> mac_ns1-2_${mode}.log &
- ip netns exec ns3 tcpdump -e -i veth0 -nn -l -e &> mac_ns1-3_${mode}.log &
+ ip netns exec ns2 tcpdump -e -i veth0 -nn -l -e &> ${LOG_DIR}/mac_ns1-2_${mode}.log &
+ ip netns exec ns3 tcpdump -e -i veth0 -nn -l -e &> ${LOG_DIR}/mac_ns1-3_${mode}.log &
sleep 0.5
ip netns exec ns1 ping 192.0.2.254 -i 0.1 -c 4 &> /dev/null
sleep 0.5
pkill -9 tcpdump
# mac check
- grep -q "${veth_mac[2]} > ff:ff:ff:ff:ff:ff" mac_ns1-2_${mode}.log && \
+ grep -q "${veth_mac[2]} > ff:ff:ff:ff:ff:ff" ${LOG_DIR}/mac_ns1-2_${mode}.log && \
test_pass "$mode mac ns1-2" || test_fail "$mode mac ns1-2"
- grep -q "${veth_mac[3]} > ff:ff:ff:ff:ff:ff" mac_ns1-3_${mode}.log && \
+ grep -q "${veth_mac[3]} > ff:ff:ff:ff:ff:ff" ${LOG_DIR}/mac_ns1-3_${mode}.log && \
test_pass "$mode mac ns1-3" || test_fail "$mode mac ns1-3"
}
@@ -121,9 +122,9 @@ do_ping_tests()
# ping6 test: echo request should be redirect back to itself, not others
ip netns exec ns1 ip neigh add 2001:db8::2 dev veth0 lladdr 00:00:00:00:00:02
- ip netns exec ns1 tcpdump -i veth0 -nn -l -e &> ns1-1_${mode}.log &
- ip netns exec ns2 tcpdump -i veth0 -nn -l -e &> ns1-2_${mode}.log &
- ip netns exec ns3 tcpdump -i veth0 -nn -l -e &> ns1-3_${mode}.log &
+ ip netns exec ns1 tcpdump -i veth0 -nn -l -e &> ${LOG_DIR}/ns1-1_${mode}.log &
+ ip netns exec ns2 tcpdump -i veth0 -nn -l -e &> ${LOG_DIR}/ns1-2_${mode}.log &
+ ip netns exec ns3 tcpdump -i veth0 -nn -l -e &> ${LOG_DIR}/ns1-3_${mode}.log &
sleep 0.5
# ARP test
ip netns exec ns1 ping 192.0.2.254 -i 0.1 -c 4 &> /dev/null
@@ -135,32 +136,32 @@ do_ping_tests()
pkill -9 tcpdump
# All netns should receive the redirect arp requests
- [ $(grep -c "who-has 192.0.2.254" ns1-1_${mode}.log) -gt 4 ] && \
+ [ $(grep -c "who-has 192.0.2.254" ${LOG_DIR}/ns1-1_${mode}.log) -gt 4 ] && \
test_pass "$mode arp(F_BROADCAST) ns1-1" || \
test_fail "$mode arp(F_BROADCAST) ns1-1"
- [ $(grep -c "who-has 192.0.2.254" ns1-2_${mode}.log) -le 4 ] && \
+ [ $(grep -c "who-has 192.0.2.254" ${LOG_DIR}/ns1-2_${mode}.log) -le 4 ] && \
test_pass "$mode arp(F_BROADCAST) ns1-2" || \
test_fail "$mode arp(F_BROADCAST) ns1-2"
- [ $(grep -c "who-has 192.0.2.254" ns1-3_${mode}.log) -le 4 ] && \
+ [ $(grep -c "who-has 192.0.2.254" ${LOG_DIR}/ns1-3_${mode}.log) -le 4 ] && \
test_pass "$mode arp(F_BROADCAST) ns1-3" || \
test_fail "$mode arp(F_BROADCAST) ns1-3"
# ns1 should not receive the redirect echo request, others should
- [ $(grep -c "ICMP echo request" ns1-1_${mode}.log) -eq 4 ] && \
+ [ $(grep -c "ICMP echo request" ${LOG_DIR}/ns1-1_${mode}.log) -eq 4 ] && \
test_pass "$mode IPv4 (F_BROADCAST|F_EXCLUDE_INGRESS) ns1-1" || \
test_fail "$mode IPv4 (F_BROADCAST|F_EXCLUDE_INGRESS) ns1-1"
- [ $(grep -c "ICMP echo request" ns1-2_${mode}.log) -eq 4 ] && \
+ [ $(grep -c "ICMP echo request" ${LOG_DIR}/ns1-2_${mode}.log) -eq 4 ] && \
test_pass "$mode IPv4 (F_BROADCAST|F_EXCLUDE_INGRESS) ns1-2" || \
test_fail "$mode IPv4 (F_BROADCAST|F_EXCLUDE_INGRESS) ns1-2"
- [ $(grep -c "ICMP echo request" ns1-3_${mode}.log) -eq 4 ] && \
+ [ $(grep -c "ICMP echo request" ${LOG_DIR}/ns1-3_${mode}.log) -eq 4 ] && \
test_pass "$mode IPv4 (F_BROADCAST|F_EXCLUDE_INGRESS) ns1-3" || \
test_fail "$mode IPv4 (F_BROADCAST|F_EXCLUDE_INGRESS) ns1-3"
# ns1 should receive the echo request, ns2 should not
- [ $(grep -c "ICMP6, echo request" ns1-1_${mode}.log) -eq 4 ] && \
+ [ $(grep -c "ICMP6, echo request" ${LOG_DIR}/ns1-1_${mode}.log) -eq 4 ] && \
test_pass "$mode IPv6 (no flags) ns1-1" || \
test_fail "$mode IPv6 (no flags) ns1-1"
- [ $(grep -c "ICMP6, echo request" ns1-2_${mode}.log) -eq 0 ] && \
+ [ $(grep -c "ICMP6, echo request" ${LOG_DIR}/ns1-2_${mode}.log) -eq 0 ] && \
test_pass "$mode IPv6 (no flags) ns1-2" || \
test_fail "$mode IPv6 (no flags) ns1-2"
}
@@ -176,7 +177,7 @@ do_tests()
xdpgeneric) drv_p="-S";;
esac
- ./xdp_redirect_multi $drv_p $IFACES &> xdp_redirect_${mode}.log &
+ ./xdp_redirect_multi $drv_p $IFACES &> ${LOG_DIR}/xdp_redirect_${mode}.log &
xdp_pid=$!
sleep 1
@@ -192,13 +193,13 @@ do_tests()
trap clean_up 0 2 3 6 9
check_env
-rm -f xdp_redirect_*.log ns*.log mac_ns*.log
for mode in ${DRV_MODE}; do
setup_ns $mode
do_tests $mode
clean_up
done
+rm -rf ${LOG_DIR}
echo "Summary: PASS $PASS, FAIL $FAIL"
[ $FAIL -eq 0 ] && exit 0 || exit 1
--
2.31.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH bpf 2/4] selftests/bpf/xdp_redirect_multi: use arping to accurate the arp number
2021-10-27 3:35 [PATCH bpf 0/4] Fix some issues for selftest test_xdp_redirect_multi.sh Hangbin Liu
2021-10-27 3:35 ` [PATCH bpf 1/4] selftests/bpf/xdp_redirect_multi: put the logs to tmp folder Hangbin Liu
@ 2021-10-27 3:35 ` Hangbin Liu
2021-10-27 3:35 ` [PATCH bpf 3/4] selftests/bpf/xdp_redirect_multi: give tcpdump a chance to terminate cleanly Hangbin Liu
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Hangbin Liu @ 2021-10-27 3:35 UTC (permalink / raw)
To: netdev
Cc: bpf, Alexei Starovoitov, Daniel Borkmann, Jesper Dangaard Brouer,
linux-kselftest, David S . Miller, Jiri Benc, Hangbin Liu
The arp request number triggered by ping none exist address is not
accurate, which may lead the test false negative/positive. Change to
use arping to accurate the arp number.
Also do not use grep pattern match for dot.
Suggested-by: Jiri Benc <jbenc@redhat.com>
Fixes: d23292476297 ("selftests/bpf: Add xdp_redirect_multi test")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
---
tools/testing/selftests/bpf/test_xdp_redirect_multi.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh b/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
index b20b96ba72ef..c2a933caa32d 100755
--- a/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
+++ b/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
@@ -127,7 +127,7 @@ do_ping_tests()
ip netns exec ns3 tcpdump -i veth0 -nn -l -e &> ${LOG_DIR}/ns1-3_${mode}.log &
sleep 0.5
# ARP test
- ip netns exec ns1 ping 192.0.2.254 -i 0.1 -c 4 &> /dev/null
+ ip netns exec ns1 arping -q -c 2 -I veth0 192.0.2.254
# IPv4 test
ip netns exec ns1 ping 192.0.2.253 -i 0.1 -c 4 &> /dev/null
# IPv6 test
@@ -136,13 +136,13 @@ do_ping_tests()
pkill -9 tcpdump
# All netns should receive the redirect arp requests
- [ $(grep -c "who-has 192.0.2.254" ${LOG_DIR}/ns1-1_${mode}.log) -gt 4 ] && \
+ [ $(grep -cF "who-has 192.0.2.254" ${LOG_DIR}/ns1-1_${mode}.log) -eq 4 ] && \
test_pass "$mode arp(F_BROADCAST) ns1-1" || \
test_fail "$mode arp(F_BROADCAST) ns1-1"
- [ $(grep -c "who-has 192.0.2.254" ${LOG_DIR}/ns1-2_${mode}.log) -le 4 ] && \
+ [ $(grep -cF "who-has 192.0.2.254" ${LOG_DIR}/ns1-2_${mode}.log) -eq 2 ] && \
test_pass "$mode arp(F_BROADCAST) ns1-2" || \
test_fail "$mode arp(F_BROADCAST) ns1-2"
- [ $(grep -c "who-has 192.0.2.254" ${LOG_DIR}/ns1-3_${mode}.log) -le 4 ] && \
+ [ $(grep -cF "who-has 192.0.2.254" ${LOG_DIR}/ns1-3_${mode}.log) -eq 2 ] && \
test_pass "$mode arp(F_BROADCAST) ns1-3" || \
test_fail "$mode arp(F_BROADCAST) ns1-3"
--
2.31.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH bpf 3/4] selftests/bpf/xdp_redirect_multi: give tcpdump a chance to terminate cleanly
2021-10-27 3:35 [PATCH bpf 0/4] Fix some issues for selftest test_xdp_redirect_multi.sh Hangbin Liu
2021-10-27 3:35 ` [PATCH bpf 1/4] selftests/bpf/xdp_redirect_multi: put the logs to tmp folder Hangbin Liu
2021-10-27 3:35 ` [PATCH bpf 2/4] selftests/bpf/xdp_redirect_multi: use arping to accurate the arp number Hangbin Liu
@ 2021-10-27 3:35 ` Hangbin Liu
2021-10-27 3:35 ` [PATCH bpf 4/4] selftests/bpf/xdp_redirect_multi: limit the tests in netns Hangbin Liu
2021-11-05 15:46 ` [PATCH bpf 0/4] Fix some issues for selftest test_xdp_redirect_multi.sh Daniel Borkmann
4 siblings, 0 replies; 7+ messages in thread
From: Hangbin Liu @ 2021-10-27 3:35 UTC (permalink / raw)
To: netdev
Cc: bpf, Alexei Starovoitov, Daniel Borkmann, Jesper Dangaard Brouer,
linux-kselftest, David S . Miller, Jiri Benc, Hangbin Liu
No need to kill tcpdump with -9.
Suggested-by: Jiri Benc <jbenc@redhat.com>
Fixes: d23292476297 ("selftests/bpf: Add xdp_redirect_multi test")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
---
tools/testing/selftests/bpf/test_xdp_redirect_multi.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh b/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
index c2a933caa32d..37e347159ab4 100755
--- a/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
+++ b/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
@@ -106,7 +106,7 @@ do_egress_tests()
sleep 0.5
ip netns exec ns1 ping 192.0.2.254 -i 0.1 -c 4 &> /dev/null
sleep 0.5
- pkill -9 tcpdump
+ pkill tcpdump
# mac check
grep -q "${veth_mac[2]} > ff:ff:ff:ff:ff:ff" ${LOG_DIR}/mac_ns1-2_${mode}.log && \
@@ -133,7 +133,7 @@ do_ping_tests()
# IPv6 test
ip netns exec ns1 ping6 2001:db8::2 -i 0.1 -c 2 &> /dev/null
sleep 0.5
- pkill -9 tcpdump
+ pkill tcpdump
# All netns should receive the redirect arp requests
[ $(grep -cF "who-has 192.0.2.254" ${LOG_DIR}/ns1-1_${mode}.log) -eq 4 ] && \
--
2.31.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH bpf 4/4] selftests/bpf/xdp_redirect_multi: limit the tests in netns
2021-10-27 3:35 [PATCH bpf 0/4] Fix some issues for selftest test_xdp_redirect_multi.sh Hangbin Liu
` (2 preceding siblings ...)
2021-10-27 3:35 ` [PATCH bpf 3/4] selftests/bpf/xdp_redirect_multi: give tcpdump a chance to terminate cleanly Hangbin Liu
@ 2021-10-27 3:35 ` Hangbin Liu
2021-11-05 15:46 ` [PATCH bpf 0/4] Fix some issues for selftest test_xdp_redirect_multi.sh Daniel Borkmann
4 siblings, 0 replies; 7+ messages in thread
From: Hangbin Liu @ 2021-10-27 3:35 UTC (permalink / raw)
To: netdev
Cc: bpf, Alexei Starovoitov, Daniel Borkmann, Jesper Dangaard Brouer,
linux-kselftest, David S . Miller, Jiri Benc, Hangbin Liu
As I want to test both DEVMAP and DEVMAP_HASH in XDP multicast redirect,
I limited DEVMAP max entries to a small value for performace. When the
test runs after amount of interface creating/deleting tests. The
interface index will exceed the map max entries and xdp_redirect_multi
will error out with "Get interfacesInterface index to large".
Fix this issue by limit the tests in netns and specify the ifindex when
creating interfaces.
Reported-by: Jiri Benc <jbenc@redhat.com>
Fixes: d23292476297 ("selftests/bpf: Add xdp_redirect_multi test")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
---
.../selftests/bpf/test_xdp_redirect_multi.sh | 23 ++++++++++++-------
.../selftests/bpf/xdp_redirect_multi.c | 4 ++--
2 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh b/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
index 37e347159ab4..bedff7aa7023 100755
--- a/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
+++ b/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
@@ -2,11 +2,11 @@
# SPDX-License-Identifier: GPL-2.0
#
# Test topology:
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# | veth1 veth2 veth3 | ... init net
+# - - - - - - - - - - - - - - - - - - -
+# | veth1 veth2 veth3 | ns0
# - -| - - - - - - | - - - - - - | - -
# --------- --------- ---------
-# | veth0 | | veth0 | | veth0 | ...
+# | veth0 | | veth0 | | veth0 |
# --------- --------- ---------
# ns1 ns2 ns3
#
@@ -51,6 +51,7 @@ clean_up()
ip link del veth$i 2> /dev/null
ip netns del ns$i 2> /dev/null
done
+ ip netns del ns0 2> /dev/null
}
# Kselftest framework requirement - SKIP code is 4.
@@ -78,10 +79,12 @@ setup_ns()
mode="xdpdrv"
fi
+ ip netns add ns0
for i in $(seq $NUM); do
ip netns add ns$i
- ip link add veth$i type veth peer name veth0 netns ns$i
- ip link set veth$i up
+ ip -n ns$i link add veth0 index 2 type veth \
+ peer name veth$i netns ns0 index $((1 + $i))
+ ip -n ns0 link set veth$i up
ip -n ns$i link set veth0 up
ip -n ns$i addr add 192.0.2.$i/24 dev veth0
@@ -92,7 +95,7 @@ setup_ns()
xdp_dummy.o sec xdp_dummy &> /dev/null || \
{ test_fail "Unable to load dummy xdp" && exit 1; }
IFACES="$IFACES veth$i"
- veth_mac[$i]=$(ip link show veth$i | awk '/link\/ether/ {print $2}')
+ veth_mac[$i]=$(ip -n ns0 link show veth$i | awk '/link\/ether/ {print $2}')
done
}
@@ -177,9 +180,13 @@ do_tests()
xdpgeneric) drv_p="-S";;
esac
- ./xdp_redirect_multi $drv_p $IFACES &> ${LOG_DIR}/xdp_redirect_${mode}.log &
+ ip netns exec ns0 ./xdp_redirect_multi $drv_p $IFACES &> ${LOG_DIR}/xdp_redirect_${mode}.log &
xdp_pid=$!
sleep 1
+ if ! ps -p $xdp_pid > /dev/null; then
+ test_fail "$mode xdp_redirect_multi start failed"
+ return 1
+ fi
if [ "$mode" = "xdpegress" ]; then
do_egress_tests $mode
@@ -190,7 +197,7 @@ do_tests()
kill $xdp_pid
}
-trap clean_up 0 2 3 6 9
+trap clean_up EXIT
check_env
diff --git a/tools/testing/selftests/bpf/xdp_redirect_multi.c b/tools/testing/selftests/bpf/xdp_redirect_multi.c
index 3696a8f32c23..f5ffba341c17 100644
--- a/tools/testing/selftests/bpf/xdp_redirect_multi.c
+++ b/tools/testing/selftests/bpf/xdp_redirect_multi.c
@@ -129,7 +129,7 @@ int main(int argc, char **argv)
goto err_out;
}
- printf("Get interfaces");
+ printf("Get interfaces:");
for (i = 0; i < MAX_IFACE_NUM && argv[optind + i]; i++) {
ifaces[i] = if_nametoindex(argv[optind + i]);
if (!ifaces[i])
@@ -139,7 +139,7 @@ int main(int argc, char **argv)
goto err_out;
}
if (ifaces[i] > MAX_INDEX_NUM) {
- printf("Interface index to large\n");
+ printf(" interface index too large\n");
goto err_out;
}
printf(" %d", ifaces[i]);
--
2.31.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH bpf 0/4] Fix some issues for selftest test_xdp_redirect_multi.sh
2021-10-27 3:35 [PATCH bpf 0/4] Fix some issues for selftest test_xdp_redirect_multi.sh Hangbin Liu
` (3 preceding siblings ...)
2021-10-27 3:35 ` [PATCH bpf 4/4] selftests/bpf/xdp_redirect_multi: limit the tests in netns Hangbin Liu
@ 2021-11-05 15:46 ` Daniel Borkmann
2021-11-08 2:15 ` Hangbin Liu
4 siblings, 1 reply; 7+ messages in thread
From: Daniel Borkmann @ 2021-11-05 15:46 UTC (permalink / raw)
To: Hangbin Liu, netdev
Cc: bpf, Alexei Starovoitov, Jesper Dangaard Brouer, linux-kselftest,
David S . Miller, Jiri Benc
On 10/27/21 5:35 AM, Hangbin Liu wrote:
> Jiri reported some issues in test_xdp_redirect_multi.sh. Like
> the test logs not cleaned after testing. The tcpdump not terminated cleanly.
> arp number count may have false positive. And the most important, after
> creating/deleting a lot interfaces, the interface index may exceed the
> DEVMAP max entry and cause program xdp_redirect_multi exec failed.
>
> This patch set fix all these issues.
>
> Hangbin Liu (4):
> selftests/bpf/xdp_redirect_multi: put the logs to tmp folder
> selftests/bpf/xdp_redirect_multi: use arping to accurate the arp
> number
> selftests/bpf/xdp_redirect_multi: give tcpdump a chance to terminate
> cleanly
> selftests/bpf/xdp_redirect_multi: limit the tests in netns
>
> .../selftests/bpf/test_xdp_redirect_multi.sh | 62 +++++++++++--------
> .../selftests/bpf/xdp_redirect_multi.c | 4 +-
> 2 files changed, 37 insertions(+), 29 deletions(-)
Applied, thanks, been fixing up a small merge conflict in the last one due to
8fffa0e3451ab ("selftests/bpf: Normalize XDP section names in selftests"), pls
double check.
^ permalink raw reply [flat|nested] 7+ messages in thread