b51880568f
client & server use a unix socket connection to communicate outside of the mptcp connection. This allows the consumer to know in advance how many bytes have been (or will be) sent by the peer. This allows stricter checks on the bytecounts reported by TCP_INQ cmsg. Suggested-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
344 lines
6.3 KiB
Bash
Executable File
344 lines
6.3 KiB
Bash
Executable File
#!/bin/bash
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
ret=0
|
|
sin=""
|
|
sout=""
|
|
cin=""
|
|
cout=""
|
|
ksft_skip=4
|
|
timeout_poll=30
|
|
timeout_test=$((timeout_poll * 2 + 1))
|
|
mptcp_connect=""
|
|
do_all_tests=1
|
|
|
|
add_mark_rules()
|
|
{
|
|
local ns=$1
|
|
local m=$2
|
|
|
|
for t in iptables ip6tables; do
|
|
# just to debug: check we have multiple subflows connection requests
|
|
ip netns exec $ns $t -A OUTPUT -p tcp --syn -m mark --mark $m -j ACCEPT
|
|
|
|
# RST packets might be handled by a internal dummy socket
|
|
ip netns exec $ns $t -A OUTPUT -p tcp --tcp-flags RST RST -m mark --mark 0 -j ACCEPT
|
|
|
|
ip netns exec $ns $t -A OUTPUT -p tcp -m mark --mark $m -j ACCEPT
|
|
ip netns exec $ns $t -A OUTPUT -p tcp -m mark --mark 0 -j DROP
|
|
done
|
|
}
|
|
|
|
init()
|
|
{
|
|
rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
|
|
|
|
ns1="ns1-$rndh"
|
|
ns2="ns2-$rndh"
|
|
|
|
for netns in "$ns1" "$ns2";do
|
|
ip netns add $netns || exit $ksft_skip
|
|
ip -net $netns link set lo up
|
|
ip netns exec $netns sysctl -q net.mptcp.enabled=1
|
|
ip netns exec $netns sysctl -q net.ipv4.conf.all.rp_filter=0
|
|
ip netns exec $netns sysctl -q net.ipv4.conf.default.rp_filter=0
|
|
done
|
|
|
|
for i in `seq 1 4`; do
|
|
ip link add ns1eth$i netns "$ns1" type veth peer name ns2eth$i netns "$ns2"
|
|
ip -net "$ns1" addr add 10.0.$i.1/24 dev ns1eth$i
|
|
ip -net "$ns1" addr add dead:beef:$i::1/64 dev ns1eth$i nodad
|
|
ip -net "$ns1" link set ns1eth$i up
|
|
|
|
ip -net "$ns2" addr add 10.0.$i.2/24 dev ns2eth$i
|
|
ip -net "$ns2" addr add dead:beef:$i::2/64 dev ns2eth$i nodad
|
|
ip -net "$ns2" link set ns2eth$i up
|
|
|
|
# let $ns2 reach any $ns1 address from any interface
|
|
ip -net "$ns2" route add default via 10.0.$i.1 dev ns2eth$i metric 10$i
|
|
|
|
ip netns exec $ns1 ./pm_nl_ctl add 10.0.$i.1 flags signal
|
|
ip netns exec $ns1 ./pm_nl_ctl add dead:beef:$i::1 flags signal
|
|
|
|
ip netns exec $ns2 ./pm_nl_ctl add 10.0.$i.2 flags signal
|
|
ip netns exec $ns2 ./pm_nl_ctl add dead:beef:$i::2 flags signal
|
|
done
|
|
|
|
ip netns exec $ns1 ./pm_nl_ctl limits 8 8
|
|
ip netns exec $ns2 ./pm_nl_ctl limits 8 8
|
|
|
|
add_mark_rules $ns1 1
|
|
add_mark_rules $ns2 2
|
|
}
|
|
|
|
cleanup()
|
|
{
|
|
for netns in "$ns1" "$ns2"; do
|
|
ip netns del $netns
|
|
done
|
|
rm -f "$cin" "$cout"
|
|
rm -f "$sin" "$sout"
|
|
}
|
|
|
|
ip -Version > /dev/null 2>&1
|
|
if [ $? -ne 0 ];then
|
|
echo "SKIP: Could not run test without ip tool"
|
|
exit $ksft_skip
|
|
fi
|
|
|
|
iptables -V > /dev/null 2>&1
|
|
if [ $? -ne 0 ];then
|
|
echo "SKIP: Could not run all tests without iptables tool"
|
|
exit $ksft_skip
|
|
fi
|
|
|
|
ip6tables -V > /dev/null 2>&1
|
|
if [ $? -ne 0 ];then
|
|
echo "SKIP: Could not run all tests without ip6tables tool"
|
|
exit $ksft_skip
|
|
fi
|
|
|
|
check_mark()
|
|
{
|
|
local ns=$1
|
|
local af=$2
|
|
|
|
tables=iptables
|
|
|
|
if [ $af -eq 6 ];then
|
|
tables=ip6tables
|
|
fi
|
|
|
|
counters=$(ip netns exec $ns $tables -v -L OUTPUT | grep DROP)
|
|
values=${counters%DROP*}
|
|
|
|
for v in $values; do
|
|
if [ $v -ne 0 ]; then
|
|
echo "FAIL: got $tables $values in ns $ns , not 0 - not all expected packets marked" 1>&2
|
|
return 1
|
|
fi
|
|
done
|
|
|
|
return 0
|
|
}
|
|
|
|
print_file_err()
|
|
{
|
|
ls -l "$1" 1>&2
|
|
echo "Trailing bytes are: "
|
|
tail -c 27 "$1"
|
|
}
|
|
|
|
check_transfer()
|
|
{
|
|
in=$1
|
|
out=$2
|
|
what=$3
|
|
|
|
cmp "$in" "$out" > /dev/null 2>&1
|
|
if [ $? -ne 0 ] ;then
|
|
echo "[ FAIL ] $what does not match (in, out):"
|
|
print_file_err "$in"
|
|
print_file_err "$out"
|
|
ret=1
|
|
|
|
return 1
|
|
fi
|
|
|
|
return 0
|
|
}
|
|
|
|
# $1: IP address
|
|
is_v6()
|
|
{
|
|
[ -z "${1##*:*}" ]
|
|
}
|
|
|
|
do_transfer()
|
|
{
|
|
listener_ns="$1"
|
|
connector_ns="$2"
|
|
cl_proto="$3"
|
|
srv_proto="$4"
|
|
connect_addr="$5"
|
|
|
|
port=12001
|
|
|
|
:> "$cout"
|
|
:> "$sout"
|
|
|
|
mptcp_connect="./mptcp_connect -r 20"
|
|
|
|
local local_addr
|
|
if is_v6 "${connect_addr}"; then
|
|
local_addr="::"
|
|
else
|
|
local_addr="0.0.0.0"
|
|
fi
|
|
|
|
timeout ${timeout_test} \
|
|
ip netns exec ${listener_ns} \
|
|
$mptcp_connect -t ${timeout_poll} -l -M 1 -p $port -s ${srv_proto} -c TIMESTAMPNS,TCPINQ \
|
|
${local_addr} < "$sin" > "$sout" &
|
|
spid=$!
|
|
|
|
sleep 1
|
|
|
|
timeout ${timeout_test} \
|
|
ip netns exec ${connector_ns} \
|
|
$mptcp_connect -t ${timeout_poll} -M 2 -p $port -s ${cl_proto} -c TIMESTAMPNS,TCPINQ \
|
|
$connect_addr < "$cin" > "$cout" &
|
|
|
|
cpid=$!
|
|
|
|
wait $cpid
|
|
retc=$?
|
|
wait $spid
|
|
rets=$?
|
|
|
|
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then
|
|
echo " client exit code $retc, server $rets" 1>&2
|
|
echo -e "\nnetns ${listener_ns} socket stat for ${port}:" 1>&2
|
|
ip netns exec ${listener_ns} ss -Menita 1>&2 -o "sport = :$port"
|
|
|
|
echo -e "\nnetns ${connector_ns} socket stat for ${port}:" 1>&2
|
|
ip netns exec ${connector_ns} ss -Menita 1>&2 -o "dport = :$port"
|
|
|
|
ret=1
|
|
return 1
|
|
fi
|
|
|
|
if [ $local_addr = "::" ];then
|
|
check_mark $listener_ns 6
|
|
check_mark $connector_ns 6
|
|
else
|
|
check_mark $listener_ns 4
|
|
check_mark $connector_ns 4
|
|
fi
|
|
|
|
check_transfer $cin $sout "file received by server"
|
|
|
|
rets=$?
|
|
|
|
if [ $retc -eq 0 ] && [ $rets -eq 0 ];then
|
|
return 0
|
|
fi
|
|
|
|
return 1
|
|
}
|
|
|
|
make_file()
|
|
{
|
|
name=$1
|
|
who=$2
|
|
size=$3
|
|
|
|
dd if=/dev/urandom of="$name" bs=1024 count=$size 2> /dev/null
|
|
echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "$name"
|
|
|
|
echo "Created $name (size $size KB) containing data sent by $who"
|
|
}
|
|
|
|
do_mptcp_sockopt_tests()
|
|
{
|
|
local lret=0
|
|
|
|
./mptcp_sockopt
|
|
lret=$?
|
|
|
|
if [ $lret -ne 0 ]; then
|
|
echo "FAIL: SOL_MPTCP getsockopt" 1>&2
|
|
ret=$lret
|
|
return
|
|
fi
|
|
|
|
./mptcp_sockopt -6
|
|
lret=$?
|
|
|
|
if [ $lret -ne 0 ]; then
|
|
echo "FAIL: SOL_MPTCP getsockopt (ipv6)" 1>&2
|
|
ret=$lret
|
|
return
|
|
fi
|
|
}
|
|
|
|
run_tests()
|
|
{
|
|
listener_ns="$1"
|
|
connector_ns="$2"
|
|
connect_addr="$3"
|
|
local lret=0
|
|
|
|
do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr}
|
|
|
|
lret=$?
|
|
|
|
if [ $lret -ne 0 ]; then
|
|
ret=$lret
|
|
return
|
|
fi
|
|
}
|
|
|
|
do_tcpinq_test()
|
|
{
|
|
ip netns exec "$ns1" ./mptcp_inq "$@"
|
|
lret=$?
|
|
if [ $lret -ne 0 ];then
|
|
ret=$lret
|
|
echo "FAIL: mptcp_inq $@" 1>&2
|
|
return $lret
|
|
fi
|
|
|
|
echo "PASS: TCP_INQ cmsg/ioctl $@"
|
|
return $lret
|
|
}
|
|
|
|
do_tcpinq_tests()
|
|
{
|
|
local lret=0
|
|
|
|
ip netns exec "$ns1" iptables -F
|
|
ip netns exec "$ns1" ip6tables -F
|
|
|
|
for args in "-t tcp" "-r tcp"; do
|
|
do_tcpinq_test $args
|
|
lret=$?
|
|
if [ $lret -ne 0 ] ; then
|
|
return $lret
|
|
fi
|
|
do_tcpinq_test -6 $args
|
|
lret=$?
|
|
if [ $lret -ne 0 ] ; then
|
|
return $lret
|
|
fi
|
|
done
|
|
|
|
do_tcpinq_test -r tcp -t tcp
|
|
|
|
return $?
|
|
}
|
|
|
|
sin=$(mktemp)
|
|
sout=$(mktemp)
|
|
cin=$(mktemp)
|
|
cout=$(mktemp)
|
|
init
|
|
make_file "$cin" "client" 1
|
|
make_file "$sin" "server" 1
|
|
trap cleanup EXIT
|
|
|
|
run_tests $ns1 $ns2 10.0.1.1
|
|
run_tests $ns1 $ns2 dead:beef:1::1
|
|
|
|
if [ $ret -eq 0 ];then
|
|
echo "PASS: all packets had packet mark set"
|
|
fi
|
|
|
|
do_mptcp_sockopt_tests
|
|
if [ $ret -eq 0 ];then
|
|
echo "PASS: SOL_MPTCP getsockopt has expected information"
|
|
fi
|
|
|
|
do_tcpinq_tests
|
|
exit $ret
|