[bpf-next,06/13] bpf: add bpf_skc_to_{tcp,tcp_timewait,tcp_request}_sock() helpers

Message ID	20200617211544.1856132-1-yhs@fb.com
State	Changes Requested
Delegated to:	BPF Maintainers
Headers	show Return-Path: <bpf-owner@vger.kernel.org> Smtp-Origin-Hostprefix: devbig From: Yonghong Song <yhs@fb.com> Smtp-Origin-Hostname: devbig003.ftw2.facebook.com To: <bpf@vger.kernel.org> CC: Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, <kernel-team@fb.com>, Martin KaFai Lau <kafai@fb.com> Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH bpf-next 06/13] bpf: add bpf_skc_to_{tcp, tcp_timewait, tcp_request}_sock() helpers Date: Wed, 17 Jun 2020 14:15:44 -0700 Message-ID: <20200617211544.1856132-1-yhs@fb.com> In-Reply-To: <20200617211536.1854348-1-yhs@fb.com> References: <20200617211536.1854348-1-yhs@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Sender: bpf-owner@vger.kernel.org Precedence: bulk
Series	implement bpf iterator for tcp and udp sockets \| expand [bpf-next,00/13] implement bpf iterator for tcp and udp sockets [bpf-next,01/13] bpf: add bpf_seq_afinfo in tcp_iter_state [bpf-next,02/13] net: bpf: implement bpf iterator for tcp [bpf-next,03/13] bpf: support 'X' in bpf_seq_printf() helper [bpf-next,04/13] bpf: allow tracing programs to use bpf_jiffies64() helper [bpf-next,05/13] bpf: add bpf_skc_to_tcp6_sock() helper [bpf-next,06/13] bpf: add bpf_skc_to_{tcp,tcp_timewait,tcp_request}_sock() helpers [bpf-next,07/13] bpf: add bpf_seq_afinfo in udp_iter_state [bpf-next,08/13] net: bpf: implement bpf iterator for udp [bpf-next,09/13] bpf: add bpf_skc_to_udp6_sock() helper [bpf-next,10/13] bpf/selftests: move newer bpf_iter_* type redefining to a new header file [bpf-next,11/13] tools/bpf: selftests: implement sample tcp/tcp6 bpf_iter programs [bpf-next,12/13] tools/bpf: add udp4/udp6 bpf iterator [bpf-next,13/13] bpf/selftests: add tcp/udp iterator programs to selftests

