| Message ID | 20201106090117.3755588-2-liuhangbin@gmail.com |
|---|---|
| State | Not Applicable |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | Remove unused test_ipip.sh test and add missed ip6ip6 test | expand |
| Context | Check | Description |
|---|---|---|
| jkicinski/cover_letter | success | Link |
| jkicinski/fixes_present | success | Link |
| jkicinski/patch_count | success | Link |
| jkicinski/tree_selection | success | Clearly marked for net |
| jkicinski/subject_prefix | success | Link |
| jkicinski/source_inline | success | Was 0 now: 0 |
| jkicinski/verify_signedoff | success | Link |
| jkicinski/module_param | success | Was 0 now: 0 |
| jkicinski/build_32bit | success | Errors and warnings before: 43 this patch: 43 |
| jkicinski/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| jkicinski/verify_fixes | success | Link |
| jkicinski/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 185 lines checked |
| jkicinski/build_allmodconfig_warn | success | Errors and warnings before: 35 this patch: 35 |
| jkicinski/header_inline | success | Link |
| jkicinski/stable | success | Stable not CCed |
On Fri, Nov 06, 2020 at 05:01:16PM +0800, Hangbin Liu wrote: > In comment 173ca26e9b51 ("samples/bpf: add comprehensive ipip, ipip6, > ip6ip6 test") we added ip6ip6 test for bpf tunnel testing. But in commit > 933a741e3b82 ("selftests/bpf: bpf tunnel test.") when we moved it to > the current folder, we didn't add it. > > This patch add the ip6ip6 test back to bpf tunnel test. Update the ipip6's > topology for both IPv4 and IPv6 testing. Since iperf test is removed as > currect framework simplified it in purpose, I also removed unused tcp > checkings in test_tunnel_kern.c. > > Fixes: 933a741e3b82 ("selftests/bpf: bpf tunnel test.") > Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> > --- > > v2: > update add_ipip6tnl_tunnel() to add_ip6tnl_tunnel() > keep the _ip6ip6_set_tunnel() section. > --- > .../selftests/bpf/progs/test_tunnel_kern.c | 44 +++---------------- > tools/testing/selftests/bpf/test_tunnel.sh | 43 ++++++++++++++++-- > 2 files changed, 44 insertions(+), 43 deletions(-) > > diff --git a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c > index f48dbfe24ddc..7fd95befef56 100644 > --- a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c > +++ b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c > @@ -15,7 +15,6 @@ > #include <linux/ip.h> > #include <linux/ipv6.h> > #include <linux/types.h> > -#include <linux/tcp.h> > #include <linux/socket.h> > #include <linux/pkt_cls.h> > #include <linux/erspan.h> > @@ -528,30 +527,17 @@ int _ipip_set_tunnel(struct __sk_buff *skb) > struct bpf_tunnel_key key = {}; > void *data = (void *)(long)skb->data; > struct iphdr *iph = data; > - struct tcphdr *tcp = data + sizeof(*iph); > void *data_end = (void *)(long)skb->data_end; > int ret; > > /* single length check */ > - if (data + sizeof(*iph) + sizeof(*tcp) > data_end) { > + if (data + sizeof(*iph) > data_end) { > ERROR(1); > return TC_ACT_SHOT; > } > > + key.remote_ipv4 = 0xac100164; /* 172.16.1.100 */ > key.tunnel_ttl = 64; > - if (iph->protocol == IPPROTO_ICMP) { > - key.remote_ipv4 = 0xac100164; /* 172.16.1.100 */ I think it is still good to check IPPROTO_ICMP even ping is the only test. > - } else { > - if (iph->protocol != IPPROTO_TCP || iph->ihl != 5) > - return TC_ACT_SHOT; > - > - if (tcp->dest == bpf_htons(5200)) > - key.remote_ipv4 = 0xac100164; /* 172.16.1.100 */ > - else if (tcp->dest == bpf_htons(5201)) > - key.remote_ipv4 = 0xac100165; /* 172.16.1.101 */ > - else > - return TC_ACT_SHOT; > - } > > ret = bpf_skb_set_tunnel_key(skb, &key, sizeof(key), 0); > if (ret < 0) { > @@ -585,12 +571,11 @@ int _ipip6_set_tunnel(struct __sk_buff *skb) > struct bpf_tunnel_key key = {}; > void *data = (void *)(long)skb->data; > struct iphdr *iph = data; > - struct tcphdr *tcp = data + sizeof(*iph); > void *data_end = (void *)(long)skb->data_end; > int ret; > > /* single length check */ > - if (data + sizeof(*iph) + sizeof(*tcp) > data_end) { > + if (data + sizeof(*iph) > data_end) { > ERROR(1); > return TC_ACT_SHOT; > } > @@ -634,37 +619,18 @@ int _ip6ip6_set_tunnel(struct __sk_buff *skb) > struct bpf_tunnel_key key = {}; > void *data = (void *)(long)skb->data; > struct ipv6hdr *iph = data; > - struct tcphdr *tcp = data + sizeof(*iph); > void *data_end = (void *)(long)skb->data_end; > int ret; > > /* single length check */ > - if (data + sizeof(*iph) + sizeof(*tcp) > data_end) { > + if (data + sizeof(*iph) > data_end) { > ERROR(1); > return TC_ACT_SHOT; > } > > - key.remote_ipv6[0] = bpf_htonl(0x2401db00); > + key.remote_ipv6[3] = bpf_htonl(0x11); /* ::11 */ > key.tunnel_ttl = 64; > > - if (iph->nexthdr == 58 /* NEXTHDR_ICMP */) { Same here. Can this check be kept? Others LGTM. > - key.remote_ipv6[3] = bpf_htonl(1); > - } else { > - if (iph->nexthdr != 6 /* NEXTHDR_TCP */) { > - ERROR(iph->nexthdr); > - return TC_ACT_SHOT; > - } > - > - if (tcp->dest == bpf_htons(5200)) { > - key.remote_ipv6[3] = bpf_htonl(1); > - } else if (tcp->dest == bpf_htons(5201)) { > - key.remote_ipv6[3] = bpf_htonl(2); > - } else { > - ERROR(tcp->dest); > - return TC_ACT_SHOT; > - } > - } > - > ret = bpf_skb_set_tunnel_key(skb, &key, sizeof(key), > BPF_F_TUNINFO_IPV6); > if (ret < 0) {
On Fri, Nov 06, 2020 at 06:15:44PM -0800, Martin KaFai Lau wrote: > > - if (iph->nexthdr == 58 /* NEXTHDR_ICMP */) { > Same here. Can this check be kept? Hi Martin, I'm OK to keep the checking, then what about _ipip6_set_tunnel()? It also doesn't have the ICMP checking. Thanks Hangbin
On Mon, Nov 09, 2020 at 11:00:15AM +0800, Hangbin Liu wrote: > On Fri, Nov 06, 2020 at 06:15:44PM -0800, Martin KaFai Lau wrote: > > > - if (iph->nexthdr == 58 /* NEXTHDR_ICMP */) { > > Same here. Can this check be kept? > > Hi Martin, > > I'm OK to keep the checking, then what about _ipip6_set_tunnel()? It also > doesn't have the ICMP checking. It should. Otherwise, what is the point on testing "data + sizeof(*iph) > data_end" without checking anything from iph?
diff --git a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c index f48dbfe24ddc..7fd95befef56 100644 --- a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c +++ b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c @@ -15,7 +15,6 @@ #include <linux/ip.h> #include <linux/ipv6.h> #include <linux/types.h> -#include <linux/tcp.h> #include <linux/socket.h> #include <linux/pkt_cls.h> #include <linux/erspan.h> @@ -528,30 +527,17 @@ int _ipip_set_tunnel(struct __sk_buff *skb) struct bpf_tunnel_key key = {}; void *data = (void *)(long)skb->data; struct iphdr *iph = data; - struct tcphdr *tcp = data + sizeof(*iph); void *data_end = (void *)(long)skb->data_end; int ret; /* single length check */ - if (data + sizeof(*iph) + sizeof(*tcp) > data_end) { + if (data + sizeof(*iph) > data_end) { ERROR(1); return TC_ACT_SHOT; } + key.remote_ipv4 = 0xac100164; /* 172.16.1.100 */ key.tunnel_ttl = 64; - if (iph->protocol == IPPROTO_ICMP) { - key.remote_ipv4 = 0xac100164; /* 172.16.1.100 */ - } else { - if (iph->protocol != IPPROTO_TCP || iph->ihl != 5) - return TC_ACT_SHOT; - - if (tcp->dest == bpf_htons(5200)) - key.remote_ipv4 = 0xac100164; /* 172.16.1.100 */ - else if (tcp->dest == bpf_htons(5201)) - key.remote_ipv4 = 0xac100165; /* 172.16.1.101 */ - else - return TC_ACT_SHOT; - } ret = bpf_skb_set_tunnel_key(skb, &key, sizeof(key), 0); if (ret < 0) { @@ -585,12 +571,11 @@ int _ipip6_set_tunnel(struct __sk_buff *skb) struct bpf_tunnel_key key = {}; void *data = (void *)(long)skb->data; struct iphdr *iph = data; - struct tcphdr *tcp = data + sizeof(*iph); void *data_end = (void *)(long)skb->data_end; int ret; /* single length check */ - if (data + sizeof(*iph) + sizeof(*tcp) > data_end) { + if (data + sizeof(*iph) > data_end) { ERROR(1); return TC_ACT_SHOT; } @@ -634,37 +619,18 @@ int _ip6ip6_set_tunnel(struct __sk_buff *skb) struct bpf_tunnel_key key = {}; void *data = (void *)(long)skb->data; struct ipv6hdr *iph = data; - struct tcphdr *tcp = data + sizeof(*iph); void *data_end = (void *)(long)skb->data_end; int ret; /* single length check */ - if (data + sizeof(*iph) + sizeof(*tcp) > data_end) { + if (data + sizeof(*iph) > data_end) { ERROR(1); return TC_ACT_SHOT; } - key.remote_ipv6[0] = bpf_htonl(0x2401db00); + key.remote_ipv6[3] = bpf_htonl(0x11); /* ::11 */ key.tunnel_ttl = 64; - if (iph->nexthdr == 58 /* NEXTHDR_ICMP */) { - key.remote_ipv6[3] = bpf_htonl(1); - } else { - if (iph->nexthdr != 6 /* NEXTHDR_TCP */) { - ERROR(iph->nexthdr); - return TC_ACT_SHOT; - } - - if (tcp->dest == bpf_htons(5200)) { - key.remote_ipv6[3] = bpf_htonl(1); - } else if (tcp->dest == bpf_htons(5201)) { - key.remote_ipv6[3] = bpf_htonl(2); - } else { - ERROR(tcp->dest); - return TC_ACT_SHOT; - } - } - ret = bpf_skb_set_tunnel_key(skb, &key, sizeof(key), BPF_F_TUNINFO_IPV6); if (ret < 0) { diff --git a/tools/testing/selftests/bpf/test_tunnel.sh b/tools/testing/selftests/bpf/test_tunnel.sh index bd12ec97a44d..1ccbe804e8e1 100755 --- a/tools/testing/selftests/bpf/test_tunnel.sh +++ b/tools/testing/selftests/bpf/test_tunnel.sh @@ -24,12 +24,12 @@ # Root namespace with metadata-mode tunnel + BPF # Device names and addresses: # veth1 IP: 172.16.1.200, IPv6: 00::22 (underlay) -# tunnel dev <type>11, ex: gre11, IPv4: 10.1.1.200 (overlay) +# tunnel dev <type>11, ex: gre11, IPv4: 10.1.1.200, IPv6: 1::22 (overlay) # # Namespace at_ns0 with native tunnel # Device names and addresses: # veth0 IPv4: 172.16.1.100, IPv6: 00::11 (underlay) -# tunnel dev <type>00, ex: gre00, IPv4: 10.1.1.100 (overlay) +# tunnel dev <type>00, ex: gre00, IPv4: 10.1.1.100, IPv6: 1::11 (overlay) # # # End-to-end ping packet flow @@ -250,7 +250,7 @@ add_ipip_tunnel() ip addr add dev $DEV 10.1.1.200/24 } -add_ipip6tnl_tunnel() +add_ip6tnl_tunnel() { ip netns exec at_ns0 ip addr add ::11/96 dev veth0 ip netns exec at_ns0 ip link set dev veth0 up @@ -262,11 +262,13 @@ add_ipip6tnl_tunnel() ip link add dev $DEV_NS type $TYPE \ local ::11 remote ::22 ip netns exec at_ns0 ip addr add dev $DEV_NS 10.1.1.100/24 + ip netns exec at_ns0 ip addr add dev $DEV_NS 1::11/96 ip netns exec at_ns0 ip link set dev $DEV_NS up # root namespace ip link add dev $DEV type $TYPE external ip addr add dev $DEV 10.1.1.200/24 + ip addr add dev $DEV 1::22/96 ip link set dev $DEV up } @@ -534,7 +536,7 @@ test_ipip6() check $TYPE config_device - add_ipip6tnl_tunnel + add_ip6tnl_tunnel ip link set dev veth1 mtu 1500 attach_bpf $DEV ipip6_set_tunnel ipip6_get_tunnel # underlay @@ -553,6 +555,34 @@ test_ipip6() echo -e ${GREEN}"PASS: $TYPE"${NC} } +test_ip6ip6() +{ + TYPE=ip6tnl + DEV_NS=ip6ip6tnl00 + DEV=ip6ip6tnl11 + ret=0 + + check $TYPE + config_device + add_ip6tnl_tunnel + ip link set dev veth1 mtu 1500 + attach_bpf $DEV ip6ip6_set_tunnel ip6ip6_get_tunnel + # underlay + ping6 $PING_ARG ::11 + # ip6 over ip6 + ping6 $PING_ARG 1::11 + check_err $? + ip netns exec at_ns0 ping6 $PING_ARG 1::22 + check_err $? + cleanup + + if [ $ret -ne 0 ]; then + echo -e ${RED}"FAIL: ip6$TYPE"${NC} + return 1 + fi + echo -e ${GREEN}"PASS: ip6$TYPE"${NC} +} + setup_xfrm_tunnel() { auth=0x$(printf '1%.0s' {1..40}) @@ -646,6 +676,7 @@ cleanup() ip link del veth1 2> /dev/null ip link del ipip11 2> /dev/null ip link del ipip6tnl11 2> /dev/null + ip link del ip6ip6tnl11 2> /dev/null ip link del gretap11 2> /dev/null ip link del ip6gre11 2> /dev/null ip link del ip6gretap11 2> /dev/null @@ -742,6 +773,10 @@ bpf_tunnel_test() test_ipip6 errors=$(( $errors + $? )) + echo "Testing IP6IP6 tunnel..." + test_ip6ip6 + errors=$(( $errors + $? )) + echo "Testing IPSec tunnel..." test_xfrm_tunnel errors=$(( $errors + $? ))
In comment 173ca26e9b51 ("samples/bpf: add comprehensive ipip, ipip6, ip6ip6 test") we added ip6ip6 test for bpf tunnel testing. But in commit 933a741e3b82 ("selftests/bpf: bpf tunnel test.") when we moved it to the current folder, we didn't add it. This patch add the ip6ip6 test back to bpf tunnel test. Update the ipip6's topology for both IPv4 and IPv6 testing. Since iperf test is removed as currect framework simplified it in purpose, I also removed unused tcp checkings in test_tunnel_kern.c. Fixes: 933a741e3b82 ("selftests/bpf: bpf tunnel test.") Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> --- v2: update add_ipip6tnl_tunnel() to add_ip6tnl_tunnel() keep the _ip6ip6_set_tunnel() section. --- .../selftests/bpf/progs/test_tunnel_kern.c | 44 +++---------------- tools/testing/selftests/bpf/test_tunnel.sh | 43 ++++++++++++++++-- 2 files changed, 44 insertions(+), 43 deletions(-)