net/mlx5: Fix return value when searching for existing flow group

[ Upstream commit 8ec40e3f1f72bf8f8accf18020d487caa99f46a4 ]

When attempting to add a rule to an existing flow group, if a matching
flow group exists but is not active, the error code returned should be
EAGAIN, so that the rule can be added to the matching flow group once
it is active, rather than ENOENT, which indicates that no matching
flow group was found.

Fixes: bd71b08ec2ee ("net/mlx5: Support multiple updates of steering rules in parallel")
Signed-off-by: Gavi Teitz <gavi@nvidia.com>
Signed-off-by: Roi Dayan <roid@nvidia.com>
Signed-off-by: Patrisious Haddad <phaddad@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Mark Bloch <mbloch@nvidia.com>
Link: https://patch.msgid.link/20250610151514.1094735-4-mbloch@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 2717450e966614698b63244ea793485017ae9e5f..b4c0a6dd171fdebbd6a925b10c0cf80377544837 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -1918,6 +1918,7 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft,
        struct mlx5_flow_handle *rule;
        struct match_list *iter;
        bool take_write = false;
+       bool try_again = false;
        struct fs_fte *fte;
        u64  version = 0;
        int err;
@@ -1977,6 +1978,7 @@ skip_search:
                nested_down_write_ref_node(&g->node, FS_LOCK_PARENT);
 
                if (!g->node.active) {
+                       try_again = true;
                        up_write_ref_node(&g->node, false);
                        continue;
                }
@@ -1998,7 +2000,8 @@ skip_search:
                        tree_put_node(&fte->node, false);
                return rule;
        }
-       rule = ERR_PTR(-ENOENT);
+       err = try_again ? -EAGAIN : -ENOENT;
+       rule = ERR_PTR(err);
 out:
        kmem_cache_free(steering->ftes_cache, fte);
        return rule;