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

Commit 48170729 authored by Arkadi Sharshevsky's avatar Arkadi Sharshevsky Committed by David S. Miller
Browse files

mlxsw: spectrum: Add support for counters on TCAM entries 



Add support for packets and byte statistics on TCAM entries. The counters
are allocated from the generic flow counters pool.

Signed-off-by: default avatarArkadi Sharshevsky <arkadis@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 938ab608

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+7 −0
Original line number Diff line number Diff line
@@ -588,6 +588,8 @@ struct mlxsw_sp_acl_rule_info { 
	unsigned int priority;

	struct mlxsw_afk_element_values values;

	struct mlxsw_afa_block *act_block;

	unsigned int counter_index;

	bool counter_valid;

};



enum mlxsw_sp_acl_profile {
@@ -652,6 +654,8 @@ int mlxsw_sp_acl_rulei_act_fwd(struct mlxsw_sp *mlxsw_sp, 
int mlxsw_sp_acl_rulei_act_vlan(struct mlxsw_sp *mlxsw_sp,

				struct mlxsw_sp_acl_rule_info *rulei,

				u32 action, u16 vid, u16 proto, u8 prio);

int mlxsw_sp_acl_rulei_act_count(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_acl_rule_info *rulei);



struct mlxsw_sp_acl_rule;
@@ -671,6 +675,9 @@ mlxsw_sp_acl_rule_lookup(struct mlxsw_sp *mlxsw_sp, 
			 unsigned long cookie);

struct mlxsw_sp_acl_rule_info *

mlxsw_sp_acl_rule_rulei(struct mlxsw_sp_acl_rule *rule);

int mlxsw_sp_acl_rule_get_stats(struct mlxsw_sp *mlxsw_sp,

				struct mlxsw_sp_acl_rule *rule,

				u64 *packets, u64 *bytes, u64 *last_use);



int mlxsw_sp_acl_init(struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_acl_fini(struct mlxsw_sp *mlxsw_sp);

drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c

+35 −0
Original line number Diff line number Diff line
@@ -247,6 +247,27 @@ void mlxsw_sp_acl_ruleset_put(struct mlxsw_sp *mlxsw_sp, 
	mlxsw_sp_acl_ruleset_ref_dec(mlxsw_sp, ruleset);

}



static int

mlxsw_sp_acl_rulei_counter_alloc(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_acl_rule_info *rulei)

{

	int err;



	err = mlxsw_sp_flow_counter_alloc(mlxsw_sp, &rulei->counter_index);

	if (err)

		return err;

	rulei->counter_valid = true;

	return 0;

}



static void

mlxsw_sp_acl_rulei_counter_free(struct mlxsw_sp *mlxsw_sp,

				struct mlxsw_sp_acl_rule_info *rulei)

{

	rulei->counter_valid = false;

	mlxsw_sp_flow_counter_free(mlxsw_sp, rulei->counter_index);

}



struct mlxsw_sp_acl_rule_info *

mlxsw_sp_acl_rulei_create(struct mlxsw_sp_acl *acl)

{
@@ -373,6 +394,13 @@ int mlxsw_sp_acl_rulei_act_vlan(struct mlxsw_sp *mlxsw_sp, 
	}

}



int mlxsw_sp_acl_rulei_act_count(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_acl_rule_info *rulei)

{

	return mlxsw_afa_block_append_counter(rulei->act_block,

					      rulei->counter_index);

}



struct mlxsw_sp_acl_rule *

mlxsw_sp_acl_rule_create(struct mlxsw_sp *mlxsw_sp,

			 struct mlxsw_sp_acl_ruleset *ruleset,
@@ -396,8 +424,14 @@ mlxsw_sp_acl_rule_create(struct mlxsw_sp *mlxsw_sp, 
		err = PTR_ERR(rule->rulei);

		goto err_rulei_create;

	}



	err = mlxsw_sp_acl_rulei_counter_alloc(mlxsw_sp, rule->rulei);

	if (err)

		goto err_counter_alloc;

	return rule;



err_counter_alloc:

	mlxsw_sp_acl_rulei_destroy(rule->rulei);

err_rulei_create:

	kfree(rule);

err_alloc:
@@ -410,6 +444,7 @@ void mlxsw_sp_acl_rule_destroy(struct mlxsw_sp *mlxsw_sp, 
{

	struct mlxsw_sp_acl_ruleset *ruleset = rule->ruleset;



	mlxsw_sp_acl_rulei_counter_free(mlxsw_sp, rule->rulei);

	mlxsw_sp_acl_rulei_destroy(rule->rulei);

	kfree(rule);

	mlxsw_sp_acl_ruleset_ref_dec(mlxsw_sp, ruleset);