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

Most forwarding tests invoke vrf_prepare() to set up VRF forwarding and
vrf_cleanup() to restore the original configuration. Add a helper,
adf_vrf_prepare(), which is like vrf_prepare(), but takes care of
scheduling the cleanup automatically.

Convert a number of 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/2f2000e54ae700d560a8d6128322dade3bd2207e.1758821127.git.petrm@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_policer.sh b/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_policer.sh
index 29a672c2270fea38b2b45468aff507771e7ae620..6cb5a7a7438bc93737f86b80328bd4bed224dfc8 100755 (executable)
--- a/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_policer.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_policer.sh
@@ -106,8 +106,7 @@ setup_prepare()
        # Reload to ensure devlink-trap settings are back to default.
        defer devlink_reload
 
-       vrf_prepare
-       defer vrf_cleanup
+       adf_vrf_prepare
 
        h1_create
        h2_create

diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh
index d5b6f2cc9a29caf70612010d0f40186ab855e627..ed217eb63cc7dfd85bcaab3057847d02cb748ca4 100755 (executable)
--- a/tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh
@@ -225,8 +225,7 @@ setup_prepare()
 
        h3mac=$(mac_get $h3)
 
-       vrf_prepare
-       defer vrf_cleanup
+       adf_vrf_prepare
 
        h1_create
        h2_create

diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_max_descriptors.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_max_descriptors.sh
index 2b5d2c2751d5c67087e0a14a51ceb3aa62a66d3a..d10df3a19300d82250f3f85094009776935281c6 100755 (executable)
--- a/tools/testing/selftests/drivers/net/mlxsw/qos_max_descriptors.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/qos_max_descriptors.sh
@@ -178,8 +178,7 @@ setup_prepare()
 
        h2mac=$(mac_get $h2)
 
-       vrf_prepare
-       defer vrf_cleanup
+       adf_vrf_prepare
 
        h1_create
        h2_create

diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh
index cd4a5c21360c406dd6c98925445860d1cae8e9d0..6aca01ebb1ee2333c7bfac764e895d9186ad93e9 100755 (executable)
--- a/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh
@@ -196,8 +196,7 @@ setup_prepare()
 
        h3mac=$(mac_get $h3)
 
-       vrf_prepare
-       defer vrf_cleanup
+       adf_vrf_prepare
 
        h1_create
        h2_create

diff --git a/tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh b/tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh
index 537d6baa77b7f1924a1d68d2e3285119764bc2ef..a88d61a84b986716487aeb455ebf52dd678da07f 100644 (file)
--- a/tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh
@@ -250,8 +250,7 @@ setup_prepare()
 
        h3_mac=$(mac_get $h3)
 
-       vrf_prepare
-       defer vrf_cleanup
+       adf_vrf_prepare
 
        h1_create
        h2_create

diff --git a/tools/testing/selftests/net/forwarding/bridge_activity_notify.sh b/tools/testing/selftests/net/forwarding/bridge_activity_notify.sh
index 8ceb205fdca0507d7b955a800f032eaa9fb48261..afce1c964d5a4077cdbcc0f0d11ecad15aff7739 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/bridge_activity_notify.sh
+++ b/tools/testing/selftests/net/forwarding/bridge_activity_notify.sh
@@ -57,8 +57,7 @@ setup_prepare()
        swp2=${NETIFS[p3]}
        h2=${NETIFS[p4]}
 
-       vrf_prepare
-       defer vrf_cleanup
+       adf_vrf_prepare
 
        h1_create
        h2_create

diff --git a/tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh b/tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh
index c1a506370c4a9f85c793ef70fd1a762624ceb14d..052b2f757ff024c4f2296d34b74c5cec3b3a61e5 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh
+++ b/tools/testing/selftests/net/forwarding/bridge_fdb_local_vlan_0.sh
@@ -98,8 +98,7 @@ setup_prepare()
        swp3=${NETIFS[p5]}
        h3=${NETIFS[p6]}
 
