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

Commit 2a52a8c6 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: spectrum_acl: Propagate errors from mlxsw_afa_block_jump/continue 



Propagate error instead of doing WARN_ON right away.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b52e57c

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

+8 −6
Original line number Diff line number Diff line
@@ -399,23 +399,25 @@ u32 mlxsw_afa_block_first_set_kvdl_index(struct mlxsw_afa_block *block) 
}

EXPORT_SYMBOL(mlxsw_afa_block_first_set_kvdl_index);



void mlxsw_afa_block_continue(struct mlxsw_afa_block *block)

int mlxsw_afa_block_continue(struct mlxsw_afa_block *block)

{

	if (WARN_ON(block->finished))

		return;

	if (block->finished)

		return -EINVAL;

	mlxsw_afa_set_goto_set(block->cur_set,

			       MLXSW_AFA_SET_GOTO_BINDING_CMD_NONE, 0);

	block->finished = true;

	return 0;

}

EXPORT_SYMBOL(mlxsw_afa_block_continue);



void mlxsw_afa_block_jump(struct mlxsw_afa_block *block, u16 group_id)

int mlxsw_afa_block_jump(struct mlxsw_afa_block *block, u16 group_id)

{

	if (WARN_ON(block->finished))

		return;

	if (block->finished)

		return -EINVAL;

	mlxsw_afa_set_goto_set(block->cur_set,

			       MLXSW_AFA_SET_GOTO_BINDING_CMD_JUMP, group_id);

	block->finished = true;

	return 0;

}

EXPORT_SYMBOL(mlxsw_afa_block_jump);

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

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ void mlxsw_afa_block_destroy(struct mlxsw_afa_block *block); 
int mlxsw_afa_block_commit(struct mlxsw_afa_block *block);

char *mlxsw_afa_block_first_set(struct mlxsw_afa_block *block);

u32 mlxsw_afa_block_first_set_kvdl_index(struct mlxsw_afa_block *block);

void mlxsw_afa_block_continue(struct mlxsw_afa_block *block);

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

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_append_drop(struct mlxsw_afa_block *block);

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

int mlxsw_afa_block_append_fwd(struct mlxsw_afa_block *block,

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

+3 −3
Original line number Diff line number Diff line
@@ -468,8 +468,8 @@ void mlxsw_sp_acl_rulei_keymask_buf(struct mlxsw_sp_acl_rule_info *rulei, 
				    enum mlxsw_afk_element element,

				    const char *key_value,

				    const char *mask_value, unsigned int len);

void mlxsw_sp_acl_rulei_act_continue(struct mlxsw_sp_acl_rule_info *rulei);

void mlxsw_sp_acl_rulei_act_jump(struct mlxsw_sp_acl_rule_info *rulei,

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_drop(struct mlxsw_sp_acl_rule_info *rulei);

int mlxsw_sp_acl_rulei_act_trap(struct mlxsw_sp_acl_rule_info *rulei);

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

+5 −5
Original line number Diff line number Diff line
@@ -378,15 +378,15 @@ void mlxsw_sp_acl_rulei_keymask_buf(struct mlxsw_sp_acl_rule_info *rulei, 
				 key_value, mask_value, len);

}



void mlxsw_sp_acl_rulei_act_continue(struct mlxsw_sp_acl_rule_info *rulei)

int mlxsw_sp_acl_rulei_act_continue(struct mlxsw_sp_acl_rule_info *rulei)

{

	mlxsw_afa_block_continue(rulei->act_block);

	return mlxsw_afa_block_continue(rulei->act_block);

}



void mlxsw_sp_acl_rulei_act_jump(struct mlxsw_sp_acl_rule_info *rulei,

int mlxsw_sp_acl_rulei_act_jump(struct mlxsw_sp_acl_rule_info *rulei,

				u16 group_id)

{

	mlxsw_afa_block_jump(rulei->act_block, group_id);

	return mlxsw_afa_block_jump(rulei->act_block, group_id);

}



int mlxsw_sp_acl_rulei_act_drop(struct mlxsw_sp_acl_rule_info *rulei)

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

+5 −1
Original line number Diff line number Diff line
@@ -608,7 +608,10 @@ mlxsw_sp_acl_tcam_region_catchall_add(struct mlxsw_sp *mlxsw_sp, 
		goto err_rulei_create;

	}



	mlxsw_sp_acl_rulei_act_continue(rulei);

	err = mlxsw_sp_acl_rulei_act_continue(rulei);

	if (WARN_ON(err))

		goto err_rulei_act_continue;



	err = mlxsw_sp_acl_rulei_commit(rulei);

	if (err)

		goto err_rulei_commit;
@@ -623,6 +626,7 @@ mlxsw_sp_acl_tcam_region_catchall_add(struct mlxsw_sp *mlxsw_sp, 


err_rule_insert:

err_rulei_commit:

err_rulei_act_continue:

	mlxsw_sp_acl_rulei_destroy(rulei);

err_rulei_create:

	parman_item_remove(region->parman, parman_prio, parman_item);