Re: [PATCH net-next] net/mlx5e: kTLS, Simplify error unwind in mlx5e_ktls_set_feature_rx()

From: Tariq Toukan

Date: Mon Nov 16 2026 - 16:28:13 EST




On 16/11/2026 13:08, Xuanqiang Luo wrote:
From: Xuanqiang Luo <luoxuanqiang@xxxxxxxxxx>

mlx5e_ktls_set_feature_rx() has become harder to follow: the error
handling is nested in the conditions and the main flow is conditional.

Handle the error cases in conditionals, keep the main flow
unconditional, and destroy the accel TCP flow tables in a single
place. Use goto to unlock on the early return.

No functional change intended.


Thanks for following up on this.
The change is correct, I see no functional change.

However, we can simplify the code further.
See below suggestion where code is flat, the same size, and leaves the enable argument alone.

Suggested-by: Simon Horman <horms@xxxxxxxxxx>
Link: https://lore.kernel.org/all/20261029134019.GG257209@xxxxxxxxxxxxxxxx/
Signed-off-by: Xuanqiang Luo <luoxuanqiang@xxxxxxxxxx>
---
Only compile-tested on top of net-next 7ccc5e05043b (arm64, W=1). I do
not have a crypto-enabled ConnectX NIC to run it on.

.../mellanox/mlx5/core/en_accel/ktls.c | 23 +++++++++++--------
1 file changed, 13 insertions(+), 10 deletions(-)

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 3cc1213c2f68..0f5dcd1b822e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c
@@ -137,19 +137,22 @@ int mlx5e_ktls_set_feature_rx(struct net_device *netdev, bool enable)
mutex_lock(&priv->state_lock);
if (enable) {
err = mlx5e_accel_fs_tcp_create(priv->fs);
- if (!err && !priv->ktls_rx_was_enabled) {
- priv->ktls_rx_was_enabled = true;
- err = mlx5e_safe_reopen_channels(priv);
- if (err) {
- priv->ktls_rx_was_enabled = false;
- mlx5e_accel_fs_tcp_destroy(priv->fs);
- }
+ if (err || priv->ktls_rx_was_enabled)
+ goto out_unlock;
+
+ priv->ktls_rx_was_enabled = true;
+ err = mlx5e_safe_reopen_channels(priv);
+ if (err) {
+ priv->ktls_rx_was_enabled = false;
+ enable = false;
}
- } else {
- mlx5e_accel_fs_tcp_destroy(priv->fs);
}
- mutex_unlock(&priv->state_lock);
+ if (!enable)
+ mlx5e_accel_fs_tcp_destroy(priv->fs);
+
+out_unlock:
+ mutex_unlock(&priv->state_lock);
return err;
}

Suggestion:

mutex_lock(&priv->state_lock);
if (!enable) {
mlx5e_accel_fs_tcp_destroy(priv->fs);
goto out_unlock;
}

err = mlx5e_accel_fs_tcp_create(priv->fs);
if (err || priv->ktls_rx_was_enabled)
goto out_unlock;

priv->ktls_rx_was_enabled = true;
err = mlx5e_safe_reopen_channels(priv);
if (err) {
priv->ktls_rx_was_enabled = false;
mlx5e_accel_fs_tcp_destroy(priv->fs);
}

out_unlock:
mutex_unlock(&priv->state_lock);
return err;