Commit 6eb7a268 authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed

net/mlx5: Don't maintain a case of del_sw_func being null

Add del_sw_func cb for root ns. Now there is no need to
maintain a case of del_sw_func being null when freeing the node.

Fixes: 2cc43b49 ("net/mlx5_core: Managing root flow table")
Signed-off-by: default avatarRoi Dayan <roid@mellanox.com>
Reviewed-by: default avatarMark Bloch <markb@mellanox.com>
Reviewed-by: default avatarPaul Blakey <paulb@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent aee37f3d
...@@ -346,14 +346,10 @@ static void tree_put_node(struct fs_node *node, bool locked) ...@@ -346,14 +346,10 @@ static void tree_put_node(struct fs_node *node, bool locked)
if (parent_node) { if (parent_node) {
down_write_ref_node(parent_node, locked); down_write_ref_node(parent_node, locked);
list_del_init(&node->list); list_del_init(&node->list);
if (node->del_sw_func) }
node->del_sw_func(node); node->del_sw_func(node);
if (parent_node)
up_write_ref_node(parent_node, locked); up_write_ref_node(parent_node, locked);
} else if (node->del_sw_func) {
node->del_sw_func(node);
} else {
kfree(node);
}
node = NULL; node = NULL;
} }
if (!node && parent_node) if (!node && parent_node)
...@@ -2352,6 +2348,11 @@ static int init_root_tree(struct mlx5_flow_steering *steering, ...@@ -2352,6 +2348,11 @@ static int init_root_tree(struct mlx5_flow_steering *steering,
return 0; return 0;
} }
static void del_sw_root_ns(struct fs_node *node)
{
kfree(node);
}
static struct mlx5_flow_root_namespace static struct mlx5_flow_root_namespace
*create_root_ns(struct mlx5_flow_steering *steering, *create_root_ns(struct mlx5_flow_steering *steering,
enum fs_flow_table_type table_type) enum fs_flow_table_type table_type)
...@@ -2378,7 +2379,7 @@ static struct mlx5_flow_root_namespace ...@@ -2378,7 +2379,7 @@ static struct mlx5_flow_root_namespace
ns = &root_ns->ns; ns = &root_ns->ns;
fs_init_namespace(ns); fs_init_namespace(ns);
mutex_init(&root_ns->chain_lock); mutex_init(&root_ns->chain_lock);
tree_init_node(&ns->node, NULL, NULL); tree_init_node(&ns->node, NULL, del_sw_root_ns);
tree_add_node(&ns->node, NULL); tree_add_node(&ns->node, NULL);
return root_ns; return root_ns;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment