Commit 71af6a2d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'mlx5-updates-2023-01-30' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 

Saeed Mahameed says:

====================
mlx5-updates-2023-01-30

Add fast update encryption key

Jianbo Liu Says:
================

Data encryption keys (DEKs) are the keys used for data encryption and
decryption operations. Starting from version 22.33.0783, firmware is
optimized to accelerate the update of user keys into DEK object in
hardware. The support for bulk allocation and destruction of DEK
objects is added, and the bulk allocated DEKs are uninitialized, as
the bulk creation requires no input key. When offload
encryption/decryption, user gets one object from a bulk, and updates
key by a new "modify DEK" command. This command is the same as create
DEK object, but requires no heavy context memory allocation in
firmware, which consumes most cpu cycles of the create DEK command.

DEKs are cached internally by the NIC, so invalidating internal NIC
caches is required before reusing DEKs. The SYNC_CRYPTO command is
added to support it. DEK object can be reused, the keys in it can be
updated after this command is executed.

This patchset enhances the key creation and destruction flow, to get
use of this new feature. Any user, for example, ktls, ipsec and
macsec, can use it to offload keys. But, only ktls uses it, as others
don't need many keys, and caching two many DEKs in pool is wasteful.

There are two new data struts added:
    a. DEK pool. One pool is created for each key type. The bulks by
the type, are placed in the pool's different bulk lists, according to
the number of available and in_used DEKs in the bulk.
    b. DEK bulk. All DEKs in one bulk allocation are store here. There
are two bitmaps to indicate the state of each DEK.

New APIs are then added. When user need a DEK object,
    a. Fetch one bulk with avail DEKs, from the partial_list or
avail_list, otherwise create new one.
    b. Pick one DEK, and set its need_sync and in_used bits to 1.
Move the bulk to full_list if no more available keys, or put it to
partial_list if the bulk is newly created.
    c. Update DEK object's key with user key, by the "modify DEK"
command.
    d. Return DEK struct to user, then it gets the object id and fills
it into the offload commands.
When user free a DEK,
    a. Set in_use bit to 0. If all need_sync bits are 1 and all in_use
bits of this bulk are 0, move it to sync_list.
    b. If the number of DEKs, which are freed by users, is over the
threshold (128), schedule a workqueue to do the sync process.

For the sync process, the SYNC_CRYPTO command is executed first. Then,
for each bulks in partial_list, full_list and sync_list, reset
need_sync bits of the freed DEK objects. If all need_sync bits in one
bulk are zero, move it to avail_list.

We already supported TIS pool to recycle the TISes. With this series
and TIS pool, TLS CPS performance is improved greatly.
And we tested https on the system:
    CPU: dual AMD EPYC 7763 64-Core processors
    RAM: 512G
    DEV: ConnectX-6 DX, with FW ver 22.33.0838 and TLS_OPTIMISE=true
TLS CPS performance numbers are:
    Before: 11k connections/sec
    After: 101 connections/sec

================

* tag 'mlx5-updates-2023-01-30' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5e: kTLS, Improve connection rate by using fast update encryption key
  net/mlx5: Keep only one bulk of full available DEKs
  net/mlx5: Add async garbage collector for DEK bulk
  net/mlx5: Reuse DEKs after executing SYNC_CRYPTO command
  net/mlx5: Use bulk allocation for fast update encryption key
  net/mlx5: Add bulk allocation and modify_dek operation
  net/mlx5: Add support SYNC_CRYPTO command
  net/mlx5: Add new APIs for fast update encryption key
  net/mlx5: Refactor the encryption key creation
  net/mlx5: Add const to the key pointer of encryption key creation
  net/mlx5: Prepare for fast crypto key update if hardware supports it
  net/mlx5: Change key type to key purpose
  net/mlx5: Add IFC bits and enums for crypto key
  net/mlx5: Add IFC bits for general obj create param
  net/mlx5: Header file for crypto
====================

Link: https://lore.kernel.org/r/20230131031201.35336-1-saeed@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c925ed5f f741db1a

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

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static bool mlx5_cmd_is_throttle_opcode(u16 op) 
	case MLX5_CMD_OP_DESTROY_GENERAL_OBJECT:

	case MLX5_CMD_OP_MODIFY_GENERAL_OBJECT:

	case MLX5_CMD_OP_QUERY_GENERAL_OBJECT:

	case MLX5_CMD_OP_SYNC_CRYPTO:

		return true;

	}

	return false;
@@ -523,6 +524,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_QUERY_VHCA_MIGRATION_STATE:

	case MLX5_CMD_OP_SAVE_VHCA_STATE:

	case MLX5_CMD_OP_LOAD_VHCA_STATE:

	case MLX5_CMD_OP_SYNC_CRYPTO:

		*status = MLX5_DRIVER_STATUS_ABORTED;

		*synd = MLX5_DRIVER_SYND;

		return -ENOLINK;
@@ -725,6 +727,7 @@ const char *mlx5_command_str(int command) 
	MLX5_COMMAND_STR_CASE(QUERY_VHCA_MIGRATION_STATE);

	MLX5_COMMAND_STR_CASE(SAVE_VHCA_STATE);

	MLX5_COMMAND_STR_CASE(LOAD_VHCA_STATE);

	MLX5_COMMAND_STR_CASE(SYNC_CRYPTO);

	default: return "unknown command opcode";

	}

}

drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c

