Commit 903fcf73 authored by Nir Dotan's avatar Nir Dotan Committed by David S. Miller
Browse files

mlxsw: spectrum_flower: Disallow usage of vlan_id key on egress 



As recent spectrum FW imposes a limitation on using vlan_id key for
egress ACL, disallow the usage of that key accordingly and return a
proper extack message.

Signed-off-by: default avatarNir Dotan <nird@mellanox.com>
Reviewed-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 82b94f5d

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

+1 −0
Original line number Diff line number Diff line
@@ -538,6 +538,7 @@ int mlxsw_sp_acl_block_unbind(struct mlxsw_sp *mlxsw_sp, 
			      struct mlxsw_sp_acl_block *block,

			      struct mlxsw_sp_port *mlxsw_sp_port,

			      bool ingress);

bool mlxsw_sp_acl_block_is_egress_bound(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

+11 −0
Original line number Diff line number Diff line
@@ -158,6 +158,17 @@ bool mlxsw_sp_acl_block_disabled(struct mlxsw_sp_acl_block *block) 
	return block->disable_count;

}



bool mlxsw_sp_acl_block_is_egress_bound(struct mlxsw_sp_acl_block *block)

{

	struct mlxsw_sp_acl_block_binding *binding;



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

		if (!binding->ingress)

			return true;

	}

	return false;

}



static bool

mlxsw_sp_acl_ruleset_is_singular(const struct mlxsw_sp_acl_ruleset *ruleset)

{

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

+5 −0
Original line number Diff line number Diff line
@@ -386,6 +386,11 @@ static int mlxsw_sp_flower_parse(struct mlxsw_sp *mlxsw_sp, 
			skb_flow_dissector_target(f->dissector,

						  FLOW_DISSECTOR_KEY_VLAN,

						  f->mask);



		if (mlxsw_sp_acl_block_is_egress_bound(block)) {

			NL_SET_ERR_MSG_MOD(f->common.extack, "vlan_id key is not supported on egress");

			return -EOPNOTSUPP;

		}

		if (mask->vlan_id != 0)

			mlxsw_sp_acl_rulei_keymask_u32(rulei,

						       MLXSW_AFK_ELEMENT_VID,

CRA Git | Maintained and supported by SUSTech CRA and CCSE