samples/bpf: extend test_tunnel_bpf.sh with ip6gre

Extend existing tests for vxlan, gre, geneve, ipip, erspan,
to include ip6 gre and gretap tunnel.

Signed-off-by: William Tu <u9012063@gmail.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/samples/bpf/tcbpf2_kern.c b/samples/bpf/tcbpf2_kern.c
index 370b749..15a4692 100644 (file)
--- a/samples/bpf/tcbpf2_kern.c
+++ b/samples/bpf/tcbpf2_kern.c
@@ -81,6 +81,49 @@ int _gre_get_tunnel(struct __sk_buff *skb)
        return TC_ACT_OK;
 }
 
+SEC("ip6gretap_set_tunnel")
+int _ip6gretap_set_tunnel(struct __sk_buff *skb)
+{
+       struct bpf_tunnel_key key;
+       int ret;
+
+       __builtin_memset(&key, 0x0, sizeof(key));
+       key.remote_ipv6[3] = _htonl(0x11); /* ::11 */
+       key.tunnel_id = 2;
+       key.tunnel_tos = 0;
+       key.tunnel_ttl = 64;
+       key.tunnel_label = 0xabcde;
+
+       ret = bpf_skb_set_tunnel_key(skb, &key, sizeof(key),
+                                    BPF_F_TUNINFO_IPV6 | BPF_F_ZERO_CSUM_TX);
+       if (ret < 0) {
+               ERROR(ret);
+               return TC_ACT_SHOT;
+       }
+
+       return TC_ACT_OK;
+}
+
+SEC("ip6gretap_get_tunnel")
+int _ip6gretap_get_tunnel(struct __sk_buff *skb)
+{
+       char fmt[] = "key %d remote ip6 ::%x label %x\n";
+       struct bpf_tunnel_key key;
+       int ret;
+
+       ret = bpf_skb_get_tunnel_key(skb, &key, sizeof(key),
+                                    BPF_F_TUNINFO_IPV6);
+       if (ret < 0) {
+               ERROR(ret);
+               return TC_ACT_SHOT;
+       }
+
+       bpf_trace_printk(fmt, sizeof(fmt),
+                        key.tunnel_id, key.remote_ipv6[3], key.tunnel_label);
+
+       return TC_ACT_OK;
+}
+
 SEC("erspan_set_tunnel")
 int _erspan_set_tunnel(struct __sk_buff *skb)
 {

diff --git a/samples/bpf/test_tunnel_bpf.sh b/samples/bpf/test_tunnel_bpf.sh
index 312e172..226f453 100755 (executable)
--- a/samples/bpf/test_tunnel_bpf.sh
+++ b/samples/bpf/test_tunnel_bpf.sh
@@ -33,6 +33,30 @@ function add_gre_tunnel {
        ip addr add dev $DEV 10.1.1.200/24
 }
 
+function add_ip6gretap_tunnel {
+
+       # assign ipv6 address
+       ip netns exec at_ns0 ip addr add ::11/96 dev veth0
+       ip netns exec at_ns0 ip link set dev veth0 up
+       ip addr add dev veth1 ::22/96
+       ip link set dev veth1 up
+
+       # in namespace
+       ip netns exec at_ns0 \
+               ip link add dev $DEV_NS type $TYPE flowlabel 0xbcdef key 2 \
+               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 fc80::100/96
+       ip netns exec at_ns0 ip link set dev $DEV_NS up
+
+       # out of namespace
+       ip link add dev $DEV type $TYPE external
+       ip addr add dev $DEV 10.1.1.200/24
+       ip addr add dev $DEV fc80::200/24
+       ip link set dev $DEV up
+}
+
 function add_erspan_tunnel {
        # in namespace
        ip netns exec at_ns0 \
@@ -113,6 +137,41 @@ function test_gre {
        cleanup
 }
 
+function test_ip6gre {
+       TYPE=ip6gre
+       DEV_NS=ip6gre00
+       DEV=ip6gre11
+       config_device
+       # reuse the ip6gretap function
+       add_ip6gretap_tunnel
+       attach_bpf $DEV ip6gretap_set_tunnel ip6gretap_get_tunnel
+       # underlay
+       ping6 -c 4 ::11
+       # overlay: ipv4 over ipv6
+       ip netns exec at_ns0 ping -c 1 10.1.1.200
+       ping -c 1 10.1.1.100
+       # overlay: ipv6 over ipv6
+       ip netns exec at_ns0 ping6 -c 1 fc80::200
+       cleanup
+}
+
+function test_ip6gretap {
+       TYPE=ip6gretap
+       DEV_NS=ip6gretap00
+       DEV=ip6gretap11
+       config_device
+       add_ip6gretap_tunnel
+       attach_bpf $DEV ip6gretap_set_tunnel ip6gretap_get_tunnel
+       # underlay
+       ping6 -c 4 ::11
+       # overlay: ipv4 over ipv6
+       ip netns exec at_ns0 ping -i .2 -c 1 10.1.1.200
+       ping -c 1 10.1.1.100
+       # overlay: ipv6 over ipv6
+       ip netns exec at_ns0 ping6 -c 1 fc80::200
+       cleanup
+}
+
 function test_erspan {
        TYPE=erspan
        DEV_NS=erspan00
@@ -175,6 +234,8 @@ function cleanup {
        ip link del veth1
        ip link del ipip11
        ip link del gretap11
+       ip link del ip6gre11
+       ip link del ip6gretap11
        ip link del vxlan11
        ip link del geneve11
        ip link del erspan11
@@ -187,6 +248,10 @@ trap cleanup 0 2 3 6 9
 cleanup
 echo "Testing GRE tunnel..."
 test_gre
+echo "Testing IP6GRE tunnel..."
+test_ip6gre
+echo "Testing IP6GRETAP tunnel..."
+test_ip6gretap
 echo "Testing ERSPAN tunnel..."
 test_erspan
 echo "Testing VXLAN tunnel..."