| Message ID | 20210416185430.62584-2-saeed@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | mlx5 updates 2021-04-16 | expand |
Hello: This series was applied to netdev/net-next.git (refs/heads/master): On Fri, 16 Apr 2021 11:54:17 -0700 you wrote: > From: Tariq Toukan <tariqt@nvidia.com> > > Maintaining an SQ state bit to indicate TLS support > has no real need, a simple and fast test [1] for the SKB is > almost equally good. > > [1] !skb->sk || !tls_is_sk_tx_device_offloaded(skb->sk) > > [...] Here is the summary with links: - [net-next,01/14] net/mlx5e: Remove non-essential TLS SQ state bit https://git.kernel.org/netdev/net-next/c/2f014f4016db - [net-next,02/14] net/mlx5e: Cleanup unused function parameter https://git.kernel.org/netdev/net-next/c/8668587a33b9 - [net-next,03/14] net/mlx5e: TX, Inline TLS skb check https://git.kernel.org/netdev/net-next/c/b6b3ad2175c8 - [net-next,04/14] net/mlx5e: TX, Inline function mlx5e_tls_handle_tx_wqe() https://git.kernel.org/netdev/net-next/c/72f6f2f8d6aa - [net-next,05/14] net/mlx5e: kTLS, Add resiliency to RX resync failures https://git.kernel.org/netdev/net-next/c/e9ce991bce5b - [net-next,06/14] net/mlx5e: Allow mlx5e_safe_switch_channels to work with channels closed https://git.kernel.org/netdev/net-next/c/6cad120d9e62 - [net-next,07/14] net/mlx5e: Use mlx5e_safe_switch_channels when channels are closed https://git.kernel.org/netdev/net-next/c/69cc4185dcba - [net-next,08/14] net/mlx5e: Refactor on-the-fly configuration changes https://git.kernel.org/netdev/net-next/c/b3b886cf965d - [net-next,09/14] net/mlx5e: Cleanup safe switch channels API by passing params https://git.kernel.org/netdev/net-next/c/94872d4ef9c0 - [net-next,10/14] net/mlx5: Allocate FC bulk structs with kvzalloc() instead of kzalloc() https://git.kernel.org/netdev/net-next/c/5cec6de0ae09 - [net-next,11/14] net/mlx5: Add register layout to support extended link state https://git.kernel.org/netdev/net-next/c/36830159acbe - [net-next,12/14] net/mlx5e: Add ethtool extended link state https://git.kernel.org/netdev/net-next/c/b3446acb2b9a - [net-next,13/14] net/mlx5: Add helper to initialize 1PPS https://git.kernel.org/netdev/net-next/c/302522e67c70 - [net-next,14/14] net/mlx5: Enhance diagnostics info for TX/RX reporters https://git.kernel.org/netdev/net-next/c/95742c1cc59d You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h index e1c51eabe8fe..cb4e7aaa4f8a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h @@ -325,7 +325,6 @@ enum { MLX5E_SQ_STATE_RECOVERING, MLX5E_SQ_STATE_IPSEC, MLX5E_SQ_STATE_AM, - MLX5E_SQ_STATE_TLS, MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE, MLX5E_SQ_STATE_PENDING_XSK_TX, }; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h index cc0efac7b812..cc2851ecd512 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h @@ -123,11 +123,9 @@ static inline bool mlx5e_accel_tx_begin(struct net_device *dev, mlx5e_udp_gso_handle_tx_skb(skb); #ifdef CONFIG_MLX5_EN_TLS - if (test_bit(MLX5E_SQ_STATE_TLS, &sq->state)) { - /* May send SKBs and WQEs. */ - if (unlikely(!mlx5e_tls_handle_tx_skb(dev, sq, skb, &state->tls))) - return false; - } + /* May send SKBs and WQEs. */ + if (unlikely(!mlx5e_tls_handle_tx_skb(dev, sq, skb, &state->tls))) + return false; #endif #ifdef CONFIG_MLX5_EN_IPSEC diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 6847e7b909a5..64d6c0fd92bf 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -1134,8 +1134,6 @@ static int mlx5e_alloc_txqsq(struct mlx5e_channel *c, set_bit(MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE, &sq->state); if (MLX5_IPSEC_DEV(c->priv->mdev)) set_bit(MLX5E_SQ_STATE_IPSEC, &sq->state); - if (mlx5_accel_is_tls_device(c->priv->mdev)) - set_bit(MLX5E_SQ_STATE_TLS, &sq->state); if (param->is_mpw) set_bit(MLX5E_SQ_STATE_MPWQE, &sq->state); sq->stop_room = param->stop_room;