+4 −2
Original line number Diff line number Diff line
@@ -204,13 +204,15 @@ mlx5e_flow_meter_create_aso_obj(struct mlx5e_flow_meters *flow_meters, int *obj_ 
	u32 in[MLX5_ST_SZ_DW(create_flow_meter_aso_obj_in)] = {};

	u32 out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)];

	struct mlx5_core_dev *mdev = flow_meters->mdev;

	void *obj;

	void *obj, *param;

	int err;



	MLX5_SET(general_obj_in_cmd_hdr, in, opcode, MLX5_CMD_OP_CREATE_GENERAL_OBJECT);

	MLX5_SET(general_obj_in_cmd_hdr, in, obj_type,

		 MLX5_GENERAL_OBJECT_TYPES_FLOW_METER_ASO);

	MLX5_SET(general_obj_in_cmd_hdr, in, log_obj_range, flow_meters->log_granularity);

	param = MLX5_ADDR_OF(general_obj_in_cmd_hdr, in, op_param);

	MLX5_SET(general_obj_create_param, param, log_obj_range,

		 flow_meters->log_granularity);



	obj = MLX5_ADDR_OF(create_flow_meter_aso_obj_in, in, flow_meter_aso_obj);

	MLX5_SET(flow_meter_aso_obj, obj, meter_aso_access_pd, flow_meters->pdn);

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

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include "mlx5_core.h"

#include "en.h"

#include "ipsec.h"

#include "lib/mlx5.h"

#include "lib/crypto.h"



enum {

	MLX5_IPSEC_ASO_REMOVE_FLOW_PKT_CNT_OFFSET,

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

+18 −11
Original line number Diff line number Diff line
@@ -4,16 +4,16 @@ 
#include <linux/debugfs.h>

#include "en.h"

#include "lib/mlx5.h"

#include "lib/crypto.h"

#include "en_accel/ktls.h"

#include "en_accel/ktls_utils.h"

#include "en_accel/fs_tcp.h"



int mlx5_ktls_create_key(struct mlx5_core_dev *mdev,

			 struct tls_crypto_info *crypto_info,

			 u32 *p_key_id)

struct mlx5_crypto_dek *mlx5_ktls_create_key(struct mlx5_crypto_dek_pool *dek_pool,

					     struct tls_crypto_info *crypto_info)

{

	const void *key;

	u32 sz_bytes;

	void *key;



	switch (crypto_info->cipher_type) {

	case TLS_CIPHER_AES_GCM_128: {
@@ -33,17 +33,16 @@ int mlx5_ktls_create_key(struct mlx5_core_dev *mdev, 
		break;

	}

	default:

		return -EINVAL;

		return ERR_PTR(-EINVAL);

	}



	return mlx5_create_encryption_key(mdev, key, sz_bytes,

					  MLX5_ACCEL_OBJ_TLS_KEY,

					  p_key_id);

	return mlx5_crypto_dek_create(dek_pool, key, sz_bytes);

}



void mlx5_ktls_destroy_key(struct mlx5_core_dev *mdev, u32 key_id)

void mlx5_ktls_destroy_key(struct mlx5_crypto_dek_pool *dek_pool,

			   struct mlx5_crypto_dek *dek)

{

	mlx5_destroy_encryption_key(mdev, key_id);

	mlx5_crypto_dek_destroy(dek_pool, dek);

}



static int mlx5e_ktls_add(struct net_device *netdev, struct sock *sk,
@@ -189,6 +188,7 @@ static void mlx5e_tls_debugfs_init(struct mlx5e_tls *tls, 


int mlx5e_ktls_init(struct mlx5e_priv *priv)

{

	struct mlx5_crypto_dek_pool *dek_pool;

	struct mlx5e_tls *tls;



	if (!mlx5e_is_ktls_device(priv->mdev))
@@ -197,9 +197,15 @@ int mlx5e_ktls_init(struct mlx5e_priv *priv) 
	tls = kzalloc(sizeof(*tls), GFP_KERNEL);

	if (!tls)

		return -ENOMEM;

	tls->mdev = priv->mdev;



	dek_pool = mlx5_crypto_dek_pool_create(priv->mdev, MLX5_ACCEL_OBJ_TLS_KEY);

	if (IS_ERR(dek_pool)) {

		kfree(tls);

		return PTR_ERR(dek_pool);

	}

	tls->dek_pool = dek_pool;

	priv->tls = tls;

	priv->tls->mdev = priv->mdev;



	mlx5e_tls_debugfs_init(tls, priv->dfs_root);
@@ -216,6 +222,7 @@ void mlx5e_ktls_cleanup(struct mlx5e_priv *priv) 
	debugfs_remove_recursive(tls->debugfs.dfs);

	tls->debugfs.dfs = NULL;



	mlx5_crypto_dek_pool_destroy(tls->dek_pool);

	kfree(priv->tls);

	priv->tls = NULL;

}

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

+7 −4
Original line number Diff line number Diff line
@@ -10,10 +10,12 @@ 
#include "en.h"



#ifdef CONFIG_MLX5_EN_TLS

int mlx5_ktls_create_key(struct mlx5_core_dev *mdev,

			 struct tls_crypto_info *crypto_info,

			 u32 *p_key_id);

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

#include "lib/crypto.h"



struct mlx5_crypto_dek *mlx5_ktls_create_key(struct mlx5_crypto_dek_pool *dek_pool,

					     struct tls_crypto_info *crypto_info);

void mlx5_ktls_destroy_key(struct mlx5_crypto_dek_pool *dek_pool,

			   struct mlx5_crypto_dek *dek);



static inline bool mlx5e_is_ktls_device(struct mlx5_core_dev *mdev)

{
@@ -83,6 +85,7 @@ struct mlx5e_tls { 
	struct mlx5e_tls_sw_stats sw_stats;

	struct workqueue_struct *rx_wq;

	struct mlx5e_tls_tx_pool *tx_pool;

	struct mlx5_crypto_dek_pool *dek_pool;

	struct mlx5e_tls_debugfs debugfs;

};