Fix selftests icmp_redirect.sh failures
Subsystems (3)
cover Fix selftests icmp_redirect.sh failures
This patchset fixes 2 failures for selftests icmp_redirect.sh.
The first patch is for IPv6 redirecting tests. When disable option CONFIG_IPV6_SUBTREES, there is not "from ::" info in ip route output. So we should not check this key word.
The second patch is for testing "mtu exception plus redirect", which do a PMTU update first and do redirect second. For topology like
(MTU 1300)
|----- R1_1 -------- R1_2 --------|
H1 ---| | ---- H2 (MTU 1500)
|----- R2_1 -------- R2_2 --------|After redirecting to R2 patch, the PMTU info in R1 path should be cleard. So we should not check PMTU info for test "mtu exception plus redirect".
After the fixes, all the test passed now
]# ./icmp_redirect.sh
###########################################################################
Legacy routing
###########################################################################
TEST: IPv4: redirect exception [ OK ]
TEST: IPv6: redirect exception [ OK ]
TEST: IPv4: redirect exception plus mtu [ OK ]
TEST: IPv6: redirect exception plus mtu [ OK ]
TEST: IPv4: routing reset [ OK ]
TEST: IPv6: routing reset [ OK ]
TEST: IPv4: mtu exception [ OK ]
TEST: IPv6: mtu exception [ OK ]
TEST: IPv4: mtu exception plus redirect [ OK ]
TEST: IPv6: mtu exception plus redirect [ OK ]
[...]
###########################################################################
Routing with nexthop objects and VRF
###########################################################################
TEST: IPv4: redirect exception [ OK ]
TEST: IPv6: redirect exception [ OK ]
TEST: IPv4: redirect exception plus mtu [ OK ]
TEST: IPv6: redirect exception plus mtu [ OK ]
TEST: IPv4: routing reset [ OK ]
TEST: IPv6: routing reset [ OK ]
TEST: IPv4: mtu exception [ OK ]
TEST: IPv6: mtu exception [ OK ]
TEST: IPv4: mtu exception plus redirect [ OK ]
TEST: IPv6: mtu exception plus redirect [ OK ]
Tests passed: 40 Tests failed: 0 Tests xfailed: 0
Hangbin Liu (2):
selftests: icmp_redirect: remove from checking for IPv6 route get
selftests: icmp_redirect: IPv6 PMTU info should be cleared after
redirect
tools/testing/selftests/net/icmp_redirect.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
2.31.1
PATCH 1/2 selftests: icmp_redirect: remove from checking for IPv6 route get
If the kernel doesn't enable option CONFIG_IPV6_SUBTREES, the RTA_SRC info will not be exported to userspace in rt6_fill_node(). And ip cmd will not print "from ::" to the route output. So remove this check.
--- tools/testing/selftests/net/icmp_redirect.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/icmp_redirect.sh +1 -1
@@ -315,7 +315,7 @@ check_exception() if [ "$with_redirect" = "yes" ]; then ip -netns h1 -6 ro get ${H1_VRF_ARG} ${H2_N2_IP6} | \ - grep -q "${H2_N2_IP6} from :: via ${R2_LLADDR} dev br0.*${mtu}" + grep -q "${H2_N2_IP6} .*via ${R2_LLADDR} dev br0.*${mtu}" elif [ -n "${mtu}" ]; then ip -netns h1 -6 ro get ${H1_VRF_ARG} ${H2_N2_IP6} | \ grep -q "${mtu}"
Signature · 1 line
2.31.1
Re: [PATCH net 1/2] selftests: icmp_redirect: remove from checking for IPv6 route get
Quoted 16 lines · Hangbin Liu
If the kernel doesn't enable option
CONFIG_IPV6_SUBTREES, theRTA_SRCinfo will not be exported to userspace inrt6_fill_node(). And ip cmd will not print "from ::" to the route output. So remove this check.Fixes ec8105352869 ("selftests: Add redirect tests")Signed-off-by Hangbin Liu <[email protected]>--- tools/testing/selftests/net/icmp_redirect.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/testing/selftests/net/icmp_redirect.sh +0
-0
tools/testing/selftests/net/icmp_redirect.sh check_exception() · line 321
Quoted 8 lines
tools/testing/selftests/net/icmp_redirect.sh +1
-1@@ -315,7 +315,7 @@ check_exception() if [ "$with_redirect" = "yes" ]; then ip -netns h1 -6 ro get ${H1_VRF_ARG} ${H2_N2_IP6} | \ - grep -q "${H2_N2_IP6} from :: via ${R2_LLADDR} dev br0.*${mtu}" + grep -q "${H2_N2_IP6} .*via ${R2_LLADDR} dev br0.*${mtu}" elif [ -n "${mtu}" ]; then ip -netns h1 -6 ro get ${H1_VRF_ARG} ${H2_N2_IP6} | \ grep -q "${mtu}"
PATCH 2/2 selftests: icmp_redirect: IPv6 PMTU info should be cleared after redirect
In reply to Hangbin LiuAfter redirecting, it's already a new path. So the old PMTU info should be cleared. The IPv6 test "mtu exception plus redirect" should only has redirect info without old PMTU.
The IPv4 test can not be changed because of legacy.
--- tools/testing/selftests/net/icmp_redirect.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/testing/selftests/net/icmp_redirect.sh +3 -2
@@ -313,9 +313,10 @@ check_exception() fi log_test $? 0 "IPv4: ${desc}" - if [ "$with_redirect" = "yes" ]; then + # No PMTU info for test "redirect" and "mtu exception plus redirect" + if [ "$with_redirect" = "yes" ] && [ "$desc" != "redirect exception plus mtu" ]; then ip -netns h1 -6 ro get ${H1_VRF_ARG} ${H2_N2_IP6} | \ - grep -q "${H2_N2_IP6} .*via ${R2_LLADDR} dev br0.*${mtu}" + grep -v "mtu" | grep -q "${H2_N2_IP6} .*via ${R2_LLADDR} dev br0" elif [ -n "${mtu}" ]; then ip -netns h1 -6 ro get ${H1_VRF_ARG} ${H2_N2_IP6} | \ grep -q "${mtu}"
Signature · 1 line
2.31.1
Re: [PATCH net 2/2] selftests: icmp_redirect: IPv6 PMTU info should be cleared after redirect
Quoted 20 lines · Hangbin Liu
After redirecting, it's already a new path. So the old PMTU info should be cleared. The IPv6 test "mtu exception plus redirect" should only has redirect info without old PMTU.
The IPv4 test can not be changed because of legacy.
Fixes ec8105352869 ("selftests: Add redirect tests")Signed-off-by Hangbin Liu <[email protected]>--- tools/testing/selftests/net/icmp_redirect.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)tools/testing/selftests/net/icmp_redirect.sh +0
-0@@ -313,9 +313,10 @@ check_exception() fi log_test $? 0 "IPv4: ${desc}"
tools/testing/selftests/net/icmp_redirect.sh check_exception() · line 322
Quoted 10 lines
tools/testing/selftests/net/icmp_redirect.sh +3
-2- if [ "$with_redirect" = "yes" ]; then + # No PMTU info for test "redirect" and "mtu exception plus redirect" + if [ "$with_redirect" = "yes" ] && [ "$desc" != "redirect exception plus mtu" ]; then ip -netns h1 -6 ro get ${H1_VRF_ARG} ${H2_N2_IP6} | \ - grep -q "${H2_N2_IP6} .*via ${R2_LLADDR} dev br0.*${mtu}" + grep -v "mtu" | grep -q "${H2_N2_IP6} .*via ${R2_LLADDR} dev br0" elif [ -n "${mtu}" ]; then ip -netns h1 -6 ro get ${H1_VRF_ARG} ${H2_N2_IP6} | \ grep -q "${mtu}"
This series was applied to netdev/net.git (refs/heads/master):
Hello:
This series was applied to netdev/net.git (refs/heads/master):
Quoted 10 lines · On Wed, 7 Jul 2021 16:15:28 +0800 you wrote:
This patchset fixes 2 failures for selftests
icmp_redirect.sh.The first patch is for IPv6 redirecting tests. When disable option
CONFIG_IPV6_SUBTREES, there is not "from ::" info in ip route output. So we should not check this key word.The second patch is for testing "mtu exception plus redirect", which do a PMTU update first and do redirect second. For topology like
[...]
Here is the summary with links:
- [net,1/2] selftests: icmp_redirect: remove from checking for IPv6 route get
https://git.kernel.org/netdev/net/c/24b671aad4ea - [net,2/2] selftests: icmp_redirect: IPv6 PMTU info should be cleared after redirect https://git.kernel.org/netdev/net/c/0e02bf5de46a
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html