From 0cb0dcfff5b1c3f55e25126fd7afd4e702ce05d5 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 27 May 2024 16:42:00 +0200 Subject: [PATCH] Revert "UBUNTU: SAUCE: selftests: net: fix "from" match test in fib_rule_tests.sh" The commit in question dates back to 2019 and still persists in the Noble kernels. It has been unnecessary since the upstream kernel applied a similar fix, d1abf388604f ("selftests: fib_rule_tests: enable forwarding before ipv4 from/iif test"). Now, it is causing an issue with this kselftest: $ linux/tools/testing/selftests/net$ sudo ./fib_rule_tests.sh Cannot open network namespace "testns": No such file or directory The reason for the failure is obvious; there is no such a namespace since the upstream commit 6c0ee7b4d69d ("selftests/net: convert fib_rule_tests.sh to run it in unique namespace"). In our SRU cycles, net:fib_rule_tests.sh in ubuntu_kselftests_net fails across all Noble kernels: 11238 20:50:51 DEBUG| [stdout] # Cannot open network namespace "testns": No such file or directory Reverting the outdated commit fixes this failure. BugLink: https://bugs.launchpad.net/bugs/2066332 Signed-off-by: Masahiro Yamada Acked-by: Paolo Pisati Acked-by: Andrei Gherzan Signed-off-by: Stefan Bader --- tools/testing/selftests/net/fib_rule_tests.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/testing/selftests/net/fib_rule_tests.sh b/tools/testing/selftests/net/fib_rule_tests.sh index c8d1c297b7a1..51157a5559b7 100755 --- a/tools/testing/selftests/net/fib_rule_tests.sh +++ b/tools/testing/selftests/net/fib_rule_tests.sh @@ -87,8 +87,6 @@ setup() $IP address add $DEV_ADDR/24 dev dummy0 $IP -6 address add $DEV_ADDR6/64 dev dummy0 - ip netns exec testns sysctl -w net.ipv4.ip_forward=1 - set +e }