| Message ID | 20230207101536.52829-2-po-hsu.lin@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fix cleanup in net/arp_ndisc_evict_nocarrier test | expand |
On 07.02.23 11:15, Po-Hsu Lin wrote: > BugLink: https://bugs.launchpad.net/bugs/1968310 > > The cleanup_v6() will cause the arp_ndisc_evict_nocarrier script exit > with 255 (No such file or directory), even the tests are good: > > # selftests: net: arp_ndisc_evict_nocarrier.sh > # run arp_evict_nocarrier=1 test > # RTNETLINK answers: File exists > # ok > # run arp_evict_nocarrier=0 test > # RTNETLINK answers: File exists > # ok > # run all.arp_evict_nocarrier=0 test > # RTNETLINK answers: File exists > # ok > # run ndisc_evict_nocarrier=1 test > # ok > # run ndisc_evict_nocarrier=0 test > # ok > # run all.ndisc_evict_nocarrier=0 test > # ok > not ok 1 selftests: net: arp_ndisc_evict_nocarrier.sh # exit=255 > > This is because it's trying to modify the parameter for ipv4 instead. > > Also, tests for ipv6 (run_ndisc_evict_nocarrier_enabled() and > run_ndisc_evict_nocarrier_disabled() are working on veth1, reflect > this fact in cleanup_v6(). > > Fixes: f86ca07eb531 ("selftests: net: add arp_ndisc_evict_nocarrier") > Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > (cherry picked from commit 9c4d7f45d60745a1cea0e841fa5e3444c398d2f1) > Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- > tools/testing/selftests/net/arp_ndisc_evict_nocarrier.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/net/arp_ndisc_evict_nocarrier.sh b/tools/testing/selftests/net/arp_ndisc_evict_nocarrier.sh > index b5af08a..b4ec1ee 100755 > --- a/tools/testing/selftests/net/arp_ndisc_evict_nocarrier.sh > +++ b/tools/testing/selftests/net/arp_ndisc_evict_nocarrier.sh > @@ -24,8 +24,8 @@ cleanup_v6() > ip netns del me > ip netns del peer > > - sysctl -w net.ipv4.conf.veth0.ndisc_evict_nocarrier=1 >/dev/null 2>&1 > - sysctl -w net.ipv4.conf.all.ndisc_evict_nocarrier=1 >/dev/null 2>&1 > + sysctl -w net.ipv6.conf.veth1.ndisc_evict_nocarrier=1 >/dev/null 2>&1 > + sysctl -w net.ipv6.conf.all.ndisc_evict_nocarrier=1 >/dev/null 2>&1 > } > > create_ns() -- Missed that this also is for Kinetic. - Stefan
diff --git a/tools/testing/selftests/net/arp_ndisc_evict_nocarrier.sh b/tools/testing/selftests/net/arp_ndisc_evict_nocarrier.sh index b5af08a..b4ec1ee 100755 --- a/tools/testing/selftests/net/arp_ndisc_evict_nocarrier.sh +++ b/tools/testing/selftests/net/arp_ndisc_evict_nocarrier.sh @@ -24,8 +24,8 @@ cleanup_v6() ip netns del me ip netns del peer - sysctl -w net.ipv4.conf.veth0.ndisc_evict_nocarrier=1 >/dev/null 2>&1 - sysctl -w net.ipv4.conf.all.ndisc_evict_nocarrier=1 >/dev/null 2>&1 + sysctl -w net.ipv6.conf.veth1.ndisc_evict_nocarrier=1 >/dev/null 2>&1 + sysctl -w net.ipv6.conf.all.ndisc_evict_nocarrier=1 >/dev/null 2>&1 } create_ns()
BugLink: https://bugs.launchpad.net/bugs/1968310 The cleanup_v6() will cause the arp_ndisc_evict_nocarrier script exit with 255 (No such file or directory), even the tests are good: # selftests: net: arp_ndisc_evict_nocarrier.sh # run arp_evict_nocarrier=1 test # RTNETLINK answers: File exists # ok # run arp_evict_nocarrier=0 test # RTNETLINK answers: File exists # ok # run all.arp_evict_nocarrier=0 test # RTNETLINK answers: File exists # ok # run ndisc_evict_nocarrier=1 test # ok # run ndisc_evict_nocarrier=0 test # ok # run all.ndisc_evict_nocarrier=0 test # ok not ok 1 selftests: net: arp_ndisc_evict_nocarrier.sh # exit=255 This is because it's trying to modify the parameter for ipv4 instead. Also, tests for ipv6 (run_ndisc_evict_nocarrier_enabled() and run_ndisc_evict_nocarrier_disabled() are working on veth1, reflect this fact in cleanup_v6(). Fixes: f86ca07eb531 ("selftests: net: add arp_ndisc_evict_nocarrier") Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit 9c4d7f45d60745a1cea0e841fa5e3444c398d2f1) Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> --- tools/testing/selftests/net/arp_ndisc_evict_nocarrier.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)