Commit 6cd2126a authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Saeed Mahameed
Browse files

net/mlx5: Cleanup XFRM attributes struct 



Remove everything that is not used or from mlx5_accel_esp_xfrm_attrs,
together with change type of spi to store proper type from the beginning.

Reviewed-by: default avatarRaed Salem <raeds@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 1c4a59b9

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

+2 −8
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ mlx5e_ipsec_build_accel_xfrm_attrs(struct mlx5e_ipsec_sa_entry *sa_entry, 
				   struct mlx5_accel_esp_xfrm_attrs *attrs)

{

	struct xfrm_state *x = sa_entry->x;

	struct aes_gcm_keymat *aes_gcm = &attrs->keymat.aes_gcm;

	struct aes_gcm_keymat *aes_gcm = &attrs->aes_gcm;

	struct aead_geniv_ctx *geniv_ctx;

	struct crypto_aead *aead;

	unsigned int crypto_data_len, key_len;
@@ -171,12 +171,6 @@ mlx5e_ipsec_build_accel_xfrm_attrs(struct mlx5e_ipsec_sa_entry *sa_entry, 
			attrs->flags |= MLX5_ACCEL_ESP_FLAGS_ESN_STATE_OVERLAP;

	}



	/* rx handle */

	attrs->sa_handle = sa_entry->handle;



	/* algo type */

	attrs->keymat_type = MLX5_ACCEL_ESP_KEYMAT_AES_GCM;



	/* action */

	attrs->action = (!(x->xso.flags & XFRM_OFFLOAD_INBOUND)) ?

			MLX5_ACCEL_ESP_ACTION_ENCRYPT :
@@ -187,7 +181,7 @@ mlx5e_ipsec_build_accel_xfrm_attrs(struct mlx5e_ipsec_sa_entry *sa_entry, 
			MLX5_ACCEL_ESP_FLAGS_TUNNEL;



	/* spi */

	attrs->spi = x->id.spi;

	attrs->spi = be32_to_cpu(x->id.spi);



	/* source , destination ips */

	memcpy(&attrs->saddr, x->props.saddr.a6, sizeof(attrs->saddr));

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h

+2 −19
Original line number Diff line number Diff line
@@ -55,11 +55,6 @@ enum mlx5_accel_esp_action { 
	MLX5_ACCEL_ESP_ACTION_ENCRYPT,

};



enum mlx5_accel_esp_keymats {

	MLX5_ACCEL_ESP_KEYMAT_AES_NONE,

	MLX5_ACCEL_ESP_KEYMAT_AES_GCM,

};



struct aes_gcm_keymat {

	u64   seq_iv;
@@ -73,21 +68,9 @@ struct aes_gcm_keymat { 
struct mlx5_accel_esp_xfrm_attrs {

	enum mlx5_accel_esp_action action;

	u32   esn;

	__be32 spi;

	u32   seq;

	u32   tfc_pad;

	u32   spi;

	u32   flags;

	u32   sa_handle;

	union {

		struct {

			u32 size;



		} bmp;

	} replay;

	enum mlx5_accel_esp_keymats keymat_type;

	union {

	struct aes_gcm_keymat aes_gcm;

	} keymat;



	union {

		__be32 a4;

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

+2 −2
Original line number Diff line number Diff line
@@ -356,8 +356,8 @@ static void setup_fte_common(struct mlx5_accel_esp_xfrm_attrs *attrs, 


	/* SPI number */

	MLX5_SET_TO_ONES(fte_match_param, spec->match_criteria, misc_parameters.outer_esp_spi);

	MLX5_SET(fte_match_param, spec->match_value, misc_parameters.outer_esp_spi,

		 be32_to_cpu(attrs->spi));

	MLX5_SET(fte_match_param, spec->match_value,

		 misc_parameters.outer_esp_spi, attrs->spi);



	if (ip_version == 4) {

		memcpy(MLX5_ADDR_OF(fte_match_param, spec->match_value,

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

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static int mlx5_create_ipsec_obj(struct mlx5e_ipsec_sa_entry *sa_entry) 
{

	struct mlx5_accel_esp_xfrm_attrs *attrs = &sa_entry->attrs;

	struct mlx5_core_dev *mdev = mlx5e_ipsec_sa2dev(sa_entry);

	struct aes_gcm_keymat *aes_gcm = &attrs->keymat.aes_gcm;

	struct aes_gcm_keymat *aes_gcm = &attrs->aes_gcm;

	u32 out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)];

	u32 in[MLX5_ST_SZ_DW(create_ipsec_obj_in)] = {};

	void *obj, *salt_p, *salt_iv_p;
@@ -106,7 +106,7 @@ static void mlx5_destroy_ipsec_obj(struct mlx5e_ipsec_sa_entry *sa_entry) 


int mlx5_ipsec_create_sa_ctx(struct mlx5e_ipsec_sa_entry *sa_entry)

{

	struct aes_gcm_keymat *aes_gcm = &sa_entry->attrs.keymat.aes_gcm;

	struct aes_gcm_keymat *aes_gcm = &sa_entry->attrs.aes_gcm;

	struct mlx5_core_dev *mdev = mlx5e_ipsec_sa2dev(sa_entry);

	int err;