Commit df67ad62 authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files

net/mlx5e: Move counter creation call to alloc_flow_attr_counter() 



Move shared code to alloc_flow_attr_counter() for reuse by the next patches.

Signed-off-by: default avatarRoi Dayan <roid@nvidia.com>
Reviewed-by: default avatarOz Shlomo <ozsh@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent c118ebc9

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

+20 −13
Original line number Diff line number Diff line
@@ -1038,6 +1038,21 @@ mlx5e_add_offloaded_nic_rule(struct mlx5e_priv *priv, 
	return ERR_CAST(rule);

}



static int

alloc_flow_attr_counter(struct mlx5_core_dev *counter_dev,

			struct mlx5_flow_attr *attr)



{

	struct mlx5_fc *counter;



	counter = mlx5_fc_create(counter_dev, true);

	if (IS_ERR(counter))

		return PTR_ERR(counter);



	attr->counter = counter;

	return 0;

}



static int

mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv,

		      struct mlx5e_tc_flow *flow,
@@ -1046,7 +1061,6 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv, 
	struct mlx5e_tc_flow_parse_attr *parse_attr;

	struct mlx5_flow_attr *attr = flow->attr;

	struct mlx5_core_dev *dev = priv->mdev;

	struct mlx5_fc *counter;

	int err;



	parse_attr = attr->parse_attr;
@@ -1058,11 +1072,9 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv, 
	}



	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_COUNT) {

		counter = mlx5_fc_create(dev, true);

		if (IS_ERR(counter))

			return PTR_ERR(counter);



		attr->counter = counter;

		err = alloc_flow_attr_counter(dev, attr);

		if (err)

			return err;

	}



	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR) {
@@ -1465,7 +1477,6 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv, 
	struct mlx5_flow_attr *attr = flow->attr;

	struct mlx5_esw_flow_attr *esw_attr;

	bool vf_tun, encap_valid;

	struct mlx5_fc *counter;

	u32 max_prio, max_chain;

	int err = 0;
@@ -1577,15 +1588,11 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv, 
	}



	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_COUNT) {

		counter = mlx5_fc_create(esw_attr->counter_dev, true);

		if (IS_ERR(counter)) {

			err = PTR_ERR(counter);

		err = alloc_flow_attr_counter(esw_attr->counter_dev, attr);

		if (err)

			goto err_out;

	}



		attr->counter = counter;

	}



	/* we get here if one of the following takes place:

	 * (1) there's no error

	 * (2) there's an encap action and we don't have valid neigh