Commit 778fc828 authored by Geliang Tang's avatar Geliang Tang Committed by Zheng Zengkai
Browse files

selftests: mptcp: fix wait_rm_addr/sf parameters 

stable inclusion
from stable-v6.6.2
commit e8b45937c82d51dc133e015e5e9423f8bd86a668
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8IW7G

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e8b45937c82d51dc133e015e5e9423f8bd86a668



--------------------------------

commit 9168ea02b898d3dde98b51e4bd3fb082bd438dab upstream.

The second input parameter of 'wait_rm_addr/sf $1 1' is misused. If it's
1, wait_rm_addr/sf will never break, and will loop ten times, then
'wait_rm_addr/sf' equals to 'sleep 1'. This delay time is too long,
which can sometimes make the tests fail.

A better way to use wait_rm_addr/sf is to use rm_addr/sf_count to obtain
the current value, and then pass into wait_rm_addr/sf.

Fixes: 4369c198 ("selftests: mptcp: test userspace pm out of transfer")
Cc: stable@vger.kernel.org
Suggested-by: default avatarMatthieu Baerts <matttbe@kernel.org>
Reviewed-by: default avatarMatthieu Baerts <matttbe@kernel.org>
Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarMat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-2-db8f25f798eb@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 2b5cda02

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

+10 −4
Original line number Diff line number Diff line
@@ -3289,6 +3289,7 @@ userspace_pm_rm_sf_addr_ns1() 
	local addr=$1

	local id=$2

	local tk sp da dp

	local cnt_addr cnt_sf



	tk=$(grep "type:1," "$evts_ns1" |

	     sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q')
@@ -3298,11 +3299,13 @@ userspace_pm_rm_sf_addr_ns1() 
	     sed -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q')

	dp=$(grep "type:10" "$evts_ns1" |

	     sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q')

	cnt_addr=$(rm_addr_count ${ns1})

	cnt_sf=$(rm_sf_count ${ns1})

	ip netns exec $ns1 ./pm_nl_ctl rem token $tk id $id

	ip netns exec $ns1 ./pm_nl_ctl dsf lip "::ffff:$addr" \

				lport $sp rip $da rport $dp token $tk

	wait_rm_addr $ns1 1

	wait_rm_sf $ns1 1

	wait_rm_addr $ns1 "${cnt_addr}"

	wait_rm_sf $ns1 "${cnt_sf}"

}



userspace_pm_add_sf()
@@ -3324,17 +3327,20 @@ userspace_pm_rm_sf_addr_ns2() 
	local addr=$1

	local id=$2

	local tk da dp sp

	local cnt_addr cnt_sf



	tk=$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2")

	da=$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evts_ns2")

	dp=$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2")

	sp=$(grep "type:10" "$evts_ns2" |

	     sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q')

	cnt_addr=$(rm_addr_count ${ns2})

	cnt_sf=$(rm_sf_count ${ns2})

	ip netns exec $ns2 ./pm_nl_ctl rem token $tk id $id

	ip netns exec $ns2 ./pm_nl_ctl dsf lip $addr lport $sp \

				rip $da rport $dp token $tk

	wait_rm_addr $ns2 1

	wait_rm_sf $ns2 1

	wait_rm_addr $ns2 "${cnt_addr}"

	wait_rm_sf $ns2 "${cnt_sf}"

}



userspace_tests()