Commit 1186d59d authored by Petr Machata's avatar Petr Machata Committed by sanglipeng1
Browse files

selftests: mlxsw: qos_pfc: Convert to iproute2 dcb 

stable inclusion
from stable-v5.10.209
commit 3e1ca8065926cfd274c950d050e275ee36d6896a
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9U3NW

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



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

[ Upstream commit b0bab229 ]

There is a dedicated tool for configuration of DCB in iproute2 now. Use it
in the selftest instead of mlnx_qos.

Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: b34f4de6d30c ("selftests: mlxsw: qos_pfc: Adjust the test to support 8 lanes")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent c761d986

tools/testing/selftests/drivers/net/mlxsw/qos_pfc.sh

+12 −12
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ switch_create() 
	# assignment.

	tc qdisc replace dev $swp1 root handle 1: \

	   ets bands 8 strict 8 priomap 7 6

	__mlnx_qos -i $swp1 --prio2buffer=0,1,0,0,0,0,0,0 >/dev/null

	dcb buffer set dev $swp1 prio-buffer all:0 1:1



	# $swp2

	# -----
@@ -209,8 +209,8 @@ switch_create() 
	# the lossless prio into a buffer of its own. Don't bother with buffer

	# sizes though, there is not going to be any pressure in the "backward"

	# direction.

	__mlnx_qos -i $swp3 --prio2buffer=0,1,0,0,0,0,0,0 >/dev/null

	__mlnx_qos -i $swp3 --pfc=0,1,0,0,0,0,0,0 >/dev/null

	dcb buffer set dev $swp3 prio-buffer all:0 1:1

	dcb pfc set dev $swp3 prio-pfc all:off 1:on



	# $swp4

	# -----
@@ -226,11 +226,11 @@ switch_create() 
	# Configure qdisc so that we can hand-tune headroom.

	tc qdisc replace dev $swp4 root handle 1: \

	   ets bands 8 strict 8 priomap 7 6

	__mlnx_qos -i $swp4 --prio2buffer=0,1,0,0,0,0,0,0 >/dev/null

	__mlnx_qos -i $swp4 --pfc=0,1,0,0,0,0,0,0 >/dev/null

	dcb buffer set dev $swp4 prio-buffer all:0 1:1

	dcb pfc set dev $swp4 prio-pfc all:off 1:on

	# PG0 will get autoconfigured to Xoff, give PG1 arbitrarily 100K, which

	# is (-2*MTU) about 80K of delay provision.

	__mlnx_qos -i $swp4 --buffer_size=0,$_100KB,0,0,0,0,0,0 >/dev/null

	dcb buffer set dev $swp4 buffer-size all:0 1:$_100KB



	# bridges

	# -------
@@ -273,9 +273,9 @@ switch_destroy() 
	# $swp4

	# -----



	__mlnx_qos -i $swp4 --buffer_size=0,0,0,0,0,0,0,0 >/dev/null

	__mlnx_qos -i $swp4 --pfc=0,0,0,0,0,0,0,0 >/dev/null

	__mlnx_qos -i $swp4 --prio2buffer=0,0,0,0,0,0,0,0 >/dev/null

	dcb buffer set dev $swp4 buffer-size all:0

	dcb pfc set dev $swp4 prio-pfc all:off

	dcb buffer set dev $swp4 prio-buffer all:0

	tc qdisc del dev $swp4 root



	devlink_tc_bind_pool_th_restore $swp4 1 ingress
@@ -288,8 +288,8 @@ switch_destroy() 
	# $swp3

	# -----



	__mlnx_qos -i $swp3 --pfc=0,0,0,0,0,0,0,0 >/dev/null

	__mlnx_qos -i $swp3 --prio2buffer=0,0,0,0,0,0,0,0 >/dev/null

	dcb pfc set dev $swp3 prio-pfc all:off

	dcb buffer set dev $swp3 prio-buffer all:0

	tc qdisc del dev $swp3 root



	devlink_tc_bind_pool_th_restore $swp3 1 egress
@@ -315,7 +315,7 @@ switch_destroy() 
	# $swp1

	# -----



	__mlnx_qos -i $swp1 --prio2buffer=0,0,0,0,0,0,0,0 >/dev/null

	dcb buffer set dev $swp1 prio-buffer all:0

	tc qdisc del dev $swp1 root



	devlink_tc_bind_pool_th_restore $swp1 1 ingress