diff --git a/include/linux/bpf.h b/include/linux/bpf.h index e455aa09039b..64059f91e8d7 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -1639,6 +1639,9 @@ extern const struct bpf_func_proto bpf_ringbuf_submit_proto; extern const struct bpf_func_proto bpf_ringbuf_discard_proto; extern const struct bpf_func_proto bpf_ringbuf_query_proto; extern const struct bpf_func_proto bpf_skc_to_tcp6_sock_proto; +extern const struct bpf_func_proto bpf_skc_to_tcp_sock_proto; +extern const struct bpf_func_proto bpf_skc_to_tcp_timewait_sock_proto; +extern const struct bpf_func_proto bpf_skc_to_tcp_request_sock_proto; const struct bpf_func_proto *bpf_tracing_func_proto( enum bpf_func_id func_id, const struct bpf_prog *prog); diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 394fcba27b6a..e256417d94c2 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -3258,6 +3258,24 @@ union bpf_attr { * Dynamically cast a *sk* pointer to a *tcp6_sock* pointer. * Return * *sk* if casting is valid, or NULL otherwise. + * + * struct tcp_sock *bpf_skc_to_tcp_sock(void *sk) + * Description + * Dynamically cast a *sk* pointer to a *tcp_sock* pointer. + * Return + * *sk* if casting is valid, or NULL otherwise. + * + * struct tcp_timewait_sock *bpf_skc_to_tcp_timewait_sock(void *sk) + * Description + * Dynamically cast a *sk* pointer to a *tcp_timewait_sock* pointer. + * Return + * *sk* if casting is valid, or NULL otherwise. + * + * struct tcp_request_sock *bpf_skc_to_tcp_request_sock(void *sk) + * Description + * Dynamically cast a *sk* pointer to a *tcp_request_sock* pointer. + * Return + * *sk* if casting is valid, or NULL otherwise. */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -3396,7 +3414,10 @@ union bpf_attr { FN(ringbuf_discard), \ FN(ringbuf_query), \ FN(csum_level), \ - FN(skc_to_tcp6_sock), + FN(skc_to_tcp6_sock), \ + FN(skc_to_tcp_sock), \ + FN(skc_to_tcp_timewait_sock), \ + FN(skc_to_tcp_request_sock), /* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 478c10d1ec33..de5fbe66e1ca 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -1517,6 +1517,12 @@ tracing_prog_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) return &bpf_xdp_output_proto; case BPF_FUNC_skc_to_tcp6_sock: return &bpf_skc_to_tcp6_sock_proto; + case BPF_FUNC_skc_to_tcp_sock: + return &bpf_skc_to_tcp_sock_proto; + case BPF_FUNC_skc_to_tcp_timewait_sock: + return &bpf_skc_to_tcp_timewait_sock_proto; + case BPF_FUNC_skc_to_tcp_request_sock: + return &bpf_skc_to_tcp_request_sock_proto; #endif case BPF_FUNC_seq_printf: return prog->expected_attach_type == BPF_TRACE_ITER ? diff --git a/net/core/filter.c b/net/core/filter.c index faf6feedd78e..03c0e2e34805 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -9247,6 +9247,60 @@ const struct bpf_func_proto bpf_skc_to_tcp6_sock_proto = { .ret_btf_id = &bpf_skc_to_tcp6_sock_ret_btf_id, }; +BPF_CALL_1(bpf_skc_to_tcp_sock, struct sock *, sk) +{ + if (sk_fullsock(sk) && sk->sk_protocol == IPPROTO_TCP) + return (unsigned long)sk; + + return (unsigned long)NULL; +} + +static int bpf_skc_to_tcp_sock_ret_btf_id; +const struct bpf_func_proto bpf_skc_to_tcp_sock_proto = { + .func = bpf_skc_to_tcp_sock, + .gpl_only = true, + .ret_type = RET_PTR_TO_BTF_ID_OR_NULL, + .arg1_type = ARG_PTR_TO_BTF_ID, + .check_btf_id = check_arg_btf_id, + .ret_btf_id = &bpf_skc_to_tcp_sock_ret_btf_id, +}; + +BPF_CALL_1(bpf_skc_to_tcp_timewait_sock, struct sock *, sk) +{ + if (sk->sk_state == TCP_TIME_WAIT) + return (unsigned long)sk; + + return (unsigned long)NULL; +} + +static int bpf_skc_to_tcp_timewait_sock_ret_btf_id; +const struct bpf_func_proto bpf_skc_to_tcp_timewait_sock_proto = { + .func = bpf_skc_to_tcp_timewait_sock, + .gpl_only = true, + .ret_type = RET_PTR_TO_BTF_ID_OR_NULL, + .arg1_type = ARG_PTR_TO_BTF_ID, + .check_btf_id = check_arg_btf_id, + .ret_btf_id = &bpf_skc_to_tcp_timewait_sock_ret_btf_id, +}; + +BPF_CALL_1(bpf_skc_to_tcp_request_sock, struct sock *, sk) +{ + if (sk->sk_state == TCP_NEW_SYN_RECV) + return (unsigned long)sk; + + return (unsigned long)NULL; +} + +static int bpf_skc_to_tcp_request_sock_ret_btf_id; +const struct bpf_func_proto bpf_skc_to_tcp_request_sock_proto = { + .func = bpf_skc_to_tcp_request_sock, + .gpl_only = true, + .ret_type = RET_PTR_TO_BTF_ID_OR_NULL, + .arg1_type = ARG_PTR_TO_BTF_ID, + .check_btf_id = check_arg_btf_id, + .ret_btf_id = &bpf_skc_to_tcp_request_sock_ret_btf_id, +}; + void init_sock_cast_types(struct btf *btf) { char *ret_type_name; @@ -9259,4 +9313,16 @@ void init_sock_cast_types(struct btf *btf) ret_type_name = "tcp6_sock"; find_array_of_btf_ids(btf, &ret_type_name, &bpf_skc_to_tcp6_sock_ret_btf_id, 1); + + ret_type_name = "tcp_sock"; + find_array_of_btf_ids(btf, &ret_type_name, + &bpf_skc_to_tcp_sock_ret_btf_id, 1); + + ret_type_name = "tcp_timewait_sock"; + find_array_of_btf_ids(btf, &ret_type_name, + &bpf_skc_to_tcp_timewait_sock_ret_btf_id, 1); + + ret_type_name = "tcp_request_sock"; + find_array_of_btf_ids(btf, &ret_type_name, + &bpf_skc_to_tcp_request_sock_ret_btf_id, 1); } diff --git a/scripts/bpf_helpers_doc.py b/scripts/bpf_helpers_doc.py index 6c2f64118651..d886657c6aaa 100755 --- a/scripts/bpf_helpers_doc.py +++ b/scripts/bpf_helpers_doc.py @@ -422,6 +422,9 @@ class PrinterHelpers(Printer): 'struct tcphdr', 'struct seq_file', 'struct tcp6_sock', + 'struct tcp_sock', + 'struct tcp_timewait_sock', + 'struct tcp_request_sock', 'struct __sk_buff', 'struct sk_msg_md', @@ -460,6 +463,9 @@ class PrinterHelpers(Printer): 'struct tcphdr', 'struct seq_file', 'struct tcp6_sock', + 'struct tcp_sock', + 'struct tcp_timewait_sock', + 'struct tcp_request_sock', } mapped_types = { 'u8': '__u8', diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 394fcba27b6a..e256417d94c2 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -3258,6 +3258,24 @@ union bpf_attr { * Dynamically cast a *sk* pointer to a *tcp6_sock* pointer. * Return * *sk* if casting is valid, or NULL otherwise. + * + * struct tcp_sock *bpf_skc_to_tcp_sock(void *sk) + * Description + * Dynamically cast a *sk* pointer to a *tcp_sock* pointer. + * Return + * *sk* if casting is valid, or NULL otherwise. + * + * struct tcp_timewait_sock *bpf_skc_to_tcp_timewait_sock(void *sk) + * Description + * Dynamically cast a *sk* pointer to a *tcp_timewait_sock* pointer. + * Return + * *sk* if casting is valid, or NULL otherwise. + * + * struct tcp_request_sock *bpf_skc_to_tcp_request_sock(void *sk) + * Description + * Dynamically cast a *sk* pointer to a *tcp_request_sock* pointer. + * Return + * *sk* if casting is valid, or NULL otherwise. */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -3396,7 +3414,10 @@ union bpf_attr { FN(ringbuf_discard), \ FN(ringbuf_query), \ FN(csum_level), \ - FN(skc_to_tcp6_sock), + FN(skc_to_tcp6_sock), \ + FN(skc_to_tcp_sock), \ + FN(skc_to_tcp_timewait_sock), \ + FN(skc_to_tcp_request_sock), /* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call

[bpf-next,06/13] bpf: add bpf_skc_to_{tcp,tcp_timewait,tcp_request}_sock() helpers

Commit Message

Patch