From: Patrisious Haddad Failing during the initialization of root_namespace didn't cleanup the priorities of the namespace on which the failure occurred. Properly cleanup said priorities on failure. Fixes: e6746b0c7423 ("net/mlx5: fs, add multiple prios to RDMA TRANSPORT steering domain") Signed-off-by: Patrisious Haddad Signed-off-by: Leon Romanovsky --- .../net/ethernet/mellanox/mlx5/core/fs_core.c | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c index 7f5608081ea0..424a6d168c53 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c @@ -3247,6 +3247,7 @@ init_rdma_transport_rx_root_ns_one(struct mlx5_flow_steering *steering, { struct mlx5_flow_root_namespace *root_ns; struct fs_prio *prio; + int ret; int i; steering->rdma_transport_rx_root_ns[vport_idx] = @@ -3258,11 +3259,17 @@ init_rdma_transport_rx_root_ns_one(struct mlx5_flow_steering *steering, for (i = 0; i < MLX5_RDMA_TRANSPORT_BYPASS_PRIO; i++) { prio = fs_create_prio(&root_ns->ns, i, 1); - if (IS_ERR(prio)) - return PTR_ERR(prio); + if (IS_ERR(prio)) { + ret = PTR_ERR(prio); + goto err; + } } set_prio_attrs(root_ns); return 0; + +err: + cleanup_root_ns(root_ns); + return ret; } static int @@ -3271,6 +3278,7 @@ init_rdma_transport_tx_root_ns_one(struct mlx5_flow_steering *steering, { struct mlx5_flow_root_namespace *root_ns; struct fs_prio *prio; + int ret; int i; steering->rdma_transport_tx_root_ns[vport_idx] = @@ -3282,11 +3290,17 @@ init_rdma_transport_tx_root_ns_one(struct mlx5_flow_steering *steering, for (i = 0; i < MLX5_RDMA_TRANSPORT_BYPASS_PRIO; i++) { prio = fs_create_prio(&root_ns->ns, i, 1); - if (IS_ERR(prio)) - return PTR_ERR(prio); + if (IS_ERR(prio)) { + ret = PTR_ERR(prio); + goto err; + } } set_prio_attrs(root_ns); return 0; + +err: + cleanup_root_ns(root_ns); + return ret; } static int init_rdma_transport_rx_root_ns(struct mlx5_flow_steering *steering) -- 2.50.0