Commit 0a82c37e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mptcp-selftests' 



Mat Martineau says:

====================
mptcp: Selftest enhancement and fixes

This is a collection of selftest updates from the MPTCP tree.

Patch 1 uses additional 'ss' command line parameters and 'nstat' to
improve output when certain MPTCP tests fail.

Patches 2 & 3 fix a copy/paste error and some output formatting.

Patch 4 makes sure tests still pass if certain connection-related
packets are retransmitted.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c3ff3b02 5f88117f

tools/testing/selftests/net/mptcp/mptcp_connect.sh

+66 −28
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ cleanup() 
	local netns

	for netns in "$ns1" "$ns2" "$ns3" "$ns4";do

		ip netns del $netns

		rm -f /tmp/$netns.{nstat,out}

	done

}
@@ -333,6 +334,21 @@ do_ping() 
	return 0

}



# $1: ns, $2: MIB counter

get_mib_counter()

{

	local listener_ns="${1}"

	local mib="${2}"



	# strip the header

	ip netns exec "${listener_ns}" \

		nstat -z -a "${mib}" | \

			tail -n+2 | \

			while read a count c rest; do

				echo $count

			done

}



# $1: ns, $2: port

wait_local_port_listen()

{
@@ -409,10 +425,10 @@ do_transfer() 
		sleep 1

	fi



	local stat_synrx_last_l=$(ip netns exec ${listener_ns} nstat -z -a MPTcpExtMPCapableSYNRX | while read a count c rest ;do  echo $count;done)

	local stat_ackrx_last_l=$(ip netns exec ${listener_ns} nstat -z -a MPTcpExtMPCapableACKRX | while read a count c rest ;do  echo $count;done)

	local stat_cookietx_last=$(ip netns exec ${listener_ns} nstat -z -a TcpExtSyncookiesSent | while read a count c rest ;do  echo $count;done)

	local stat_cookierx_last=$(ip netns exec ${listener_ns} nstat -z -a TcpExtSyncookiesRecv | while read a count c rest ;do  echo $count;done)

	local stat_synrx_last_l=$(get_mib_counter "${listener_ns}" "MPTcpExtMPCapableSYNRX")

	local stat_ackrx_last_l=$(get_mib_counter "${listener_ns}" "MPTcpExtMPCapableACKRX")

	local stat_cookietx_last=$(get_mib_counter "${listener_ns}" "TcpExtSyncookiesSent")

	local stat_cookierx_last=$(get_mib_counter "${listener_ns}" "TcpExtSyncookiesRecv")



	ip netns exec ${listener_ns} ./mptcp_connect -t $timeout -l -p $port -s ${srv_proto} $extra_args $local_addr < "$sin" > "$sout" &

	local spid=$!
@@ -438,16 +454,26 @@ do_transfer() 
		kill ${cappid_connector}

	fi



	NSTAT_HISTORY=/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \

		nstat | grep Tcp > /tmp/${listener_ns}.out

	if [ ${listener_ns} != ${connector_ns} ]; then

		NSTAT_HISTORY=/tmp/${connector_ns}.nstat ip netns exec ${connector_ns} \

			nstat | grep Tcp > /tmp/${connector_ns}.out

	fi



	local duration

	duration=$((stop-start))

	duration=$(printf "(duration %05sms)" $duration)

	printf "(duration %05sms) " "${duration}"

	if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then

		echo "$duration [ FAIL ] client exit code $retc, server $rets" 1>&2

		echo "[ FAIL ] 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 -nita 1>&2 -o "sport = :$port"

		ip netns exec ${listener_ns} ss -Menita 1>&2 -o "sport = :$port"

		cat /tmp/${listener_ns}.out

		echo -e "\nnetns ${connector_ns} socket stat for ${port}:" 1>&2

		ip netns exec ${connector_ns} ss -nita 1>&2 -o "dport = :$port"

		ip netns exec ${connector_ns} ss -Menita 1>&2 -o "dport = :$port"

		[ ${listener_ns} != ${connector_ns} ] && cat /tmp/${connector_ns}.out



		echo

		cat "$capout"

		return 1

	fi
@@ -457,11 +483,10 @@ do_transfer() 
	check_transfer $cin $sout "file received by server"

	rets=$?



	local stat_synrx_now_l=$(ip netns exec ${listener_ns} nstat -z -a MPTcpExtMPCapableSYNRX  | while read a count c rest ;do  echo $count;done)

	local stat_ackrx_now_l=$(ip netns exec ${listener_ns} nstat -z -a MPTcpExtMPCapableACKRX  | while read a count c rest ;do  echo $count;done)



	local stat_cookietx_now=$(ip netns exec ${listener_ns} nstat -z -a TcpExtSyncookiesSent | while read a count c rest ;do  echo $count;done)

	local stat_cookierx_now=$(ip netns exec ${listener_ns} nstat -z -a TcpExtSyncookiesRecv | while read a count c rest ;do  echo $count;done)

	local stat_synrx_now_l=$(get_mib_counter "${listener_ns}" "MPTcpExtMPCapableSYNRX")

	local stat_ackrx_now_l=$(get_mib_counter "${listener_ns}" "MPTcpExtMPCapableACKRX")

	local stat_cookietx_now=$(get_mib_counter "${listener_ns}" "TcpExtSyncookiesSent")

	local stat_cookierx_now=$(get_mib_counter "${listener_ns}" "TcpExtSyncookiesRecv")



	expect_synrx=$((stat_synrx_last_l))

	expect_ackrx=$((stat_ackrx_last_l))
@@ -473,37 +498,50 @@ do_transfer() 
		expect_synrx=$((stat_synrx_last_l+1))

		expect_ackrx=$((stat_ackrx_last_l+1))

	fi



	if [ ${stat_synrx_now_l} -lt ${expect_synrx} ]; then

		printf "[ FAIL ] lower MPC SYN rx (%d) than expected (%d)\n" \

			"${stat_synrx_now_l}" "${expect_synrx}" 1>&2

		retc=1

	fi

	if [ ${stat_ackrx_now_l} -lt ${expect_ackrx} ]; then

		printf "[ FAIL ] lower MPC ACK rx (%d) than expected (%d)\n" \

			"${stat_ackrx_now_l}" "${expect_ackrx}" 1>&2

		rets=1

	fi



	if [ $retc -eq 0 ] && [ $rets -eq 0 ]; then

		printf "[ OK ]"

	fi



	if [ $cookies -eq 2 ];then

		if [ $stat_cookietx_last -ge $stat_cookietx_now ] ;then

			echo "${listener_ns} CookieSent: ${cl_proto} -> ${srv_proto}: did not advance"

			printf " WARN: CookieSent: did not advance"

		fi

		if [ $stat_cookierx_last -ge $stat_cookierx_now ] ;then

			echo "${listener_ns} CookieRecv: ${cl_proto} -> ${srv_proto}: did not advance"

			printf " WARN: CookieRecv: did not advance"

		fi

	else

		if [ $stat_cookietx_last -ne $stat_cookietx_now ] ;then

			echo "${listener_ns} CookieSent: ${cl_proto} -> ${srv_proto}: changed"

			printf " WARN: CookieSent: changed"

		fi

		if [ $stat_cookierx_last -ne $stat_cookierx_now ] ;then

			echo "${listener_ns} CookieRecv: ${cl_proto} -> ${srv_proto}: changed"

			printf " WARN: CookieRecv: changed"

		fi

	fi



	if [ $expect_synrx -ne $stat_synrx_now_l ] ;then

		echo "${listener_ns} SYNRX: ${cl_proto} -> ${srv_proto}: expect ${expect_synrx}, got ${stat_synrx_now_l}"

	if [ ${stat_synrx_now_l} -gt ${expect_synrx} ]; then

		printf " WARN: SYNRX: expect %d, got %d (probably retransmissions)" \

			"${expect_synrx}" "${stat_synrx_now_l}"

	fi

	if [ $expect_ackrx -ne $stat_ackrx_now_l ] ;then

		echo "${listener_ns} ACKRX: ${cl_proto} -> ${srv_proto}: expect ${expect_synrx}, got ${stat_synrx_now_l}"

	if [ ${stat_ackrx_now_l} -gt ${expect_ackrx} ]; then

		printf " WARN: ACKRX: expect %d, got %d (probably retransmissions)" \

			"${expect_ackrx}" "${stat_ackrx_now_l}"

	fi



	if [ $retc -eq 0 ] && [ $rets -eq 0 ];then

		echo "$duration [ OK ]"

	echo

	cat "$capout"

		return 0

	fi



	cat "$capout"

	return 1

	[ $retc -eq 0 ] && [ $rets -eq 0 ]

}



make_file()