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

From: Xuanqiang Luo

Date: Tue Nov 17 2026 - 21:59:25 EST


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 disable case first, handle the error cases in conditionals,
and keep the main flow unconditional. Use goto to unlock on the early
returns.

No functional change intended.

Suggested-by: Simon Horman <horms@xxxxxxxxxx>
Suggested-by: Tariq Toukan <tariqt@xxxxxxxxxx>
Link: https://lore.kernel.org/all/20261029134019.GG257209@xxxxxxxxxxxxxxxx/
Signed-off-by: Xuanqiang Luo <luoxuanqiang@xxxxxxxxxx>
---
Changes:
v2:
- Handle the disable case first and keep the enable argument unchanged,
instead of reusing it as a flag to destroy the tables. (Suggested by
Tariq.)

v1: https://lore.kernel.org/all/20261116110830.2850785-1-xuanqiang.luo@xxxxxxxxx/

.../mellanox/mlx5/core/en_accel/ktls.c | 27 ++++++++++---------
1 file changed, 15 insertions(+), 12 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..2358ad1f2331 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c
@@ -135,21 +135,24 @@ int mlx5e_ktls_set_feature_rx(struct net_device *netdev, bool enable)
int err = 0;

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);
- }
- }
- } else {
+ if (!enable) {
mlx5e_accel_fs_tcp_destroy(priv->fs);
+ goto out_unlock;
}
- mutex_unlock(&priv->state_lock);

+ 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;
}

--
2.43.0