Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 139ed6c6 authored by Maor Gottlieb's avatar Maor Gottlieb Committed by Saeed Mahameed
Browse files

net/mlx5: Fix steering memory leak 



Flow steering priority and namespace are software only objects that
didn't have the proper destructors and were not freed during steering
cleanup.

Fix it by adding destructor functions for these objects.

Fixes: bd71b08e ("net/mlx5: Support multiple updates of steering rules in parallel")
Signed-off-by: default avatarMaor Gottlieb <maorg@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 0c1cc8b2

drivers/net/ethernet/mellanox/mlx5/core/fs_core.c

+14 −2
Original line number Diff line number Diff line
@@ -174,6 +174,8 @@ static void del_hw_fte(struct fs_node *node); 
static void del_sw_flow_table(struct fs_node *node);

static void del_sw_flow_group(struct fs_node *node);

static void del_sw_fte(struct fs_node *node);

static void del_sw_prio(struct fs_node *node);

static void del_sw_ns(struct fs_node *node);

/* Delete rule (destination) is special case that 

 * requires to lock the FTE for all the deletion process.

 */
@@ -408,6 +410,16 @@ static inline struct mlx5_core_dev *get_dev(struct fs_node *node) 
	return NULL;

}



static void del_sw_ns(struct fs_node *node)

{

	kfree(node);

}



static void del_sw_prio(struct fs_node *node)

{

	kfree(node);

}



static void del_hw_flow_table(struct fs_node *node)

{

	struct mlx5_flow_table *ft;
@@ -2064,7 +2076,7 @@ static struct fs_prio *fs_create_prio(struct mlx5_flow_namespace *ns, 
		return ERR_PTR(-ENOMEM);



	fs_prio->node.type = FS_TYPE_PRIO;

	tree_init_node(&fs_prio->node, NULL, NULL);

	tree_init_node(&fs_prio->node, NULL, del_sw_prio);

	tree_add_node(&fs_prio->node, &ns->node);

	fs_prio->num_levels = num_levels;

	fs_prio->prio = prio;
@@ -2090,7 +2102,7 @@ static struct mlx5_flow_namespace *fs_create_namespace(struct fs_prio *prio) 
		return ERR_PTR(-ENOMEM);



	fs_init_namespace(ns);

	tree_init_node(&ns->node, NULL, NULL);

	tree_init_node(&ns->node, NULL, del_sw_ns);

	tree_add_node(&ns->node, &prio->node);

	list_add_tail(&ns->node.list, &prio->node.children);