Add uid and cookie bpf helper to cg_skb_func_proto
authorChenbo Feng <fengc@google.com>
Sat, 15 Apr 2017 01:25:26 +0000 (18:25 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Apr 2017 19:22:00 +0000 (15:22 -0400)
BPF helper functions get_socket_cookie and get_socket_uid can be
used for network traffic classifications, among others. Expose
them also to programs of type BPF_PROG_TYPE_CGROUP_SKB. As of
commit 8f917bba0042 ("bpf: pass sk to helper functions") the
required skb->sk function is available at both cgroup bpf ingress
and egress hooks. With these two new helper, cg_skb_func_proto is
effectively the same as sk_filter_func_proto.

Change since V1:
Instead of add the helper to cg_skb_func_proto, redirect the
cg_skb_func_proto to sk_filter_func_proto since all helper function
in sk_filter_func_proto are applicable to cg_skb_func_proto now.

Signed-off-by: Chenbo Feng <fengc@google.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/filter.c

index ce2a19da8aa404ecaf7e25b5c1b2ddee6dad99f9..19be954f8ce70812b98a19d030d6a1e936114b5a 100644 (file)
@@ -2766,12 +2766,7 @@ xdp_func_proto(enum bpf_func_id func_id)
 static const struct bpf_func_proto *
 cg_skb_func_proto(enum bpf_func_id func_id)
 {
-       switch (func_id) {
-       case BPF_FUNC_skb_load_bytes:
-               return &bpf_skb_load_bytes_proto;
-       default:
-               return bpf_base_func_proto(func_id);
-       }
+       return sk_filter_func_proto(func_id);
 }
 
 static const struct bpf_func_proto *