From: Jakub Kicinski <jakub.kicinski@netronome.com>
Date: Thu, 3 Oct 2019 11:18:56 -0700
Subject: net/tls: move tls_build_proto() on init path
Patch-mainline: v5.5-rc1
Git-commit: 16bed0e6ac07b1a0b3e9c33ec5e892bc7074a627
References: bsc#1154353
Move tls_build_proto() so that TOE offload doesn't have to call it
mid way through its bypass enable path.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: John Hurley <john.hurley@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
net/tls/tls_main.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -670,14 +670,11 @@ static int tls_hw_prot(struct sock *sk)
if (!ctx)
goto out;
- spin_unlock_bh(&device_spinlock);
- tls_build_proto(sk);
ctx->sk_destruct = sk->sk_destruct;
sk->sk_destruct = tls_hw_sk_destruct;
ctx->rx_conf = TLS_HW_RECORD;
ctx->tx_conf = TLS_HW_RECORD;
update_sk_prot(sk, ctx);
- spin_lock_bh(&device_spinlock);
rc = 1;
break;
}
@@ -778,6 +775,8 @@ static int tls_init(struct sock *sk)
struct tls_context *ctx;
int rc = 0;
+ tls_build_proto(sk);
+
if (tls_hw_prot(sk))
return 0;
@@ -790,8 +789,6 @@ static int tls_init(struct sock *sk)
if (sk->sk_state != TCP_ESTABLISHED)
return -ENOTSUPP;
- tls_build_proto(sk);
-
/* allocate tls context */
write_lock_bh(&sk->sk_callback_lock);
ctx = create_ctx(sk);