Commit 6ac6dc74 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux 

Saeed Mahameed says:

====================
mlx5-next: updates 2022-06-14

1) Updated HW bits and definitions for upcoming features
 1.1) vport debug counters
 1.2) flow meter
 1.3) Execute ASO action for flow entry
 1.4) enhanced CQE compression

2) Add ICM header-modify-pattern RDMA API

Leon Says
=========

SW steering manipulates packet's header using "modifying header" actions.
Many of these actions do the same operation, but use different data each time.
Currently we create and keep every one of these actions, which use expensive
and limited resources.

Now we introduce a new mechanism - pattern and argument, which splits
a modifying action into two parts:
1. action pattern: contains the operations to be applied on packet's header,
mainly set/add/copy of fields in the packet
2. action data/argument: contains the data to be used by each operation
in the pattern.

This way we reuse same patterns with different arguments to create new
modifying actions, and since many actions share the same operations, we end
up creating a small number of patterns that we keep in a dedicated cache.

These modify header patterns are implemented as new type of ICM memory,
so the following kernel patch series add the support for this new ICM type.
==========

* 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux:
  net/mlx5: Add bits and fields to support enhanced CQE compression
  net/mlx5: Remove not used MLX5_CAP_BITS_RW_MASK
  net/mlx5: group fdb cleanup to single function
  net/mlx5: Add support EXECUTE_ASO action for flow entry
  net/mlx5: Add HW definitions of vport debug counters
  net/mlx5: Add IFC bits and enums for flow meter
  RDMA/mlx5: Support handling of modify-header pattern ICM area
  net/mlx5: Manage ICM of type modify-header pattern
  net/mlx5: Introduce header-modify-pattern ICM properties
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7e5e8ec7 cdcdce94

drivers/infiniband/hw/mlx5/dm.c

+35 −18
Original line number Diff line number Diff line
@@ -336,9 +336,15 @@ static struct ib_dm *handle_alloc_dm_memic(struct ib_ucontext *ctx, 


static enum mlx5_sw_icm_type get_icm_type(int uapi_type)

{

	return uapi_type == MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM ?

		       MLX5_SW_ICM_TYPE_STEERING :

		       MLX5_SW_ICM_TYPE_HEADER_MODIFY;

	switch (uapi_type) {

	case MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_SW_ICM:

		return MLX5_SW_ICM_TYPE_HEADER_MODIFY;

	case MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_PATTERN_SW_ICM:

		return MLX5_SW_ICM_TYPE_HEADER_MODIFY_PATTERN;

	case MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM:

	default:

		return MLX5_SW_ICM_TYPE_STEERING;

	}

}



static struct ib_dm *handle_alloc_dm_sw_icm(struct ib_ucontext *ctx,
@@ -347,11 +353,32 @@ static struct ib_dm *handle_alloc_dm_sw_icm(struct ib_ucontext *ctx, 
					    int type)

{

	struct mlx5_core_dev *dev = to_mdev(ctx->device)->mdev;

	enum mlx5_sw_icm_type icm_type = get_icm_type(type);

	enum mlx5_sw_icm_type icm_type;

	struct mlx5_ib_dm_icm *dm;

	u64 act_size;

	int err;



	if (!capable(CAP_SYS_RAWIO) || !capable(CAP_NET_RAW))

		return ERR_PTR(-EPERM);



	switch (type) {

	case MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM:

	case MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_SW_ICM:

		if (!(MLX5_CAP_FLOWTABLE_NIC_RX(dev, sw_owner) ||

		      MLX5_CAP_FLOWTABLE_NIC_TX(dev, sw_owner) ||

		      MLX5_CAP_FLOWTABLE_NIC_RX(dev, sw_owner_v2) ||

		      MLX5_CAP_FLOWTABLE_NIC_TX(dev, sw_owner_v2)))

			return ERR_PTR(-EOPNOTSUPP);

		break;

	case MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_PATTERN_SW_ICM:

		if (!MLX5_CAP_FLOWTABLE_NIC_RX(dev, sw_owner_v2) ||

		    !MLX5_CAP_FLOWTABLE_NIC_TX(dev, sw_owner_v2))

			return ERR_PTR(-EOPNOTSUPP);

		break;

	default:

		return ERR_PTR(-EOPNOTSUPP);

	}



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

	if (!dm)

		return ERR_PTR(-ENOMEM);
@@ -359,19 +386,6 @@ static struct ib_dm *handle_alloc_dm_sw_icm(struct ib_ucontext *ctx, 
	dm->base.type = type;

	dm->base.ibdm.device = ctx->device;



	if (!capable(CAP_SYS_RAWIO) || !capable(CAP_NET_RAW)) {

		err = -EPERM;

		goto free;

	}



	if (!(MLX5_CAP_FLOWTABLE_NIC_RX(dev, sw_owner) ||

	      MLX5_CAP_FLOWTABLE_NIC_TX(dev, sw_owner) ||

	      MLX5_CAP_FLOWTABLE_NIC_RX(dev, sw_owner_v2) ||

	      MLX5_CAP_FLOWTABLE_NIC_TX(dev, sw_owner_v2))) {

		err = -EOPNOTSUPP;

		goto free;

	}



	/* Allocation size must a multiple of the basic block size

	 * and a power of 2.

	 */
@@ -379,6 +393,8 @@ static struct ib_dm *handle_alloc_dm_sw_icm(struct ib_ucontext *ctx, 
	act_size = roundup_pow_of_two(act_size);



	dm->base.size = act_size;

	icm_type = get_icm_type(type);



	err = mlx5_dm_sw_icm_alloc(dev, icm_type, act_size, attr->alignment,

				   to_mucontext(ctx)->devx_uid,

				   &dm->base.dev_addr, &dm->obj_id);
@@ -420,8 +436,8 @@ struct ib_dm *mlx5_ib_alloc_dm(struct ib_device *ibdev, 
	case MLX5_IB_UAPI_DM_TYPE_MEMIC:

		return handle_alloc_dm_memic(context, attr, attrs);

	case MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM:

		return handle_alloc_dm_sw_icm(context, attr, attrs, type);

	case MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_SW_ICM:

	case MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_PATTERN_SW_ICM:

		return handle_alloc_dm_sw_icm(context, attr, attrs, type);

	default:

		return ERR_PTR(-EOPNOTSUPP);
@@ -474,6 +490,7 @@ static int mlx5_ib_dealloc_dm(struct ib_dm *ibdm, 
		return 0;

	case MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM:

	case MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_SW_ICM:

	case MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_PATTERN_SW_ICM:

		return mlx5_dm_icm_dealloc(ctx, to_icm(ibdm));

	default:

		return -EOPNOTSUPP;

drivers/infiniband/hw/mlx5/mr.c

+1 −0
Original line number Diff line number Diff line
@@ -1083,6 +1083,7 @@ struct ib_mr *mlx5_ib_reg_dm_mr(struct ib_pd *pd, struct ib_dm *dm, 
		break;

	case MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM:

	case MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_SW_ICM:

	case MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_PATTERN_SW_ICM:

		if (attr->access_flags & ~MLX5_IB_DM_SW_ICM_ALLOWED_ACCESS)

			return ERR_PTR(-EINVAL);

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

+33 −0
Original line number Diff line number Diff line
@@ -479,6 +479,30 @@ static int mlx5_set_extended_dest(struct mlx5_core_dev *dev, 


	return 0;

}



static void

mlx5_cmd_set_fte_flow_meter(struct fs_fte *fte, void *in_flow_context)

{

	void *exe_aso_ctrl;

	void *execute_aso;



	execute_aso = MLX5_ADDR_OF(flow_context, in_flow_context,

				   execute_aso[0]);

	MLX5_SET(execute_aso, execute_aso, valid, 1);

	MLX5_SET(execute_aso, execute_aso, aso_object_id,

		 fte->action.exe_aso.object_id);



	exe_aso_ctrl = MLX5_ADDR_OF(execute_aso, execute_aso, exe_aso_ctrl);

	MLX5_SET(exe_aso_ctrl_flow_meter, exe_aso_ctrl, return_reg_id,

		 fte->action.exe_aso.return_reg_id);

	MLX5_SET(exe_aso_ctrl_flow_meter, exe_aso_ctrl, aso_type,

		 fte->action.exe_aso.type);

	MLX5_SET(exe_aso_ctrl_flow_meter, exe_aso_ctrl, init_color,

		 fte->action.exe_aso.flow_meter.init_color);

	MLX5_SET(exe_aso_ctrl_flow_meter, exe_aso_ctrl, meter_id,

		 fte->action.exe_aso.flow_meter.meter_idx);

}



static int mlx5_cmd_set_fte(struct mlx5_core_dev *dev,

			    int opmod, int modify_mask,

			    struct mlx5_flow_table *ft,
@@ -663,6 +687,15 @@ static int mlx5_cmd_set_fte(struct mlx5_core_dev *dev, 
			 list_size);

	}



	if (fte->action.action & MLX5_FLOW_CONTEXT_ACTION_EXECUTE_ASO) {

		if (fte->action.exe_aso.type == MLX5_EXE_ASO_FLOW_METER) {

			mlx5_cmd_set_fte_flow_meter(fte, in_flow_context);

		} else {

			err = -EOPNOTSUPP;

			goto err_out;

		}

	}



	err = mlx5_cmd_exec(dev, in, inlen, out, sizeof(out));

err_out:

	kvfree(in);

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

+10 −8
Original line number Diff line number Diff line
@@ -2895,6 +2895,14 @@ static int create_fdb_bypass(struct mlx5_flow_steering *steering) 
	return 0;

}



static void cleanup_fdb_root_ns(struct mlx5_flow_steering *steering)

{

	cleanup_root_ns(steering->fdb_root_ns);

	steering->fdb_root_ns = NULL;

	kfree(steering->fdb_sub_ns);

	steering->fdb_sub_ns = NULL;

}



static int init_fdb_root_ns(struct mlx5_flow_steering *steering)

{

	struct fs_prio *maj_prio;
@@ -2945,10 +2953,7 @@ static int init_fdb_root_ns(struct mlx5_flow_steering *steering) 
	return 0;



out_err:

	cleanup_root_ns(steering->fdb_root_ns);

	kfree(steering->fdb_sub_ns);

	steering->fdb_sub_ns = NULL;

	steering->fdb_root_ns = NULL;

	cleanup_fdb_root_ns(steering);

	return err;

}
@@ -3108,10 +3113,7 @@ void mlx5_fs_core_cleanup(struct mlx5_core_dev *dev) 
	struct mlx5_flow_steering *steering = dev->priv.steering;



	cleanup_root_ns(steering->root_ns);

	cleanup_root_ns(steering->fdb_root_ns);

	steering->fdb_root_ns = NULL;

	kfree(steering->fdb_sub_ns);

	steering->fdb_sub_ns = NULL;

	cleanup_fdb_root_ns(steering);

	cleanup_root_ns(steering->port_sel_root_ns);

	cleanup_root_ns(steering->sniffer_rx_root_ns);

	cleanup_root_ns(steering->sniffer_tx_root_ns);

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

+42 −0
Original line number Diff line number Diff line
@@ -12,13 +12,16 @@ struct mlx5_dm { 
	spinlock_t lock;

	unsigned long *steering_sw_icm_alloc_blocks;

	unsigned long *header_modify_sw_icm_alloc_blocks;

	unsigned long *header_modify_pattern_sw_icm_alloc_blocks;

};



struct mlx5_dm *mlx5_dm_create(struct mlx5_core_dev *dev)

{

	u64 header_modify_pattern_icm_blocks = 0;

	u64 header_modify_icm_blocks = 0;

	u64 steering_icm_blocks = 0;

	struct mlx5_dm *dm;

	bool support_v2;



	if (!(MLX5_CAP_GEN_64(dev, general_obj_types) & MLX5_GENERAL_OBJ_TYPES_CAP_SW_ICM))

		return NULL;
@@ -53,8 +56,27 @@ struct mlx5_dm *mlx5_dm_create(struct mlx5_core_dev *dev) 
			goto err_modify_hdr;

	}



	support_v2 = MLX5_CAP_FLOWTABLE_NIC_RX(dev, sw_owner_v2) &&

		     MLX5_CAP_FLOWTABLE_NIC_TX(dev, sw_owner_v2) &&

		     MLX5_CAP64_DEV_MEM(dev, header_modify_pattern_sw_icm_start_address);



	if (support_v2) {

		header_modify_pattern_icm_blocks =

			BIT(MLX5_CAP_DEV_MEM(dev, log_header_modify_pattern_sw_icm_size) -

			    MLX5_LOG_SW_ICM_BLOCK_SIZE(dev));



		dm->header_modify_pattern_sw_icm_alloc_blocks =

			kcalloc(BITS_TO_LONGS(header_modify_pattern_icm_blocks),

				sizeof(unsigned long), GFP_KERNEL);

		if (!dm->header_modify_pattern_sw_icm_alloc_blocks)

			goto err_pattern;

	}



	return dm;



err_pattern:

	kfree(dm->header_modify_sw_icm_alloc_blocks);



err_modify_hdr:

	kfree(dm->steering_sw_icm_alloc_blocks);
@@ -86,6 +108,14 @@ void mlx5_dm_cleanup(struct mlx5_core_dev *dev) 
		kfree(dm->header_modify_sw_icm_alloc_blocks);

	}



	if (dm->header_modify_pattern_sw_icm_alloc_blocks) {

		WARN_ON(!bitmap_empty(dm->header_modify_pattern_sw_icm_alloc_blocks,

				      BIT(MLX5_CAP_DEV_MEM(dev,

							   log_header_modify_pattern_sw_icm_size) -

					  MLX5_LOG_SW_ICM_BLOCK_SIZE(dev))));

		kfree(dm->header_modify_pattern_sw_icm_alloc_blocks);

	}



	kfree(dm);

}
@@ -130,6 +160,13 @@ int mlx5_dm_sw_icm_alloc(struct mlx5_core_dev *dev, enum mlx5_sw_icm_type type, 
						log_header_modify_sw_icm_size);

		block_map = dm->header_modify_sw_icm_alloc_blocks;

		break;

	case MLX5_SW_ICM_TYPE_HEADER_MODIFY_PATTERN:

		icm_start_addr = MLX5_CAP64_DEV_MEM(dev,

						    header_modify_pattern_sw_icm_start_address);

		log_icm_size = MLX5_CAP_DEV_MEM(dev,

						log_header_modify_pattern_sw_icm_size);

		block_map = dm->header_modify_pattern_sw_icm_alloc_blocks;

		break;

	default:

		return -EINVAL;

	}
@@ -203,6 +240,11 @@ int mlx5_dm_sw_icm_dealloc(struct mlx5_core_dev *dev, enum mlx5_sw_icm_type type 
		icm_start_addr = MLX5_CAP64_DEV_MEM(dev, header_modify_sw_icm_start_address);

		block_map = dm->header_modify_sw_icm_alloc_blocks;

		break;

	case MLX5_SW_ICM_TYPE_HEADER_MODIFY_PATTERN:

		icm_start_addr = MLX5_CAP64_DEV_MEM(dev,

						    header_modify_pattern_sw_icm_start_address);

		block_map = dm->header_modify_pattern_sw_icm_alloc_blocks;

		break;

	default:

		return -EINVAL;

	}