diff mbox series

[net-next,v2,8/8] selftests: net: Add two test cases for link netns

Message ID 20241107133004.7469-9-shaw.leon@gmail.com
State New
Headers show
Series net: Improve netns handling in RTNL and ip_tunnel | expand

Commit Message

Xiao Liang Nov. 7, 2024, 1:30 p.m. UTC 
- Add test for creating link in another netns when a link of the same
   name and ifindex exists in current netns.
 - Add test for netns_atomic - create link directly in target netns,
   and no notifications should be generated in current netns.

Signed-off-by: Xiao Liang <shaw.leon@gmail.com>
---
 tools/testing/selftests/net/Makefile        |  1 +
 tools/testing/selftests/net/netns-name.sh   | 10 ++++
 tools/testing/selftests/net/netns_atomic.py | 54 +++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100755 tools/testing/selftests/net/netns_atomic.py

Comments

Jakub Kicinski Nov. 10, 2024, 1:01 a.m. UTC | #1 
On Thu,  7 Nov 2024 21:30:03 +0800 Xiao Liang wrote:
> +class NSEnter:
> +    def __init__(self, ns_name):
> +        self.ns_path = f"/run/netns/{ns_name}"
> +
> +    def __enter__(self):
> +        self.saved = open("/proc/thread-self/ns/net")
> +        with open(self.ns_path) as ns_file:
> +            libc.setns(ns_file.fileno(), 0)
> +
> +    def __exit__(self, exc_type, exc_value, traceback):
> +        libc.setns(self.saved.fileno(), 0)
> +        self.saved.close()

This is quite nice, why not move it to
tools/testing/selftests/net/lib/py/netns.py
so others can use it too
Xiao Liang Nov. 11, 2024, 8:16 a.m. UTC | #2 
On Sun, Nov 10, 2024 at 9:01 AM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Thu,  7 Nov 2024 21:30:03 +0800 Xiao Liang wrote:
> > +class NSEnter:
> > +    def __init__(self, ns_name):
> > +        self.ns_path = f"/run/netns/{ns_name}"
> > +
> > +    def __enter__(self):
> > +        self.saved = open("/proc/thread-self/ns/net")
> > +        with open(self.ns_path) as ns_file:
> > +            libc.setns(ns_file.fileno(), 0)
> > +
> > +    def __exit__(self, exc_type, exc_value, traceback):
> > +        libc.setns(self.saved.fileno(), 0)
> > +        self.saved.close()
>
> This is quite nice, why not move it to
> tools/testing/selftests/net/lib/py/netns.py
> so others can use it too

Sure, I will move it to lib.
diff mbox series

Patch

diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile
index 26a4883a65c9..ba1a486f93dc 100644
--- a/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@ -34,6 +34,7 @@  TEST_PROGS += gre_gso.sh
 TEST_PROGS += cmsg_so_mark.sh
 TEST_PROGS += cmsg_time.sh cmsg_ipv6.sh
 TEST_PROGS += netns-name.sh
+TEST_PROGS += netns_atomic.py
 TEST_PROGS += nl_netdev.py
 TEST_PROGS += srv6_end_dt46_l3vpn_test.sh
 TEST_PROGS += srv6_end_dt4_l3vpn_test.sh
diff --git a/tools/testing/selftests/net/netns-name.sh b/tools/testing/selftests/net/netns-name.sh
index 6974474c26f3..0be1905d1f2f 100755
--- a/tools/testing/selftests/net/netns-name.sh
+++ b/tools/testing/selftests/net/netns-name.sh
@@ -78,6 +78,16 @@  ip -netns $NS link show dev $ALT_NAME 2> /dev/null &&
     fail "Can still find alt-name after move"
 ip -netns $test_ns link del $DEV || fail
 
+#
+# Test no conflict of the same name/ifindex in different netns
+#
+ip -netns $NS link add name $DEV index 100 type dummy || fail
+ip -netns $NS link add netns $test_ns name $DEV index 100 type dummy ||
+    fail "Can create in netns without moving"
+ip -netns $test_ns link show dev $DEV >> /dev/null || fail "Device not found"
+ip -netns $NS link del $DEV || fail
+ip -netns $test_ns link del $DEV || fail
+
 echo -ne "$(basename $0) \t\t\t\t"
 if [ $RET_CODE -eq 0 ]; then
     echo "[  OK  ]"
diff --git a/tools/testing/selftests/net/netns_atomic.py b/tools/testing/selftests/net/netns_atomic.py
new file mode 100755
index 000000000000..0a3864e22b8b
--- /dev/null
+++ b/tools/testing/selftests/net/netns_atomic.py
@@ -0,0 +1,54 @@ 
+#!/usr/bin/env python3
+# SPDX-License-Identifier: GPL-2.0
+
+import ctypes
+
+from lib.py import ksft_run, ksft_exit, ksft_true
+from lib.py import ip
+from lib.py import NetNS
+from lib.py import RtnlFamily
+
+libc = ctypes.cdll.LoadLibrary('libc.so.6')
+
+
+class NSEnter:
+    def __init__(self, ns_name):
+        self.ns_path = f"/run/netns/{ns_name}"
+
+    def __enter__(self):
+        self.saved = open("/proc/thread-self/ns/net")
+        with open(self.ns_path) as ns_file:
+            libc.setns(ns_file.fileno(), 0)
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        libc.setns(self.saved.fileno(), 0)
+        self.saved.close()
+
+
+def test_event(ns1, ns2) -> None:
+    with NSEnter(str(ns1)):
+        rtnl = RtnlFamily()
+
+    rtnl.ntf_subscribe("rtnlgrp-link")
+
+    ip(f"netns set {ns1} 0", ns=str(ns2))
+
+    ip(f"link add netns {ns2} link-netnsid 0 dummy1 type dummy")
+    ip(f"link add netns {ns2} dummy2 type dummy", ns=str(ns1))
+
+    ip("link del dummy1", ns=str(ns2))
+    ip("link del dummy2", ns=str(ns2))
+
+    # Should receive no link events in ns1. Wait 5*0.1 seconds.
+    ksft_true(next(rtnl.check_ntf(max_retries=5), None) is None,
+              "Received unexpected link notification")
+
+
+def main() -> None:
+    with NetNS() as ns1, NetNS() as ns2:
+        ksft_run([test_event], args=(ns1, ns2))
+    ksft_exit()
+
+
+if __name__ == "__main__":
+    main()