Commit fcf752ea authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Alexei Starovoitov
Browse files

bpf: Enable perf event rb output for bpf cgroup progs 



Currently, connect(), sendmsg(), recvmsg() and bind-related hooks
are all lacking perf event rb output in order to push notifications
or monitoring events up to user space. Back in commit a5a3a828
("bpf: add perf event notificaton support for sock_ops"), I've worked
with Sowmini to enable them for sock_ops where the context part is
not used (as opposed to skbs for example where the packet data can
be appended). Make the bpf_sockopt_event_output() helper generic and
enable it for mentioned hooks.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/69c39daf87e076b31e52473c902e9bfd37559124.1585323121.git.daniel@iogearbox.net
parent 0e53d9e5

net/core/filter.c

+9 −5
Original line number Diff line number Diff line
@@ -4159,8 +4159,8 @@ static const struct bpf_func_proto bpf_get_socket_uid_proto = { 
	.arg1_type      = ARG_PTR_TO_CTX,

};



BPF_CALL_5(bpf_sockopt_event_output, struct bpf_sock_ops_kern *, bpf_sock,

	   struct bpf_map *, map, u64, flags, void *, data, u64, size)

BPF_CALL_5(bpf_event_output_data, void *, ctx, struct bpf_map *, map, u64, flags,

	   void *, data, u64, size)

{

	if (unlikely(flags & ~(BPF_F_INDEX_MASK)))

		return -EINVAL;
@@ -4168,8 +4168,8 @@ BPF_CALL_5(bpf_sockopt_event_output, struct bpf_sock_ops_kern *, bpf_sock, 
	return bpf_event_output(map, flags, data, size, NULL, 0, NULL);

}



static const struct bpf_func_proto bpf_sockopt_event_output_proto =  {

	.func		= bpf_sockopt_event_output,

static const struct bpf_func_proto bpf_event_output_data_proto =  {

	.func		= bpf_event_output_data,

	.gpl_only       = true,

	.ret_type       = RET_INTEGER,

	.arg1_type      = ARG_PTR_TO_CTX,
@@ -5968,6 +5968,8 @@ sock_filter_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) 
		return &bpf_get_local_storage_proto;

	case BPF_FUNC_get_socket_cookie:

		return &bpf_get_socket_cookie_sock_proto;

	case BPF_FUNC_perf_event_output:

		return &bpf_event_output_data_proto;

	default:

		return bpf_base_func_proto(func_id);

	}
@@ -5994,6 +5996,8 @@ sock_addr_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) 
		return &bpf_get_socket_cookie_sock_addr_proto;

	case BPF_FUNC_get_local_storage:

		return &bpf_get_local_storage_proto;

	case BPF_FUNC_perf_event_output:

		return &bpf_event_output_data_proto;

#ifdef CONFIG_INET

	case BPF_FUNC_sk_lookup_tcp:

		return &bpf_sock_addr_sk_lookup_tcp_proto;
@@ -6236,7 +6240,7 @@ sock_ops_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) 
	case BPF_FUNC_get_local_storage:

		return &bpf_get_local_storage_proto;

	case BPF_FUNC_perf_event_output:

		return &bpf_sockopt_event_output_proto;

		return &bpf_event_output_data_proto;

	case BPF_FUNC_sk_storage_get:

		return &bpf_sk_storage_get_proto;

	case BPF_FUNC_sk_storage_delete:

CRA Git | Maintained and supported by SUSTech CRA and CCSE