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: Raed Salem <raeds@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
index be7650d2cfd3f1f33d84a937bf1ea95b7eb8cfc5..35e2bb301c264944b8321f52a52d3d5507a8fe29 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
@@ -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));

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
index 97c55620089d5ee52022a97df73ec3fde7b4c8f2..16bcceec16c445500ccb979e6a67f496c90304c6 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
@@ -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;
+       struct aes_gcm_keymat aes_gcm;
 
        union {
                __be32 a4;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
index 9d95a0025fd6915f18c97fdcdf159cfa1a55ff8e..8315e8f603d7b545dc1102f9b95f4822b5f27099 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
@@ -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,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c
index 91ec8b8bf1ece2f5adc032ba2dce0b0bf4b3fc99..b13e152fe9fcecb7d23fef6bdbae777ccecbd458 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c
@@ -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;