From: Petr Machata <petrm@nvidia.com>
To: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
<netdev@vger.kernel.org>
Cc: Simon Horman <horms@kernel.org>, Ido Schimmel <idosch@nvidia.com>,
"Nikolay Aleksandrov" <razor@blackwall.org>,
Petr Machata <petrm@nvidia.com>, "Shuah Khan" <shuah@kernel.org>,
<linux-kselftest@vger.kernel.org>, <mlxsw@nvidia.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
Alessandro Zanni <alessandro.zanni87@gmail.com>,
Hangbin Liu <liuhangbin@gmail.com>,
"David Yang" <mmyangfl@gmail.com>, Li Shuang <shuali@redhat.com>
Subject: [PATCH net-next 10/13] selftests: forwarding: lib: Add an autodefer variant of vrf_prepare()
Date: Thu, 25 Sep 2025 19:31:53 +0200 [thread overview]
Message-ID: <2f2000e54ae700d560a8d6128322dade3bd2207e.1758821127.git.petrm@nvidia.com> (raw)
In-Reply-To: <cover.1758821127.git.petrm@nvidia.com>
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>
---
Notes:
CC: Andrew Lunn <andrew+netdev@lunn.ch>
CC: Alessandro Zanni <alessandro.zanni87@gmail.com>
CC: Hangbin Liu <liuhangbin@gmail.com>
CC: David Yang <mmyangfl@gmail.com>
CC: Li Shuang <shuali@redhat.com>
.../selftests/drivers/net/mlxsw/devlink_trap_policer.sh | 3 +--
tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh | 3 +--
.../selftests/drivers/net/mlxsw/qos_max_descriptors.sh | 3 +--
tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh | 3 +--
tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh | 3 +--
.../selftests/net/forwarding/bridge_activity_notify.sh | 3 +--
.../selftests/net/forwarding/bridge_fdb_local_vlan_0.sh | 3 +--
tools/testing/selftests/net/forwarding/lib.sh | 6 ++++++
tools/testing/selftests/net/forwarding/sch_ets_core.sh | 3 +--
tools/testing/selftests/net/forwarding/sch_red.sh | 3 +--
tools/testing/selftests/net/forwarding/sch_tbf_core.sh | 3 +--
.../selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh | 3 +--
tools/testing/selftests/net/forwarding/vxlan_reserved.sh | 3 +--
13 files changed, 18 insertions(+), 24 deletions(-)
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 29a672c2270f..6cb5a7a7438b 100755
--- 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 d5b6f2cc9a29..ed217eb63cc7 100755
--- 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 2b5d2c2751d5..d10df3a19300 100755
--- 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 cd4a5c21360c..6aca01ebb1ee 100755
--- 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 537d6baa77b7..a88d61a84b98 100644
--- 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 8ceb205fdca0..afce1c964d5a 100755
--- 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 c1a506370c4a..052b2f757ff0 100755
--- 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 2c252423b326..1370d7a32655 100644
--- 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 8f9922c695b0..f9d15b2f4615 100644
--- 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 af166662b78a..8f79a86cb15b 100755
--- 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 ec309a5086bc..bce9ab3cb24a 100644
--- 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 a968a3ecbcbf..9beb5d512b8e 100755
--- 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 6fa1668986cc..c564d7a3af0b 100755
--- 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
--
2.49.0
next prev parent reply other threads:[~2025-09-25 17:34 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-25 17:31 [PATCH net-next 00/13] selftests: Mark auto-deferring functions clearly Petr Machata
2025-09-25 17:31 ` [PATCH net-next 01/13] selftests: net: lib: Rename ip_link_add() to adf_* Petr Machata
2025-09-26 13:53 ` Simon Horman
2025-09-25 17:31 ` [PATCH net-next 02/13] selftests: net: lib: Rename ip_link_set_master() " Petr Machata
2025-09-26 13:54 ` Simon Horman
2025-09-25 17:31 ` [PATCH net-next 03/13] selftests: net: lib: Rename ip_link_set_addr() " Petr Machata
2025-09-26 13:54 ` Simon Horman
2025-09-25 17:31 ` [PATCH net-next 04/13] selftests: net: lib: Rename ip_link_set_up() " Petr Machata
2025-09-26 13:54 ` Simon Horman
2025-09-25 17:31 ` [PATCH net-next 05/13] selftests: net: lib: Rename ip_link_set_down() " Petr Machata
2025-09-26 13:54 ` Simon Horman
2025-09-25 17:31 ` [PATCH net-next 06/13] selftests: net: lib: Rename ip_addr_add() " Petr Machata
2025-09-26 13:55 ` Simon Horman
2025-09-25 17:31 ` [PATCH net-next 07/13] selftests: net: lib: Rename ip_route_add() " Petr Machata
2025-09-26 13:55 ` Simon Horman
2025-09-25 17:31 ` [PATCH net-next 08/13] selftests: net: lib: Rename bridge_vlan_add() " Petr Machata
2025-09-26 13:55 ` Simon Horman
2025-09-25 17:31 ` [PATCH net-next 09/13] selftests: net: vlan_bridge_binding: Rename dfr_set_binding_*() " Petr Machata
2025-09-26 13:55 ` Simon Horman
2025-09-25 17:31 ` Petr Machata [this message]
2025-09-26 13:55 ` [PATCH net-next 10/13] selftests: forwarding: lib: Add an autodefer variant of vrf_prepare() Simon Horman
2025-09-25 17:31 ` [PATCH net-next 11/13] selftests: forwarding: lib: Add an autodefer variant of simple_if_init() Petr Machata
2025-09-26 13:56 ` Simon Horman
2025-09-25 17:31 ` [PATCH net-next 12/13] selftests: forwarding: lib: Add an autodefer variant of forwarding_enable() Petr Machata
2025-09-26 13:56 ` Simon Horman
2025-09-25 17:31 ` [PATCH net-next 13/13] selftests: forwarding: README: Mention defer, adf_ Petr Machata
2025-09-26 13:56 ` Simon Horman
2025-09-27 1:20 ` [PATCH net-next 00/13] selftests: Mark auto-deferring functions clearly patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2f2000e54ae700d560a8d6128322dade3bd2207e.1758821127.git.petrm@nvidia.com \
--to=petrm@nvidia.com \
--cc=alessandro.zanni87@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=idosch@nvidia.com \
--cc=kuba@kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=liuhangbin@gmail.com \
--cc=mlxsw@nvidia.com \
--cc=mmyangfl@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=razor@blackwall.org \
--cc=shuah@kernel.org \
--cc=shuali@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox