From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: 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 2/6] bpf: tls fix transition through disconnect with close
Date: Tue, 9 Jul 2019 19:45:25 -0700 [thread overview]
Message-ID: <20190709194525.0d4c15a6@cakuba.netronome.com> (raw)
In-Reply-To: <156261324561.31108.14410711674221391677.stgit@ubuntu3-kvm1>
On Mon, 08 Jul 2019 19:14:05 +0000, John Fastabend wrote:
> @@ -287,6 +313,27 @@ static void tls_sk_proto_cleanup(struct sock *sk,
> #endif
> }
>
> +static void tls_sk_proto_unhash(struct sock *sk)
> +{
> + struct inet_connection_sock *icsk = inet_csk(sk);
> + long timeo = sock_sndtimeo(sk, 0);
> + struct tls_context *ctx;
> +
> + if (unlikely(!icsk->icsk_ulp_data)) {
Is this for when sockmap is stacked on top of TLS and TLS got removed
without letting sockmap know?
> + if (sk->sk_prot->unhash)
> + sk->sk_prot->unhash(sk);
> + }
> +
> + ctx = tls_get_ctx(sk);
> + if (ctx->tx_conf == TLS_SW || ctx->rx_conf == TLS_SW)
> + tls_sk_proto_cleanup(sk, ctx, timeo);
> + icsk->icsk_ulp_data = NULL;
I think close only starts checking if ctx is NULL in patch 6.
Looks like some chunks of ctx checking/clearing got spread to
patch 1 and some to patch 6.
> + tls_ctx_free_wq(ctx);
> +
> + if (ctx->unhash)
> + ctx->unhash(sk);
> +}
> +
> static void tls_sk_proto_close(struct sock *sk, long timeout)
> {
> struct tls_context *ctx = tls_get_ctx(sk);
next prev parent reply other threads:[~2019-07-10 2:45 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 [this message]
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
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=20190709194525.0d4c15a6@cakuba.netronome.com \
--to=jakub.kicinski@netronome.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=edumazet@google.com \
--cc=john.fastabend@gmail.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).