OSDN Git Service

net/mlx5: Remove useless validity check
authorLeon Romanovsky <leonro@nvidia.com>
Tue, 8 Mar 2022 18:55:00 +0000 (20:55 +0200)
committerSaeed Mahameed <saeedm@nvidia.com>
Wed, 4 May 2022 05:59:15 +0000 (22:59 -0700)
All callers build xfrm attributes with help of mlx5e_ipsec_build_accel_xfrm_attrs()
function that ensure validity of attributes. There is no need to recheck
them again.

Reviewed-by: Raed Salem <raeds@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c
include/linux/mlx5/accel.h

index bbfb664..9d2932c 100644 (file)
@@ -62,55 +62,11 @@ u32 mlx5_ipsec_device_caps(struct mlx5_core_dev *mdev)
 }
 EXPORT_SYMBOL_GPL(mlx5_ipsec_device_caps);
 
-static int
-mlx5_ipsec_offload_esp_validate_xfrm_attrs(struct mlx5_core_dev *mdev,
-                                          const struct mlx5_accel_esp_xfrm_attrs *attrs)
-{
-       if (attrs->replay_type != MLX5_ACCEL_ESP_REPLAY_NONE) {
-               mlx5_core_err(mdev, "Cannot offload xfrm states with anti replay (replay_type = %d)\n",
-                             attrs->replay_type);
-               return -EOPNOTSUPP;
-       }
-
-       if (attrs->keymat_type != MLX5_ACCEL_ESP_KEYMAT_AES_GCM) {
-               mlx5_core_err(mdev, "Only aes gcm keymat is supported (keymat_type = %d)\n",
-                             attrs->keymat_type);
-               return -EOPNOTSUPP;
-       }
-
-       if (attrs->keymat.aes_gcm.iv_algo !=
-           MLX5_ACCEL_ESP_AES_GCM_IV_ALGO_SEQ) {
-               mlx5_core_err(mdev, "Only iv sequence algo is supported (iv_algo = %d)\n",
-                             attrs->keymat.aes_gcm.iv_algo);
-               return -EOPNOTSUPP;
-       }
-
-       if (attrs->keymat.aes_gcm.key_len != 128 &&
-           attrs->keymat.aes_gcm.key_len != 256) {
-               mlx5_core_err(mdev, "Cannot offload xfrm states with key length other than 128/256 bit (key length = %d)\n",
-                             attrs->keymat.aes_gcm.key_len);
-               return -EOPNOTSUPP;
-       }
-
-       if ((attrs->flags & MLX5_ACCEL_ESP_FLAGS_ESN_TRIGGERED) &&
-           !MLX5_CAP_IPSEC(mdev, ipsec_esn)) {
-               mlx5_core_err(mdev, "Cannot offload xfrm states with ESN triggered\n");
-               return -EOPNOTSUPP;
-       }
-
-       return 0;
-}
-
 static struct mlx5_accel_esp_xfrm *
 mlx5_ipsec_offload_esp_create_xfrm(struct mlx5_core_dev *mdev,
                                   const struct mlx5_accel_esp_xfrm_attrs *attrs)
 {
        struct mlx5_ipsec_esp_xfrm *mxfrm;
-       int err = 0;
-
-       err = mlx5_ipsec_offload_esp_validate_xfrm_attrs(mdev, attrs);
-       if (err)
-               return ERR_PTR(err);
 
        mxfrm = kzalloc(sizeof(*mxfrm), GFP_KERNEL);
        if (!mxfrm)
index a2720eb..9c511d4 100644 (file)
 
 #include <linux/mlx5/driver.h>
 
-enum mlx5_accel_esp_aes_gcm_keymat_iv_algo {
-       MLX5_ACCEL_ESP_AES_GCM_IV_ALGO_SEQ,
-};
-
 enum mlx5_accel_esp_flags {
        MLX5_ACCEL_ESP_FLAGS_TUNNEL            = 0,    /* Default */
        MLX5_ACCEL_ESP_FLAGS_TRANSPORT         = 1UL << 0,
@@ -57,14 +53,9 @@ enum mlx5_accel_esp_keymats {
        MLX5_ACCEL_ESP_KEYMAT_AES_GCM,
 };
 
-enum mlx5_accel_esp_replay {
-       MLX5_ACCEL_ESP_REPLAY_NONE,
-       MLX5_ACCEL_ESP_REPLAY_BMP,
-};
 
 struct aes_gcm_keymat {
        u64   seq_iv;
-       enum mlx5_accel_esp_aes_gcm_keymat_iv_algo iv_algo;
 
        u32   salt;
        u32   icv_len;
@@ -81,7 +72,6 @@ struct mlx5_accel_esp_xfrm_attrs {
        u32   tfc_pad;
        u32   flags;
        u32   sa_handle;
-       enum mlx5_accel_esp_replay replay_type;
        union {
                struct {
                        u32 size;