From: John Fastabend <john.fastabend@gmail.com>
To: Jakub Kicinski <jakub.kicinski@netronome.com>,
John Fastabend <john.fastabend@gmail.com>
Cc: ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org,
edumazet@google.com, bpf@vger.kernel.org
Subject: Re: [bpf PATCH v2 6/6] bpf: sockmap/tls, close can race with map free
Date: Tue, 09 Jul 2019 20:33:58 -0700 [thread overview]
Message-ID: <5d255ca6e5b0d_1b7a2aec940d65b4f6@john-XPS-13-9370.notmuch> (raw)
In-Reply-To: <20190709193846.62f0a2c7@cakuba.netronome.com>
Jakub Kicinski wrote:
> On Mon, 08 Jul 2019 19:15:18 +0000, John Fastabend wrote:
> > @@ -352,15 +354,18 @@ static void tls_sk_proto_close(struct sock *sk, long timeout)
> > if (ctx->tx_conf == TLS_BASE && ctx->rx_conf == TLS_BASE)
> > goto skip_tx_cleanup;
> >
> > - sk->sk_prot = ctx->sk_proto;
> > tls_sk_proto_cleanup(sk, ctx, timeo);
> >
> > skip_tx_cleanup:
> > + write_lock_bh(&sk->sk_callback_lock);
> > + icsk->icsk_ulp_data = NULL;
>
> Is ulp_data pointer now supposed to be updated under the
> sk_callback_lock?
Yes otherwise it can race with tls_update(). I didn't remove the
ulp pointer null set from tcp_ulp.c though. Could be done in this
patch or as a follow up.
>
> > + if (sk->sk_prot->close == tls_sk_proto_close)
> > + sk->sk_prot = ctx->sk_proto;
> > + write_unlock_bh(&sk->sk_callback_lock);
> > release_sock(sk);
> > if (ctx->rx_conf == TLS_SW)
> > tls_sw_release_strp_rx(ctx);
> > - sk_proto_close(sk, timeout);
> > -
> > + ctx->sk_proto_close(sk, timeout);
> > if (ctx->tx_conf != TLS_HW && ctx->rx_conf != TLS_HW &&
> > ctx->tx_conf != TLS_HW_RECORD && ctx->rx_conf != TLS_HW_RECORD)
> > tls_ctx_free(ctx);
next prev parent reply other threads:[~2019-07-10 3:34 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-08 19:13 [bpf PATCH v2 0/6] bpf: sockmap/tls fixes John Fastabend
2019-07-08 19:13 ` [bpf PATCH v2 1/6] tls: remove close callback sock unlock/lock and flush_sync John Fastabend
2019-07-08 19:14 ` [bpf PATCH v2 2/6] bpf: tls fix transition through disconnect with close John Fastabend
2019-07-10 2:45 ` Jakub Kicinski
2019-07-10 3:39 ` John Fastabend
2019-07-10 19:34 ` Jakub Kicinski
2019-07-10 20:04 ` Jakub Kicinski
2019-07-11 16:47 ` John Fastabend
2019-07-11 18:32 ` Jakub Kicinski
2019-07-11 21:25 ` John Fastabend
2019-07-12 3:16 ` Jakub Kicinski
2019-07-15 20:58 ` John Fastabend
2019-07-11 16:35 ` John Fastabend
2019-07-08 19:14 ` [bpf PATCH v2 3/6] bpf: sockmap, sock_map_delete needs to use xchg John Fastabend
2019-07-08 19:14 ` [bpf PATCH v2 4/6] bpf: sockmap, synchronize_rcu before free'ing map John Fastabend
2019-07-08 19:15 ` [bpf PATCH v2 5/6] bpf: sockmap, only create entry if ulp is not already enabled John Fastabend
2019-07-08 19:15 ` [bpf PATCH v2 6/6] bpf: sockmap/tls, close can race with map free John Fastabend
2019-07-10 2:36 ` Jakub Kicinski
2019-07-10 2:38 ` Jakub Kicinski
2019-07-10 3:33 ` John Fastabend [this message]
2019-07-10 19:35 ` Jakub Kicinski
2019-07-11 16:39 ` John Fastabend
2019-07-09 6:13 ` [bpf PATCH v2 0/6] bpf: sockmap/tls fixes Jakub Kicinski
2019-07-09 15:40 ` John Fastabend
2019-07-10 0:04 ` Jakub Kicinski
2019-07-10 2:21 ` Jakub Kicinski
2019-07-10 3:28 ` 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=5d255ca6e5b0d_1b7a2aec940d65b4f6@john-XPS-13-9370.notmuch \
--to=john.fastabend@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=edumazet@google.com \
--cc=jakub.kicinski@netronome.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