xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selftests: mlxsw: qos_pfc: Convert to iproute2 dcb

Browse Source 
[ Upstream commit b0bab2298ec9b3a837f8ef4a0cae4b42a4d03365 ]

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

Signed-off-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: b34f4de6d30c ("selftests: mlxsw: qos_pfc: Adjust the test to support 8 lanes")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Petr Machata
2021-05-17 20:03:54 +03:00
committed by Greg Kroah-Hartman
parent 56750ea5d1
commit 3e1ca80659
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/testing/selftests/drivers/net/mlxsw/qos_pfc.sh
View File

@@ -171,7 +171,7 @@ switch_create()
# assignment. # assignment.
tc qdisc replace dev $swp1 root handle 1: \ tc qdisc replace dev $swp1 root handle 1: \
ets bands 8 strict 8 priomap 7 6 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 # $swp2
# ----- # -----
@@ -209,8 +209,8 @@ switch_create()
# the lossless prio into a buffer of its own. Don't bother with buffer # 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" # sizes though, there is not going to be any pressure in the "backward"
# direction. # direction.
__mlnx_qos -i $swp3 --prio2buffer=0,1,0,0,0,0,0,0 >/dev/null dcb buffer set dev $swp3 prio-buffer all:0 1:1
__mlnx_qos -i $swp3 --pfc=0,1,0,0,0,0,0,0 >/dev/null dcb pfc set dev $swp3 prio-pfc all:off 1:on
# $swp4 # $swp4
# ----- # -----
@@ -226,11 +226,11 @@ switch_create()
# Configure qdisc so that we can hand-tune headroom. # Configure qdisc so that we can hand-tune headroom.
tc qdisc replace dev $swp4 root handle 1: \ tc qdisc replace dev $swp4 root handle 1: \
ets bands 8 strict 8 priomap 7 6 ets bands 8 strict 8 priomap 7 6
__mlnx_qos -i $swp4 --prio2buffer=0,1,0,0,0,0,0,0 >/dev/null dcb buffer set dev $swp4 prio-buffer all:0 1:1
__mlnx_qos -i $swp4 --pfc=0,1,0,0,0,0,0,0 >/dev/null dcb pfc set dev $swp4 prio-pfc all:off 1:on
# PG0 will get autoconfigured to Xoff, give PG1 arbitrarily 100K, which # PG0 will get autoconfigured to Xoff, give PG1 arbitrarily 100K, which
# is (-2*MTU) about 80K of delay provision. # 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 # bridges
# ------- # -------
@@ -273,9 +273,9 @@ switch_destroy()
# $swp4 # $swp4
# ----- # -----
__mlnx_qos -i $swp4 --buffer_size=0,0,0,0,0,0,0,0 >/dev/null dcb buffer set dev $swp4 buffer-size all:0
__mlnx_qos -i $swp4 --pfc=0,0,0,0,0,0,0,0 >/dev/null dcb pfc set dev $swp4 prio-pfc all:off
__mlnx_qos -i $swp4 --prio2buffer=0,0,0,0,0,0,0,0 >/dev/null dcb buffer set dev $swp4 prio-buffer all:0
tc qdisc del dev $swp4 root tc qdisc del dev $swp4 root
devlink_tc_bind_pool_th_restore $swp4 1 ingress devlink_tc_bind_pool_th_restore $swp4 1 ingress
@@ -288,8 +288,8 @@ switch_destroy()
# $swp3 # $swp3
# ----- # -----
__mlnx_qos -i $swp3 --pfc=0,0,0,0,0,0,0,0 >/dev/null dcb pfc set dev $swp3 prio-pfc all:off
__mlnx_qos -i $swp3 --prio2buffer=0,0,0,0,0,0,0,0 >/dev/null dcb buffer set dev $swp3 prio-buffer all:0
tc qdisc del dev $swp3 root tc qdisc del dev $swp3 root
devlink_tc_bind_pool_th_restore $swp3 1 egress devlink_tc_bind_pool_th_restore $swp3 1 egress
@@ -315,7 +315,7 @@ switch_destroy()
# $swp1 # $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 tc qdisc del dev $swp1 root
devlink_tc_bind_pool_th_restore $swp1 1 ingress devlink_tc_bind_pool_th_restore $swp1 1 ingress