Introduce eBPF flow dissector
Subsystems (9)
v2 cover Introduce eBPF flow dissector
From: Petar Penkov <[email protected]>
This patch series hardens the RX stack by allowing flow dissection in BPF, as previously discussed [1]. Because of the rigorous checks of the BPF verifier, this provides significant security guarantees. In particular, the BPF flow dissector cannot get inside of an infinite loop, as with CVE-2013-4348, because BPF programs are guaranteed to terminate. It cannot read outside of packet bounds, because all memory accesses are checked. Also, with BPF the administrator can decide which protocols to support, reducing potential attack surface. Rarely encountered protocols can be excluded from dissection and the program can be updated without kernel recompile or reboot if a bug is discovered.
Patch 1 adds infrastructure to execute a BPF program in __skb_flow_dissect. This includes a new BPF program and attach type.
Patch 2 adds a flow dissector program in BPF. This parses most protocols in __skb_flow_dissect in BPF for a subset of flow keys (basic, control, ports, and address types).
Patch 3 adds a selftest that attaches the BPF program to the flow dissector and sends traffic with different levels of encapsulation.
Performance Evaluation:
The in-kernel implementation was compared against the demo program from patch 2 using the test in patch 3 with IPv4/UDP traffic over 10 seconds.
$perf record -a -C 4 taskset -c 4 ./test_flow_dissector -i 4 -f 8 \ -t 10
In-kernel Dissector:
__skb_flow_dissect overhead: 2.12% Total Packets: 3,272,597 (from output of ./test_flow_dissector)
BPF Dissector:
__skb_flow_dissect overhead: 1.63% Total Packets: 3,232,356 (from output of ./test_flow_dissector)
No-op BPF Dissector:
__skb_flow_dissect overhead: 1.52% Total Packets: 3,330,635 (from output of ./test_flow_dissector)
Changes since v1:
1/ (Patch 1) LD_ABS instructions now disallowed for the new BPF prog type 2/ (Patch 1) now checks if skb is NULL in __skb_flow_dissect() 3/ (Patch 1) fixed incorrect accesses in flow_dissector_is_valid_access()
- writes to the flow_keys field now disallowed
- reads/writes to tc_classid and data_meta now disallowed
4/ (Patch 2) headers pulled with bpf_skb_load_data if direct access fails
Changes since RFC:
1/ (Patch 1) Flow dissector hook changed from global to per-netns 2/ (Patch 1) Defined struct bpf_flow_keys to be used in BPF flow dissector programs instead of exposing the internal flow keys layout. Added a function to translate from bpf_flow_keys to the internal layout after BPF dissection is complete. The pointer to this struct is stored in qdisc_skb_cb rather than inside of the 20 byte control block which simplifies verification and allows access to all 20 bytes of the cb. 3/ (Patch 2) Removed GUE parsing as it relied on a hardcoded port 4/ (Patch 2) MPLS parsing now stops at the first label which is consistent with the in-kernel flow dissector
5/ (Patch 2) Refactored to use direct packet access and to write out to struct bpf_flow_keys
[1] http://vger.kernel.org/netconf2017_files/rx_hardening_and_udp_gso.pdf
Petar Penkov (3):
flow_dissector: implements flow dissector BPF hook
flow_dissector: implements eBPF parser selftests/bpf: test bpf flow dissection
include/linux/bpf.h | 1 + include/linux/bpf_types.h | 1 + include/linux/skbuff.h | 7 + include/net/net_namespace.h | 3 + include/net/sch_generic.h | 12 +- include/uapi/linux/bpf.h | 25 + kernel/bpf/syscall.c | 8 + kernel/bpf/verifier.c | 32 + net/core/filter.c | 67 ++ net/core/flow_dissector.c | 136 +++ tools/bpf/bpftool/prog.c | 1 + tools/include/uapi/linux/bpf.h | 25 + tools/lib/bpf/libbpf.c | 2 + tools/testing/selftests/bpf/.gitignore | 2 + tools/testing/selftests/bpf/Makefile | 8 +- tools/testing/selftests/bpf/bpf_flow.c | 386 +++++++++ tools/testing/selftests/bpf/config | 1 + .../selftests/bpf/flow_dissector_load.c | 140 ++++ .../selftests/bpf/test_flow_dissector.c | 782 ++++++++++++++++++ .../selftests/bpf/test_flow_dissector.sh | 115 +++ tools/testing/selftests/bpf/with_addr.sh | 54 ++ tools/testing/selftests/bpf/with_tunnels.sh | 36 + 22 files changed, 1838 insertions(+), 6 deletions(-) create mode 100644 tools/testing/selftests/bpf/bpf_flow.c create mode 100644 tools/testing/selftests/bpf/flow_dissector_load.c create mode 100644 tools/testing/selftests/bpf/test_flow_dissector.c create mode 100755 tools/testing/selftests/bpf/test_flow_dissector.sh create mode 100755 tools/testing/selftests/bpf/with_addr.sh create mode 100755 tools/testing/selftests/bpf/with_tunnels.sh
Signature · 1 line
2.19.0.rc2.392.g5ba43deb5a-goog
PATCH v2 1/3 flow_dissector: implements flow dissector BPF hook
From: Petar Penkov <[email protected]>
Adds a hook for programs of type BPF_PROG_TYPE_FLOW_DISSECTOR and attach type BPF_FLOW_DISSECTOR that is executed in the flow dissector path. The BPF program is per-network namespace.
--- include/linux/bpf.h | 1 + include/linux/bpf_types.h | 1 + include/linux/skbuff.h | 7 ++ include/net/net_namespace.h | 3 + include/net/sch_generic.h | 12 ++- include/uapi/linux/bpf.h | 25 ++++++ kernel/bpf/syscall.c | 8 ++ kernel/bpf/verifier.c | 32 ++++++++ net/core/filter.c | 67 ++++++++++++++++ net/core/flow_dissector.c | 136 +++++++++++++++++++++++++++++++++ tools/bpf/bpftool/prog.c | 1 + tools/include/uapi/linux/bpf.h | 25 ++++++ tools/lib/bpf/libbpf.c | 2 + 13 files changed, 317 insertions(+), 3 deletions(-)
include/linux/bpf.h +1 -0
@@ -212,6 +212,7 @@ enum bpf_reg_type {PTR_TO_PACKET_META ,/* skb->data - meta_len */ PTR_TO_PACKET ,/* reg points to skb->data */ PTR_TO_PACKET_END ,/* skb->data + headlen */ + PTR_TO_FLOW_KEYS, /* reg points to bpf_flow_keys */ };/* The information passed from prog-specific *_is_valid_access
include/linux/bpf_types.h +1 -0
@@ -32,6 +32,7 @@ BPF_PROG_TYPE(BPF_PROG_TYPE_LIRC_MODE2, lirc_mode2)#ifdef CONFIG_INET BPF_PROG_TYPE(BPF_PROG_TYPE_SK_REUSEPORT, sk_reuseport)#endif +BPF_PROG_TYPE(BPF_PROG_TYPE_FLOW_DISSECTOR, flow_dissector) BPF_MAP_TYPE(BPF_MAP_TYPE_ARRAY, array_map_ops)BPF_MAP_TYPE (BPF_MAP_TYPE_PERCPU_ARRAY , percpu_array_map_ops)
include/linux/skbuff.h +7 -0
@@ -243,6 +243,8 @@ struct scatterlist;struct pipe_inode_info ;struct iov_iter ;struct napi_struct ; +struct bpf_prog ; +union bpf_attr ;#if defined(CONFIG_NF_CONNTRACK ) || defined(CONFIG_NF_CONNTRACK_MODULE ) struct nf_conntrack {
@@ -1192,6 +1194,11 @@ void skb_flow_dissector_init(struct flow_dissector *flow_dissector,const struct flow_dissector_key *key, unsigned int key_count); +int skb_flow_dissector_bpf_prog_attach (const union bpf_attr *attr, +struct bpf_prog *prog); + +int skb_flow_dissector_bpf_prog_detach (const union bpf_attr *attr); + bool __skb_flow_dissect(const struct sk_buff *skb, struct flow_dissector *flow_dissector, void *target_container,
include/net/net_namespace.h +3 -0
@@ -43,6 +43,7 @@ struct ctl_table_header;struct net_generic ;struct uevent_sock ;struct netns_ipvs ; +struct bpf_prog ;#define NETDEV_HASHBITS 8
@@ -145,6 +146,8 @@ struct net {#endif struct net_generic __rcu *gen; +struct bpf_prog __rcu *flow_dissector_prog; +/* Note : following structs are cache line aligned */ #ifdef CONFIG_XFRM struct netns_xfrm xfrm;
include/net/sch_generic.h +9 -3
@@ -19,6 +19,7 @@ struct Qdisc_ops;struct qdisc_walker ;struct tcf_walker ;struct module ; +struct bpf_flow_keys ;typedef int tc_setup_cb_t (enum tc_setup_type type,void *type_data,void *cb_priv);
@@ -307,9 +308,14 @@ struct tcf_proto { };struct qdisc_skb_cb { -unsigned int pkt_len; -u16 slave_dev_queue_mapping; -u16 tc_classid; +union { +struct { +unsigned int pkt_len; +u16 slave_dev_queue_mapping; +u16 tc_classid; + }; +struct bpf_flow_keys *flow_keys; + };#define QDISC_CB_PRIV_LEN 20unsigned char data[QDISC_CB_PRIV_LEN ]; };
include/uapi/linux/bpf.h +25 -0
@@ -152,6 +152,7 @@ enum bpf_prog_type {BPF_PROG_TYPE_LWT_SEG6LOCAL ,BPF_PROG_TYPE_LIRC_MODE2 ,BPF_PROG_TYPE_SK_REUSEPORT , + BPF_PROG_TYPE_FLOW_DISSECTOR, }; enum bpf_attach_type {
@@ -172,6 +173,7 @@ enum bpf_attach_type {BPF_CGROUP_UDP4_SENDMSG ,BPF_CGROUP_UDP6_SENDMSG ,BPF_LIRC_MODE2 , +BPF_FLOW_DISSECTOR , __MAX_BPF_ATTACH_TYPE };
@@ -2333,6 +2335,7 @@ struct __sk_buff {/* ... here. */ __u32 data_meta; +__u32 flow_keys; };struct bpf_tunnel_key {
@@ -2778,4 +2781,26 @@ enum bpf_task_fd_type { BPF_FD_TYPE_URETPROBE, /* filename + offset */ }; +struct bpf_flow_keys { +__u16 thoff; +__u16 addr_proto;/* ETH_P_* of valid addrs */ +__u8 is_frag; +__u8 is_first_frag; +__u8 is_encap; +__be16 n_proto; +__u8 ip_proto; +union { +struct { +__be32 ipv4_src; +__be32 ipv4_dst; + }; +struct { +__u32 ipv6_src[4 ];/* in6_addr; network order */ +__u32 ipv6_dst[4 ];/* in6_addr; network order */ + }; + }; +__be16 sport; +__be16 dport; +}; +#endif /* _UAPI__LINUX_BPF_H__ */
kernel/bpf/syscall.c +8 -0
@@ -1615,6 +1615,9 @@ static int bpf_prog_attach(const union bpf_attr *attr)case BPF_LIRC_MODE2 : ptype =BPF_PROG_TYPE_LIRC_MODE2 ;break ; +case BPF_FLOW_DISSECTOR : + ptype =BPF_PROG_TYPE_FLOW_DISSECTOR ; +break ;default :return -EINVAL ; }
@@ -1636,6 +1639,9 @@ static int bpf_prog_attach(const union bpf_attr *attr)case BPF_PROG_TYPE_LIRC_MODE2 : ret =lirc_prog_attach (attr, prog);break ; +case BPF_PROG_TYPE_FLOW_DISSECTOR : + ret =skb_flow_dissector_bpf_prog_attach (attr, prog); +break ;default : ret =cgroup_bpf_prog_attach (attr, ptype, prog); }
@@ -1688,6 +1694,8 @@ static int bpf_prog_detach(const union bpf_attr *attr)return sockmap_get_from_fd (attr,BPF_PROG_TYPE_SK_SKB ,NULL );case BPF_LIRC_MODE2 :return lirc_prog_detach (attr); +case BPF_FLOW_DISSECTOR : +return skb_flow_dissector_bpf_prog_detach (attr);default :return -EINVAL ; }
kernel/bpf/verifier.c +32 -0
@@ -261,6 +261,7 @@ static const char * const reg_type_str[] = { [PTR_TO_PACKET] = "pkt", [PTR_TO_PACKET_META] = "pkt_meta", [PTR_TO_PACKET_END] = "pkt_end", + [PTR_TO_FLOW_KEYS] = "flow_keys", };static char slot_type_char[] = {
@@ -965,6 +966,7 @@ static bool is_spillable_regtype(enum bpf_reg_type type)case PTR_TO_PACKET :case PTR_TO_PACKET_META :case PTR_TO_PACKET_END : +case PTR_TO_FLOW_KEYS :case CONST_PTR_TO_MAP :return true;default :
@@ -1238,6 +1240,7 @@ static bool may_access_direct_pkt_data(struct bpf_verifier_env *env,case BPF_PROG_TYPE_LWT_XMIT :case BPF_PROG_TYPE_SK_SKB :case BPF_PROG_TYPE_SK_MSG : +case BPF_PROG_TYPE_FLOW_DISSECTOR :if (meta)return meta->pkt_access;
@@ -1321,6 +1324,18 @@ static int check_ctx_access(struct bpf_verifier_env *env, int insn_idx, int off,return -EACCES ; } +static int check_flow_keys_access (struct bpf_verifier_env *env,int off, +int size) +{ +if (size <0 || off <0 || + (u64 )off + size >sizeof (struct bpf_flow_keys )) { +verbose (env,"invalid access to flow keys off=%d size=%d\n" , + off, size); +return -EACCES ; + } +return 0 ; +} +static bool __is_pointer_value (bool allow_ptr_leaks,const struct bpf_reg_state *reg) {
@@ -1422,6 +1437,9 @@ static int check_ptr_alignment(struct bpf_verifier_env *env,* right in front, treat it the very same way. */ return check_pkt_ptr_alignment (env, reg, off, size, strict); +case PTR_TO_FLOW_KEYS : + pointer_desc ="flow keys " ; +break ;case PTR_TO_MAP_VALUE : pointer_desc ="value " ;break ;
@@ -1692,6 +1710,17 @@ static int check_mem_access(struct bpf_verifier_env *env, int insn_idx, u32 regn err =check_packet_access (env, regno, off, size, false);if (!err && t ==BPF_READ && value_regno >=0 )mark_reg_unknown (env, regs, value_regno); + }else if (reg->type ==PTR_TO_FLOW_KEYS ) { +if (t ==BPF_WRITE && value_regno >=0 && +is_pointer_value (env, value_regno)) { +verbose (env,"R%d leaks addr into flow keys\n" , + value_regno); +return -EACCES ; + } + + err =check_flow_keys_access (env, off, size); +if (!err && t ==BPF_READ && value_regno >=0 ) +mark_reg_unknown (env, regs, value_regno); }else {verbose (env,"R%d invalid mem access '%s'\n" , regno, reg_type_str[reg->type]);
@@ -1839,6 +1868,8 @@ static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,case PTR_TO_PACKET_META :return check_packet_access (env, regno, reg->off, access_size, zero_size_allowed); +case PTR_TO_FLOW_KEYS : +return check_flow_keys_access (env, reg->off, access_size);case PTR_TO_MAP_VALUE :return check_map_access (env, regno, reg->off, access_size, zero_size_allowed);
@@ -4366,6 +4397,7 @@ static bool regsafe(struct bpf_reg_state *rold, struct bpf_reg_state *rcur,case PTR_TO_CTX :case CONST_PTR_TO_MAP :case PTR_TO_PACKET_END : +case PTR_TO_FLOW_KEYS :/* Only valid matches are exact, which memcmp() above * would have accepted */
net/core/filter.c +67 -0
121 lines not on this page · raw message
net/core/flow_dissector.c +136 -0
166 lines not on this page · raw message
tools/bpf/bpftool/prog.c +1 -0
@@ -74,6 +74,7 @@ static const char * const prog_type_name[] = { [BPF_PROG_TYPE_RAW_TRACEPOINT] = "raw_tracepoint", [BPF_PROG_TYPE_CGROUP_SOCK_ADDR] = "cgroup_sock_addr", [BPF_PROG_TYPE_LIRC_MODE2] = "lirc_mode2", + [BPF_PROG_TYPE_FLOW_DISSECTOR] = "flow_dissector", };static void print_boot_time (__u64 nsecs,char *buf,unsigned int size)
tools/include/uapi/linux/bpf.h +25 -0
@@ -152,6 +152,7 @@ enum bpf_prog_type {BPF_PROG_TYPE_LWT_SEG6LOCAL ,BPF_PROG_TYPE_LIRC_MODE2 ,BPF_PROG_TYPE_SK_REUSEPORT , + BPF_PROG_TYPE_FLOW_DISSECTOR, }; enum bpf_attach_type {
@@ -172,6 +173,7 @@ enum bpf_attach_type {BPF_CGROUP_UDP4_SENDMSG ,BPF_CGROUP_UDP6_SENDMSG ,BPF_LIRC_MODE2 , +BPF_FLOW_DISSECTOR , __MAX_BPF_ATTACH_TYPE };
@@ -2333,6 +2335,7 @@ struct __sk_buff {/* ... here. */ __u32 data_meta; +__u32 flow_keys; };struct bpf_tunnel_key {
@@ -2778,4 +2781,26 @@ enum bpf_task_fd_type { BPF_FD_TYPE_URETPROBE, /* filename + offset */ }; +struct bpf_flow_keys { +__u16 thoff; +__u16 addr_proto;/* ETH_P_* of valid addrs */ +__u8 is_frag; +__u8 is_first_frag; +__u8 is_encap; +__be16 n_proto; +__u8 ip_proto; +union { +struct { +__be32 ipv4_src; +__be32 ipv4_dst; + }; +struct { +__u32 ipv6_src[4 ];/* in6_addr; network order */ +__u32 ipv6_dst[4 ];/* in6_addr; network order */ + }; + }; +__be16 sport; +__be16 dport; +}; +#endif /* _UAPI__LINUX_BPF_H__ */
tools/lib/bpf/libbpf.c +2 -0
@@ -1502,6 +1502,7 @@ static bool bpf_prog_type__needs_kver(enum bpf_prog_type type)case BPF_PROG_TYPE_CGROUP_SOCK_ADDR :case BPF_PROG_TYPE_LIRC_MODE2 :case BPF_PROG_TYPE_SK_REUSEPORT : +case BPF_PROG_TYPE_FLOW_DISSECTOR :return false;case BPF_PROG_TYPE_UNSPEC :case BPF_PROG_TYPE_KPROBE :
@@ -2121,6 +2122,7 @@ static const struct {BPF_PROG_SEC ("sk_skb" ,BPF_PROG_TYPE_SK_SKB ),BPF_PROG_SEC ("sk_msg" ,BPF_PROG_TYPE_SK_MSG ),BPF_PROG_SEC ("lirc_mode2" ,BPF_PROG_TYPE_LIRC_MODE2 ), +BPF_PROG_SEC ("flow_dissector" ,BPF_PROG_TYPE_FLOW_DISSECTOR ),BPF_SA_PROG_SEC ("cgroup/bind4" ,BPF_CGROUP_INET4_BIND ),BPF_SA_PROG_SEC ("cgroup/bind6" ,BPF_CGROUP_INET6_BIND ), BPF_SA_PROG_SEC("cgroup/connect4", BPF_CGROUP_INET4_CONNECT),
Signature · 1 line
2.19.0.rc2.392.g5ba43deb5a-goog
Re: [bpf-next, v2 1/3] flow_dissector: implements flow dissector BPF hook
Quoted 8 lines · Petar Penkov
From: Petar Penkov <[email protected]>
Adds a hook for programs of type
BPF_PROG_TYPE_FLOW_DISSECTORand attach typeBPF_FLOW_DISSECTORthat is executed in the flow dissector path. The BPF program is per-network namespace.Signed-off-by Petar Penkov <[email protected]>Signed-off-by Willem de Bruijn <[email protected]>
Quoted 14 lines
--- include/linux/bpf.h | 1 + include/linux/bpf_types.h | 1 + include/linux/skbuff.h | 7 ++ include/net/net_namespace.h | 3 + include/net/sch_generic.h | 12 ++- include/uapi/linux/bpf.h | 25 ++++++ kernel/bpf/syscall.c | 8 ++ kernel/bpf/verifier.c | 32 ++++++++ net/core/filter.c | 67 ++++++++++++++++ net/core/flow_dissector.c | 136 +++++++++++++++++++++++++++++++++ tools/bpf/bpftool/prog.c | 1 + tools/include/uapi/linux/bpf.h | 25 ++++++ tools/lib/bpf/libbpf.c | 2 +
please split up update to tools/include/uapi/linux/bpf.h as a separate patch 2. We often have conflicts in there, so best to have a separate.
Also please split tools/lib and tools/bpf chnages into patch 3.
Quoted 89 lines
13 files changed, 317 insertions(+), 3 deletions(-)include/linux/bpf.h +1
-0@@ -212,6 +212,7 @@ enum bpf_reg_type {PTR_TO_PACKET_META ,/* skb->data - meta_len */ PTR_TO_PACKET ,/* reg points to skb->data */ PTR_TO_PACKET_END ,/* skb->data + headlen */ + PTR_TO_FLOW_KEYS, /* reg points to bpf_flow_keys */ };/* The information passed from prog-specific *_is_valid_access include/linux/bpf_types.h +1
-0@@ -32,6 +32,7 @@ BPF_PROG_TYPE(BPF_PROG_TYPE_LIRC_MODE2, lirc_mode2)#ifdef CONFIG_INET BPF_PROG_TYPE(BPF_PROG_TYPE_SK_REUSEPORT, sk_reuseport)#endif +BPF_PROG_TYPE(BPF_PROG_TYPE_FLOW_DISSECTOR, flow_dissector) BPF_MAP_TYPE(BPF_MAP_TYPE_ARRAY, array_map_ops)BPF_MAP_TYPE (BPF_MAP_TYPE_PERCPU_ARRAY , percpu_array_map_ops)include/linux/skbuff.h +7
-0@@ -243,6 +243,8 @@ struct scatterlist;struct pipe_inode_info ;struct iov_iter ;struct napi_struct ; +struct bpf_prog ; +union bpf_attr ;#if defined(CONFIG_NF_CONNTRACK ) || defined(CONFIG_NF_CONNTRACK_MODULE ) struct nf_conntrack {@@ -1192,6 +1194,11 @@ void skb_flow_dissector_init(struct flow_dissector *flow_dissector,const struct flow_dissector_key *key, unsigned int key_count); +int skb_flow_dissector_bpf_prog_attach (const union bpf_attr *attr, +struct bpf_prog *prog); + +int skb_flow_dissector_bpf_prog_detach (const union bpf_attr *attr); + bool __skb_flow_dissect(const struct sk_buff *skb, struct flow_dissector *flow_dissector, void *target_container,include/net/net_namespace.h +3
-0@@ -43,6 +43,7 @@ struct ctl_table_header;struct net_generic ;struct uevent_sock ;struct netns_ipvs ; +struct bpf_prog ;#define NETDEV_HASHBITS 8@@ -145,6 +146,8 @@ struct net {#endif struct net_generic __rcu *gen; +struct bpf_prog __rcu *flow_dissector_prog; +/* Note : following structs are cache line aligned */ #ifdef CONFIG_XFRM struct netns_xfrm xfrm;include/net/sch_generic.h +1
-1@@ -19,6 +19,7 @@ struct Qdisc_ops;struct qdisc_walker ;struct tcf_walker ;struct module ; +struct bpf_flow_keys ;typedef int tc_setup_cb_t (enum tc_setup_type type,void *type_data,void *cb_priv);@@ -307,9 +308,14 @@ struct tcf_proto { };struct qdisc_skb_cb { -unsigned int pkt_len;
include/net/sch_generic.h struct tcf_proto { · line 318
Quoted 10 lines
include/net/sch_generic.h +8
-2-u16 slave_dev_queue_mapping; -u16 tc_classid; +union { +struct { +unsigned int pkt_len; +u16 slave_dev_queue_mapping; +u16 tc_classid; + }; +struct bpf_flow_keys *flow_keys; + };
is this magic really necessary? flow_dissector runs very early in recv path. There is no qdisc or conflicts with tcp/ip use of cb.
I think the whole cb block can be used.
Quoted 24 lines
include/net/sch_generic.h +0
-0#define QDISC_CB_PRIV_LEN 20unsigned char data[QDISC_CB_PRIV_LEN ]; };include/uapi/linux/bpf.h +2
-0@@ -152,6 +152,7 @@ enum bpf_prog_type {BPF_PROG_TYPE_LWT_SEG6LOCAL ,BPF_PROG_TYPE_LIRC_MODE2 ,BPF_PROG_TYPE_SK_REUSEPORT , + BPF_PROG_TYPE_FLOW_DISSECTOR, }; enum bpf_attach_type {@@ -172,6 +173,7 @@ enum bpf_attach_type {BPF_CGROUP_UDP4_SENDMSG ,BPF_CGROUP_UDP6_SENDMSG ,BPF_LIRC_MODE2 , +BPF_FLOW_DISSECTOR , __MAX_BPF_ATTACH_TYPE };
include/uapi/linux/bpf.h struct __sk_buff { · line 2338
Quoted 4 lines
include/uapi/linux/bpf.h +1
-0@@ -2333,6 +2335,7 @@ struct __sk_buff {/* ... here. */ __u32 data_meta; +__u32 flow_keys;
please use
struct bpf_flow_keys *flow_keys;
instead.
See what we did in 'struct sk_msg_md' and in 'struct sk_reuseport_md'. There is no need to hide pointers in u32.
Quoted 436 lines
include/uapi/linux/bpf.h +22
-0};struct bpf_tunnel_key {@@ -2778,4 +2781,26 @@ enum bpf_task_fd_type { BPF_FD_TYPE_URETPROBE, /* filename + offset */ }; +struct bpf_flow_keys { +__u16 thoff; +__u16 addr_proto;/* ETH_P_* of valid addrs */ +__u8 is_frag; +__u8 is_first_frag; +__u8 is_encap; +__be16 n_proto; +__u8 ip_proto; +union { +struct { +__be32 ipv4_src; +__be32 ipv4_dst; + }; +struct { +__u32 ipv6_src[4 ];/* in6_addr; network order */ +__u32 ipv6_dst[4 ];/* in6_addr; network order */ + }; + }; +__be16 sport; +__be16 dport; +}; +#endif /* _UAPI__LINUX_BPF_H__ */ kernel/bpf/syscall.c +8
-0@@ -1615,6 +1615,9 @@ static int bpf_prog_attach(const union bpf_attr *attr)case BPF_LIRC_MODE2 : ptype =BPF_PROG_TYPE_LIRC_MODE2 ;break ; +case BPF_FLOW_DISSECTOR : + ptype =BPF_PROG_TYPE_FLOW_DISSECTOR ; +break ;default :return -EINVAL ; }@@ -1636,6 +1639,9 @@ static int bpf_prog_attach(const union bpf_attr *attr)case BPF_PROG_TYPE_LIRC_MODE2 : ret =lirc_prog_attach (attr, prog);break ; +case BPF_PROG_TYPE_FLOW_DISSECTOR : + ret =skb_flow_dissector_bpf_prog_attach (attr, prog); +break ;default : ret =cgroup_bpf_prog_attach (attr, ptype, prog); }@@ -1688,6 +1694,8 @@ static int bpf_prog_detach(const union bpf_attr *attr)return sockmap_get_from_fd (attr,BPF_PROG_TYPE_SK_SKB ,NULL );case BPF_LIRC_MODE2 :return lirc_prog_detach (attr); +case BPF_FLOW_DISSECTOR : +return skb_flow_dissector_bpf_prog_detach (attr);default :return -EINVAL ; }kernel/bpf/verifier.c +32
-0@@ -261,6 +261,7 @@ static const char * const reg_type_str[] = { [PTR_TO_PACKET] = "pkt", [PTR_TO_PACKET_META] = "pkt_meta", [PTR_TO_PACKET_END] = "pkt_end", + [PTR_TO_FLOW_KEYS] = "flow_keys", };static char slot_type_char[] = {@@ -965,6 +966,7 @@ static bool is_spillable_regtype(enum bpf_reg_type type)case PTR_TO_PACKET :case PTR_TO_PACKET_META :case PTR_TO_PACKET_END : +case PTR_TO_FLOW_KEYS :case CONST_PTR_TO_MAP :return true;default :@@ -1238,6 +1240,7 @@ static bool may_access_direct_pkt_data(struct bpf_verifier_env *env,case BPF_PROG_TYPE_LWT_XMIT :case BPF_PROG_TYPE_SK_SKB :case BPF_PROG_TYPE_SK_MSG : +case BPF_PROG_TYPE_FLOW_DISSECTOR :if (meta)return meta->pkt_access;@@ -1321,6 +1324,18 @@ static int check_ctx_access(struct bpf_verifier_env *env, int insn_idx, int off,return -EACCES ; } +static int check_flow_keys_access (struct bpf_verifier_env *env,int off, +int size) +{ +if (size <0 || off <0 || + (u64 )off + size >sizeof (struct bpf_flow_keys )) { +verbose (env,"invalid access to flow keys off=%d size=%d\n" , + off, size); +return -EACCES ; + } +return 0 ; +} +static bool __is_pointer_value (bool allow_ptr_leaks,const struct bpf_reg_state *reg) {@@ -1422,6 +1437,9 @@ static int check_ptr_alignment(struct bpf_verifier_env *env,* right in front, treat it the very same way. */ return check_pkt_ptr_alignment (env, reg, off, size, strict); +case PTR_TO_FLOW_KEYS : + pointer_desc ="flow keys " ; +break ;case PTR_TO_MAP_VALUE : pointer_desc ="value " ;break ;@@ -1692,6 +1710,17 @@ static int check_mem_access(struct bpf_verifier_env *env, int insn_idx, u32 regn err =check_packet_access (env, regno, off, size, false);if (!err && t ==BPF_READ && value_regno >=0 )mark_reg_unknown (env, regs, value_regno); + }else if (reg->type ==PTR_TO_FLOW_KEYS ) { +if (t ==BPF_WRITE && value_regno >=0 && +is_pointer_value (env, value_regno)) { +verbose (env,"R%d leaks addr into flow keys\n" , + value_regno); +return -EACCES ; + } + + err =check_flow_keys_access (env, off, size); +if (!err && t ==BPF_READ && value_regno >=0 ) +mark_reg_unknown (env, regs, value_regno); }else {verbose (env,"R%d invalid mem access '%s'\n" , regno, reg_type_str[reg->type]);@@ -1839,6 +1868,8 @@ static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,case PTR_TO_PACKET_META :return check_packet_access (env, regno, reg->off, access_size, zero_size_allowed); +case PTR_TO_FLOW_KEYS : +return check_flow_keys_access (env, reg->off, access_size);case PTR_TO_MAP_VALUE :return check_map_access (env, regno, reg->off, access_size, zero_size_allowed);@@ -4366,6 +4397,7 @@ static bool regsafe(struct bpf_reg_state *rold, struct bpf_reg_state *rcur,case PTR_TO_CTX :case CONST_PTR_TO_MAP :case PTR_TO_PACKET_END : +case PTR_TO_FLOW_KEYS :/* Only valid matches are exact, which memcmp() above * would have accepted */ net/core/filter.c +67
-0@@ -5122,6 +5122,17 @@ sk_skb_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) } } +static const struct bpf_func_proto * +flow_dissector_func_proto (enum bpf_func_id func_id,const struct bpf_prog *prog) +{ +switch (func_id) { +case BPF_FUNC_skb_load_bytes: +return &bpf_skb_load_bytes_proto; +default : +return bpf_base_func_proto (func_id); + } +} +static const struct bpf_func_proto *lwt_out_func_proto (enum bpf_func_id func_id,const struct bpf_prog *prog) {@@ -5237,6 +5248,7 @@ static bool bpf_skb_is_valid_access(int off, int size, enum bpf_access_type type case bpf_ctx_range(struct __sk_buff, data): case bpf_ctx_range(struct __sk_buff, data_meta): case bpf_ctx_range(struct __sk_buff, data_end): + case bpf_ctx_range(struct __sk_buff, flow_keys):if (size != size_default)return false;break ;@@ -5265,6 +5277,7 @@ static bool sk_filter_is_valid_access(int off, int size, case bpf_ctx_range(struct __sk_buff, data): case bpf_ctx_range(struct __sk_buff, data_meta): case bpf_ctx_range(struct __sk_buff, data_end): + case bpf_ctx_range(struct __sk_buff, flow_keys): case bpf_ctx_range_till(struct __sk_buff, family, local_port):return false; }@@ -5290,6 +5303,7 @@ static bool lwt_is_valid_access(int off, int size, case bpf_ctx_range(struct __sk_buff, tc_classid): case bpf_ctx_range_till(struct __sk_buff, family, local_port): case bpf_ctx_range(struct __sk_buff, data_meta): + case bpf_ctx_range(struct __sk_buff, flow_keys):return false; }@@ -5500,6 +5514,7 @@ static bool tc_cls_act_is_valid_access(int off, int size, case bpf_ctx_range(struct __sk_buff, data_end): info->reg_type =PTR_TO_PACKET_END ;break ; + case bpf_ctx_range(struct __sk_buff, flow_keys): case bpf_ctx_range_till(struct __sk_buff, family, local_port):return false; }@@ -5701,6 +5716,7 @@ static bool sk_skb_is_valid_access(int off, int size,switch (off) { case bpf_ctx_range(struct __sk_buff, tc_classid): case bpf_ctx_range(struct __sk_buff, data_meta): + case bpf_ctx_range(struct __sk_buff, flow_keys):return false; }@@ -5760,6 +5776,39 @@ static bool sk_msg_is_valid_access(int off, int size,return true; } +static bool flow_dissector_is_valid_access (int off,int size, +enum bpf_access_type type, +const struct bpf_prog *prog, +struct bpf_insn_access_aux *info) +{ +if (type ==BPF_WRITE ) { +switch (off) { + case bpf_ctx_range_till(struct __sk_buff, cb[0], cb[4]): +break ; +default : +return false; + } + } + +switch (off) { + case bpf_ctx_range(struct __sk_buff, data): + info->reg_type =PTR_TO_PACKET ; +break ; + case bpf_ctx_range(struct __sk_buff, data_end): + info->reg_type =PTR_TO_PACKET_END ; +break ; + case bpf_ctx_range(struct __sk_buff, flow_keys): + info->reg_type =PTR_TO_FLOW_KEYS ; +break ; + case bpf_ctx_range(struct __sk_buff, tc_classid): + case bpf_ctx_range(struct __sk_buff, data_meta): + case bpf_ctx_range_till(struct __sk_buff, family, local_port): +return false; + } + +return bpf_skb_is_valid_access (off, size, type, prog, info); +} + static u32 bpf_convert_ctx_access(enum bpf_access_type type, const struct bpf_insn *si, struct bpf_insn *insn_buf,@@ -6054,6 +6103,15 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type, bpf_target_off(struct sock_common, skc_num, 2, target_size));break ; + +case offsetof(struct __sk_buff , flow_keys): + off = si->off; + off -= offsetof(struct __sk_buff , flow_keys); + off += offsetof(struct sk_buff , cb); + off += offsetof(struct qdisc_skb_cb , flow_keys); + *insn++ = BPF_LDX_MEM(BPF_SIZEOF(void *), si->dst_reg, + si->src_reg, off); +break ; }return insn - insn_buf;@@ -7017,6 +7075,15 @@ const struct bpf_verifier_ops sk_msg_verifier_ops = {const struct bpf_prog_ops sk_msg_prog_ops = { }; +const struct bpf_verifier_ops flow_dissector_verifier_ops = { + .get_func_proto = flow_dissector_func_proto, + .is_valid_access = flow_dissector_is_valid_access, + .convert_ctx_access = bpf_convert_ctx_access, +}; + +const struct bpf_prog_ops flow_dissector_prog_ops = { +}; +int sk_detach_filter (struct sock *sk) {int ret = -ENOENT ;net/core/flow_dissector.c +111
-0@@ -25,6 +25,9 @@#include <net/flow_dissector.h> #include <scsi/fc/fc_fcoe.h> #include <uapi/linux/batadv_packet.h> +#include <linux/bpf.h> + +static DEFINE_MUTEX (flow_dissector_mutex);static void dissector_set_key (struct flow_dissector *flow_dissector,enum flow_dissector_key_id key_id)@@ -62,6 +65,44 @@ void skb_flow_dissector_init(struct flow_dissector *flow_dissector, }EXPORT_SYMBOL (skb_flow_dissector_init); +int skb_flow_dissector_bpf_prog_attach (const union bpf_attr *attr, +struct bpf_prog *prog) +{ +struct bpf_prog *attached; +struct net *net; + + net = current->nsproxy->net_ns; +mutex_lock (&flow_dissector_mutex); + attached =rcu_dereference_protected (net->flow_dissector_prog, +lockdep_is_held (&flow_dissector_mutex)); +if (attached) { +/* Only one BPF program can be attached at a time */ +mutex_unlock (&flow_dissector_mutex); +return -EEXIST ; + } +rcu_assign_pointer (net->flow_dissector_prog, prog); +mutex_unlock (&flow_dissector_mutex); +return 0 ; +} + +int skb_flow_dissector_bpf_prog_detach (const union bpf_attr *attr) +{ +struct bpf_prog *attached; +struct net *net; + + net = current->nsproxy->net_ns; +mutex_lock (&flow_dissector_mutex); + attached =rcu_dereference_protected (net->flow_dissector_prog, +lockdep_is_held (&flow_dissector_mutex)); +if (!attached) { +mutex_unlock (&flow_dissector_mutex); +return -ENOENT ; + } +bpf_prog_put (attached); +RCU_INIT_POINTER (net->flow_dissector_prog,NULL ); +mutex_unlock (&flow_dissector_mutex); +return 0 ; +}/** * skb_flow_get_be16 - extract be16 entity * @skb: sk_buff to extract from @@ -588,6 +629,60 @@ static bool skb_flow_dissect_allowed(int *num_hdrs)return (*num_hdrs <=MAX_FLOW_DISSECT_HDRS ); } +static void __skb_flow_bpf_to_target (const struct bpf_flow_keys *flow_keys, +struct flow_dissector *flow_dissector, +void *target_container) +{ +struct flow_dissector_key_control *key_control; +struct flow_dissector_key_basic *key_basic; +struct flow_dissector_key_addrs *key_addrs; +struct flow_dissector_key_ports *key_ports; + + key_control =skb_flow_dissector_target (flow_dissector, +FLOW_DISSECTOR_KEY_CONTROL , + target_container); + key_control->thoff = flow_keys->thoff; +if (flow_keys->is_frag) + key_control->flags |=FLOW_DIS_IS_FRAGMENT ; +if (flow_keys->is_first_frag) + key_control->flags |=FLOW_DIS_FIRST_FRAG ; +if (flow_keys->is_encap) + key_control->flags |=FLOW_DIS_ENCAPSULATION ; + + key_basic =skb_flow_dissector_target (flow_dissector, +FLOW_DISSECTOR_KEY_BASIC , + target_container); + key_basic->n_proto = flow_keys->n_proto; + key_basic->ip_proto = flow_keys->ip_proto; + +if (flow_keys->addr_proto ==ETH_P_IP && +dissector_uses_key (flow_dissector,FLOW_DISSECTOR_KEY_IPV4_ADDRS )) { + key_addrs =skb_flow_dissector_target (flow_dissector, +FLOW_DISSECTOR_KEY_IPV4_ADDRS , + target_container); + key_addrs->v4addrs.src = flow_keys->ipv4_src; + key_addrs->v4addrs.dst = flow_keys->ipv4_dst; + key_control->addr_type =FLOW_DISSECTOR_KEY_IPV4_ADDRS ; + }else if (flow_keys->addr_proto ==ETH_P_IPV6 && +dissector_uses_key (flow_dissector, +FLOW_DISSECTOR_KEY_IPV6_ADDRS )) { + key_addrs =skb_flow_dissector_target (flow_dissector, +FLOW_DISSECTOR_KEY_IPV6_ADDRS , + target_container); +memcpy (&key_addrs->v6addrs, &flow_keys->ipv6_src, +sizeof (key_addrs->v6addrs)); + key_control->addr_type =FLOW_DISSECTOR_KEY_IPV6_ADDRS ; + } + +if (dissector_uses_key (flow_dissector,FLOW_DISSECTOR_KEY_PORTS )) { + key_ports =skb_flow_dissector_target (flow_dissector, +FLOW_DISSECTOR_KEY_PORTS , + target_container); + key_ports->src = flow_keys->sport; + key_ports->dst = flow_keys->dport; + } +} +/** * __skb_flow_dissect - extract the flow_keys struct and return it * @skb: sk_buff to extract the flow from, can be NULL if the rest are specified @@ -619,6 +714,7 @@ bool __skb_flow_dissect(const struct sk_buff *skb,struct flow_dissector_key_vlan *key_vlan;enum flow_dissect_ret fdret;enum flow_dissector_key_id dissector_vlan =FLOW_DISSECTOR_KEY_MAX ; +struct bpf_prog *attached;int num_hdrs =0 ;u8 ip_proto =0 ;bool ret;@@ -658,6 +754,46 @@ bool __skb_flow_dissect(const struct sk_buff *skb,FLOW_DISSECTOR_KEY_BASIC , target_container); +rcu_read_lock (); + attached = skb ?rcu_dereference (dev_net (skb->dev)->flow_dissector_prog) + :NULL ; +if (attached) { +/* Note that even though the const qualifier is discarded +* throughout the execution of the BPF program, all changes(the +* control block) are reverted after the BPF program returns. +* Therefore, __skb_flow_dissect does not alter the skb. +*/ +struct bpf_flow_keys flow_keys = {}; +struct qdisc_skb_cb cb_saved; +struct qdisc_skb_cb *cb; +u16 *pseudo_cb; +u32 result; +
net/core/flow_dissector.c bool __skb_flow_dissect(const struct sk_buff *skb, · line 781
Quoted 10 lines
net/core/flow_dissector.c +10
-0+ cb =qdisc_skb_cb (skb); + pseudo_cb = (u16 *)bpf_skb_cb ((struct sk_buff *)skb); + +/* Save Control Block */ +memcpy (&cb_saved, cb,sizeof (cb_saved)); +memset (cb,0 ,sizeof (cb_saved)); + +/* Pass parameters to the BPF program */ + cb->flow_keys = &flow_keys; + *pseudo_cb = nhoff;
I don't understand this bit.
What is this pseudo_cb and why nhoff goes in there? Some odd way to pass it into the prog?
Quoted 18 lines
net/core/flow_dissector.c +15
-0+ +bpf_compute_data_pointers ((struct sk_buff *)skb); + result =BPF_PROG_RUN (attached, skb); + +/* Restore state */ +memcpy (cb, &cb_saved,sizeof (cb_saved)); + +__skb_flow_bpf_to_target (&flow_keys, flow_dissector, + target_container); + key_control->thoff =min_t (u16, key_control->thoff, skb->len); +rcu_read_unlock (); +return result ==BPF_OK ; + } +rcu_read_unlock (); +if (dissector_uses_key (flow_dissector,FLOW_DISSECTOR_KEY_ETH_ADDRS )) {struct ethhdr *eth =eth_hdr (skb);
Re: [bpf-next, v2 1/3] flow_dissector: implements flow dissector BPF hook
Quoted 25 lines · Alexei Starovoitov
Quoted 8 lines · Petar Penkov
From: Petar Penkov <[email protected]>
Adds a hook for programs of type
BPF_PROG_TYPE_FLOW_DISSECTORand attach typeBPF_FLOW_DISSECTORthat is executed in the flow dissector path. The BPF program is per-network namespace.Signed-off-by Petar Penkov <[email protected]>Signed-off-by Willem de Bruijn <[email protected]>Quoted 14 lines
--- include/linux/bpf.h | 1 + include/linux/bpf_types.h | 1 + include/linux/skbuff.h | 7 ++ include/net/net_namespace.h | 3 + include/net/sch_generic.h | 12 ++- include/uapi/linux/bpf.h | 25 ++++++ kernel/bpf/syscall.c | 8 ++ kernel/bpf/verifier.c | 32 ++++++++ net/core/filter.c | 67 ++++++++++++++++ net/core/flow_dissector.c | 136 +++++++++++++++++++++++++++++++++ tools/bpf/bpftool/prog.c | 1 + tools/include/uapi/linux/bpf.h | 25 ++++++ tools/lib/bpf/libbpf.c | 2 +
Quoted 3 lines
please split up update to
tools/include/uapi/linux/bpf.has a separate patch 2. We often have conflicts in there, so best to have a separate.
Also please splittools/libandtools/bpfchnages into patch 3.
Will do in v3.
Quoted 13 lines
include/net/sch_generic.h struct tcf_proto { · line 318
Quoted 12 lines
struct
qdisc_skb_cb{include/net/sch_generic.h +8
-3-unsigned int pkt_len; -u16 slave_dev_queue_mapping; -u16 tc_classid; +union { +struct { +unsigned int pkt_len; +u16 slave_dev_queue_mapping; +u16 tc_classid; + }; +struct bpf_flow_keys *flow_keys; + };
Quoted 3 lines
is this magic really necessary?
flow_dissectorruns very early in recv path. There is no qdisc or conflicts with tcp/ip use of cb.
I think the whole cb block can be used.
The flow dissector also runs in the context of TC, from flower. But that is not a reason to use this struct.
We need both (a) data shared with the BPF application and between applications using tail-calls, to pass along the parse offset (nhoff), and (b) data not accessible by the program, to store the flow_keys pointer.
qdisc_skb_cb already has this split, exposing only the 20B .data field to the application. Flow dissection currently reuses the existing bpf_convert_ctx_access logic for this field.
We could create a separate flowdissect_skb_cb struct with the same split setup, but a second constraint is that relevant internal BPF interfaces already expect qdisc_skb_cb, notably bkf_skb_data_end. So the union was easier.
There is another way to pass nhoff besides cb[] (see below). But I don't immediately see another place to store the flow_keys ptr.
At least, if we pass skb as context. One larger change would be to introduce another ctx struct, similar to sk_reuseport_(kern|md).
Quoted 10 lines
include/uapi/linux/bpf.h struct __sk_buff { · line 2338
Quoted 5 lines
include/uapi/linux/bpf.h +1
-0@@ -2333,6 +2335,7 @@ struct __sk_buff {/* ... here. */ __u32 data_meta; +__u32 flow_keys;please use
structbpf_flow_keys*flow_keys;
instead.
Quoted 3 lines
See what we did in 'struct
sk_msg_md' and in 'structsk_reuseport_md'. There is no need to hide pointers in u32.
Will do in v3.
Quoted 25 lines
Quoted 25 lines
net/core/flow_dissector.c +21
-0@@ -658,6 +754,46 @@ bool __skb_flow_dissect(const struct sk_buff *skb,FLOW_DISSECTOR_KEY_BASIC , target_container); +rcu_read_lock (); + attached = skb ?rcu_dereference (dev_net (skb->dev)->flow_dissector_prog) + :NULL ; +if (attached) { +/* Note that even though the const qualifier is discarded +* throughout the execution of the BPF program, all changes(the +* control block) are reverted after the BPF program returns. +* Therefore, __skb_flow_dissect does not alter the skb. +*/ +struct bpf_flow_keys flow_keys = {}; +struct qdisc_skb_cb cb_saved; +struct qdisc_skb_cb *cb; +u16 *pseudo_cb; +u32 result; + + cb =qdisc_skb_cb (skb); + pseudo_cb = (u16 *)bpf_skb_cb ((struct sk_buff *)skb); + +/* Save Control Block */ +memcpy (&cb_saved, cb,sizeof (cb_saved)); +memset (cb,0 ,sizeof (cb_saved));
Quoted 8 lines
net/core/flow_dissector.c bool __skb_flow_dissect(const struct sk_buff *skb, · line 781
Quoted 4 lines
net/core/flow_dissector.c +4
-0+ +/* Pass parameters to the BPF program */ + cb->flow_keys = &flow_keys; + *pseudo_cb = nhoff;I don't understand this bit.
What is thispseudo_cband why nhoff goes in there? Some odd way to pass it into the prog?
Yes. nhoff passes the offset to the program to start parsing from. Applications also pass this during tail calls.
Alternatively we can just add a new field to struct bpf_flow_keys.
Re: [bpf-next, v2 1/3] flow_dissector: implements flow dissector BPF hook
Quoted 58 lines · Willem de Bruijn
Quoted 25 lines · Alexei Starovoitov
Quoted 8 lines · Petar Penkov
From: Petar Penkov <[email protected]>
Adds a hook for programs of type
BPF_PROG_TYPE_FLOW_DISSECTORand attach typeBPF_FLOW_DISSECTORthat is executed in the flow dissector path. The BPF program is per-network namespace.Signed-off-by Petar Penkov <[email protected]>Signed-off-by Willem de Bruijn <[email protected]>Quoted 14 lines
--- include/linux/bpf.h | 1 + include/linux/bpf_types.h | 1 + include/linux/skbuff.h | 7 ++ include/net/net_namespace.h | 3 + include/net/sch_generic.h | 12 ++- include/uapi/linux/bpf.h | 25 ++++++ kernel/bpf/syscall.c | 8 ++ kernel/bpf/verifier.c | 32 ++++++++ net/core/filter.c | 67 ++++++++++++++++ net/core/flow_dissector.c | 136 +++++++++++++++++++++++++++++++++ tools/bpf/bpftool/prog.c | 1 + tools/include/uapi/linux/bpf.h | 25 ++++++ tools/lib/bpf/libbpf.c | 2 +Quoted 3 lines
please split up update to
tools/include/uapi/linux/bpf.has a separate patch 2. We often have conflicts in there, so best to have a separate.
Also please splittools/libandtools/bpfchnages into patch 3.Will do in v3.
Quoted 13 lines
include/net/sch_generic.h struct tcf_proto { · line 318
Quoted 12 lines
struct
qdisc_skb_cb{include/net/sch_generic.h +8
-3-unsigned int pkt_len; -u16 slave_dev_queue_mapping; -u16 tc_classid; +union { +struct { +unsigned int pkt_len; +u16 slave_dev_queue_mapping; +u16 tc_classid; + }; +struct bpf_flow_keys *flow_keys; + };Quoted 3 lines
is this magic really necessary?
flow_dissectorruns very early in recv path. There is no qdisc or conflicts with tcp/ip use of cb.
I think the whole cb block can be used.The flow dissector also runs in the context of TC, from flower. But that is not a reason to use this struct.
We need both (a) data shared with the BPF application and between applications using tail-calls, to pass along the parse offset (nhoff), and (b) data not accessible by the program, to store the
flow_keyspointer.
Quoted 8 lines
qdisc_skb_cbalready has this split, exposing only the 20B .data field to the application. Flow dissection currently reuses the existingbpf_convert_ctx_accesslogic for this field.We could create a separate
flowdissect_skb_cbstruct with the same split setup, but a second constraint is that relevant internal BPF interfaces already expectqdisc_skb_cb, notablybkf_skb_data_end. So the union was easier.
got it. all makes sense.
Quoted 6 lines
There is another way to pass nhoff besides cb[] (see below). But I don't immediately see another place to store the
flow_keysptr.At least, if we pass skb as context. One larger change would be to introduce another ctx struct, similar to
sk_reuseport_(kern|md).
yeah. thought about this too, but your approach looks easier and faster. Accesses to skb have one less dereference.
Quoted 50 lines
Quoted 10 lines
include/uapi/linux/bpf.h struct __sk_buff { · line 2338
Quoted 5 lines
include/uapi/linux/bpf.h +1
-0@@ -2333,6 +2335,7 @@ struct __sk_buff {/* ... here. */ __u32 data_meta; +__u32 flow_keys;please use
structbpf_flow_keys*flow_keys;
instead.Quoted 3 lines
See what we did in 'struct
sk_msg_md' and in 'structsk_reuseport_md'. There is no need to hide pointers in u32.Will do in v3.
Quoted 25 lines
Quoted 25 lines
net/core/flow_dissector.c +21
-0@@ -658,6 +754,46 @@ bool __skb_flow_dissect(const struct sk_buff *skb,FLOW_DISSECTOR_KEY_BASIC , target_container); +rcu_read_lock (); + attached = skb ?rcu_dereference (dev_net (skb->dev)->flow_dissector_prog) + :NULL ; +if (attached) { +/* Note that even though the const qualifier is discarded +* throughout the execution of the BPF program, all changes(the +* control block) are reverted after the BPF program returns. +* Therefore, __skb_flow_dissect does not alter the skb. +*/ +struct bpf_flow_keys flow_keys = {}; +struct qdisc_skb_cb cb_saved; +struct qdisc_skb_cb *cb; +u16 *pseudo_cb; +u32 result; + + cb =qdisc_skb_cb (skb); + pseudo_cb = (u16 *)bpf_skb_cb ((struct sk_buff *)skb); + +/* Save Control Block */ +memcpy (&cb_saved, cb,sizeof (cb_saved)); +memset (cb,0 ,sizeof (cb_saved));Quoted 8 lines
net/core/flow_dissector.c bool __skb_flow_dissect(const struct sk_buff *skb, · line 781
Quoted 4 lines
net/core/flow_dissector.c +4
-0+ +/* Pass parameters to the BPF program */ + cb->flow_keys = &flow_keys; + *pseudo_cb = nhoff;I don't understand this bit.
What is thispseudo_cband why nhoff goes in there? Some odd way to pass it into the prog?
Quoted 4 lines
Yes. nhoff passes the offset to the program to start parsing from. Applications also pass this during tail calls.
Alternatively we can just add a new field to struct
bpf_flow_keys.
I think that certainly will be cleaner and easier to use from bpf prog pov. Since flow_keys stay constant any change to nhoff between tail_calls will be preserved too. I see no cons to such approach.
Re: [bpf-next, v2 1/3] flow_dissector: implements flow dissector BPF hook
Quoted 131 lines · Alexei Starovoitov
Quoted 58 lines · Willem de Bruijn
Quoted 25 lines · Alexei Starovoitov
Quoted 8 lines · Petar Penkov
From: Petar Penkov <[email protected]>
Adds a hook for programs of type
BPF_PROG_TYPE_FLOW_DISSECTORand attach typeBPF_FLOW_DISSECTORthat is executed in the flow dissector path. The BPF program is per-network namespace.Signed-off-by Petar Penkov <[email protected]>Signed-off-by Willem de Bruijn <[email protected]>Quoted 14 lines
--- include/linux/bpf.h | 1 + include/linux/bpf_types.h | 1 + include/linux/skbuff.h | 7 ++ include/net/net_namespace.h | 3 + include/net/sch_generic.h | 12 ++- include/uapi/linux/bpf.h | 25 ++++++ kernel/bpf/syscall.c | 8 ++ kernel/bpf/verifier.c | 32 ++++++++ net/core/filter.c | 67 ++++++++++++++++ net/core/flow_dissector.c | 136 +++++++++++++++++++++++++++++++++ tools/bpf/bpftool/prog.c | 1 + tools/include/uapi/linux/bpf.h | 25 ++++++ tools/lib/bpf/libbpf.c | 2 +Quoted 3 lines
please split up update to
tools/include/uapi/linux/bpf.has a separate patch 2. We often have conflicts in there, so best to have a separate.
Also please splittools/libandtools/bpfchnages into patch 3.Will do in v3.
Quoted 13 lines
include/net/sch_generic.h struct tcf_proto { · line 318
Quoted 12 lines
struct
qdisc_skb_cb{include/net/sch_generic.h +8
-3-unsigned int pkt_len; -u16 slave_dev_queue_mapping; -u16 tc_classid; +union { +struct { +unsigned int pkt_len; +u16 slave_dev_queue_mapping; +u16 tc_classid; + }; +struct bpf_flow_keys *flow_keys; + };Quoted 3 lines
is this magic really necessary?
flow_dissectorruns very early in recv path. There is no qdisc or conflicts with tcp/ip use of cb.
I think the whole cb block can be used.The flow dissector also runs in the context of TC, from flower. But that is not a reason to use this struct.
We need both (a) data shared with the BPF application and between applications using tail-calls, to pass along the parse offset (nhoff), and (b) data not accessible by the program, to store the
flow_keyspointer.Quoted 8 lines
qdisc_skb_cbalready has this split, exposing only the 20B .data field to the application. Flow dissection currently reuses the existingbpf_convert_ctx_accesslogic for this field.We could create a separate
flowdissect_skb_cbstruct with the same split setup, but a second constraint is that relevant internal BPF interfaces already expectqdisc_skb_cb, notablybkf_skb_data_end. So the union was easier.got it. all makes sense.
Quoted 6 lines
There is another way to pass nhoff besides cb[] (see below). But I don't immediately see another place to store the
flow_keysptr.At least, if we pass skb as context. One larger change would be to introduce another ctx struct, similar to
sk_reuseport_(kern|md).yeah. thought about this too, but your approach looks easier and faster. Accesses to skb have one less dereference.
Quoted 50 lines
Quoted 10 lines
include/uapi/linux/bpf.h struct __sk_buff { · line 2338
Quoted 5 lines
include/uapi/linux/bpf.h +1
-0@@ -2333,6 +2335,7 @@ struct __sk_buff {/* ... here. */ __u32 data_meta; +__u32 flow_keys;please use
structbpf_flow_keys*flow_keys;
instead.Quoted 3 lines
See what we did in 'struct
sk_msg_md' and in 'structsk_reuseport_md'. There is no need to hide pointers in u32.Will do in v3.
Quoted 33 lines
Quoted 19 lines
net/core/flow_dissector.c +15
-0@@ -658,6 +754,46 @@ bool __skb_flow_dissect(const struct sk_buff *skb,FLOW_DISSECTOR_KEY_BASIC , target_container); +rcu_read_lock (); + attached = skb ?rcu_dereference (dev_net (skb->dev)->flow_dissector_prog) + :NULL ; +if (attached) { +/* Note that even though the const qualifier is discarded +* throughout the execution of the BPF program, all changes(the +* control block) are reverted after the BPF program returns. +* Therefore, __skb_flow_dissect does not alter the skb. +*/ +struct bpf_flow_keys flow_keys = {}; +struct qdisc_skb_cb cb_saved; +struct qdisc_skb_cb *cb; +u16 *pseudo_cb; +u32 result; +net/core/flow_dissector.c bool __skb_flow_dissect(const struct sk_buff *skb, · line 781
Quoted 10 lines
net/core/flow_dissector.c +10
-0+ cb =qdisc_skb_cb (skb); + pseudo_cb = (u16 *)bpf_skb_cb ((struct sk_buff *)skb); + +/* Save Control Block */ +memcpy (&cb_saved, cb,sizeof (cb_saved)); +memset (cb,0 ,sizeof (cb_saved)); + +/* Pass parameters to the BPF program */ + cb->flow_keys = &flow_keys; + *pseudo_cb = nhoff;I don't understand this bit.
What is thispseudo_cband why nhoff goes in there? Some odd way to pass it into the prog?
Quoted 8 lines
Quoted 4 lines
Yes. nhoff passes the offset to the program to start parsing from. Applications also pass this during tail calls.
Alternatively we can just add a new field to struct
bpf_flow_keys.I think that certainly will be cleaner and easier to use from bpf prog pov. Since
flow_keysstay constant any change to nhoff betweentail_callswill be preserved too. I see no cons to such approach.
Yes, it's definitely simpler. We'll do that.
Thanks!
PATCH v2 2/3 flow_dissector: implements eBPF parser
In reply to Petar PenkovFrom: Petar Penkov <[email protected]>
This eBPF program extracts basic/control/ip address/ports keys from incoming packets. It supports recursive parsing for IP encapsulation, and VLAN, along with IPv4/IPv6 and extension headers. This program is meant to show how flow dissection and key extraction can be done in eBPF.
--- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/bpf_flow.c | 386 +++++++++++++++++++++++++ 2 files changed, 387 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/bpf_flow.c
tools/testing/selftests/bpf/Makefile +1 -1
@@ -35,7 +35,7 @@ TEST_GEN_FILES = test_pkt_access.o test_xdp.o test_l4lb.o test_tcp_estats.o test test_get_stack_rawtp.o test_sockmap_kern.o test_sockhash_kern.o \ test_lwt_seg6local.o sendmsg4_prog.o sendmsg6_prog.o test_lirc_mode2_kern.o \ get_cgroup_id_kern.o socket_cookie_prog.o test_select_reuseport_kern.o \ - test_skb_cgroup_id_kern.o + test_skb_cgroup_id_kern.o bpf_flow.o # Order correspond to 'make run_tests' order TEST_PROGS := test_kmod.sh \
tools/testing/selftests/bpf/bpf_flow.c new file +386 -0
386 lines not on this page · raw message
Signature · 1 line
2.19.0.rc2.392.g5ba43deb5a-goog
PATCH v2 3/3 selftests/bpf: test bpf flow dissection
In reply to Petar PenkovFrom: Petar Penkov <[email protected]>
Adds a test that sends different types of packets over multiple tunnels and verifies that valid packets are dissected correctly. To do so, a tc-flower rule is added to drop packets on UDP src port 9, and packets are sent from ports 8, 9, and 10. Only the packets on port 9 should be dropped. Because tc-flower relies on the flow dissector to match flows, correct classification demonstrates correct dissection.
Also add support logic to load the BPF program and to inject the test packets.
--- tools/testing/selftests/bpf/.gitignore | 2 + tools/testing/selftests/bpf/Makefile | 6 +- tools/testing/selftests/bpf/config | 1 + .../selftests/bpf/flow_dissector_load.c | 140 ++++ .../selftests/bpf/test_flow_dissector.c | 782 ++++++++++++++++++ .../selftests/bpf/test_flow_dissector.sh | 115 +++ tools/testing/selftests/bpf/with_addr.sh | 54 ++ tools/testing/selftests/bpf/with_tunnels.sh | 36 + 8 files changed, 1134 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/bpf/flow_dissector_load.c create mode 100644 tools/testing/selftests/bpf/test_flow_dissector.c create mode 100755 tools/testing/selftests/bpf/test_flow_dissector.sh create mode 100755 tools/testing/selftests/bpf/with_addr.sh create mode 100755 tools/testing/selftests/bpf/with_tunnels.sh
tools/testing/selftests/bpf/.gitignore +2 -0
@@ -23,3 +23,5 @@ test_skb_cgroup_id_user test_socket_cookie test_cgroup_storage test_select_reuseport +test_flow_dissector +flow_dissector_load
tools/testing/selftests/bpf/Makefile +4 -2
@@ -47,10 +47,12 @@ TEST_PROGS := test_kmod.sh \ test_tunnel.sh \ test_lwt_seg6local.sh \ test_lirc_mode2.sh \ - test_skb_cgroup_id.sh + test_skb_cgroup_id.sh \ + test_flow_dissector.sh # Compile but not part of 'make run_tests' -TEST_GEN_PROGS_EXTENDED = test_libbpf_open test_sock_addr test_skb_cgroup_id_user +TEST_GEN_PROGS_EXTENDED = test_libbpf_open test_sock_addr test_skb_cgroup_id_user \ + flow_dissector_load test_flow_dissector include ../lib.mk
tools/testing/selftests/bpf/config +1 -0
@@ -18,3 +18,4 @@ CONFIG_CRYPTO_HMAC=m CONFIG_CRYPTO_SHA256=m CONFIG_VXLAN=y CONFIG_GENEVE=y +CONFIG_NET_CLS_FLOWER=m
tools/testing/selftests/bpf/flow_dissector_load.c new file +140 -0
140 lines not on this page · raw message
tools/testing/selftests/bpf/test_flow_dissector.c new file +782 -0
782 lines not on this page · raw message
tools/testing/selftests/bpf/test_flow_dissector.sh new file +115 -0
115 lines not on this page · raw message
tools/testing/selftests/bpf/with_addr.sh new file +54 -0
54 lines not on this page · raw message
tools/testing/selftests/bpf/with_tunnels.sh new file +36 -0
@@ -0,0 +1,36 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# +# setup tunnels for flow dissection test + +readonly SUFFIX="test_$(mktemp -u XXXX)" +CONFIG="remote 127.0.0.2 local 127.0.0.1 dev lo" + +setup() { + ip link add "ipip_${SUFFIX}" type ipip ${CONFIG} + ip link add "gre_${SUFFIX}" type gre ${CONFIG} + ip link add "sit_${SUFFIX}" type sit ${CONFIG} + + echo "tunnels before test:" + ip tunnel show + + ip link set "ipip_${SUFFIX}" up + ip link set "gre_${SUFFIX}" up + ip link set "sit_${SUFFIX}" up +} + + +cleanup() { + ip tunnel del "ipip_${SUFFIX}" + ip tunnel del "gre_${SUFFIX}" + ip tunnel del "sit_${SUFFIX}" + + echo "tunnels after test:" + ip tunnel show +} + +trap cleanup EXIT + +setup +"$@" +exit "$?"
Signature · 1 line
2.19.0.rc2.392.g5ba43deb5a-goog