From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
To: mptcp@lists.linux.dev, stable@vger.kernel.org,
gregkh@linuxfoundation.org
Cc: Geliang Tang <geliang.tang@suse.com>,
Matthieu Baerts <matttbe@kernel.org>,
Mat Martineau <martineau@kernel.org>,
Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH 6.6.y 1/5] selftests: mptcp: display simult in extra_msg
Date: Fri, 5 Apr 2024 17:36:38 +0200 [thread overview]
Message-ID: <20240405153636.958019-8-matttbe@kernel.org> (raw)
In-Reply-To: <2024040520-unselect-antitrust-a41b@gregkh>
From: Geliang Tang <geliang.tang@suse.com>
Just like displaying "invert" after "Info: ", "simult" should be
displayed too when rm_subflow_nr doesn't match the expect value in
chk_rm_nr():
syn [ ok ]
synack [ ok ]
ack [ ok ]
add [ ok ]
echo [ ok ]
rm [ ok ]
rmsf [ ok ] 3 in [2:4]
Info: invert simult
syn [ ok ]
synack [ ok ]
ack [ ok ]
add [ ok ]
echo [ ok ]
rm [ ok ]
rmsf [ ok ]
Info: invert
Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-10-db8f25f798eb@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit 629b35a225b0d49fbcff3b5c22e3b983c7c7b36f)
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 34c342346967..e6b778a9a937 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -1740,7 +1740,10 @@ chk_rm_nr()
# in case of simult flush, the subflow removal count on each side is
# unreliable
count=$((count + cnt))
- [ "$count" != "$rm_subflow_nr" ] && suffix="$count in [$rm_subflow_nr:$((rm_subflow_nr*2))]"
+ if [ "$count" != "$rm_subflow_nr" ]; then
+ suffix="$count in [$rm_subflow_nr:$((rm_subflow_nr*2))]"
+ extra_msg="$extra_msg simult"
+ fi
if [ $count -ge "$rm_subflow_nr" ] && \
[ "$count" -le "$((rm_subflow_nr *2 ))" ]; then
print_ok "$suffix"
--
2.43.0
next prev parent reply other threads:[~2024-04-05 15:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-05 6:29 FAILED: patch "[PATCH] mptcp: don't account accept() of non-MPC client as fallback" failed to apply to 6.6-stable tree gregkh
2024-04-05 15:36 ` [PATCH 6.6.y 0/5] Backport "mptcp: don't account accept() of non-MPC client as fallback to TCP" Matthieu Baerts (NGI0)
2024-04-05 15:36 ` Matthieu Baerts (NGI0) [this message]
2024-04-05 15:36 ` [PATCH 6.6.y 2/5] selftests: mptcp: connect: fix shellcheck warnings Matthieu Baerts (NGI0)
2024-04-05 15:36 ` [PATCH 6.6.y 3/5] selftests: mptcp: use += operator to append strings Matthieu Baerts (NGI0)
2024-04-08 11:31 ` Greg KH
2024-04-08 16:10 ` Matthieu Baerts
2024-04-09 12:16 ` Greg KH
2024-04-09 15:04 ` Matthieu Baerts
2024-04-11 7:32 ` Greg KH
2024-04-11 10:06 ` Matthieu Baerts
2024-04-05 15:36 ` [PATCH 6.6.y 4/5] mptcp: don't overwrite sock_ops in mptcp_is_tcpsk() Matthieu Baerts (NGI0)
2024-04-05 15:36 ` [PATCH 6.6.y 5/5] mptcp: don't account accept() of non-MPC client as fallback to TCP Matthieu Baerts (NGI0)
2024-04-11 10:07 ` [PATCH 6.6.y] selftests: mptcp: use += operator to append strings Matthieu Baerts (NGI0)
2024-04-15 10:44 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240405153636.958019-8-matttbe@kernel.org \
--to=matttbe@kernel.org \
--cc=geliang.tang@suse.com \
--cc=gregkh@linuxfoundation.org \
--cc=kuba@kernel.org \
--cc=martineau@kernel.org \
--cc=mptcp@lists.linux.dev \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).