@@ -21,6 +21,7 @@ switch_create()
2121 # Create a bottleneck so that the DWRR process can kick in.
2222 tc qdisc replace dev $swp2 root handle 3: tbf rate 1gbit \
2323 burst 128K limit 1G
24+ defer tc qdisc del dev $swp2 root handle 3:
2425
2526 ets_switch_create
2627
@@ -30,37 +31,34 @@ switch_create()
3031 # for the DWRR process.
3132 devlink_port_pool_th_save $swp1 0
3233 devlink_port_pool_th_set $swp1 0 12
34+ defer devlink_port_pool_th_restore $swp1 0
35+
3336 devlink_tc_bind_pool_th_save $swp1 0 ingress
3437 devlink_tc_bind_pool_th_set $swp1 0 ingress 0 12
38+ defer devlink_tc_bind_pool_th_restore $swp1 0 ingress
39+
3540 devlink_port_pool_th_save $swp2 4
3641 devlink_port_pool_th_set $swp2 4 12
42+ defer devlink_port_pool_th_restore $swp2 4
43+
3744 devlink_tc_bind_pool_th_save $swp2 7 egress
3845 devlink_tc_bind_pool_th_set $swp2 7 egress 4 5
46+ defer devlink_tc_bind_pool_th_restore $swp2 7 egress
47+
3948 devlink_tc_bind_pool_th_save $swp2 6 egress
4049 devlink_tc_bind_pool_th_set $swp2 6 egress 4 5
50+ defer devlink_tc_bind_pool_th_restore $swp2 6 egress
51+
4152 devlink_tc_bind_pool_th_save $swp2 5 egress
4253 devlink_tc_bind_pool_th_set $swp2 5 egress 4 5
54+ defer devlink_tc_bind_pool_th_restore $swp2 5 egress
4355
4456 # Note: sch_ets_core.sh uses VLAN ingress-qos-map to assign packet
4557 # priorities at $swp1 based on their 802.1p headers. ingress-qos-map is
4658 # not offloaded by mlxsw as of this writing, but the mapping used is
4759 # 1:1, which is the mapping currently hard-coded by the driver.
4860}
4961
50- switch_destroy ()
51- {
52- devlink_tc_bind_pool_th_restore $swp2 5 egress
53- devlink_tc_bind_pool_th_restore $swp2 6 egress
54- devlink_tc_bind_pool_th_restore $swp2 7 egress
55- devlink_port_pool_th_restore $swp2 4
56- devlink_tc_bind_pool_th_restore $swp1 0 ingress
57- devlink_port_pool_th_restore $swp1 0
58-
59- ets_switch_destroy
60-
61- tc qdisc del dev $swp2 root handle 3:
62- }
63-
6462# Callback from sch_ets_tests.sh
6563collect_stats ()
6664{
0 commit comments