samples/bpf: extend test_tunnel_bpf.sh with xfrm state test

Add a test for fetching xfrm state parameters from a tc program running
on ingress.

Signed-off-by: Eyal Birger <eyal.birger@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/samples/bpf/tcbpf2_kern.c b/samples/bpf/tcbpf2_kern.c
index 9a8db7bd6db4899591835ebfb4dffc32b1bb876b..fa260c750fb1b8aa6c6ad98e00a506ab16fc59c4 100644 (file)
--- a/samples/bpf/tcbpf2_kern.c
+++ b/samples/bpf/tcbpf2_kern.c
@@ -593,4 +593,20 @@ int _ip6ip6_get_tunnel(struct __sk_buff *skb)
        return TC_ACT_OK;
 }
 
+SEC("xfrm_get_state")
+int _xfrm_get_state(struct __sk_buff *skb)
+{
+       struct bpf_xfrm_state x;
+       char fmt[] = "reqid %d spi 0x%x remote ip 0x%x\n";
+       int ret;
+
+       ret = bpf_skb_get_xfrm_state(skb, 0, &x, sizeof(x), 0);
+       if (ret < 0)
+               return TC_ACT_OK;
+
+       bpf_trace_printk(fmt, sizeof(fmt), x.reqid, bpf_ntohl(x.spi),
+                        bpf_ntohl(x.remote_ipv4));
+       return TC_ACT_OK;
+}
+
 char _license[] SEC("license") = "GPL";

diff --git a/samples/bpf/test_tunnel_bpf.sh b/samples/bpf/test_tunnel_bpf.sh
index c265863ccdf924df375eab36230292df47d36f42..9c534dc07b36fa1fef939496541167e037a24cfe 100755 (executable)
--- a/samples/bpf/test_tunnel_bpf.sh
+++ b/samples/bpf/test_tunnel_bpf.sh
@@ -155,6 +155,57 @@ function add_ipip_tunnel {
        ip addr add dev $DEV 10.1.1.200/24
 }
 
+function setup_xfrm_tunnel {
+       auth=0x$(printf '1%.0s' {1..40})
+       enc=0x$(printf '2%.0s' {1..32})
+       spi_in_to_out=0x1
+       spi_out_to_in=0x2
+       # in namespace
+       # in -> out
+       ip netns exec at_ns0 \
+               ip xfrm state add src 172.16.1.100 dst 172.16.1.200 proto esp \
+                       spi $spi_in_to_out reqid 1 mode tunnel \
+                       auth-trunc 'hmac(sha1)' $auth 96 enc 'cbc(aes)' $enc
+       ip netns exec at_ns0 \
+               ip xfrm policy add src 10.1.1.100/32 dst 10.1.1.200/32 dir out \
+               tmpl src 172.16.1.100 dst 172.16.1.200 proto esp reqid 1 \
+               mode tunnel
+       # out -> in
+       ip netns exec at_ns0 \
+               ip xfrm state add src 172.16.1.200 dst 172.16.1.100 proto esp \
+                       spi $spi_out_to_in reqid 2 mode tunnel \
+                       auth-trunc 'hmac(sha1)' $auth 96 enc 'cbc(aes)' $enc
+       ip netns exec at_ns0 \
+               ip xfrm policy add src 10.1.1.200/32 dst 10.1.1.100/32 dir in \
+               tmpl src 172.16.1.200 dst 172.16.1.100 proto esp reqid 2 \
+               mode tunnel
+       # address & route
+       ip netns exec at_ns0 \
+               ip addr add dev veth0 10.1.1.100/32
+       ip netns exec at_ns0 \
+               ip route add 10.1.1.200 dev veth0 via 172.16.1.200 \
+                       src 10.1.1.100
+
+       # out of namespace
+       # in -> out
+       ip xfrm state add src 172.16.1.100 dst 172.16.1.200 proto esp \
+               spi $spi_in_to_out reqid 1 mode tunnel \
+               auth-trunc 'hmac(sha1)' $auth 96  enc 'cbc(aes)' $enc
+       ip xfrm policy add src 10.1.1.100/32 dst 10.1.1.200/32 dir in \
+               tmpl src 172.16.1.100 dst 172.16.1.200 proto esp reqid 1 \
+               mode tunnel
+       # out -> in
+       ip xfrm state add src 172.16.1.200 dst 172.16.1.100 proto esp \
+               spi $spi_out_to_in reqid 2 mode tunnel \
+               auth-trunc 'hmac(sha1)' $auth 96  enc 'cbc(aes)' $enc
+       ip xfrm policy add src 10.1.1.200/32 dst 10.1.1.100/32 dir out \
+               tmpl src 172.16.1.200 dst 172.16.1.100 proto esp reqid 2 \
+               mode tunnel
+       # address & route
+       ip addr add dev veth1 10.1.1.200/32
+       ip route add 10.1.1.100 dev veth1 via 172.16.1.100 src 10.1.1.200
+}
+
 function attach_bpf {
        DEV=$1
        SET_TUNNEL=$2
@@ -278,6 +329,22 @@ function test_ipip {
        cleanup
 }
 
+function test_xfrm_tunnel {
+       config_device
+        tcpdump -nei veth1 ip &
+       output=$(mktemp)
+       cat /sys/kernel/debug/tracing/trace_pipe | tee $output &
+        setup_xfrm_tunnel
+       tc qdisc add dev veth1 clsact
+       tc filter add dev veth1 proto ip ingress bpf da obj tcbpf2_kern.o \
+               sec xfrm_get_state
+       ip netns exec at_ns0 ping -c 1 10.1.1.200
+       grep "reqid 1" $output
+       grep "spi 0x1" $output
+       grep "remote ip 0xac100164" $output
+       cleanup
+}
+
 function cleanup {
        set +ex
        pkill iperf
@@ -291,6 +358,8 @@ function cleanup {
        ip link del geneve11
        ip link del erspan11
        ip link del ip6erspan11
+       ip x s flush
+       ip x p flush
        pkill tcpdump
        pkill cat
        set -ex
@@ -316,4 +385,6 @@ echo "Testing GENEVE tunnel..."
 test_geneve
 echo "Testing IPIP tunnel..."
 test_ipip
+echo "Testing IPSec tunnel..."
+test_xfrm_tunnel
 echo "*** PASS ***"

diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index 7f7fbb9d0253422b56eac7387b42c10e04972d4a..5841ed41b30ca6d69729dbed5854b5f967fd520d 100644 (file)
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -774,6 +774,15 @@ union bpf_attr {
  *     @xdp_md: pointer to xdp_md
  *     @delta: A negative integer to be added to xdp_md.data_end
  *     Return: 0 on success or negative on error
+ *
+ * int bpf_skb_get_xfrm_state(skb, index, xfrm_state, size, flags)
+ *     retrieve XFRM state
+ *     @skb: pointer to skb
+ *     @index: index of the xfrm state in the secpath
+ *     @key: pointer to 'struct bpf_xfrm_state'
+ *     @size: size of 'struct bpf_xfrm_state'
+ *     @flags: room for future extensions
+ *     Return: 0 on success or negative error
  */
 #define __BPF_FUNC_MAPPER(FN)          \
        FN(unspec),                     \
@@ -841,7 +850,8 @@ union bpf_attr {
        FN(msg_cork_bytes),             \
        FN(msg_pull_data),              \
        FN(bind),                       \
-       FN(xdp_adjust_tail),
+       FN(xdp_adjust_tail),            \
+       FN(skb_get_xfrm_state),
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
  * function eBPF program intends to call
@@ -946,6 +956,19 @@ struct bpf_tunnel_key {
        __u32 tunnel_label;
 };
 
+/* user accessible mirror of in-kernel xfrm_state.
+ * new fields can only be added to the end of this structure
+ */
+struct bpf_xfrm_state {
+       __u32 reqid;
+       __u32 spi;      /* Stored in network byte order */
+       __u16 family;
+       union {
+               __u32 remote_ipv4;      /* Stored in network byte order */
+               __u32 remote_ipv6[4];   /* Stored in network byte order */
+       };
+};
+
 /* Generic BPF return codes which all BPF program types may support.
  * The values are binary compatible with their TC_ACT_* counter-part to
  * provide backwards compatibility with existing SCHED_CLS and SCHED_ACT

diff --git a/tools/testing/selftests/bpf/bpf_helpers.h b/tools/testing/selftests/bpf/bpf_helpers.h
index 9271576bdc8f26410a1df1a5ab679dd5cab768d8..69d7b918e66ab10b763fb759cff812520a8e7457 100644 (file)
--- a/tools/testing/selftests/bpf/bpf_helpers.h
+++ b/tools/testing/selftests/bpf/bpf_helpers.h
@@ -98,7 +98,9 @@ static int (*bpf_bind)(void *ctx, void *addr, int addr_len) =
        (void *) BPF_FUNC_bind;
 static int (*bpf_xdp_adjust_tail)(void *ctx, int offset) =
        (void *) BPF_FUNC_xdp_adjust_tail;
-
+static int (*bpf_skb_get_xfrm_state)(void *ctx, int index, void *state,
+                                    int size, int flags) =
+       (void *) BPF_FUNC_skb_get_xfrm_state;
 
 /* llvm builtin functions that eBPF C program may use to
  * emit BPF_LD_ABS and BPF_LD_IND instructions