-       vrf_prepare
-       defer vrf_cleanup
+       adf_vrf_prepare
 
        forwarding_enable
        defer forwarding_restore

diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
index 2c252423b326342136701a860affa738192f2246..1370d7a326552974b8e9af81b935fd123e80f6a0 100644 (file)
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -599,6 +599,12 @@ vrf_cleanup()
        ip -4 rule del pref 32765
 }
 
+adf_vrf_prepare()
+{
+       vrf_prepare
+       defer vrf_cleanup
+}
+
 __last_tb_id=0
 declare -A __TB_IDS
 

diff --git a/tools/testing/selftests/net/forwarding/sch_ets_core.sh b/tools/testing/selftests/net/forwarding/sch_ets_core.sh
index 8f9922c695b0ca16435365e8fe0e71af747fec9e..f9d15b2f4615e031be57100587030579f7ca6eb3 100644 (file)
--- a/tools/testing/selftests/net/forwarding/sch_ets_core.sh
+++ b/tools/testing/selftests/net/forwarding/sch_ets_core.sh
@@ -251,8 +251,7 @@ setup_prepare()
        put=$swp2
        hut=$h2
 
-       vrf_prepare
-       defer vrf_cleanup
+       adf_vrf_prepare
 
        h1_create
        h2_create

diff --git a/tools/testing/selftests/net/forwarding/sch_red.sh b/tools/testing/selftests/net/forwarding/sch_red.sh
index af166662b78af4542e8cf1c88328d7658ff9be3e..8f79a86cb15b3b3ee749b407931532806d092b2d 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/sch_red.sh
+++ b/tools/testing/selftests/net/forwarding/sch_red.sh
@@ -125,8 +125,7 @@ setup_prepare()
 
        h3_mac=$(mac_get $h3)
 
-       vrf_prepare
-       defer vrf_cleanup
+       adf_vrf_prepare
 
        h1_create
        h2_create

diff --git a/tools/testing/selftests/net/forwarding/sch_tbf_core.sh b/tools/testing/selftests/net/forwarding/sch_tbf_core.sh
index ec309a5086bc6158042b2e6ac6cfce0b63d7a689..bce9ab3cb24ac65e16460c06eef06b50aef8af25 100644 (file)
--- a/tools/testing/selftests/net/forwarding/sch_tbf_core.sh
+++ b/tools/testing/selftests/net/forwarding/sch_tbf_core.sh
@@ -149,8 +149,7 @@ setup_prepare()
 
        h2_mac=$(mac_get $h2)
 
-       vrf_prepare
-       defer vrf_cleanup
+       adf_vrf_prepare
 
        h1_create
        h2_create

diff --git a/tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh b/tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh
index a968a3ecbcbf053708aa639f414928f8132e6a57..9beb5d512b8e91616da45a8290c7b5bcda05c397 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh
+++ b/tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh
@@ -371,8 +371,7 @@ setup_prepare()
        swp3=${NETIFS[p5]}
        h3=${NETIFS[p6]}
 
-       vrf_prepare
-       defer vrf_cleanup
+       adf_vrf_prepare
 
        forwarding_enable
        defer forwarding_restore

diff --git a/tools/testing/selftests/net/forwarding/vxlan_reserved.sh b/tools/testing/selftests/net/forwarding/vxlan_reserved.sh
index 6fa1668986cc436ec16f017e8f98b04d38332132..c564d7a3af0b3763d2f954839e87bedcaeba6809 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/vxlan_reserved.sh
+++ b/tools/testing/selftests/net/forwarding/vxlan_reserved.sh
@@ -88,8 +88,7 @@ setup_prepare()
        rp1=${NETIFS[p3]}
        rp2=${NETIFS[p4]}
 
-       vrf_prepare
-       defer vrf_cleanup
+       adf_vrf_prepare
 
        forwarding_enable
        defer forwarding_restore