aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorEli Britstein <elibr@mellanox.com>2019-01-31 14:56:01 +0200
committerSaeed Mahameed <saeedm@mellanox.com>2019-03-11 11:32:38 -0700
commit6237634d8fcc65c9e3348382910e7cdb15084c68 (patch)
treec069bfb125e1f2b1ad4948a33514bebfb9bf3a92 /drivers/net
parentnet: sit: fix UBSAN Undefined behaviour in check_6rd (diff)
downloadlinux-dev-6237634d8fcc65c9e3348382910e7cdb15084c68.tar.xz
linux-dev-6237634d8fcc65c9e3348382910e7cdb15084c68.zip
net/mlx5: Fix multiple updates of steering rules in parallel
There might be a condition where the fte found is not active yet. In this case we should not use it, but continue to search for another, or allocate a new one. Fixes: bd71b08ec2ee ("net/mlx5: Support multiple updates of steering rules in parallel") Signed-off-by: Eli Britstein <elibr@mellanox.com> Reviewed-by: Maor Gottlieb <maorg@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/fs_core.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index f2cfa012315e..86f986308a90 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -491,6 +491,7 @@ static void del_hw_fte(struct fs_node *node)
mlx5_core_warn(dev,
"flow steering can't delete fte in index %d of flow group id %d\n",
fte->index, fg->id);
+ node->active = 0;
}
}
@@ -1601,6 +1602,11 @@ lookup_fte_locked(struct mlx5_flow_group *g,
fte_tmp = NULL;
goto out;
}
+ if (!fte_tmp->node.active) {
+ tree_put_node(&fte_tmp->node);
+ fte_tmp = NULL;
+ goto out;
+ }
nested_down_write_ref_node(&fte_tmp->node, FS_LOCK_CHILD);
out: