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

net/mlx5: Merge various control path IPsec headers into one file 



The mlx5 IPsec code has logical separation between code that operates
with XFRM objects (ipsec.c), HW objects (ipsec_offload.c), flow steering
logic (ipsec_fs.c) and data path (ipsec_rxtx.c).

Such separation makes sense for C-files, but isn't needed at all for
H-files as they are included in batch anyway.

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 2ea36e2e

drivers/net/ethernet/mellanox/mlx5/core/en/params.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#include "en/txrx.h"

#include "en/port.h"

#include "en_accel/en_accel.h"

#include "en_accel/ipsec_offload.h"

#include "en_accel/ipsec.h"



static bool mlx5e_rx_is_xdp(struct mlx5e_params *params,

			    struct mlx5e_xsk_param *xsk)

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

+2 −3
Original line number Diff line number Diff line
@@ -37,9 +37,8 @@ 
#include <linux/netdevice.h>



#include "en.h"

#include "en_accel/ipsec.h"

#include "en_accel/ipsec_rxtx.h"

#include "en_accel/ipsec_fs.h"

#include "ipsec.h"

#include "ipsec_rxtx.h"



static struct mlx5e_ipsec_sa_entry *to_ipsec_sa_entry(struct xfrm_state *x)

{

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

+99 −2
Original line number Diff line number Diff line
@@ -40,11 +40,81 @@ 
#include <net/xfrm.h>

#include <linux/idr.h>



#include "ipsec_offload.h"



#define MLX5E_IPSEC_SADB_RX_BITS 10

#define MLX5E_IPSEC_ESN_SCOPE_MID 0x80000000L



enum mlx5_accel_esp_flags {

	MLX5_ACCEL_ESP_FLAGS_TUNNEL            = 0,    /* Default */

	MLX5_ACCEL_ESP_FLAGS_TRANSPORT         = 1UL << 0,

	MLX5_ACCEL_ESP_FLAGS_ESN_TRIGGERED     = 1UL << 1,

	MLX5_ACCEL_ESP_FLAGS_ESN_STATE_OVERLAP = 1UL << 2,

};



enum mlx5_accel_esp_action {

	MLX5_ACCEL_ESP_ACTION_DECRYPT,

	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;



	u32   salt;

	u32   icv_len;



	u32   key_len;

	u32   aes_key[256 / 32];

};



struct mlx5_accel_esp_xfrm_attrs {

	enum mlx5_accel_esp_action action;

	u32   esn;

	__be32 spi;

	u32   seq;

	u32   tfc_pad;

	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;

		__be32 a6[4];

	} saddr;



	union {

		__be32 a4;

		__be32 a6[4];

	} daddr;



	u8 is_ipv6;

};



struct mlx5_accel_esp_xfrm {

	struct mlx5_core_dev  *mdev;

	struct mlx5_accel_esp_xfrm_attrs attrs;

};



enum mlx5_accel_ipsec_cap {

	MLX5_ACCEL_IPSEC_CAP_DEVICE		= 1 << 0,

	MLX5_ACCEL_IPSEC_CAP_ESP		= 1 << 1,

	MLX5_ACCEL_IPSEC_CAP_IPV6		= 1 << 2,

	MLX5_ACCEL_IPSEC_CAP_LSO		= 1 << 3,

	MLX5_ACCEL_IPSEC_CAP_ESN		= 1 << 4,

};



struct mlx5e_priv;



struct mlx5e_ipsec_sw_stats {
@@ -108,6 +178,29 @@ void mlx5e_ipsec_build_netdev(struct mlx5e_priv *priv); 
struct xfrm_state *mlx5e_ipsec_sadb_rx_lookup(struct mlx5e_ipsec *dev,

					      unsigned int handle);



void mlx5e_accel_ipsec_fs_cleanup(struct mlx5e_ipsec *ipsec);

int mlx5e_accel_ipsec_fs_init(struct mlx5e_ipsec *ipsec);

int mlx5e_accel_ipsec_fs_add_rule(struct mlx5e_priv *priv,

				  struct mlx5_accel_esp_xfrm_attrs *attrs,

				  u32 ipsec_obj_id,

				  struct mlx5e_ipsec_rule *ipsec_rule);

void mlx5e_accel_ipsec_fs_del_rule(struct mlx5e_priv *priv,

				   struct mlx5_accel_esp_xfrm_attrs *attrs,

				   struct mlx5e_ipsec_rule *ipsec_rule);



void *mlx5_accel_esp_create_hw_context(struct mlx5_core_dev *mdev,

				       struct mlx5_accel_esp_xfrm *xfrm,

				       u32 *sa_handle);

void mlx5_accel_esp_free_hw_context(struct mlx5_core_dev *mdev, void *context);



u32 mlx5_ipsec_device_caps(struct mlx5_core_dev *mdev);



struct mlx5_accel_esp_xfrm *

mlx5_accel_esp_create_xfrm(struct mlx5_core_dev *mdev,

			   const struct mlx5_accel_esp_xfrm_attrs *attrs);

void mlx5_accel_esp_destroy_xfrm(struct mlx5_accel_esp_xfrm *xfrm);

void mlx5_accel_esp_modify_xfrm(struct mlx5_accel_esp_xfrm *xfrm,

				const struct mlx5_accel_esp_xfrm_attrs *attrs);

#else

static inline int mlx5e_ipsec_init(struct mlx5e_priv *priv)

{
@@ -122,6 +215,10 @@ static inline void mlx5e_ipsec_build_netdev(struct mlx5e_priv *priv) 
{

}



static inline u32 mlx5_ipsec_device_caps(struct mlx5_core_dev *mdev)

{

	return 0;

}

#endif



#endif	/* __MLX5E_IPSEC_H__ */

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

+9 −8
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ 
/* Copyright (c) 2020, Mellanox Technologies inc. All rights reserved. */



#include <linux/netdevice.h>

#include "ipsec_offload.h"

#include "ipsec_fs.h"

#include "en.h"

#include "en/fs.h"

#include "ipsec.h"

#include "fs_core.h"



#define NUM_IPSEC_FTE BIT(15)

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

+1 −2
Original line number Diff line number Diff line
@@ -2,9 +2,8 @@ 
/* Copyright (c) 2017, Mellanox Technologies inc. All rights reserved. */



#include "mlx5_core.h"

#include "ipsec_offload.h"

#include "ipsec.h"

#include "lib/mlx5.h"

#include "en_accel/ipsec_fs.h"



struct mlx5_ipsec_sa_ctx {

	struct rhash_head hash;