[net-next,v2,10/11] selftests: net: lib: Add several autodefer helpers

Commit Message

Petr Machata Dec. 5, 2024, 3:40 p.m. UTC

Add ip_link_set_addr(), ip_link_set_up(), ip_addr_add() and ip_route_add()
to the suite of helpers that automatically schedule a corresponding
cleanup.

When setting a new MAC, one needs to remember the old address first. Move
mac_get() from forwarding/ to that end.

Signed-off-by: Petr Machata <[e-mail]>
Reviewed-by: Ido Schimmel <[e-mail]>
---

Notes:
CC: Shuah Khan <[e-mail]>
CC: Benjamin Poirier <[e-mail]>
CC: Hangbin Liu <[e-mail]>
CC: Vladimir Oltean <[e-mail]>
CC: [e-mail]

 tools/testing/selftests/net/forwarding/lib.sh |  7 ----
 tools/testing/selftests/net/lib.sh            | 39 +++++++++++++++++++
 2 files changed, 39 insertions(+), 7 deletions(-)

Comments

Nikolay Aleksandrov Dec. 6, 2024, 9:48 a.m. UTC | #1

On 12/5/24 17:40, Petr Machata wrote:
> Add ip_link_set_addr(), ip_link_set_up(), ip_addr_add() and ip_route_add()
> to the suite of helpers that automatically schedule a corresponding
> cleanup.
> 
> When setting a new MAC, one needs to remember the old address first. Move
> mac_get() from forwarding/ to that end.
> 
> Signed-off-by: Petr Machata <[e-mail]>
> Reviewed-by: Ido Schimmel <[e-mail]>
> ---
> 
> Notes:
> CC: Shuah Khan <[e-mail]>
> CC: Benjamin Poirier <[e-mail]>
> CC: Hangbin Liu <[e-mail]>
> CC: Vladimir Oltean <[e-mail]>
> CC: [e-mail]
> 

Reviewed-by: Nikolay Aleksandrov <[e-mail]>

Patch

diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
index 7337f398f9cc..1fd40bada694 100644
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -932,13 +932,6 @@  packets_rate()
 	echo $(((t1 - t0) / interval))
 }
 
-mac_get()
-{
-	local if_name=$1
-
-	ip -j link show dev $if_name | jq -r '.[]["address"]'
-}
-
 ether_addr_to_u64()
 {
 	local addr="$1"
diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/net/lib.sh
index 5ea6537acd2b..2cd5c743b2d9 100644
--- a/tools/testing/selftests/net/lib.sh
+++ b/tools/testing/selftests/net/lib.sh
@@ -435,6 +435,13 @@  xfail_on_veth()
 	fi
 }
 
+mac_get()
+{
+	local if_name=$1
+
+	ip -j link show dev $if_name | jq -r '.[]["address"]'
+}
+
 kill_process()
 {
 	local pid=$1; shift
@@ -459,3 +466,35 @@  ip_link_set_master()
 	ip link set dev "$member" master "$master"
 	defer ip link set dev "$member" nomaster
 }
+
+ip_link_set_addr()
+{
+	local name=$1; shift
+	local addr=$1; shift
+
+	local old_addr=$(mac_get "$name")
+	ip link set dev "$name" address "$addr"
+	defer ip link set dev "$name" address "$old_addr"
+}
+
+ip_link_set_up()
+{
+	local name=$1; shift
+
+	ip link set dev "$name" up
+	defer ip link set dev "$name" down
+}
+
+ip_addr_add()
+{
+	local name=$1; shift
+
+	ip addr add dev "$name" "$@"
+	defer ip addr del dev "$name" "$@"
+}
+
+ip_route_add()
+{
+	ip route add "$@"
+	defer ip route del "$@"
+}