From: Kuniyuki Iwashima <kuniyu@amazon.com>
To: <martin.lau@linux.dev>
Cc: <andrii@kernel.org>, <ast@kernel.org>, <bpf@vger.kernel.org>,
<daniel@iogearbox.net>, <edumazet@google.com>,
<kuni1840@gmail.com>, <kuniyu@amazon.com>,
<netdev@vger.kernel.org>
Subject: Re: [PATCH v4 bpf-next 1/3] bpf: tcp: Handle BPF SYN Cookie in cookie_v[46]_check().
Date: Wed, 6 Dec 2023 10:29:52 +0900 [thread overview]
Message-ID: <20231206012952.18761-1-kuniyu@amazon.com> (raw)
In-Reply-To: <8bd1d595-4bb3-44d1-a9c3-2d9c0c960bcb@linux.dev>
From: Martin KaFai Lau <martin.lau@linux.dev>
Date: Tue, 5 Dec 2023 16:19:20 -0800
> On 12/4/23 5:34 PM, Kuniyuki Iwashima wrote:
> > diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
> > index 61f1c96cfe63..0f9c3aed2014 100644
> > --- a/net/ipv4/syncookies.c
> > +++ b/net/ipv4/syncookies.c
> > @@ -304,6 +304,59 @@ static int cookie_tcp_reqsk_init(struct sock *sk, struct sk_buff *skb,
> > return 0;
> > }
> >
> > +#if IS_ENABLED(CONFIG_BPF)
> > +struct request_sock *cookie_bpf_check(struct net *net, struct sock *sk,
> > + struct sk_buff *skb)
> > +{
> > + struct request_sock *req = inet_reqsk(skb->sk);
> > + struct inet_request_sock *ireq = inet_rsk(req);
> > + struct tcp_request_sock *treq = tcp_rsk(req);
> > + struct tcp_options_received tcp_opt;
> > + int ret;
> > +
> > + skb->sk = NULL;
> > + skb->destructor = NULL;
> > + req->rsk_listener = NULL;
> > +
> > + memset(&tcp_opt, 0, sizeof(tcp_opt));
> > + tcp_parse_options(net, skb, &tcp_opt, 0, NULL);
>
> In patch 2, the bpf prog is passing the tcp_opt to the kfunc. The selftest in
> patch 3 is also parsing the tcp-options.
>
> The kernel parses the tcp-option here again to do some checking and req's member
> initialization. Can these checking and initialization be done in the
> bpf_sk_assign_tcp_reqsk() kfunc instead to avoid the double tcp-option parsing?
If TS is not used as a cookie storage, bpf prog need not parse it.
OTOH, if a value is encoded into TS, bpf prog need to parse it.
In that case, we cannot avoid parsing options in bpf prog.
The parsing here comes from my paranoia, so.. probably we can drop it
and the first test below, and rely on bpf prog's tcp_opt, especially
tstamp_ok, rcv_tsval, and rcv_tsecr ?
I placed other tests here to align with the normal cookie flow, but
they can be moved to kfunc. However, initialisation assuems skb
points to TCP header, so here would be better place, I think.
>
> > +
> > + if (ireq->tstamp_ok ^ tcp_opt.saw_tstamp) {
> > + __NET_INC_STATS(net, LINUX_MIB_SYNCOOKIESFAILED);
> > + goto reset;
> > + }
> > +
> > + __NET_INC_STATS(net, LINUX_MIB_SYNCOOKIESRECV);
> > +
> > + if (ireq->tstamp_ok) {
> > + if (!READ_ONCE(net->ipv4.sysctl_tcp_timestamps))
> > + goto reset;
> > +
> > + req->ts_recent = tcp_opt.rcv_tsval;
> > + treq->ts_off = tcp_opt.rcv_tsecr - tcp_ns_to_ts(false, tcp_clock_ns());
> > + }
> > +
> > + if (ireq->sack_ok && !READ_ONCE(net->ipv4.sysctl_tcp_sack))
> > + goto reset;
> > +
> > + if (ireq->wscale_ok && !READ_ONCE(net->ipv4.sysctl_tcp_window_scaling))
> > + goto reset;
> > +
> > + ret = cookie_tcp_reqsk_init(sk, skb, req);
> > + if (ret) {
> > + reqsk_free(req);
> > + req = NULL;
> > + }
> > +
> > + return req;
> > +
> > +reset:
> > + reqsk_free(req);
> > + return ERR_PTR(-EINVAL);
> > +}
> > +EXPORT_SYMBOL_GPL(cookie_bpf_check);
> > +#endif
next prev parent reply other threads:[~2023-12-06 1:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-05 1:34 [PATCH v4 bpf-next 0/3] bpf: tcp: Support arbitrary SYN Cookie at TC Kuniyuki Iwashima
2023-12-05 1:34 ` [PATCH v4 bpf-next 1/3] bpf: tcp: Handle BPF SYN Cookie in cookie_v[46]_check() Kuniyuki Iwashima
2023-12-06 0:19 ` Martin KaFai Lau
2023-12-06 1:29 ` Kuniyuki Iwashima [this message]
2023-12-06 3:11 ` Martin KaFai Lau
2023-12-06 5:58 ` Kuniyuki Iwashima
2023-12-05 1:34 ` [PATCH v4 bpf-next 2/3] bpf: tcp: Support arbitrary SYN Cookie Kuniyuki Iwashima
2023-12-06 1:20 ` Martin KaFai Lau
2023-12-06 1:42 ` Kuniyuki Iwashima
2023-12-05 1:34 ` [PATCH v4 bpf-next 3/3] selftest: bpf: Test bpf_sk_assign_tcp_reqsk() Kuniyuki Iwashima
2023-12-05 2:13 ` Alexei Starovoitov
2023-12-05 3:00 ` Kuniyuki Iwashima
2023-12-06 6:39 ` Martin KaFai Lau
2023-12-07 6:56 ` Kuniyuki Iwashima
2023-12-09 1:27 ` Martin KaFai Lau
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=20231206012952.18761-1-kuniyu@amazon.com \
--to=kuniyu@amazon.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=edumazet@google.com \
--cc=kuni1840@gmail.com \
--cc=martin.lau@linux.dev \
--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