2022-04-19 07:23:02

by Chuck Lever III

Subject: [PATCH RFC 2/5] tls: build proto after context has been initialized

From: Hannes Reinecke <[email protected]>

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 <[email protected]>
Signed-off-by: Chuck Lever <[email protected]>
---
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);

2022-04-25 20:31:38

by Jakub Kicinski

Subject: Re: [PATCH RFC 2/5] tls: build proto after context has been initialized

On Mon, 18 Apr 2022 12:49:36 -0400 Chuck Lever wrote:
> From: Hannes Reinecke <[email protected]>
>
> 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().

2022-04-26 08:37:32

by Chuck Lever III

Subject: Re: [PATCH RFC 2/5] tls: build proto after context has been initialized

> On Apr 25, 2022, at 1:11 PM, Jakub Kicinski <[email protected]> wrote:
>
> On Mon, 18 Apr 2022 12:49:36 -0400 Chuck Lever wrote:
>> From: Hannes Reinecke <[email protected]>
>>
>> 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

2022-05-20 20:08:15

by Chuck Lever III

Subject: Re: [PATCH RFC 2/5] tls: build proto after context has been initialized

> On Apr 18, 2022, at 12:49 PM, Chuck Lever <[email protected]> wrote:
>
> From: Hannes Reinecke <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: Chuck Lever <[email protected]>
> ---
> 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