From: Martin Lau <kafai@fb.com>
To: Jakub Sitnicki <jakub@cloudflare.com>
Cc: "bpf@vger.kernel.org" <bpf@vger.kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"kernel-team@cloudflare.com" <kernel-team@cloudflare.com>,
Eric Dumazet <edumazet@google.com>,
"John Fastabend" <john.fastabend@gmail.com>,
Lorenz Bauer <lmb@cloudflare.com>
Subject: Re: [PATCH bpf-next v2 04/11] tcp_bpf: Don't let child socket inherit parent protocol ops on copy
Date: Mon, 13 Jan 2020 22:23:45 +0000 [thread overview]
Message-ID: <20200113222342.suypc3rgib7xbkjl@kafai-mbp.dhcp.thefacebook.com> (raw)
In-Reply-To: <20200110105027.257877-5-jakub@cloudflare.com>
On Fri, Jan 10, 2020 at 11:50:20AM +0100, Jakub Sitnicki wrote:
> Prepare for cloning listening sockets that have their protocol callbacks
> overridden by sk_msg. Child sockets must not inherit parent callbacks that
> access state stored in sk_user_data owned by the parent.
>
> Restore the child socket protocol callbacks before the it gets hashed and
> any of the callbacks can get invoked.
>
> Signed-off-by: Jakub Sitnicki <jakub@cloudflare.com>
> ---
> include/net/tcp.h | 1 +
> net/ipv4/tcp_bpf.c | 13 +++++++++++++
> net/ipv4/tcp_minisocks.c | 2 ++
> 3 files changed, 16 insertions(+)
>
> diff --git a/include/net/tcp.h b/include/net/tcp.h
> index 9dd975be7fdf..7cbf9465bb10 100644
> --- a/include/net/tcp.h
> +++ b/include/net/tcp.h
> @@ -2181,6 +2181,7 @@ int tcp_bpf_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
> int nonblock, int flags, int *addr_len);
> int __tcp_bpf_recvmsg(struct sock *sk, struct sk_psock *psock,
> struct msghdr *msg, int len, int flags);
> +void tcp_bpf_clone(const struct sock *sk, struct sock *child);
>
> /* Call BPF_SOCK_OPS program that returns an int. If the return value
> * is < 0, then the BPF op failed (for example if the loaded BPF
> diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c
> index f6c83747c71e..6f96320fb7cf 100644
> --- a/net/ipv4/tcp_bpf.c
> +++ b/net/ipv4/tcp_bpf.c
> @@ -586,6 +586,19 @@ static void tcp_bpf_close(struct sock *sk, long timeout)
> saved_close(sk, timeout);
> }
>
> +/* If a child got cloned from a listening socket that had tcp_bpf
> + * protocol callbacks installed, we need to restore the callbacks to
> + * the default ones because the child does not inherit the psock state
> + * that tcp_bpf callbacks expect.
> + */
> +void tcp_bpf_clone(const struct sock *sk, struct sock *newsk)
> +{
> + struct proto *prot = newsk->sk_prot;
> +
> + if (prot->recvmsg == tcp_bpf_recvmsg)
A question not related to this patch (may be it is more for patch 6).
How tcp_bpf_recvmsg may be used for a listening sock (sk here)?
> + newsk->sk_prot = sk->sk_prot_creator;
> +}
> +
next prev parent reply other threads:[~2020-01-13 22:23 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-10 10:50 [PATCH bpf-next v2 00/11] Extend SOCKMAP to store listening sockets Jakub Sitnicki
2020-01-10 10:50 ` [PATCH bpf-next v2 01/11] bpf, sk_msg: Don't reset saved sock proto on restore Jakub Sitnicki
2020-01-11 22:50 ` John Fastabend
2020-01-10 10:50 ` [PATCH bpf-next v2 02/11] net, sk_msg: Annotate lockless access to sk_prot on clone Jakub Sitnicki
2020-01-11 23:14 ` John Fastabend
2020-01-13 15:09 ` Jakub Sitnicki
2020-01-14 3:14 ` John Fastabend
2020-01-20 17:00 ` John Fastabend
2020-01-20 18:11 ` Jakub Sitnicki
2020-01-21 12:42 ` Jakub Sitnicki
2020-01-10 10:50 ` [PATCH bpf-next v2 03/11] net, sk_msg: Clear sk_user_data pointer on clone if tagged Jakub Sitnicki
2020-01-11 23:38 ` John Fastabend
2020-01-12 12:55 ` kbuild test robot
2020-01-13 20:15 ` Martin Lau
2020-01-14 16:04 ` Jakub Sitnicki
2020-01-10 10:50 ` [PATCH bpf-next v2 04/11] tcp_bpf: Don't let child socket inherit parent protocol ops on copy Jakub Sitnicki
2020-01-11 2:42 ` kbuild test robot
2020-01-11 3:02 ` kbuild test robot
2020-01-11 23:48 ` John Fastabend
2020-01-13 22:31 ` Jakub Sitnicki
2020-01-13 22:23 ` Martin Lau [this message]
2020-01-13 22:42 ` Jakub Sitnicki
2020-01-13 23:23 ` Martin Lau
2020-01-10 10:50 ` [PATCH bpf-next v2 05/11] bpf, sockmap: Allow inserting listening TCP sockets into sockmap Jakub Sitnicki
2020-01-11 23:59 ` John Fastabend
2020-01-13 15:48 ` Jakub Sitnicki
2020-01-10 10:50 ` [PATCH bpf-next v2 06/11] bpf, sockmap: Don't set up sockmap progs for listening sockets Jakub Sitnicki
2020-01-12 0:51 ` John Fastabend
2020-01-12 1:07 ` John Fastabend
2020-01-13 17:59 ` Jakub Sitnicki
2020-01-10 10:50 ` [PATCH bpf-next v2 07/11] bpf, sockmap: Return socket cookie on lookup from syscall Jakub Sitnicki
2020-01-12 0:56 ` John Fastabend
2020-01-13 23:12 ` Martin Lau
2020-01-14 3:16 ` John Fastabend
2020-01-14 15:48 ` Jakub Sitnicki
2020-01-10 10:50 ` [PATCH bpf-next v2 08/11] bpf, sockmap: Let all kernel-land lookup values in SOCKMAP Jakub Sitnicki
2020-01-10 10:50 ` [PATCH bpf-next v2 09/11] bpf: Allow selecting reuseport socket from a SOCKMAP Jakub Sitnicki
2020-01-12 1:00 ` John Fastabend
2020-01-13 23:45 ` Martin Lau
2020-01-15 12:41 ` Jakub Sitnicki
2020-01-13 23:51 ` Martin Lau
2020-01-15 12:57 ` Jakub Sitnicki
2020-01-10 10:50 ` [PATCH bpf-next v2 10/11] selftests/bpf: Extend SK_REUSEPORT tests to cover SOCKMAP Jakub Sitnicki
2020-01-12 1:01 ` John Fastabend
2020-01-10 10:50 ` [PATCH bpf-next v2 11/11] selftests/bpf: Tests for SOCKMAP holding listening sockets Jakub Sitnicki
2020-01-12 1:06 ` John Fastabend
2020-01-13 15:58 ` Jakub Sitnicki
2020-01-11 0:18 ` [PATCH bpf-next v2 00/11] Extend SOCKMAP to store " Alexei Starovoitov
2020-01-11 22:47 ` John Fastabend
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200113222342.suypc3rgib7xbkjl@kafai-mbp.dhcp.thefacebook.com \
--to=kafai@fb.com \
--cc=bpf@vger.kernel.org \
--cc=edumazet@google.com \
--cc=jakub@cloudflare.com \
--cc=john.fastabend@gmail.com \
--cc=kernel-team@cloudflare.com \
--cc=lmb@cloudflare.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).