Commit 313fb184 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'selftests-bonding-use-slowwait-when-waiting' 

Hangbin Liu says:

====================
selftests: bonding: use slowwait when waiting

There are a lot waitings in bonding tests use sleep. Let's replace them with
slowwait(added in the first patch). This could save much test time. e.g.

bond-break-lacpdu-tx.sh
  before: 0m16.346s
  after: 0m2.824s

bond_options.sh
  before: 9m25.299s
  after: 6m14.439s

bond-lladdr-target.sh
  before: 0m7.090s
  after: 0m6.148s

In total, we could save about 180 seconds.
====================

Link: https://lore.kernel.org/r/20240205130048.282087-1-liuhangbin@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b27696cd e1f0da9b

tools/testing/selftests/drivers/net/bonding/bond-break-lacpdu-tx.sh

+9 −10
Original line number Diff line number Diff line
@@ -20,21 +20,21 @@ 
#    +------+ +------+

#

# We use veths instead of physical interfaces

REQUIRE_MZ=no

NUM_NETIFS=0

lib_dir=$(dirname "$0")

source "$lib_dir"/../../../net/forwarding/lib.sh



set -e

tmp=$(mktemp -q dump.XXXXXX)

cleanup() {

	ip link del fab-br0 >/dev/null 2>&1 || :

	ip link del fbond  >/dev/null 2>&1 || :

	ip link del veth1-bond  >/dev/null 2>&1 || :

	ip link del veth2-bond  >/dev/null 2>&1 || :

	modprobe -r bonding  >/dev/null 2>&1 || :

	rm -f -- ${tmp}

}



trap cleanup 0 1 2

cleanup

sleep 1



# create the bridge

ip link add fab-br0 address 52:54:00:3B:7C:A6 mtu 1500 type bridge \
@@ -67,13 +67,12 @@ ip link set fab-br0 up 
ip link set fbond up

ip addr add dev fab-br0 10.0.0.3



tcpdump -n -i veth1-end -e ether proto 0x8809 >${tmp} 2>&1 &

sleep 15

pkill tcpdump >/dev/null 2>&1

rc=0

num=$(grep "packets captured" ${tmp} | awk '{print $1}')

if test "$num" -gt 0; then

	echo "PASS, captured ${num}"

tc qdisc add dev veth1-end clsact

tc filter add dev veth1-end ingress protocol 0x8809 pref 1 handle 101 flower skip_hw action pass

if slowwait_for_counter 15 2 \

	tc_rule_handle_stats_get "dev veth1-end ingress" 101 ".packets" "" &> /dev/null; then

	echo "PASS, captured 2"

else

	echo "FAIL"

	rc=1

tools/testing/selftests/drivers/net/bonding/bond-lladdr-target.sh

+18 −3
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ 
#  +----------------+

#

# We use veths instead of physical interfaces

REQUIRE_MZ=no

NUM_NETIFS=0

lib_dir=$(dirname "$0")

source "$lib_dir"/../../../net/forwarding/lib.sh



sw="sw-$(mktemp -u XXXXXX)"

host="ns-$(mktemp -u XXXXXX)"
@@ -26,6 +31,16 @@ cleanup() 
	ip netns del $host

}



wait_lladdr_dad()

{

	$@ | grep fe80 | grep -qv tentative

}



wait_bond_up()

{

	$@ | grep -q 'state UP'

}



trap cleanup 0 1 2



ip netns add $sw
@@ -37,8 +52,8 @@ ip -n $host link add veth1 type veth peer name veth1 netns $sw 
ip -n $sw link add br0 type bridge

ip -n $sw link set br0 up

sw_lladdr=$(ip -n $sw addr show br0 | awk '/fe80/{print $2}' | cut -d'/' -f1)

# sleep some time to make sure bridge lladdr pass DAD

sleep 2

# wait some time to make sure bridge lladdr pass DAD

slowwait 2 wait_lladdr_dad ip -n $sw addr show br0



ip -n $host link add bond0 type bond mode 1 ns_ip6_target ${sw_lladdr} \

	arp_validate 3 arp_interval 1000
@@ -53,7 +68,7 @@ ip -n $sw link set veth1 master br0 
ip -n $sw link set veth0 up

ip -n $sw link set veth1 up



sleep 5

slowwait 5 wait_bond_up ip -n $host link show bond0



rc=0

if ip -n $host link show bond0 | grep -q LOWER_UP; then

tools/testing/selftests/drivers/net/bonding/bond_options.sh

+29 −9
Original line number Diff line number Diff line
@@ -45,15 +45,23 @@ skip_ns() 
}



active_slave=""

active_slave_changed()

{

	local old_active_slave=$1

	local new_active_slave=$(cmd_jq "ip -n ${s_ns} -d -j link show bond0" \

				".[].linkinfo.info_data.active_slave")

	test "$old_active_slave" != "$new_active_slave"

}



check_active_slave()

{

	local target_active_slave=$1

	slowwait 2 active_slave_changed $active_slave

	active_slave=$(cmd_jq "ip -n ${s_ns} -d -j link show bond0" ".[].linkinfo.info_data.active_slave")

	test "$active_slave" = "$target_active_slave"

	check_err $? "Current active slave is $active_slave but not $target_active_slave"

}





# Test bonding prio option

prio_test()

