Commit 7092dbee authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski
Browse files

selftests: mptcp: rm subflow with v4/v4mapped addr 

Now both a v4 address and a v4-mapped address are supported when
destroying a userspace pm subflow, this patch adds a second subflow
to "userspace pm add & remove address" test, and two subflows could
be removed two different ways, one with the v4mapped and one with v4.

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


Fixes: 48d73f60 ("selftests: mptcp: update userspace pm addr tests")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240223-upstream-net-20240223-misc-fixes-v1-2-162e87e48497@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 535d620e

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

+16 −12
Original line number Diff line number Diff line
@@ -3333,16 +3333,17 @@ userspace_pm_rm_sf() 
{

	local evts=$evts_ns1

	local t=${3:-1}

	local ip=4

	local ip

	local tk da dp sp

	local cnt



	[ "$1" == "$ns2" ] && evts=$evts_ns2

	if mptcp_lib_is_v6 $2; then ip=6; fi

	[ -n "$(mptcp_lib_evts_get_info "saddr4" "$evts" $t)" ] && ip=4

	[ -n "$(mptcp_lib_evts_get_info "saddr6" "$evts" $t)" ] && ip=6

	tk=$(mptcp_lib_evts_get_info token "$evts")

	da=$(mptcp_lib_evts_get_info "daddr$ip" "$evts" $t)

	dp=$(mptcp_lib_evts_get_info dport "$evts" $t)

	sp=$(mptcp_lib_evts_get_info sport "$evts" $t)

	da=$(mptcp_lib_evts_get_info "daddr$ip" "$evts" $t $2)

	dp=$(mptcp_lib_evts_get_info dport "$evts" $t $2)

	sp=$(mptcp_lib_evts_get_info sport "$evts" $t $2)



	cnt=$(rm_sf_count ${1})

	ip netns exec $1 ./pm_nl_ctl dsf lip $2 lport $sp \
@@ -3429,20 +3430,23 @@ userspace_tests() 
	if reset_with_events "userspace pm add & remove address" &&

	   continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then

		set_userspace_pm $ns1

		pm_nl_set_limits $ns2 1 1

		pm_nl_set_limits $ns2 2 2

		speed=5 \

			run_tests $ns1 $ns2 10.0.1.1 &

		local tests_pid=$!

		wait_mpj $ns1

		userspace_pm_add_addr $ns1 10.0.2.1 10

		chk_join_nr 1 1 1

		chk_add_nr 1 1

		chk_mptcp_info subflows 1 subflows 1

		chk_subflows_total 2 2

		chk_mptcp_info add_addr_signal 1 add_addr_accepted 1

		userspace_pm_add_addr $ns1 10.0.3.1 20

		chk_join_nr 2 2 2

		chk_add_nr 2 2

		chk_mptcp_info subflows 2 subflows 2

		chk_subflows_total 3 3

		chk_mptcp_info add_addr_signal 2 add_addr_accepted 2

		userspace_pm_rm_addr $ns1 10

		userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $SUB_ESTABLISHED

		chk_rm_nr 1 1 invert

		userspace_pm_rm_addr $ns1 20

		userspace_pm_rm_sf $ns1 10.0.3.1 $SUB_ESTABLISHED

		chk_rm_nr 2 2 invert

		chk_mptcp_info subflows 0 subflows 0

		chk_subflows_total 1 1

		kill_events_pids

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

+2 −2
Original line number Diff line number Diff line
@@ -213,9 +213,9 @@ mptcp_lib_get_info_value() { 
	grep "${2}" | sed -n 's/.*\('"${1}"':\)\([0-9a-f:.]*\).*$/\2/p;q'

}



# $1: info name ; $2: evts_ns ; $3: event type

# $1: info name ; $2: evts_ns ; [$3: event type; [$4: addr]]

mptcp_lib_evts_get_info() {

	mptcp_lib_get_info_value "${1}" "^type:${3:-1}," < "${2}"

	grep "${4:-}" "${2}" | mptcp_lib_get_info_value "${1}" "^type:${3:-1},"

}



# $1: PID