net/mlx5e: kTLS, Improve TLS RX workqueue scope

The TLS RX workqueue is needed only when kTLS RX device offload
is supported.

Move its creation from the general TLS init function to the
kTLS RX init.
Create it once at init time if supported, avoid creation/destroy
everytime the feature bit is toggled.

Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Reviewed-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c
index 1b39269..95293ee 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c
@@ -2,6 +2,7 @@
 // Copyright (c) 2019 Mellanox Technologies.
 
 #include "en.h"
+#include "en_accel/tls.h"
 #include "en_accel/ktls.h"
 #include "en_accel/ktls_utils.h"
 #include "en_accel/fs_tcp.h"
@@ -86,16 +87,33 @@ int mlx5e_ktls_set_feature_rx(struct net_device *netdev, bool enable)
 
 int mlx5e_ktls_init_rx(struct mlx5e_priv *priv)
 {
-       int err = 0;
+       int err;
 
-       if (priv->netdev->features & NETIF_F_HW_TLS_RX)
+       if (!mlx5_accel_is_ktls_rx(priv->mdev))
+               return 0;
+
+       priv->tls->rx_wq = create_singlethread_workqueue("mlx5e_tls_rx");
+       if (!priv->tls->rx_wq)
+               return -ENOMEM;
+
+       if (priv->netdev->features & NETIF_F_HW_TLS_RX) {
                err = mlx5e_accel_fs_tcp_create(priv);
+               if (err) {
+                       destroy_workqueue(priv->tls->rx_wq);
+                       return err;
+               }
+       }
 
-       return err;
+       return 0;
 }
 
 void mlx5e_ktls_cleanup_rx(struct mlx5e_priv *priv)
 {
+       if (!mlx5_accel_is_ktls_rx(priv->mdev))
+               return;
+
        if (priv->netdev->features & NETIF_F_HW_TLS_RX)
                mlx5e_accel_fs_tcp_destroy(priv);
+
+       destroy_workqueue(priv->tls->rx_wq);
 }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c
index fee991f..d6b21b8 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c
@@ -231,12 +231,6 @@ int mlx5e_tls_init(struct mlx5e_priv *priv)
        if (!tls)
                return -ENOMEM;
 
-       tls->rx_wq = create_singlethread_workqueue("mlx5e_tls_rx");
-       if (!tls->rx_wq) {
-               kfree(tls);
-               return -ENOMEM;
-       }
-
        priv->tls = tls;
        return 0;
 }
@@ -248,7 +242,6 @@ void mlx5e_tls_cleanup(struct mlx5e_priv *priv)
        if (!tls)
                return;
 
-       destroy_workqueue(tls->rx_wq);
        kfree(tls);
        priv->tls = NULL;
 }