| Message ID | 165030057652.5073.10364318727607743572.stgit@oracle-102.nfsv4.dev (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Implement a TLS handshake upcall | expand |
On Mon, 18 Apr 2022 12:49:36 -0400 Chuck Lever wrote: > From: Hannes Reinecke <hare@suse.de> > > We have to build the proto ops only after the context has been > initialized, as otherwise we might crash when I/O is ongoing > during initialisation. Can you say more about the crash you see? protos are not used until at least one socket calls update_sk_prot().
> On Apr 25, 2022, at 1:11 PM, Jakub Kicinski <kuba@kernel.org> wrote: > > On Mon, 18 Apr 2022 12:49:36 -0400 Chuck Lever wrote: >> From: Hannes Reinecke <hare@suse.de> >> >> We have to build the proto ops only after the context has been >> initialized, as otherwise we might crash when I/O is ongoing >> during initialisation. > > Can you say more about the crash you see? protos are not used until > at least one socket calls update_sk_prot(). Hannes reported the crash and supplied the fix. I didn't have a problem with this patch series without this patch. Hannes? -- Chuck Lever
> On Apr 18, 2022, at 12:49 PM, Chuck Lever <chuck.lever@oracle.com> wrote: > > From: Hannes Reinecke <hare@suse.de> > > We have to build the proto ops only after the context has been > initialized, as otherwise we might crash when I/O is ongoing > during initialisation. > > Signed-off-by: Hannes Reinecke <hare@suse.de> > Signed-off-by: Chuck Lever <chuck.lever@oracle.com> > --- > net/tls/tls_main.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c > index 7b2b0e7ffee4..7eca4d9a83c4 100644 > --- a/net/tls/tls_main.c > +++ b/net/tls/tls_main.c > @@ -836,8 +836,6 @@ static int tls_init(struct sock *sk) > struct tls_context *ctx; > int rc = 0; > > - tls_build_proto(sk); > - > #ifdef CONFIG_TLS_TOE > if (tls_toe_bypass(sk)) > return 0; > @@ -862,6 +860,7 @@ static int tls_init(struct sock *sk) > > ctx->tx_conf = TLS_BASE; > ctx->rx_conf = TLS_BASE; > + tls_build_proto(sk); > update_sk_prot(sk, ctx); > out: > write_unlock_bh(&sk->sk_callback_lock); > > While we're working on a better upcall mechanism, I'm dropping this one from the series. tls_build_proto() can grab a mutex, so tls_init() can't call it while holding sk_callback_lock. -- Chuck Lever
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index 7b2b0e7ffee4..7eca4d9a83c4 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -836,8 +836,6 @@ static int tls_init(struct sock *sk) struct tls_context *ctx; int rc = 0; - tls_build_proto(sk); - #ifdef CONFIG_TLS_TOE if (tls_toe_bypass(sk)) return 0; @@ -862,6 +860,7 @@ static int tls_init(struct sock *sk) ctx->tx_conf = TLS_BASE; ctx->rx_conf = TLS_BASE; + tls_build_proto(sk); update_sk_prot(sk, ctx); out: write_unlock_bh(&sk->sk_callback_lock);