Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests: forwarding: lib: Add an autodefer variant of forwarding_enable()

Most forwarding tests invoke forwarding_enable() to enable the router and
forwarding_restore() to restore the original configuration. Add a helper,
adf_forwarding_enable(), which is like forwarding_enable(), but takes care
of scheduling the cleanup automatically.

Convert the tests that currently use defer to schedule the cleanup.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/78b752c40069cde21c44dcf4c7b966a76a0eef2c.1758821127.git.petrm@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Petr Machata and committed by
Jakub Kicinski
040a6cbe f53748d5

+9 -9
+1 -3
tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh
··· 95 95 h3=${NETIFS[p6]} 96 96 97 97 adf_vrf_prepare 98 - 99 - forwarding_enable 100 - defer forwarding_restore 98 + adf_forwarding_enable 101 99 102 100 host_create "$h1" 192.0.2.1/28 2001:db8:1::1/64 103 101 host_create "$h2" 192.0.2.2/28 2001:db8:1::2/64
+6
tools/testing/selftests/net/forwarding/lib.sh
··· 1023 1023 sysctl_restore net.ipv4.conf.all.forwarding 1024 1024 } 1025 1025 1026 + adf_forwarding_enable() 1027 + { 1028 + forwarding_enable 1029 + defer forwarding_restore 1030 + } 1031 + 1026 1032 declare -A MTU_ORIG 1027 1033 mtu_set() 1028 1034 {
+1 -3
tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh
··· 370 370 h3=${NETIFS[p6]} 371 371 372 372 adf_vrf_prepare 373 - 374 - forwarding_enable 375 - defer forwarding_restore 373 + adf_forwarding_enable 376 374 377 375 adf_ip_link_add "v1$h2" type veth peer name "v2$h2" 378 376 adf_ip_link_add "v1$h3" type veth peer name "v2$h3"
+1 -3
tools/testing/selftests/net/forwarding/vxlan_reserved.sh
··· 87 87 rp2=${NETIFS[p4]} 88 88 89 89 adf_vrf_prepare 90 - 91 - forwarding_enable 92 - defer forwarding_restore 90 + adf_forwarding_enable 93 91 94 92 h1_create 95 93 switch_create