tls: Fix write space handling

TLS device cannot use the sw context. This patch returns the original
tls device write space handler and moves the sw/device specific portions
to the relevant files.

Also, we remove the write_space call for the tls_sw flow, because it
handles partial records in its delayed tx work handler.

Fixes: a42055e8d2c3 ("net/tls: Add support for async encryption of records for performance")
Signed-off-by: Boris Pismenny <borisp@mellanox.com>
Reviewed-by: Eran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 9 deletions

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index 7e05af75536d..17e8667917aa 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -212,7 +212,6 @@ int tls_push_partial_record(struct sock *sk, struct tls_context *ctx,
 static void tls_write_space(struct sock *sk)
 {
         struct tls_context *ctx = tls_get_ctx(sk);
-        struct tls_sw_context_tx *tx_ctx = tls_sw_ctx_tx(ctx);
 
         /* If in_tcp_sendpages call lower protocol write space handler
          * to ensure we wake up any waiting operations there. For example
@@ -223,14 +222,12 @@ static void tls_write_space(struct sock *sk)
                 return;
         }
 
-        /* Schedule the transmission if tx list is ready */
-        if (is_tx_ready(tx_ctx) && !sk->sk_write_pending) {
-                /* Schedule the transmission */
-                if (!test_and_set_bit(BIT_TX_SCHEDULED, &tx_ctx->tx_bitmask))
-                        schedule_delayed_work(&tx_ctx->tx_work.work, 0);
-        }
-
-        ctx->sk_write_space(sk);
+#ifdef CONFIG_TLS_DEVICE
+        if (ctx->tx_conf == TLS_HW)
+                tls_device_write_space(sk, ctx);
+        else
+#endif
+                tls_sw_write_space(sk, ctx);
 }
 
 static void tls_ctx_free(struct tls_context *ctx)