{
@@ -84,13 +92,13 @@ prio_test() 


	# active slave should be the higher prio slave

	ip -n ${s_ns} link set $active_slave down

	bond_check_connection "fail over"

	check_active_slave eth2

	bond_check_connection "fail over"



	# when only 1 slave is up

	ip -n ${s_ns} link set $active_slave down

	bond_check_connection "only 1 slave up"

	check_active_slave eth0

	bond_check_connection "only 1 slave up"



	# when a higher prio slave change to up

	ip -n ${s_ns} link set eth2 up
@@ -140,8 +148,8 @@ prio_test() 
		check_active_slave "eth1"



		ip -n ${s_ns} link set $active_slave down

		bond_check_connection "change slave prio"

		check_active_slave "eth0"

		bond_check_connection "change slave prio"

	fi

}
@@ -199,6 +207,15 @@ prio() 
	prio_ns "active-backup"

}



wait_mii_up()

{

	for i in $(seq 0 2); do

		mii_status=$(cmd_jq "ip -n ${s_ns} -j -d link show eth$i" ".[].linkinfo.info_slave_data.mii_status")

		[ ${mii_status} != "UP" ] && return 1

	done

	return 0

}



arp_validate_test()

{

	local param="$1"
@@ -211,7 +228,7 @@ arp_validate_test() 
	[ $RET -ne 0 ] && log_test "arp_validate" "$retmsg"



	# wait for a while to make sure the mii status stable

	sleep 5

	slowwait 5 wait_mii_up

	for i in $(seq 0 2); do

		mii_status=$(cmd_jq "ip -n ${s_ns} -j -d link show eth$i" ".[].linkinfo.info_slave_data.mii_status")

		if [ ${mii_status} != "UP" ]; then
@@ -276,10 +293,13 @@ garp_test() 
	active_slave=$(cmd_jq "ip -n ${s_ns} -d -j link show bond0" ".[].linkinfo.info_data.active_slave")

	ip -n ${s_ns} link set ${active_slave} down



	exp_num=$(echo "${param}" | cut -f6 -d ' ')

	sleep $((exp_num + 2))

	# wait for active link change

	slowwait 2 active_slave_changed $active_slave



	exp_num=$(echo "${param}" | cut -f6 -d ' ')

	active_slave=$(cmd_jq "ip -n ${s_ns} -d -j link show bond0" ".[].linkinfo.info_data.active_slave")

	slowwait_for_counter $((exp_num + 5)) $exp_num \

		tc_rule_handle_stats_get "dev s${active_slave#eth} ingress" 101 ".packets" "-n ${g_ns}"



	# check result

	real_num=$(tc_rule_handle_stats_get "dev s${active_slave#eth} ingress" 101 ".packets" "-n ${g_ns}")
@@ -296,8 +316,8 @@ garp_test() 
num_grat_arp()

{

	local val

	for val in 10 20 30 50; do

		garp_test "mode active-backup miimon 100 num_grat_arp $val peer_notify_delay 1000"

	for val in 10 20 30; do

		garp_test "mode active-backup miimon 10 num_grat_arp $val peer_notify_delay 100"

		log_test "num_grat_arp" "active-backup miimon num_grat_arp $val"

	done

}

tools/testing/selftests/drivers/net/bonding/bond_topo_2d1c.sh

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ server_create() 
	ip -n ${s_ns} link set bond0 up

	ip -n ${s_ns} addr add ${s_ip4}/24 dev bond0

	ip -n ${s_ns} addr add ${s_ip6}/24 dev bond0

	sleep 2

}



# Reset bond with new mode and options
@@ -96,7 +95,8 @@ bond_reset() 
	ip -n ${s_ns} link set bond0 up

	ip -n ${s_ns} addr add ${s_ip4}/24 dev bond0

	ip -n ${s_ns} addr add ${s_ip6}/24 dev bond0

	sleep 2

	# Wait for IPv6 address ready as it needs DAD

	slowwait 2 ip netns exec ${s_ns} ping6 ${c_ip6} -c 1 -W 0.1 &> /dev/null

}



server_destroy()
@@ -150,7 +150,7 @@ bond_check_connection() 
{

	local msg=${1:-"check connection"}



	sleep 2

	slowwait 2 ip netns exec ${s_ns} ping ${c_ip4} -c 1 -W 0.1 &> /dev/null

	ip netns exec ${s_ns} ping ${c_ip4} -c5 -i 0.1 &>/dev/null

	check_err $? "${msg}: ping failed"

	ip netns exec ${s_ns} ping6 ${c_ip6} -c5 -i 0.1 &>/dev/null

tools/testing/selftests/drivers/net/bonding/lag_lib.sh

+3 −4
Original line number Diff line number Diff line
@@ -107,13 +107,12 @@ lag_setup2x2() 
	NAMESPACES="${namespaces}"

}



# cleanup all lag related namespaces and remove the bonding module

# cleanup all lag related namespaces

lag_cleanup()

{

	for n in ${NAMESPACES}; do

		ip netns delete ${n} >/dev/null 2>&1 || true

	done

	modprobe -r bonding

}



SWITCH="lag_node1"
@@ -159,7 +158,7 @@ test_bond_recovery() 
	create_bond $@



	# verify connectivity

	ip netns exec ${CLIENT} ping ${SWITCHIP} -c 2 >/dev/null 2>&1

	slowwait 2 ip netns exec ${CLIENT} ping ${SWITCHIP} -c 2 -W 0.1 &> /dev/null

	check_err $? "No connectivity"



	# force the links of the bond down
@@ -169,7 +168,7 @@ test_bond_recovery() 
	ip netns exec ${SWITCH} ip link set eth1 down



	# re-verify connectivity

	ip netns exec ${CLIENT} ping ${SWITCHIP} -c 2 >/dev/null 2>&1

	slowwait 2 ip netns exec ${CLIENT} ping ${SWITCHIP} -c 2 -W 0.1 &> /dev/null



	local rc=$?

	check_err $rc "Bond failed to recover"