From: Geliang Tang <geliangtang@gmail.com>
To: Mat Martineau <mathew.j.martineau@linux.intel.com>,
Matthieu Baerts <matthieu.baerts@tessares.net>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Geliang Tang <geliangtang@gmail.com>,
netdev@vger.kernel.org, mptcp@lists.01.org,
linux-kernel@vger.kernel.org
Subject: [MPTCP][PATCH net-next 06/16] selftests: mptcp: add ADD_ADDR mibs check function
Date: Thu, 24 Sep 2020 08:29:52 +0800 [thread overview]
Message-ID: <7b0898eff793dde434464b5fac2629739d9546fd.1600853093.git.geliangtang@gmail.com> (raw)
In-Reply-To: <cover.1600853093.git.geliangtang@gmail.com>
In-Reply-To: <430dd4f9c241ae990a5cfa6809276b36993ce91b.1600853093.git.geliangtang@gmail.com>
This patch added the ADD_ADDR related mibs counter check function
chk_add_nr(). This function check both ADD_ADDR and ADD_ADDR with
echo flag.
The output looks like this:
07 unused signal address syn[ ok ] - synack[ ok ] - ack[ ok ]
add[ ok ] - echo [ ok ]
08 signal address syn[ ok ] - synack[ ok ] - ack[ ok ]
add[ ok ] - echo [ ok ]
09 subflow and signal syn[ ok ] - synack[ ok ] - ack[ ok ]
add[ ok ] - echo [ ok ]
10 multiple subflows and signal syn[ ok ] - synack[ ok ] - ack[ ok ]
add[ ok ] - echo [ ok ]
11 remove subflow and signal syn[ ok ] - synack[ ok ] - ack[ ok ]
add[ ok ] - echo [ ok ]
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 44 +++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index c2943e4dfcfe..9d64abdde146 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -276,6 +276,43 @@ chk_join_nr()
fi
}
+chk_add_nr()
+{
+ local add_nr=$1
+ local echo_nr=$2
+ local count
+ local dump_stats
+
+ printf "%-39s %s" " " "add"
+ count=`ip netns exec $ns2 nstat -as | grep MPTcpExtAddAddr | awk '{print $2}'`
+ [ -z "$count" ] && count=0
+ if [ "$count" != "$add_nr" ]; then
+ echo "[fail] got $count ADD_ADDR[s] expected $add_nr"
+ ret=1
+ dump_stats=1
+ else
+ echo -n "[ ok ]"
+ fi
+
+ echo -n " - echo "
+ count=`ip netns exec $ns1 nstat -as | grep MPTcpExtEchoAdd | awk '{print $2}'`
+ [ -z "$count" ] && count=0
+ if [ "$count" != "$echo_nr" ]; then
+ echo "[fail] got $count ADD_ADDR echo[s] expected $echo_nr"
+ ret=1
+ dump_stats=1
+ else
+ echo "[ ok ]"
+ fi
+
+ if [ "${dump_stats}" = 1 ]; then
+ echo Server ns stats
+ ip netns exec $ns1 nstat -as | grep MPTcp
+ echo Client ns stats
+ ip netns exec $ns2 nstat -as | grep MPTcp
+ fi
+}
+
sin=$(mktemp)
sout=$(mktemp)
cin=$(mktemp)
@@ -332,6 +369,7 @@ reset
ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr "unused signal address" 0 0 0
+chk_add_nr 1 1
# accept and use add_addr
reset
@@ -340,6 +378,7 @@ ip netns exec $ns2 ./pm_nl_ctl limits 1 1
ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr "signal address" 1 1 1
+chk_add_nr 1 1
# accept and use add_addr with an additional subflow
# note: signal address in server ns and local addresses in client ns must
@@ -352,6 +391,7 @@ ip netns exec $ns2 ./pm_nl_ctl limits 1 2
ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr "subflow and signal" 2 2 2
+chk_add_nr 1 1
# accept and use add_addr with additional subflows
reset
@@ -362,6 +402,7 @@ ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr "multiple subflows and signal" 3 3 3
+chk_add_nr 1 1
# single subflow, syncookies
reset_with_cookies
@@ -396,6 +437,7 @@ ip netns exec $ns2 ./pm_nl_ctl limits 1 1
ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr "signal address with syn cookies" 1 1 1
+chk_add_nr 1 1
# test cookie with subflow and signal
reset_with_cookies
@@ -405,6 +447,7 @@ ip netns exec $ns2 ./pm_nl_ctl limits 1 2
ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr "subflow and signal w cookies" 2 2 2
+chk_add_nr 1 1
# accept and use add_addr with additional subflows
reset_with_cookies
@@ -415,5 +458,6 @@ ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr "subflows and signal w. cookies" 3 3 3
+chk_add_nr 1 1
exit $ret
--
2.17.1
next prev parent reply other threads:[~2020-09-24 0:45 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-24 0:29 [MPTCP][PATCH net-next 00/16] mptcp: RM_ADDR/ADD_ADDR enhancements Geliang Tang
2020-09-24 0:29 ` [MPTCP][PATCH net-next 01/16] mptcp: rename addr_signal and the related functions Geliang Tang
2020-09-24 0:29 ` [MPTCP][PATCH net-next 02/16] mptcp: add the outgoing RM_ADDR support Geliang Tang
2020-09-24 0:29 ` [MPTCP][PATCH net-next 03/16] mptcp: add the incoming " Geliang Tang
2020-09-24 0:29 ` [MPTCP][PATCH net-next 04/16] mptcp: send out ADD_ADDR with echo flag Geliang Tang
2020-09-24 0:29 ` [MPTCP][PATCH net-next 05/16] mptcp: add ADD_ADDR related mibs Geliang Tang
2020-09-24 0:29 ` Geliang Tang [this message]
2020-09-24 0:29 ` [MPTCP][PATCH net-next 07/16] mptcp: add accept_subflow re-check Geliang Tang
2020-09-24 0:29 ` [MPTCP][PATCH net-next 08/16] mptcp: remove addr and subflow in PM netlink Geliang Tang
2020-09-24 0:29 ` [MPTCP][PATCH net-next 09/16] mptcp: implement mptcp_pm_remove_subflow Geliang Tang
2020-09-24 0:29 ` [MPTCP][PATCH net-next 10/16] mptcp: add RM_ADDR related mibs Geliang Tang
2020-09-24 0:29 ` [MPTCP][PATCH net-next 11/16] mptcp: add mptcp_destroy_common helper Geliang Tang
2020-09-24 0:29 ` [MPTCP][PATCH net-next 12/16] selftests: mptcp: add remove cfg in mptcp_connect Geliang Tang
2020-09-24 0:29 ` [MPTCP][PATCH net-next 13/16] selftests: mptcp: add remove addr and subflow test cases Geliang Tang
2020-09-24 0:30 ` [MPTCP][PATCH net-next 14/16] mptcp: add struct mptcp_pm_add_entry Geliang Tang
2020-09-24 0:30 ` [MPTCP][PATCH net-next 15/16] mptcp: add sk_stop_timer_sync helper Geliang Tang
2020-09-24 0:30 ` [MPTCP][PATCH net-next 16/16] mptcp: retransmit ADD_ADDR when timeout Geliang Tang
2020-09-25 0:26 ` Mat Martineau
2020-09-25 0:26 ` [MPTCP][PATCH net-next 15/16] mptcp: add sk_stop_timer_sync helper Mat Martineau
2020-09-25 0:25 ` [MPTCP][PATCH net-next 14/16] mptcp: add struct mptcp_pm_add_entry Mat Martineau
2020-09-25 0:25 ` [MPTCP][PATCH net-next 13/16] selftests: mptcp: add remove addr and subflow test cases Mat Martineau
2020-09-25 0:24 ` [MPTCP][PATCH net-next 12/16] selftests: mptcp: add remove cfg in mptcp_connect Mat Martineau
2020-09-25 0:23 ` [MPTCP][PATCH net-next 11/16] mptcp: add mptcp_destroy_common helper Mat Martineau
2020-09-25 0:21 ` [MPTCP][PATCH net-next 10/16] mptcp: add RM_ADDR related mibs Mat Martineau
2020-09-25 0:20 ` [MPTCP][PATCH net-next 08/16] mptcp: remove addr and subflow in PM netlink Mat Martineau
2020-09-25 0:19 ` [MPTCP][PATCH net-next 03/16] mptcp: add the incoming RM_ADDR support Mat Martineau
2020-09-25 0:17 ` [MPTCP][PATCH net-next 02/16] mptcp: add the outgoing " Mat Martineau
2020-09-25 0:17 ` [MPTCP][PATCH net-next 01/16] mptcp: rename addr_signal and the related functions Mat Martineau
2020-09-25 2:58 ` [MPTCP][PATCH net-next 00/16] mptcp: RM_ADDR/ADD_ADDR enhancements David Miller
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=7b0898eff793dde434464b5fac2629739d9546fd.1600853093.git.geliangtang@gmail.com \
--to=geliangtang@gmail.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathew.j.martineau@linux.intel.com \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.01.org \
--cc=netdev@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
all inboxes | Powered by JetHome®