All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH mptcp-next v5 0/6] MP_FAIL echo and retrans
@ 2022-03-15  6:58 Geliang Tang
  2022-03-15  6:58 ` [PATCH mptcp-next v5 1/6] mptcp: use mptcp_stop_timer Geliang Tang
                   ` (6 more replies)
  0 siblings, 7 replies; 12+ messages in thread
From: Geliang Tang @ 2022-03-15  6:58 UTC (permalink / raw)
  To: mptcp; +Cc: Geliang Tang

v5:
 - re-check for TCP_CLOSE.
 - add a new helper mptcp_check_mp_fail_response().
 - add two timers cleanup patches.

v4:
 - start and stop sk_timer instead of setting and clearing msk->flags.
 - add a new patch.

v3:
 - use msk->sk_timer and a msk->flags bit.
 - use READ_ONCE/WRITE_ONCE for subflow->mp_fail_response_expect.
 - update selftest.

v2:
 - don't clear mp_fail_response_expect flag.
 - add a helper mp_fail_response_expect_subflow to get the subflow,
   instead of using msk->first.
 - add locks as Mat suggested.
 - add a selftest.

Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/261

Geliang Tang (6):
  mptcp: use mptcp_stop_timer
  mptcp: add data lock for sk timers
  mptcp: add MP_FAIL response support
  mptcp: reset subflow when MP_FAIL doesn't respond
  selftests: mptcp: check MP_FAIL response mibs
  selftests: mptcp: print extra msg in chk_csum_nr

 net/mptcp/pm.c                                | 18 +++++-
 net/mptcp/protocol.c                          | 64 ++++++++++++++++++-
 net/mptcp/protocol.h                          |  2 +
 net/mptcp/subflow.c                           | 13 ++++
 .../testing/selftests/net/mptcp/mptcp_join.sh | 49 ++++++++++++--
 5 files changed, 139 insertions(+), 7 deletions(-)

-- 
2.34.1


^ permalink raw reply	[flat|nested] 12+ messages in thread
* [PATCH mptcp-next v4 4/4] selftests: mptcp: print extra msg in chk_csum_nr
@ 2022-03-10  8:09 Geliang Tang
  2022-03-10  9:58 ` selftests: mptcp: print extra msg in chk_csum_nr: Tests Results MPTCP CI
  0 siblings, 1 reply; 12+ messages in thread
From: Geliang Tang @ 2022-03-10  8:09 UTC (permalink / raw)
  To: mptcp; +Cc: Geliang Tang

When the multiple checksum errors occur in chk_csum_nr(), print the
numbers of the errors as an extra message.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 2b77576d773c..375b087edc7b 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -1014,6 +1014,7 @@ chk_csum_nr()
 	local csum_ns2=${2:-0}
 	local count
 	local dump_stats
+	local extra_msg=""
 	local allow_multi_errors_ns1=0
 	local allow_multi_errors_ns2=0
 
@@ -1029,6 +1030,9 @@ chk_csum_nr()
 	printf "%-${nr_blank}s %s" " " "sum"
 	count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtDataCsumErr | awk '{print $2}')
 	[ -z "$count" ] && count=0
+	if [ "$count" != "$csum_ns1" ]; then
+		extra_msg="$extra_msg ns1=$count"
+	fi
 	if { [ "$count" != $csum_ns1 ] && [ $allow_multi_errors_ns1 -eq 0 ]; } ||
 	   { [ "$count" -lt $csum_ns1 ] && [ $allow_multi_errors_ns1 -eq 1 ]; }; then
 		echo "[fail] got $count data checksum error[s] expected $csum_ns1"
@@ -1040,15 +1044,20 @@ chk_csum_nr()
 	echo -n " - csum  "
 	count=$(ip netns exec $ns2 nstat -as | grep MPTcpExtDataCsumErr | awk '{print $2}')
 	[ -z "$count" ] && count=0
+	if [ "$count" != "$csum_ns2" ]; then
+		extra_msg="$extra_msg ns2=$count"
+	fi
 	if { [ "$count" != $csum_ns2 ] && [ $allow_multi_errors_ns2 -eq 0 ]; } ||
 	   { [ "$count" -lt $csum_ns2 ] && [ $allow_multi_errors_ns2 -eq 1 ]; }; then
 		echo "[fail] got $count data checksum error[s] expected $csum_ns2"
 		fail_test
 		dump_stats=1
 	else
-		echo "[ ok ]"
+		echo -n "[ ok ]"
 	fi
 	[ "${dump_stats}" = 1 ] && dump_stats
+
+	echo "$extra_msg"
 }
 
 chk_fail_nr()
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-03-23 17:10 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-15  6:58 [PATCH mptcp-next v5 0/6] MP_FAIL echo and retrans Geliang Tang
2022-03-15  6:58 ` [PATCH mptcp-next v5 1/6] mptcp: use mptcp_stop_timer Geliang Tang
2022-03-15  6:58 ` [PATCH mptcp-next v5 2/6] mptcp: add data lock for sk timers Geliang Tang
2022-03-15  6:58 ` [PATCH mptcp-next v5 3/6] mptcp: add MP_FAIL response support Geliang Tang
2022-03-15  6:58 ` [PATCH mptcp-next v5 4/6] mptcp: reset subflow when MP_FAIL doesn't respond Geliang Tang
2022-03-15  6:58 ` [PATCH mptcp-next v5 5/6] selftests: mptcp: check MP_FAIL response mibs Geliang Tang
2022-03-15  6:58 ` [PATCH mptcp-next v5 6/6] selftests: mptcp: print extra msg in chk_csum_nr Geliang Tang
2022-03-15  8:08   ` selftests: mptcp: print extra msg in chk_csum_nr: Tests Results MPTCP CI
2022-03-17  0:20 ` [PATCH mptcp-next v5 0/6] MP_FAIL echo and retrans Mat Martineau
2022-03-18 23:19   ` Mat Martineau
2022-03-23 17:10     ` Matthieu Baerts
  -- strict thread matches above, loose matches on Subject: below --
2022-03-10  8:09 [PATCH mptcp-next v4 4/4] selftests: mptcp: print extra msg in chk_csum_nr Geliang Tang
2022-03-10  9:58 ` selftests: mptcp: print extra msg in chk_csum_nr: Tests Results MPTCP CI

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.