Skip to content

Commit 7c4b90d

Browse files
Allan ZhangAlexei Starovoitov
authored andcommitted
bpf: Allow bpf_skb_event_output for a few prog types
Software event output is only enabled by a few prog types right now (TC, LWT out, XDP, sockops). Many other skb based prog types need bpf_skb_event_output to produce software event. Added socket_filter, cg_skb, sk_skb prog types to generate sw event. Test bpf code is generated from code snippet: struct TMP { uint64_t tmp; } tt; tt.tmp = 5; bpf_perf_event_output(skb, &connection_tracking_event_map, 0, &tt, sizeof(tt)); return 1; the bpf assembly from llvm is: 0: b7 02 00 00 05 00 00 00 r2 = 5 1: 7b 2a f8 ff 00 00 00 00 *(u64 *)(r10 - 8) = r2 2: bf a4 00 00 00 00 00 00 r4 = r10 3: 07 04 00 00 f8 ff ff ff r4 += -8 4: 18 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 r2 = 0ll 6: b7 03 00 00 00 00 00 00 r3 = 0 7: b7 05 00 00 08 00 00 00 r5 = 8 8: 85 00 00 00 19 00 00 00 call 25 9: b7 00 00 00 01 00 00 00 r0 = 1 10: 95 00 00 00 00 00 00 00 exit Signed-off-by: Allan Zhang <[email protected]> Acked-by: Song Liu <[email protected]> Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent 5e31d50 commit 7c4b90d

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

net/core/filter.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5999,6 +5999,8 @@ sk_filter_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
59995999
return &bpf_get_socket_cookie_proto;
60006000
case BPF_FUNC_get_socket_uid:
60016001
return &bpf_get_socket_uid_proto;
6002+
case BPF_FUNC_perf_event_output:
6003+
return &bpf_skb_event_output_proto;
60026004
default:
60036005
return bpf_base_func_proto(func_id);
60046006
}
@@ -6019,6 +6021,8 @@ cg_skb_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
60196021
return &bpf_sk_storage_get_proto;
60206022
case BPF_FUNC_sk_storage_delete:
60216023
return &bpf_sk_storage_delete_proto;
6024+
case BPF_FUNC_perf_event_output:
6025+
return &bpf_skb_event_output_proto;
60226026
#ifdef CONFIG_SOCK_CGROUP_DATA
60236027
case BPF_FUNC_skb_cgroup_id:
60246028
return &bpf_skb_cgroup_id_proto;
@@ -6267,6 +6271,8 @@ sk_skb_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
62676271
return &bpf_sk_redirect_map_proto;
62686272
case BPF_FUNC_sk_redirect_hash:
62696273
return &bpf_sk_redirect_hash_proto;
6274+
case BPF_FUNC_perf_event_output:
6275+
return &bpf_skb_event_output_proto;
62706276
#ifdef CONFIG_INET
62716277
case BPF_FUNC_sk_lookup_tcp:
62726278
return &bpf_sk_lookup_tcp_proto;

0 commit comments

Comments
 (0)