selftests: net: ip_defrag: modprobe missing nf_defrag_ipv6 support
diff mbox series

Message ID 20200714124032.49133-1-paolo.pisati@canonical.com
State New
Headers show
Series
  • selftests: net: ip_defrag: modprobe missing nf_defrag_ipv6 support
Related show

Commit Message

Paolo Pisati July 14, 2020, 12:40 p.m. UTC
Fix ip_defrag.sh when CONFIG_NF_DEFRAG_IPV6=m:

$ sudo ./ip_defrag.sh
+ set -e
+ mktemp -u XXXXXX
+ readonly NETNS=ns-rGlXcw
+ trap cleanup EXIT
+ setup
+ ip netns add ns-rGlXcw
+ ip -netns ns-rGlXcw link set lo up
+ ip netns exec ns-rGlXcw sysctl -w net.ipv4.ipfrag_high_thresh=9000000
+ ip netns exec ns-rGlXcw sysctl -w net.ipv4.ipfrag_low_thresh=7000000
+ ip netns exec ns-rGlXcw sysctl -w net.ipv4.ipfrag_time=1
+ ip netns exec ns-rGlXcw sysctl -w net.ipv6.ip6frag_high_thresh=9000000
+ ip netns exec ns-rGlXcw sysctl -w net.ipv6.ip6frag_low_thresh=7000000
+ ip netns exec ns-rGlXcw sysctl -w net.ipv6.ip6frag_time=1
+ ip netns exec ns-rGlXcw sysctl -w net.netfilter.nf_conntrack_frag6_high_thresh=9000000
+ cleanup
+ ip netns del ns-rGlXcw

$ ls -la /proc/sys/net/netfilter/nf_conntrack_frag6_high_thresh
ls: cannot access '/proc/sys/net/netfilter/nf_conntrack_frag6_high_thresh': No such file or directory

$ sudo modprobe nf_defrag_ipv6
$ ls -la /proc/sys/net/netfilter/nf_conntrack_frag6_high_thresh
-rw-r--r-- 1 root root 0 Jul 14 12:34 /proc/sys/net/netfilter/nf_conntrack_frag6_high_thresh

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 tools/testing/selftests/net/ip_defrag.sh | 2 ++
 1 file changed, 2 insertions(+)

Comments

Jakub Kicinski July 16, 2020, 1:01 a.m. UTC | #1
On Tue, 14 Jul 2020 14:40:32 +0200 Paolo Pisati wrote:
>  #
>  # Run a couple of IP defragmentation tests.
>  
> +modprobe -q nf_defrag_ipv6
> +
>  set +x
>  set -e
>  

Any reason you add this command before set -e ?

It seems we want the script to fail if module can't be loaded.
Paolo Pisati July 16, 2020, 7:23 a.m. UTC | #2
On Thu, Jul 16, 2020 at 3:01 AM Jakub Kicinski <kuba@kernel.org> wrote:
>
> Any reason you add this command before set -e ?
>
> It seems we want the script to fail if module can't be loaded.

Cause if CONFIG_NF_DEFRAG_IPV6=y, the script would unnecessarily fail.
Jakub Kicinski July 16, 2020, 3:38 p.m. UTC | #3
On Thu, 16 Jul 2020 09:23:12 +0200 Paolo Pisati wrote:
> On Thu, Jul 16, 2020 at 3:01 AM Jakub Kicinski <kuba@kernel.org> wrote:
> >
> > Any reason you add this command before set -e ?
> >
> > It seems we want the script to fail if module can't be loaded.  
> 
> Cause if CONFIG_NF_DEFRAG_IPV6=y, the script would unnecessarily fail.

I don't think modprobe fails when code is built in.

$ sudo modprobe pstore
$ echo $?
0
$ grep CONFIG_PSTORE= /boot/config-5.7.8-200.fc32.x86_64
CONFIG_PSTORE=y
$ lsmod | grep pstore
$
Paolo Pisati July 16, 2020, 3:46 p.m. UTC | #4
On Thu, Jul 16, 2020 at 5:38 PM Jakub Kicinski <kuba@kernel.org> wrote:
>
> I don't think modprobe fails when code is built in.
>
> $ sudo modprobe pstore
> $ echo $?
> 0
> $ grep CONFIG_PSTORE= /boot/config-5.7.8-200.fc32.x86_64
> CONFIG_PSTORE=y
> $ lsmod | grep pstore
> $

Ah, i didn't know - i'll send a V2 then.

Patch
diff mbox series

diff --git a/tools/testing/selftests/net/ip_defrag.sh b/tools/testing/selftests/net/ip_defrag.sh
index 15d3489ecd9c..6919afe47e0a 100755
--- a/tools/testing/selftests/net/ip_defrag.sh
+++ b/tools/testing/selftests/net/ip_defrag.sh
@@ -3,6 +3,8 @@ 
 #
 # Run a couple of IP defragmentation tests.
 
+modprobe -q nf_defrag_ipv6
+
 set +x
 set -e