Commit 68cc7ecc authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: spectrum_acl: Track ingress and egress block bindings 



Count the number of ingress and egress block bindings. Use the egress
counter in "is_egress_bound" helper. Add couple of helpers to check
ingress and mixed bound.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ecd942a0

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

+4 −0
Original line number Diff line number Diff line
@@ -665,6 +665,8 @@ struct mlxsw_sp_acl_block { 
	unsigned int rule_count;

	unsigned int disable_count;

	unsigned int egress_blocker_rule_count;

	unsigned int ingress_binding_count;

	unsigned int egress_binding_count;

	struct net *net;

};
@@ -688,6 +690,8 @@ int mlxsw_sp_acl_block_unbind(struct mlxsw_sp *mlxsw_sp, 
			      struct mlxsw_sp_port *mlxsw_sp_port,

			      bool ingress);

bool mlxsw_sp_acl_block_is_egress_bound(const struct mlxsw_sp_acl_block *block);

bool mlxsw_sp_acl_block_is_ingress_bound(const struct mlxsw_sp_acl_block *block);

bool mlxsw_sp_acl_block_is_mixed_bound(const struct mlxsw_sp_acl_block *block);

struct mlxsw_sp_acl_ruleset *

mlxsw_sp_acl_ruleset_lookup(struct mlxsw_sp *mlxsw_sp,

			    struct mlxsw_sp_acl_block *block, u32 chain_index,

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

+19 −6
Original line number Diff line number Diff line
@@ -124,13 +124,17 @@ bool mlxsw_sp_acl_block_disabled(const struct mlxsw_sp_acl_block *block) 


bool mlxsw_sp_acl_block_is_egress_bound(const struct mlxsw_sp_acl_block *block)

{

	struct mlxsw_sp_acl_block_binding *binding;

	return block->egress_binding_count;

}



	list_for_each_entry(binding, &block->binding_list, list) {

		if (!binding->ingress)

			return true;

bool mlxsw_sp_acl_block_is_ingress_bound(const struct mlxsw_sp_acl_block *block)

{

	return block->ingress_binding_count;

}

	return false;



bool mlxsw_sp_acl_block_is_mixed_bound(const struct mlxsw_sp_acl_block *block)

{

	return block->ingress_binding_count && block->egress_binding_count;

}



static bool
@@ -269,6 +273,10 @@ int mlxsw_sp_acl_block_bind(struct mlxsw_sp *mlxsw_sp, 
			goto err_ruleset_bind;

	}



	if (ingress)

		block->ingress_binding_count++;

	else

		block->egress_binding_count++;

	list_add(&binding->list, &block->binding_list);

	return 0;
@@ -290,6 +298,11 @@ int mlxsw_sp_acl_block_unbind(struct mlxsw_sp *mlxsw_sp, 


	list_del(&binding->list);



	if (ingress)

		block->ingress_binding_count--;

	else

		block->egress_binding_count--;



	if (mlxsw_sp_acl_ruleset_block_bound(block))

		mlxsw_sp_acl_ruleset_unbind(mlxsw_sp, block, binding);

CRA Git | Maintained and supported by SUSTech CRA and CCSE