Commit 3128f3a1 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: spectrum_acl: Pass the ingress indication down to flex action 



The ACL flex action will have to know if it is in ingress or egress,
so it can use correct trap ID. Pass the ingress indication down to it.

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 86272d33

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

+1 −1
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ mlxsw_afa_trap_mirror_pack(char *payload, bool mirror_enable, 
	mlxsw_afa_trap_mirror_agent_set(payload, mirror_agent);

}



int mlxsw_afa_block_append_drop(struct mlxsw_afa_block *block)

int mlxsw_afa_block_append_drop(struct mlxsw_afa_block *block, bool ingress)

{

	char *act = mlxsw_afa_block_append_action(block, MLXSW_AFA_TRAP_CODE,

						  MLXSW_AFA_TRAP_SIZE);

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

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int mlxsw_afa_block_activity_get(struct mlxsw_afa_block *block, bool *activity); 
int mlxsw_afa_block_continue(struct mlxsw_afa_block *block);

int mlxsw_afa_block_jump(struct mlxsw_afa_block *block, u16 group_id);

int mlxsw_afa_block_terminate(struct mlxsw_afa_block *block);

int mlxsw_afa_block_append_drop(struct mlxsw_afa_block *block);

int mlxsw_afa_block_append_drop(struct mlxsw_afa_block *block, bool ingress);

int mlxsw_afa_block_append_trap(struct mlxsw_afa_block *block, u16 trap_id);

int mlxsw_afa_block_append_trap_and_forward(struct mlxsw_afa_block *block,

					    u16 trap_id);

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

+2 −1
Original line number Diff line number Diff line
@@ -725,7 +725,8 @@ int mlxsw_sp_acl_rulei_act_continue(struct mlxsw_sp_acl_rule_info *rulei); 
int mlxsw_sp_acl_rulei_act_jump(struct mlxsw_sp_acl_rule_info *rulei,

				u16 group_id);

int mlxsw_sp_acl_rulei_act_terminate(struct mlxsw_sp_acl_rule_info *rulei);

int mlxsw_sp_acl_rulei_act_drop(struct mlxsw_sp_acl_rule_info *rulei);

int mlxsw_sp_acl_rulei_act_drop(struct mlxsw_sp_acl_rule_info *rulei,

				bool ingress);

int mlxsw_sp_acl_rulei_act_trap(struct mlxsw_sp_acl_rule_info *rulei);

int mlxsw_sp_acl_rulei_act_mirror(struct mlxsw_sp *mlxsw_sp,

				  struct mlxsw_sp_acl_rule_info *rulei,

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

+3 −2
Original line number Diff line number Diff line
@@ -535,9 +535,10 @@ int mlxsw_sp_acl_rulei_act_terminate(struct mlxsw_sp_acl_rule_info *rulei) 
	return mlxsw_afa_block_terminate(rulei->act_block);

}



int mlxsw_sp_acl_rulei_act_drop(struct mlxsw_sp_acl_rule_info *rulei)

int mlxsw_sp_acl_rulei_act_drop(struct mlxsw_sp_acl_rule_info *rulei,

				bool ingress)

{

	return mlxsw_afa_block_append_drop(rulei->act_block);

	return mlxsw_afa_block_append_drop(rulei->act_block, ingress);

}



int mlxsw_sp_acl_rulei_act_trap(struct mlxsw_sp_acl_rule_info *rulei)

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

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp, 
				return -EOPNOTSUPP;

			}

			ingress = mlxsw_sp_acl_block_is_ingress_bound(block);

			err = mlxsw_sp_acl_rulei_act_drop(rulei);

			err = mlxsw_sp_acl_rulei_act_drop(rulei, ingress);

			if (err) {

				NL_SET_ERR_MSG_MOD(extack, "Cannot append drop action");

				return err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE