microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

selftests: devlink: Make devlink_trap_cleanup() more generic 

Add proto parameter in order to enable the use of devlink_trap_cleanup()
in tests that use IPv6 protocol.

Signed-off-by: Amit Cohen <amitc@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Amit Cohen 2019-11-07 18:42:12 +02:00 коммит произвёл David S. Miller
Родитель 6b45fe95fd
Коммит ef7f6b1615
2 изменённых файлов: 9 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l2_drops.sh
Просмотреть файл

@ -111,7 +111,7 @@ source_mac_is_multicast_test()
log_test "Source MAC is multicast" log_test "Source MAC is multicast"
devlink_trap_drop_cleanup $mz_pid $swp2 devlink_trap_drop_cleanup $mz_pid $swp2 ip
} }
__vlan_tag_mismatch_test() __vlan_tag_mismatch_test()
@ -148,7 +148,7 @@ __vlan_tag_mismatch_test()
devlink_trap_action_set $trap_name "drop" devlink_trap_action_set $trap_name "drop"
devlink_trap_drop_cleanup $mz_pid $swp2 devlink_trap_drop_cleanup $mz_pid $swp2 ip
} }
vlan_tag_mismatch_untagged_test() vlan_tag_mismatch_untagged_test()
@ -212,7 +212,7 @@ ingress_vlan_filter_test()
log_test "Ingress VLAN filter" log_test "Ingress VLAN filter"
devlink_trap_drop_cleanup $mz_pid $swp2 devlink_trap_drop_cleanup $mz_pid $swp2 ip
bridge vlan del vid $vid dev $swp1 master bridge vlan del vid $vid dev $swp1 master
bridge vlan del vid $vid dev $swp2 master bridge vlan del vid $vid dev $swp2 master
@ -254,7 +254,7 @@ __ingress_stp_filter_test()
devlink_trap_action_set $trap_name "drop" devlink_trap_action_set $trap_name "drop"
devlink_trap_drop_cleanup $mz_pid $swp2 devlink_trap_drop_cleanup $mz_pid $swp2 ip
bridge vlan del vid $vid dev $swp1 master bridge vlan del vid $vid dev $swp1 master
bridge vlan del vid $vid dev $swp2 master bridge vlan del vid $vid dev $swp2 master
@ -326,7 +326,7 @@ port_list_is_empty_uc_test()
log_test "Port list is empty - unicast" log_test "Port list is empty - unicast"
devlink_trap_drop_cleanup $mz_pid $swp2 devlink_trap_drop_cleanup $mz_pid $swp2 ip
ip link set dev $swp1 type bridge_slave flood on ip link set dev $swp1 type bridge_slave flood on
} }
@ -372,7 +372,7 @@ port_list_is_empty_mc_test()
log_test "Port list is empty - multicast" log_test "Port list is empty - multicast"
devlink_trap_drop_cleanup $mz_pid $swp2 devlink_trap_drop_cleanup $mz_pid $swp2 ip
ip link set dev $swp1 type bridge_slave mcast_flood on ip link set dev $swp1 type bridge_slave mcast_flood on
} }
@ -419,7 +419,7 @@ port_loopback_filter_uc_test()
log_test "Port loopback filter - unicast" log_test "Port loopback filter - unicast"
devlink_trap_drop_cleanup $mz_pid $swp2 devlink_trap_drop_cleanup $mz_pid $swp2 ip
} }
port_loopback_filter_test() port_loopback_filter_test()

3
tools/testing/selftests/net/forwarding/devlink_lib.sh
Просмотреть файл

@ -393,7 +393,8 @@ devlink_trap_drop_cleanup()
{ {
local mz_pid=$1; shift local mz_pid=$1; shift
local dev=$1; shift local dev=$1; shift
local proto=$1; shift
kill $mz_pid && wait $mz_pid &> /dev/null kill $mz_pid && wait $mz_pid &> /dev/null
tc filter del dev $dev egress protocol ip pref 1 handle 101 flower tc filter del dev $dev egress protocol $proto pref 1 handle 101 flower
} }