Commit 1dbd51d0 authored by Raed Salem's avatar Raed Salem Committed by Saeed Mahameed
Browse files

net/mlx5: Refactor mlx5_accel_esp_create_hw_context parameter list 



Currently the FPGA IPsec is the only hw implementation of the IPsec
acceleration api, and so the mlx5_accel_esp_create_hw_context was
wrongly made to suit this HW api, among other in its parameter list
and some of its parameter endianness.

This implementation might not be suitable for different HW.

Refactor by group and pass all function arguments of
mlx5_accel_esp_create_hw_context in common mlx5_accel_esp_xfrm_attrs
struct field of mlx5_accel_esp_xfrm struct and correct the endianness
according to the HW being called.

Signed-off-by: default avatarRaed Salem <raeds@mellanox.com>
Reviewed-by: default avatarBoris Pismenny <borisp@mellanox.com>
Reviewed-by: default avatarHuy Nguyen <huyn@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 9425c595

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

+14 −6
Original line number Diff line number Diff line
@@ -57,13 +57,21 @@ int mlx5_accel_ipsec_counters_read(struct mlx5_core_dev *mdev, u64 *counters, 
}



void *mlx5_accel_esp_create_hw_context(struct mlx5_core_dev *mdev,

				       struct mlx5_accel_esp_xfrm *xfrm,

				       const __be32 saddr[4],

				       const __be32 daddr[4],

				       const __be32 spi, bool is_ipv6)

				       struct mlx5_accel_esp_xfrm *xfrm)

{

	return mlx5_fpga_ipsec_create_sa_ctx(mdev, xfrm, saddr, daddr,

					     spi, is_ipv6);

	__be32 saddr[4] = {}, daddr[4] = {};



	if (!xfrm->attrs.is_ipv6) {

		saddr[3] = xfrm->attrs.saddr.a4;

		daddr[3] = xfrm->attrs.daddr.a4;

	} else {

		memcpy(saddr, xfrm->attrs.saddr.a6, sizeof(saddr));

		memcpy(daddr, xfrm->attrs.daddr.a6, sizeof(daddr));

	}



	return mlx5_fpga_ipsec_create_sa_ctx(mdev, xfrm, saddr,

					     daddr, xfrm->attrs.spi,

					     xfrm->attrs.is_ipv6);

}



void mlx5_accel_esp_free_hw_context(void *context)

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

+2 −8
Original line number Diff line number Diff line
@@ -47,10 +47,7 @@ int mlx5_accel_ipsec_counters_read(struct mlx5_core_dev *mdev, u64 *counters, 
				   unsigned int count);



void *mlx5_accel_esp_create_hw_context(struct mlx5_core_dev *mdev,

				       struct mlx5_accel_esp_xfrm *xfrm,

				       const __be32 saddr[4],

				       const __be32 daddr[4],

				       const __be32 spi, bool is_ipv6);

				       struct mlx5_accel_esp_xfrm *xfrm);

void mlx5_accel_esp_free_hw_context(void *context);



int mlx5_accel_ipsec_init(struct mlx5_core_dev *mdev);
@@ -63,10 +60,7 @@ void mlx5_accel_ipsec_cleanup(struct mlx5_core_dev *mdev); 


static inline void *

mlx5_accel_esp_create_hw_context(struct mlx5_core_dev *mdev,

				 struct mlx5_accel_esp_xfrm *xfrm,

				 const __be32 saddr[4],

				 const __be32 daddr[4],

				 const __be32 spi, bool is_ipv6)

				 struct mlx5_accel_esp_xfrm *xfrm)

{

	return NULL;

}

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

+9 −14
Original line number Diff line number Diff line
@@ -199,6 +199,14 @@ mlx5e_ipsec_build_accel_xfrm_attrs(struct mlx5e_ipsec_sa_entry *sa_entry, 
	attrs->flags |= (x->props.mode == XFRM_MODE_TRANSPORT) ?

			MLX5_ACCEL_ESP_FLAGS_TRANSPORT :

			MLX5_ACCEL_ESP_FLAGS_TUNNEL;



	/* spi */

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



	/* source , destination ips */

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

	memcpy(&attrs->daddr, x->id.daddr.a6, sizeof(attrs->daddr));

	attrs->is_ipv6 = (x->props.family != AF_INET);

}



static inline int mlx5e_xfrm_validate_state(struct xfrm_state *x)
@@ -284,8 +292,6 @@ static int mlx5e_xfrm_add_state(struct xfrm_state *x) 
	struct net_device *netdev = x->xso.dev;

	struct mlx5_accel_esp_xfrm_attrs attrs;

	struct mlx5e_priv *priv;

	__be32 saddr[4] = {0}, daddr[4] = {0}, spi;

	bool is_ipv6 = false;

	int err;



	priv = netdev_priv(netdev);
@@ -331,20 +337,9 @@ static int mlx5e_xfrm_add_state(struct xfrm_state *x) 
	}



	/* create hw context */

	if (x->props.family == AF_INET) {

		saddr[3] = x->props.saddr.a4;

		daddr[3] = x->id.daddr.a4;

	} else {

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

		memcpy(daddr, x->id.daddr.a6, sizeof(daddr));

		is_ipv6 = true;

	}

	spi = x->id.spi;

	sa_entry->hw_context =

			mlx5_accel_esp_create_hw_context(priv->mdev,

							 sa_entry->xfrm,

							 saddr, daddr, spi,

							 is_ipv6);

							 sa_entry->xfrm);

	if (IS_ERR(sa_entry->hw_context)) {

		err = PTR_ERR(sa_entry->hw_context);

		goto err_xfrm;

include/linux/mlx5/accel.h

+12 −0
Original line number Diff line number Diff line
@@ -92,6 +92,18 @@ struct mlx5_accel_esp_xfrm_attrs { 
	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 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE