Commit fe298bdf authored by Jianbo Liu's avatar Jianbo Liu Committed by Saeed Mahameed
Browse files

net/mlx5: Prepare for fast crypto key update if hardware supports it 



Add CAP for crypto offload, do the simple initialization if hardware
supports it. Currently set log_dek_obj_range to 12, so 4k DEKs will be
created in one bulk allocation.

Signed-off-by: default avatarJianbo Liu <jianbol@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 60c8972d

drivers/net/ethernet/mellanox/mlx5/core/en_common.c

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
 */



#include "en.h"

#include "lib/crypto.h"



/* mlx5e global resources should be placed in this file.

 * Global resources are common to all the netdevices created on the same nic.
@@ -104,6 +105,13 @@ int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev) 
	INIT_LIST_HEAD(&res->td.tirs_list);

	mutex_init(&res->td.list_lock);



	mdev->mlx5e_res.dek_priv = mlx5_crypto_dek_init(mdev);

	if (IS_ERR(mdev->mlx5e_res.dek_priv)) {

		mlx5_core_err(mdev, "crypto dek init failed, %ld\n",

			      PTR_ERR(mdev->mlx5e_res.dek_priv));

		mdev->mlx5e_res.dek_priv = NULL;

	}



	return 0;



err_destroy_mkey:
@@ -119,6 +127,8 @@ void mlx5e_destroy_mdev_resources(struct mlx5_core_dev *mdev) 
{

	struct mlx5e_hw_objs *res = &mdev->mlx5e_res.hw_objs;



	mlx5_crypto_dek_cleanup(mdev->mlx5e_res.dek_priv);

	mdev->mlx5e_res.dek_priv = NULL;

	mlx5_free_bfreg(mdev, &res->bfreg);

	mlx5_core_destroy_mkey(mdev, res->mkey);

	mlx5_core_dealloc_transport_domain(mdev, res->td.tdn);

drivers/net/ethernet/mellanox/mlx5/core/fw.c

+6 −0
Original line number Diff line number Diff line
@@ -267,6 +267,12 @@ int mlx5_query_hca_caps(struct mlx5_core_dev *dev) 
			return err;

	}



	if (MLX5_CAP_GEN(dev, crypto)) {

		err = mlx5_core_get_caps(dev, MLX5_CAP_CRYPTO);

		if (err)

			return err;

	}



	if (MLX5_CAP_GEN(dev, shampo)) {

		err = mlx5_core_get_caps(dev, MLX5_CAP_DEV_SHAMPO);

		if (err)

drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c

+36 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 
#include "mlx5_core.h"

#include "lib/crypto.h"



struct mlx5_crypto_dek_priv {

	struct mlx5_core_dev *mdev;

	int log_dek_obj_range;

};



int mlx5_create_encryption_key(struct mlx5_core_dev *mdev,

			       void *key, u32 sz_bytes,

			       u32 key_type, u32 *p_key_id)
@@ -71,3 +76,34 @@ void mlx5_destroy_encryption_key(struct mlx5_core_dev *mdev, u32 key_id) 


	mlx5_cmd_exec(mdev, in, sizeof(in), out, sizeof(out));

}



void mlx5_crypto_dek_cleanup(struct mlx5_crypto_dek_priv *dek_priv)

{

	if (!dek_priv)

		return;



	kfree(dek_priv);

}



struct mlx5_crypto_dek_priv *mlx5_crypto_dek_init(struct mlx5_core_dev *mdev)

{

	struct mlx5_crypto_dek_priv *dek_priv;



	if (!MLX5_CAP_CRYPTO(mdev, log_dek_max_alloc))

		return NULL;



	dek_priv = kzalloc(sizeof(*dek_priv), GFP_KERNEL);

	if (!dek_priv)

		return ERR_PTR(-ENOMEM);



	dek_priv->mdev = mdev;

	dek_priv->log_dek_obj_range = min_t(int, 12,

					    MLX5_CAP_CRYPTO(mdev, log_dek_max_alloc));



	mlx5_core_dbg(mdev, "Crypto DEK enabled, %d deks per alloc (max %d), total %d\n",

		      1 << dek_priv->log_dek_obj_range,

		      1 << MLX5_CAP_CRYPTO(mdev, log_dek_max_alloc),

		      1 << MLX5_CAP_CRYPTO(mdev, log_max_num_deks));



	return dek_priv;

}

drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.h

+2 −0
Original line number Diff line number Diff line
@@ -16,4 +16,6 @@ int mlx5_create_encryption_key(struct mlx5_core_dev *mdev, 


void mlx5_destroy_encryption_key(struct mlx5_core_dev *mdev, u32 key_id);



struct mlx5_crypto_dek_priv *mlx5_crypto_dek_init(struct mlx5_core_dev *mdev);

void mlx5_crypto_dek_cleanup(struct mlx5_crypto_dek_priv *dek_priv);

#endif /* __MLX5_LIB_CRYPTO_H__ */

drivers/net/ethernet/mellanox/mlx5/core/main.c

+1 −0
Original line number Diff line number Diff line
@@ -1555,6 +1555,7 @@ static const int types[] = { 
	MLX5_CAP_DEV_SHAMPO,

	MLX5_CAP_MACSEC,

	MLX5_CAP_ADV_VIRTUALIZATION,

	MLX5_CAP_CRYPTO,

};



static void mlx5_hca_caps_free(struct mlx5_core_dev *dev)