Commit 509541b4 authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

net/mlx5e: Factor out IPsec ASO update function 

The ASO update is common operation which is going to be used in next
patch, so as a preparation, let's refactor the code for future reuse.

As part of this refactoring, not used function argument was removed too.

Link: https://lore.kernel.org/r/d04770b959822fed51c22c13e798f04d760a682e.1680162300.git.leonro@nvidia.com


Reviewed-by: default avatarRaed Salem <raeds@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
parent 5a6cddb8

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c

+14 −13
Original line number Diff line number Diff line
@@ -275,26 +275,21 @@ void mlx5_accel_esp_modify_xfrm(struct mlx5e_ipsec_sa_entry *sa_entry, 
	memcpy(&sa_entry->attrs, attrs, sizeof(sa_entry->attrs));

}



static void

mlx5e_ipsec_aso_update_esn(struct mlx5e_ipsec_sa_entry *sa_entry,

			   const struct mlx5_accel_esp_xfrm_attrs *attrs)

static void mlx5e_ipsec_aso_update(struct mlx5e_ipsec_sa_entry *sa_entry,

				   struct mlx5_wqe_aso_ctrl_seg *data)

{

	struct mlx5_wqe_aso_ctrl_seg data = {};



	data.data_mask_mode = MLX5_ASO_DATA_MASK_MODE_BITWISE_64BIT << 6;

	data.condition_1_0_operand = MLX5_ASO_ALWAYS_TRUE | MLX5_ASO_ALWAYS_TRUE

								    << 4;

	data.data_offset_condition_operand = MLX5_IPSEC_ASO_REMOVE_FLOW_PKT_CNT_OFFSET;

	data.bitwise_data = cpu_to_be64(BIT_ULL(54));

	data.data_mask = data.bitwise_data;

	data->data_mask_mode = MLX5_ASO_DATA_MASK_MODE_BITWISE_64BIT << 6;

	data->condition_1_0_operand = MLX5_ASO_ALWAYS_TRUE |

				      MLX5_ASO_ALWAYS_TRUE << 4;



	mlx5e_ipsec_aso_query(sa_entry, &data);

	mlx5e_ipsec_aso_query(sa_entry, data);

}



static void mlx5e_ipsec_update_esn_state(struct mlx5e_ipsec_sa_entry *sa_entry,

					 u32 mode_param)

{

	struct mlx5_accel_esp_xfrm_attrs attrs = {};

	struct mlx5_wqe_aso_ctrl_seg data = {};



	if (mode_param < MLX5E_IPSEC_ESN_SCOPE_MID) {

		sa_entry->esn_state.esn++;
@@ -305,7 +300,13 @@ static void mlx5e_ipsec_update_esn_state(struct mlx5e_ipsec_sa_entry *sa_entry, 


	mlx5e_ipsec_build_accel_xfrm_attrs(sa_entry, &attrs);

	mlx5_accel_esp_modify_xfrm(sa_entry, &attrs);

	mlx5e_ipsec_aso_update_esn(sa_entry, &attrs);



	data.data_offset_condition_operand =

		MLX5_IPSEC_ASO_REMOVE_FLOW_PKT_CNT_OFFSET;

	data.bitwise_data = cpu_to_be64(BIT_ULL(54));

	data.data_mask = data.bitwise_data;



	mlx5e_ipsec_aso_update(sa_entry, &data);

}



static void mlx5e_ipsec_handle_event(struct work_struct *_work)