* [PATCH net-next 0/6] mptcp: Self test improvements and a header tweak
@ 2022-07-08 17:14 Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 1/6] mptcp: move MPTCPOPT_HMAC_LEN to net/mptcp.h Mat Martineau
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Mat Martineau @ 2022-07-08 17:14 UTC (permalink / raw)
To: netdev
Cc: Mat Martineau, davem, kuba, pabeni, edumazet, matthieu.baerts,
geliang.tang, mptcp
Patch 1 moves a definition to a header so it can be used in a struct
declaration.
Patch 2 adjusts a time threshold for a selftest that runs much slower on
debug kernels (and even more on slow CI infrastructure), to reduce
spurious failures.
Patches 3 & 4 improve userspace PM test coverage.
Patches 5 & 6 clean up output from a test script and selftest helper
tool.
Geliang Tang (5):
mptcp: move MPTCPOPT_HMAC_LEN to net/mptcp.h
selftests: mptcp: userspace pm address tests
selftests: mptcp: userspace pm subflow tests
selftests: mptcp: avoid Terminated messages in userspace_pm
selftests: mptcp: update pm_nl_ctl usage header
Paolo Abeni (1):
selftests: mptcp: tweak simult_flows for debug kernels
include/net/mptcp.h | 3 +-
net/mptcp/protocol.h | 1 -
.../testing/selftests/net/mptcp/mptcp_join.sh | 86 ++++++++++++++++++-
tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 2 +-
.../selftests/net/mptcp/simult_flows.sh | 14 ++-
.../selftests/net/mptcp/userspace_pm.sh | 40 +++++----
6 files changed, 123 insertions(+), 23 deletions(-)
base-commit: 67d7ebdeb2d5a058dd5079107505fffe7332b27a
--
2.37.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH net-next 1/6] mptcp: move MPTCPOPT_HMAC_LEN to net/mptcp.h
2022-07-08 17:14 [PATCH net-next 0/6] mptcp: Self test improvements and a header tweak Mat Martineau
@ 2022-07-08 17:14 ` Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 2/6] selftests: mptcp: tweak simult_flows for debug kernels Mat Martineau
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Mat Martineau @ 2022-07-08 17:14 UTC (permalink / raw)
To: netdev
Cc: Geliang Tang, davem, kuba, pabeni, edumazet, matthieu.baerts,
mptcp, Mat Martineau
From: Geliang Tang <geliang.tang@suse.com>
Move macro MPTCPOPT_HMAC_LEN definition from net/mptcp/protocol.h to
include/net/mptcp.h.
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
include/net/mptcp.h | 3 ++-
net/mptcp/protocol.h | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index 4d761ad530c9..ac9cf7271d46 100644
--- a/include/net/mptcp.h
+++ b/include/net/mptcp.h
@@ -39,6 +39,7 @@ struct mptcp_ext {
infinite_map:1;
};
+#define MPTCPOPT_HMAC_LEN 20
#define MPTCP_RM_IDS_MAX 8
struct mptcp_rm_list {
@@ -89,7 +90,7 @@ struct mptcp_out_options {
u32 nonce;
u32 token;
u64 thmac;
- u8 hmac[20];
+ u8 hmac[MPTCPOPT_HMAC_LEN];
};
};
#endif
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 480c5320b86e..07871e10e510 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -83,7 +83,6 @@
/* MPTCP MP_JOIN flags */
#define MPTCPOPT_BACKUP BIT(0)
-#define MPTCPOPT_HMAC_LEN 20
#define MPTCPOPT_THMAC_LEN 8
/* MPTCP MP_CAPABLE flags */
--
2.37.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net-next 2/6] selftests: mptcp: tweak simult_flows for debug kernels
2022-07-08 17:14 [PATCH net-next 0/6] mptcp: Self test improvements and a header tweak Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 1/6] mptcp: move MPTCPOPT_HMAC_LEN to net/mptcp.h Mat Martineau
@ 2022-07-08 17:14 ` Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 3/6] selftests: mptcp: userspace pm address tests Mat Martineau
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Mat Martineau @ 2022-07-08 17:14 UTC (permalink / raw)
To: netdev
Cc: Paolo Abeni, davem, kuba, edumazet, matthieu.baerts, mptcp,
Mat Martineau
From: Paolo Abeni <pabeni@redhat.com>
The mentioned test measures the transfer run-time to verify
that the user-space program is able to use the full aggregate B/W.
Even on (virtual) link-speed-bound tests, debug kernel can slow
down the transfer enough to cause sporadic test failures.
Instead of unconditionally raising the maximum allowed run-time,
tweak when the running kernel is a debug one, and use some simple/
rough heuristic to guess such scenarios.
Note: this intentionally avoids looking for /boot/config-<version> as
the latter file is not always available in our reference CI
environments.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Co-developed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
tools/testing/selftests/net/mptcp/simult_flows.sh | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index f441ff7904fc..ffa13a957a36 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -12,6 +12,7 @@ timeout_test=$((timeout_poll * 2 + 1))
test_cnt=1
ret=0
bail=0
+slack=50
usage() {
echo "Usage: $0 [ -b ] [ -c ] [ -d ]"
@@ -52,6 +53,7 @@ setup()
cout=$(mktemp)
capout=$(mktemp)
size=$((2 * 2048 * 4096))
+
dd if=/dev/zero of=$small bs=4096 count=20 >/dev/null 2>&1
dd if=/dev/zero of=$large bs=4096 count=$((size / 4096)) >/dev/null 2>&1
@@ -104,6 +106,16 @@ setup()
ip -net "$ns3" route add default via dead:beef:3::2
ip netns exec "$ns3" ./pm_nl_ctl limits 1 1
+
+ # debug build can slow down measurably the test program
+ # we use quite tight time limit on the run-time, to ensure
+ # maximum B/W usage.
+ # Use kmemleak/lockdep/kasan/prove_locking presence as a rough
+ # estimate for this being a debug kernel and increase the
+ # maximum run-time accordingly. Observed run times for CI builds
+ # running selftests, including kbuild, were used to determine the
+ # amount of time to add.
+ grep -q ' kmemleak_init$\| lockdep_init$\| kasan_init$\| prove_locking$' /proc/kallsyms && slack=$((slack+550))
}
# $1: ns, $2: port
@@ -241,7 +253,7 @@ run_test()
# mptcp_connect will do some sleeps to allow the mp_join handshake
# completion (see mptcp_connect): 200ms on each side, add some slack
- time=$((time + 450))
+ time=$((time + 400 + slack))
printf "%-60s" "$msg"
do_transfer $small $large $time
--
2.37.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net-next 3/6] selftests: mptcp: userspace pm address tests
2022-07-08 17:14 [PATCH net-next 0/6] mptcp: Self test improvements and a header tweak Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 1/6] mptcp: move MPTCPOPT_HMAC_LEN to net/mptcp.h Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 2/6] selftests: mptcp: tweak simult_flows for debug kernels Mat Martineau
@ 2022-07-08 17:14 ` Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 4/6] selftests: mptcp: userspace pm subflow tests Mat Martineau
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Mat Martineau @ 2022-07-08 17:14 UTC (permalink / raw)
To: netdev
Cc: Geliang Tang, davem, kuba, pabeni, edumazet, matthieu.baerts,
mptcp, Mat Martineau
From: Geliang Tang <geliang.tang@suse.com>
This patch adds userspace pm tests support for mptcp_join.sh script. Add
userspace pm add_addr and rm_addr test cases in userspace_tests().
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 49 ++++++++++++++++++-
1 file changed, 48 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index a4406b7a8064..d889e7507cd9 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -455,6 +455,12 @@ wait_mpj()
done
}
+kill_wait()
+{
+ kill $1 > /dev/null 2>&1
+ wait $1 2>/dev/null
+}
+
pm_nl_set_limits()
{
local ns=$1
@@ -654,6 +660,9 @@ do_transfer()
local port=$((10000 + TEST_COUNT - 1))
local cappid
+ local userspace_pm=0
+ local evts_ns1
+ local evts_ns1_pid
:> "$cout"
:> "$sout"
@@ -690,12 +699,24 @@ do_transfer()
extra_args="-r ${speed:6}"
fi
+ if [[ "${addr_nr_ns1}" = "userspace_"* ]]; then
+ userspace_pm=1
+ addr_nr_ns1=${addr_nr_ns1:10}
+ fi
+
if [[ "${addr_nr_ns2}" = "fastclose_"* ]]; then
# disconnect
extra_args="$extra_args -I ${addr_nr_ns2:10}"
addr_nr_ns2=0
fi
+ if [ $userspace_pm -eq 1 ]; then
+ evts_ns1=$(mktemp)
+ :> "$evts_ns1"
+ ip netns exec ${listener_ns} ./pm_nl_ctl events >> "$evts_ns1" 2>&1 &
+ evts_ns1_pid=$!
+ fi
+
local local_addr
if is_v6 "${connect_addr}"; then
local_addr="::"
@@ -748,6 +769,8 @@ do_transfer()
if [ $addr_nr_ns1 -gt 0 ]; then
local counter=2
local add_nr_ns1=${addr_nr_ns1}
+ local id=10
+ local tk
while [ $add_nr_ns1 -gt 0 ]; do
local addr
if is_v6 "${connect_addr}"; then
@@ -755,9 +778,18 @@ do_transfer()
else
addr="10.0.$counter.1"
fi
- pm_nl_add_endpoint $ns1 $addr flags signal
+ if [ $userspace_pm -eq 0 ]; then
+ pm_nl_add_endpoint $ns1 $addr flags signal
+ else
+ tk=$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns1")
+ ip netns exec ${listener_ns} ./pm_nl_ctl ann $addr token $tk id $id
+ sleep 1
+ ip netns exec ${listener_ns} ./pm_nl_ctl rem token $tk id $id
+ fi
+
counter=$((counter + 1))
add_nr_ns1=$((add_nr_ns1 - 1))
+ id=$((id + 1))
done
elif [ $addr_nr_ns1 -lt 0 ]; then
local rm_nr_ns1=$((-addr_nr_ns1))
@@ -890,6 +922,11 @@ do_transfer()
kill $cappid
fi
+ if [ $userspace_pm -eq 1 ]; then
+ kill_wait $evts_ns1_pid
+ rm -rf $evts_ns1
+ fi
+
NSTAT_HISTORY=/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \
nstat | grep Tcp > /tmp/${listener_ns}.out
NSTAT_HISTORY=/tmp/${connector_ns}.nstat ip netns exec ${connector_ns} \
@@ -2810,6 +2847,16 @@ userspace_tests()
chk_join_nr 0 0 0
chk_rm_nr 0 0
fi
+
+ # userspace pm add & remove address
+ if reset "userspace pm add & remove address"; then
+ set_userspace_pm $ns1
+ pm_nl_set_limits $ns2 1 1
+ run_tests $ns1 $ns2 10.0.1.1 0 userspace_1 0 slow
+ chk_join_nr 1 1 1
+ chk_add_nr 1 1
+ chk_rm_nr 1 1 invert
+ fi
}
endpoint_tests()
--
2.37.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net-next 4/6] selftests: mptcp: userspace pm subflow tests
2022-07-08 17:14 [PATCH net-next 0/6] mptcp: Self test improvements and a header tweak Mat Martineau
` (2 preceding siblings ...)
2022-07-08 17:14 ` [PATCH net-next 3/6] selftests: mptcp: userspace pm address tests Mat Martineau
@ 2022-07-08 17:14 ` Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 5/6] selftests: mptcp: avoid Terminated messages in userspace_pm Mat Martineau
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Mat Martineau @ 2022-07-08 17:14 UTC (permalink / raw)
To: netdev
Cc: Geliang Tang, davem, kuba, pabeni, edumazet, matthieu.baerts,
mptcp, Mat Martineau
From: Geliang Tang <geliang.tang@suse.com>
This patch adds userspace pm subflow tests support for mptcp_join.sh
script. Add userspace pm create subflow and destroy test cases in
userspace_tests().
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 39 ++++++++++++++++++-
1 file changed, 37 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index d889e7507cd9..55efe2aafb84 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -663,6 +663,8 @@ do_transfer()
local userspace_pm=0
local evts_ns1
local evts_ns1_pid
+ local evts_ns2
+ local evts_ns2_pid
:> "$cout"
:> "$sout"
@@ -708,13 +710,20 @@ do_transfer()
# disconnect
extra_args="$extra_args -I ${addr_nr_ns2:10}"
addr_nr_ns2=0
+ elif [[ "${addr_nr_ns2}" = "userspace_"* ]]; then
+ userspace_pm=1
+ addr_nr_ns2=${addr_nr_ns2:10}
fi
if [ $userspace_pm -eq 1 ]; then
evts_ns1=$(mktemp)
+ evts_ns2=$(mktemp)
:> "$evts_ns1"
+ :> "$evts_ns2"
ip netns exec ${listener_ns} ./pm_nl_ctl events >> "$evts_ns1" 2>&1 &
evts_ns1_pid=$!
+ ip netns exec ${connector_ns} ./pm_nl_ctl events >> "$evts_ns2" 2>&1 &
+ evts_ns2_pid=$!
fi
local local_addr
@@ -836,6 +845,8 @@ do_transfer()
if [ $addr_nr_ns2 -gt 0 ]; then
local add_nr_ns2=${addr_nr_ns2}
local counter=3
+ local id=20
+ local tk da dp sp
while [ $add_nr_ns2 -gt 0 ]; do
local addr
if is_v6 "${connect_addr}"; then
@@ -843,9 +854,23 @@ do_transfer()
else
addr="10.0.$counter.2"
fi
- pm_nl_add_endpoint $ns2 $addr flags $flags
+ if [ $userspace_pm -eq 0 ]; then
+ pm_nl_add_endpoint $ns2 $addr flags $flags
+ else
+ tk=$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2")
+ da=$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evts_ns2")
+ dp=$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2")
+ ip netns exec ${connector_ns} ./pm_nl_ctl csf lip $addr lid $id \
+ rip $da rport $dp token $tk
+ sleep 1
+ sp=$(grep "type:10" "$evts_ns2" |
+ sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q')
+ ip netns exec ${connector_ns} ./pm_nl_ctl dsf lip $addr lport $sp \
+ rip $da rport $dp token $tk
+ fi
counter=$((counter + 1))
add_nr_ns2=$((add_nr_ns2 - 1))
+ id=$((id + 1))
done
elif [ $addr_nr_ns2 -lt 0 ]; then
local rm_nr_ns2=$((-addr_nr_ns2))
@@ -924,7 +949,8 @@ do_transfer()
if [ $userspace_pm -eq 1 ]; then
kill_wait $evts_ns1_pid
- rm -rf $evts_ns1
+ kill_wait $evts_ns2_pid
+ rm -rf $evts_ns1 $evts_ns2
fi
NSTAT_HISTORY=/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \
@@ -2857,6 +2883,15 @@ userspace_tests()
chk_add_nr 1 1
chk_rm_nr 1 1 invert
fi
+
+ # userspace pm create destroy subflow
+ if reset "userspace pm create destroy subflow"; then
+ set_userspace_pm $ns2
+ pm_nl_set_limits $ns1 0 1
+ run_tests $ns1 $ns2 10.0.1.1 0 0 userspace_1 slow
+ chk_join_nr 1 1 1
+ chk_rm_nr 0 1
+ fi
}
endpoint_tests()
--
2.37.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net-next 5/6] selftests: mptcp: avoid Terminated messages in userspace_pm
2022-07-08 17:14 [PATCH net-next 0/6] mptcp: Self test improvements and a header tweak Mat Martineau
` (3 preceding siblings ...)
2022-07-08 17:14 ` [PATCH net-next 4/6] selftests: mptcp: userspace pm subflow tests Mat Martineau
@ 2022-07-08 17:14 ` Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 6/6] selftests: mptcp: update pm_nl_ctl usage header Mat Martineau
2022-07-09 11:40 ` [PATCH net-next 0/6] mptcp: Self test improvements and a header tweak patchwork-bot+netdevbpf
6 siblings, 0 replies; 8+ messages in thread
From: Mat Martineau @ 2022-07-08 17:14 UTC (permalink / raw)
To: netdev
Cc: Geliang Tang, davem, kuba, pabeni, edumazet, matthieu.baerts,
mptcp, Mat Martineau
From: Geliang Tang <geliang.tang@suse.com>
There're some 'Terminated' messages in the output of userspace pm tests
script after killing './pm_nl_ctl events' processes:
Created network namespaces ns1, ns2 [OK]
./userspace_pm.sh: line 166: 13735 Terminated ip netns exec "$ns2" ./pm_nl_ctl events >> "$client_evts" 2>&1
./userspace_pm.sh: line 172: 13737 Terminated ip netns exec "$ns1" ./pm_nl_ctl events >> "$server_evts" 2>&1
Established IPv4 MPTCP Connection ns2 => ns1 [OK]
./userspace_pm.sh: line 166: 13753 Terminated ip netns exec "$ns2" ./pm_nl_ctl events >> "$client_evts" 2>&1
./userspace_pm.sh: line 172: 13755 Terminated ip netns exec "$ns1" ./pm_nl_ctl events >> "$server_evts" 2>&1
Established IPv6 MPTCP Connection ns2 => ns1 [OK]
ADD_ADDR 10.0.2.2 (ns2) => ns1, invalid token [OK]
This patch adds a helper kill_wait(), in it using 'wait $pid 2>/dev/null'
commands after 'kill $pid' to avoid printing out these Terminated messages.
Use this helper instead of using 'kill $pid'.
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
.../selftests/net/mptcp/userspace_pm.sh | 40 +++++++++++--------
1 file changed, 23 insertions(+), 17 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index abe3d4ebe554..3229725b64b0 100755
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -37,6 +37,12 @@ rndh=$(stdbuf -o0 -e0 printf %x "$sec")-$(mktemp -u XXXXXX)
ns1="ns1-$rndh"
ns2="ns2-$rndh"
+kill_wait()
+{
+ kill $1 > /dev/null 2>&1
+ wait $1 2>/dev/null
+}
+
cleanup()
{
echo "cleanup"
@@ -48,16 +54,16 @@ cleanup()
kill -SIGUSR1 $client4_pid > /dev/null 2>&1
fi
if [ $server4_pid -ne 0 ]; then
- kill $server4_pid > /dev/null 2>&1
+ kill_wait $server4_pid
fi
if [ $client6_pid -ne 0 ]; then
kill -SIGUSR1 $client6_pid > /dev/null 2>&1
fi
if [ $server6_pid -ne 0 ]; then
- kill $server6_pid > /dev/null 2>&1
+ kill_wait $server6_pid
fi
if [ $evts_pid -ne 0 ]; then
- kill $evts_pid > /dev/null 2>&1
+ kill_wait $evts_pid
fi
local netns
for netns in "$ns1" "$ns2" ;do
@@ -153,7 +159,7 @@ make_connection()
sleep 1
# Capture client/server attributes from MPTCP connection netlink events
- kill $client_evts_pid
+ kill_wait $client_evts_pid
local client_token
local client_port
@@ -165,7 +171,7 @@ make_connection()
client_port=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$client_evts")
client_serverside=$(sed --unbuffered -n 's/.*\(server_side:\)\([[:digit:]]*\).*$/\2/p;q'\
"$client_evts")
- kill $server_evts_pid
+ kill_wait $server_evts_pid
server_token=$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$server_evts")
server_serverside=$(sed --unbuffered -n 's/.*\(server_side:\)\([[:digit:]]*\).*$/\2/p;q'\
"$server_evts")
@@ -286,7 +292,7 @@ test_announce()
verify_announce_event "$evts" "$ANNOUNCED" "$server4_token" "10.0.2.2"\
"$client_addr_id" "$new4_port"
- kill $evts_pid
+ kill_wait $evts_pid
# Capture events on the network namespace running the client
:>"$evts"
@@ -321,7 +327,7 @@ test_announce()
verify_announce_event "$evts" "$ANNOUNCED" "$client4_token" "10.0.2.1"\
"$server_addr_id" "$new4_port"
- kill $evts_pid
+ kill_wait $evts_pid
rm -f "$evts"
}
@@ -416,7 +422,7 @@ test_remove()
sleep 0.5
verify_remove_event "$evts" "$REMOVED" "$server6_token" "$client_addr_id"
- kill $evts_pid
+ kill_wait $evts_pid
# Capture events on the network namespace running the client
:>"$evts"
@@ -449,7 +455,7 @@ test_remove()
sleep 0.5
verify_remove_event "$evts" "$REMOVED" "$client6_token" "$server_addr_id"
- kill $evts_pid
+ kill_wait $evts_pid
rm -f "$evts"
}
@@ -553,7 +559,7 @@ test_subflows()
"10.0.2.2" "$client4_port" "23" "$client_addr_id" "ns1" "ns2"
# Delete the listener from the client ns, if one was created
- kill $listener_pid > /dev/null 2>&1
+ kill_wait $listener_pid
local sport
sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts")
@@ -592,7 +598,7 @@ test_subflows()
"$client_addr_id" "ns1" "ns2"
# Delete the listener from the client ns, if one was created
- kill $listener_pid > /dev/null 2>&1
+ kill_wait $listener_pid
sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts")
@@ -631,7 +637,7 @@ test_subflows()
"$client_addr_id" "ns1" "ns2"
# Delete the listener from the client ns, if one was created
- kill $listener_pid > /dev/null 2>&1
+ kill_wait $listener_pid
sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts")
@@ -647,7 +653,7 @@ test_subflows()
ip netns exec "$ns2" ./pm_nl_ctl rem id $client_addr_id token\
"$client4_token" > /dev/null 2>&1
- kill $evts_pid
+ kill_wait $evts_pid
# Capture events on the network namespace running the client
:>"$evts"
@@ -674,7 +680,7 @@ test_subflows()
"10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "ns1"
# Delete the listener from the server ns, if one was created
- kill $listener_pid> /dev/null 2>&1
+ kill_wait $listener_pid
sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts")
@@ -713,7 +719,7 @@ test_subflows()
"$server_addr_id" "ns2" "ns1"
# Delete the listener from the server ns, if one was created
- kill $listener_pid > /dev/null 2>&1
+ kill_wait $listener_pid
sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts")
@@ -750,7 +756,7 @@ test_subflows()
"10.0.2.2" "10.0.2.1" "$new4_port" "23" "$server_addr_id" "ns2" "ns1"
# Delete the listener from the server ns, if one was created
- kill $listener_pid > /dev/null 2>&1
+ kill_wait $listener_pid
sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts")
@@ -766,7 +772,7 @@ test_subflows()
ip netns exec "$ns1" ./pm_nl_ctl rem id $server_addr_id token\
"$server4_token" > /dev/null 2>&1
- kill $evts_pid
+ kill_wait $evts_pid
rm -f "$evts"
}
--
2.37.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net-next 6/6] selftests: mptcp: update pm_nl_ctl usage header
2022-07-08 17:14 [PATCH net-next 0/6] mptcp: Self test improvements and a header tweak Mat Martineau
` (4 preceding siblings ...)
2022-07-08 17:14 ` [PATCH net-next 5/6] selftests: mptcp: avoid Terminated messages in userspace_pm Mat Martineau
@ 2022-07-08 17:14 ` Mat Martineau
2022-07-09 11:40 ` [PATCH net-next 0/6] mptcp: Self test improvements and a header tweak patchwork-bot+netdevbpf
6 siblings, 0 replies; 8+ messages in thread
From: Mat Martineau @ 2022-07-08 17:14 UTC (permalink / raw)
To: netdev
Cc: Geliang Tang, davem, kuba, pabeni, edumazet, matthieu.baerts,
mptcp, Mat Martineau
From: Geliang Tang <geliang.tang@suse.com>
The usage header of pm_nl_ctl command doesn't match with the context. So
this patch adds the missing userspace PM keywords 'ann', 'rem', 'csf',
'dsf', 'events' and 'listen' in it.
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
index cb79f0719e3b..abddf4c63e79 100644
--- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
+++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
@@ -31,7 +31,7 @@
static void syntax(char *argv[])
{
- fprintf(stderr, "%s add|get|set|del|flush|dump|accept [<args>]\n", argv[0]);
+ fprintf(stderr, "%s add|ann|rem|csf|dsf|get|set|del|flush|dump|events|listen|accept [<args>]\n", argv[0]);
fprintf(stderr, "\tadd [flags signal|subflow|backup|fullmesh] [id <nr>] [dev <name>] <ip>\n");
fprintf(stderr, "\tann <local-ip> id <local-id> token <token> [port <local-port>] [dev <name>]\n");
fprintf(stderr, "\trem id <local-id> token <token>\n");
--
2.37.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 0/6] mptcp: Self test improvements and a header tweak
2022-07-08 17:14 [PATCH net-next 0/6] mptcp: Self test improvements and a header tweak Mat Martineau
` (5 preceding siblings ...)
2022-07-08 17:14 ` [PATCH net-next 6/6] selftests: mptcp: update pm_nl_ctl usage header Mat Martineau
@ 2022-07-09 11:40 ` patchwork-bot+netdevbpf
6 siblings, 0 replies; 8+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-07-09 11:40 UTC (permalink / raw)
To: Mat Martineau
Cc: netdev, davem, kuba, pabeni, edumazet, matthieu.baerts,
geliang.tang, mptcp
Hello:
This series was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:
On Fri, 8 Jul 2022 10:14:07 -0700 you wrote:
> Patch 1 moves a definition to a header so it can be used in a struct
> declaration.
>
> Patch 2 adjusts a time threshold for a selftest that runs much slower on
> debug kernels (and even more on slow CI infrastructure), to reduce
> spurious failures.
>
> [...]
Here is the summary with links:
- [net-next,1/6] mptcp: move MPTCPOPT_HMAC_LEN to net/mptcp.h
https://git.kernel.org/netdev/net-next/c/f7657ff4a709
- [net-next,2/6] selftests: mptcp: tweak simult_flows for debug kernels
https://git.kernel.org/netdev/net-next/c/d0d9c8f2df60
- [net-next,3/6] selftests: mptcp: userspace pm address tests
https://git.kernel.org/netdev/net-next/c/97040cf9806e
- [net-next,4/6] selftests: mptcp: userspace pm subflow tests
https://git.kernel.org/netdev/net-next/c/5e986ec46874
- [net-next,5/6] selftests: mptcp: avoid Terminated messages in userspace_pm
https://git.kernel.org/netdev/net-next/c/507719cd7c0f
- [net-next,6/6] selftests: mptcp: update pm_nl_ctl usage header
https://git.kernel.org/netdev/net-next/c/65ebc6676d17
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-07-09 11:40 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-08 17:14 [PATCH net-next 0/6] mptcp: Self test improvements and a header tweak Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 1/6] mptcp: move MPTCPOPT_HMAC_LEN to net/mptcp.h Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 2/6] selftests: mptcp: tweak simult_flows for debug kernels Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 3/6] selftests: mptcp: userspace pm address tests Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 4/6] selftests: mptcp: userspace pm subflow tests Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 5/6] selftests: mptcp: avoid Terminated messages in userspace_pm Mat Martineau
2022-07-08 17:14 ` [PATCH net-next 6/6] selftests: mptcp: update pm_nl_ctl usage header Mat Martineau
2022-07-09 11:40 ` [PATCH net-next 0/6] mptcp: Self test improvements and a header tweak patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.