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

Commit 814fb875 authored by Mark Bloch's avatar Mark Bloch Committed by Leon Romanovsky
Browse files

net/mlx5: Refactor find_flow_rule 



The way we compare between two dests will need to be used in other
places in the future, so we factor out the comparison logic
between two dests into a separate function.

Signed-off-by: default avatarMark Bloch <markb@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 0501fc47

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

+20 −9
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ static void del_rule(struct fs_node *node); 
static void del_flow_table(struct fs_node *node);

static void del_flow_group(struct fs_node *node);

static void del_fte(struct fs_node *node);

static bool mlx5_flow_dests_cmp(struct mlx5_flow_destination *d1,

				struct mlx5_flow_destination *d2);



static void tree_init_node(struct fs_node *node,

			   unsigned int refcount,
@@ -1064,22 +1066,31 @@ static struct mlx5_flow_group *create_autogroup(struct mlx5_flow_table *ft, 
	return fg;

}



static bool mlx5_flow_dests_cmp(struct mlx5_flow_destination *d1,

				struct mlx5_flow_destination *d2)

{

	if (d1->type == d2->type) {

		if ((d1->type == MLX5_FLOW_DESTINATION_TYPE_VPORT &&

		     d1->vport_num == d2->vport_num) ||

		    (d1->type == MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE &&

		     d1->ft == d2->ft) ||

		    (d1->type == MLX5_FLOW_DESTINATION_TYPE_TIR &&

		     d1->tir_num == d2->tir_num))

			return true;

	}



	return false;

}



static struct mlx5_flow_rule *find_flow_rule(struct fs_fte *fte,

					     struct mlx5_flow_destination *dest)

{

	struct mlx5_flow_rule *rule;



	list_for_each_entry(rule, &fte->node.children, node.list) {

		if (rule->dest_attr.type == dest->type) {

			if ((dest->type == MLX5_FLOW_DESTINATION_TYPE_VPORT &&

			     dest->vport_num == rule->dest_attr.vport_num) ||

			    (dest->type == MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE &&

			     dest->ft == rule->dest_attr.ft) ||

			    (dest->type == MLX5_FLOW_DESTINATION_TYPE_TIR &&

			     dest->tir_num == rule->dest_attr.tir_num))

		if (mlx5_flow_dests_cmp(&rule->dest_attr, dest))

			return rule;

	}

	}

	return NULL;

}