net/mlx5e: Delete obsolete IPsec code

After addition of HW managed counters and implementation drop
in flow steering logic, the code in driver which checks syndrome
is not reachable anymore.

Let's delete it.

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.h b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
index adaea3493193ef05dcf148dfda376b520acc94b7..7d943e93cf6dc0aa292953dd53dd64d935770c3e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
@@ -137,7 +137,6 @@ struct mlx5e_ipsec_hw_stats {
 struct mlx5e_ipsec_sw_stats {
        atomic64_t ipsec_rx_drop_sp_alloc;
        atomic64_t ipsec_rx_drop_sadb_miss;
-       atomic64_t ipsec_rx_drop_syndrome;
        atomic64_t ipsec_tx_drop_bundle;
        atomic64_t ipsec_tx_drop_no_state;
        atomic64_t ipsec_tx_drop_not_ip;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c
index 51a144246ea6230a5711714d52e6308af65b2652..727fa7c185238c25447089c110c43cd76c99aa24 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c
@@ -304,12 +304,6 @@ drop:
        return false;
 }
 
-enum {
-       MLX5E_IPSEC_OFFLOAD_RX_SYNDROME_DECRYPTED,
-       MLX5E_IPSEC_OFFLOAD_RX_SYNDROME_AUTH_FAILED,
-       MLX5E_IPSEC_OFFLOAD_RX_SYNDROME_BAD_TRAILER,
-};
-
 void mlx5e_ipsec_offload_handle_rx_skb(struct net_device *netdev,
                                       struct sk_buff *skb,
                                       u32 ipsec_meta_data)
@@ -343,20 +337,7 @@ void mlx5e_ipsec_offload_handle_rx_skb(struct net_device *netdev,
 
        xo = xfrm_offload(skb);
        xo->flags = CRYPTO_DONE;
-
-       switch (MLX5_IPSEC_METADATA_SYNDROM(ipsec_meta_data)) {
-       case MLX5E_IPSEC_OFFLOAD_RX_SYNDROME_DECRYPTED:
-               xo->status = CRYPTO_SUCCESS;
-               break;
-       case MLX5E_IPSEC_OFFLOAD_RX_SYNDROME_AUTH_FAILED:
-               xo->status = CRYPTO_TUNNEL_ESP_AUTH_FAILED;
-               break;
-       case MLX5E_IPSEC_OFFLOAD_RX_SYNDROME_BAD_TRAILER:
-               xo->status = CRYPTO_INVALID_PACKET_SYNTAX;
-               break;
-       default:
-               atomic64_inc(&ipsec->sw_stats.ipsec_rx_drop_syndrome);
-       }
+       xo->status = CRYPTO_SUCCESS;
 }
 
 int mlx5_esw_ipsec_rx_make_metadata(struct mlx5e_priv *priv, u32 id, u32 *metadata)
@@ -374,8 +355,6 @@ int mlx5_esw_ipsec_rx_make_metadata(struct mlx5e_priv *priv, u32 id, u32 *metada
                return err;
        }
 
-       *metadata = MLX5_IPSEC_METADATA_CREATE(ipsec_obj_id,
-                                              MLX5E_IPSEC_OFFLOAD_RX_SYNDROME_DECRYPTED);
-
+       *metadata = ipsec_obj_id;
        return 0;
 }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h
index 2ed99772f168ac7fd844a4f0179bee1cb069790e..82064614846f5f88646b12a887bf548ccbe47639 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h
@@ -43,7 +43,6 @@
 #define MLX5_IPSEC_METADATA_MARKER(metadata)  (((metadata) >> 31) & 0x1)
 #define MLX5_IPSEC_METADATA_SYNDROM(metadata) (((metadata) >> 24) & GENMASK(5, 0))
 #define MLX5_IPSEC_METADATA_HANDLE(metadata)  ((metadata) & GENMASK(23, 0))
-#define MLX5_IPSEC_METADATA_CREATE(id, syndrome) ((id) | ((syndrome) << 24))
 
 struct mlx5e_accel_tx_ipsec_state {
        struct xfrm_offload *xo;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_stats.c
index e0e36a09721c5187c0c1b9f18a15b0f537962d4f..dd36b04e30a0025d9ff1cff0121d115f476f22e8 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_stats.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_stats.c
@@ -51,7 +51,6 @@ static const struct counter_desc mlx5e_ipsec_hw_stats_desc[] = {
 static const struct counter_desc mlx5e_ipsec_sw_stats_desc[] = {
        { MLX5E_DECLARE_STAT(struct mlx5e_ipsec_sw_stats, ipsec_rx_drop_sp_alloc) },
        { MLX5E_DECLARE_STAT(struct mlx5e_ipsec_sw_stats, ipsec_rx_drop_sadb_miss) },
-       { MLX5E_DECLARE_STAT(struct mlx5e_ipsec_sw_stats, ipsec_rx_drop_syndrome) },
        { MLX5E_DECLARE_STAT(struct mlx5e_ipsec_sw_stats, ipsec_tx_drop_bundle) },
        { MLX5E_DECLARE_STAT(struct mlx5e_ipsec_sw_stats, ipsec_tx_drop_no_state) },
        { MLX5E_DECLARE_STAT(struct mlx5e_ipsec_sw_stats, ipsec_tx_drop_not_ip) },