| Message ID | 20201026054614.17114-4-po-hsu.lin@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [G,Unstable,SRU,1/1] selftests: rtnetlink: load fou module for kci_test_encap_fou() test | expand |
On 26.10.20 06:46, Po-Hsu Lin wrote: > BugLink: https://bugs.launchpad.net/bugs/1891421 > > The kci_test_encap_fou() test from kci_test_encap() in rtnetlink.sh > needs the fou module to work. Otherwise it will fail with: > > $ ip netns exec "$testns" ip fou add port 7777 ipproto 47 > RTNETLINK answers: No such file or directory > Error talking to the kernel > > Add the CONFIG_NET_FOU into the config file as well. Which needs at > least to be set as a loadable module. > > Fixes: 6227efc1a20b ("selftests: rtnetlink.sh: add vxlan and fou test cases") > Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> > Link: https://lore.kernel.org/r/20201019030928.9859-1-po-hsu.lin@canonical.com > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > (backported from commit 26ebd6fed9bb3aa480c7c0f147ac0e7b11000f65) > Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> > --- Applied to groovy/master-next. Thanks. -Stefan > tools/testing/selftests/net/config | 1 + > tools/testing/selftests/net/rtnetlink.sh | 5 +++++ > 2 files changed, 6 insertions(+) > > diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config > index 3b42c06b..c5e50ab 100644 > --- a/tools/testing/selftests/net/config > +++ b/tools/testing/selftests/net/config > @@ -31,3 +31,4 @@ CONFIG_NET_SCH_ETF=m > CONFIG_NET_SCH_NETEM=y > CONFIG_TEST_BLACKHOLE_DEV=m > CONFIG_KALLSYMS=y > +CONFIG_NET_FOU=m > diff --git a/tools/testing/selftests/net/rtnetlink.sh b/tools/testing/selftests/net/rtnetlink.sh > index 7c38a90..6f8f159 100755 > --- a/tools/testing/selftests/net/rtnetlink.sh > +++ b/tools/testing/selftests/net/rtnetlink.sh > @@ -520,6 +520,11 @@ kci_test_encap_fou() > return $ksft_skip > fi > > + if ! /sbin/modprobe -q -n fou; then > + echo "SKIP: module fou is not found" > + return $ksft_skip > + fi > + /sbin/modprobe -q fou > ip -netns "$testns" fou add port 7777 ipproto 47 2>/dev/null > if [ $? -ne 0 ];then > echo "FAIL: can't add fou port 7777, skipping test" >
On Mon, Oct 26, 2020 at 01:46:12PM +0800, Po-Hsu Lin wrote:
> BugLink: https://bugs.launchpad.net/bugs/1891421
Since we moved unstable to 5.10, we got this patch from upstream.
diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config index 3b42c06b..c5e50ab 100644 --- a/tools/testing/selftests/net/config +++ b/tools/testing/selftests/net/config @@ -31,3 +31,4 @@ CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_NETEM=y CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_KALLSYMS=y +CONFIG_NET_FOU=m diff --git a/tools/testing/selftests/net/rtnetlink.sh b/tools/testing/selftests/net/rtnetlink.sh index 7c38a90..6f8f159 100755 --- a/tools/testing/selftests/net/rtnetlink.sh +++ b/tools/testing/selftests/net/rtnetlink.sh @@ -520,6 +520,11 @@ kci_test_encap_fou() return $ksft_skip fi + if ! /sbin/modprobe -q -n fou; then + echo "SKIP: module fou is not found" + return $ksft_skip + fi + /sbin/modprobe -q fou ip -netns "$testns" fou add port 7777 ipproto 47 2>/dev/null if [ $? -ne 0 ];then echo "FAIL: can't add fou port 7777, skipping test"
BugLink: https://bugs.launchpad.net/bugs/1891421 The kci_test_encap_fou() test from kci_test_encap() in rtnetlink.sh needs the fou module to work. Otherwise it will fail with: $ ip netns exec "$testns" ip fou add port 7777 ipproto 47 RTNETLINK answers: No such file or directory Error talking to the kernel Add the CONFIG_NET_FOU into the config file as well. Which needs at least to be set as a loadable module. Fixes: 6227efc1a20b ("selftests: rtnetlink.sh: add vxlan and fou test cases") Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> Link: https://lore.kernel.org/r/20201019030928.9859-1-po-hsu.lin@canonical.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> (backported from commit 26ebd6fed9bb3aa480c7c0f147ac0e7b11000f65) Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> --- tools/testing/selftests/net/config | 1 + tools/testing/selftests/net/rtnetlink.sh | 5 +++++ 2 files changed, 6 insertions(+)