Commit a429ec96 authored by Shun Hao's avatar Shun Hao Committed by Leon Romanovsky
Browse files

RDMA/mlx5: Support handling of SW encap ICM area 



New type for this ICM area, now the user can allocate/deallocate
the new type of SW encap ICM memory, to store the encap header data
which are managed by SW.

Signed-off-by: default avatarShun Hao <shunh@nvidia.com>
Link: https://lore.kernel.org/r/546fe43fc700240709e30acf7713ec6834d652bd.1701871118.git.leon@kernel.org


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 1ca51628

drivers/infiniband/hw/mlx5/dm.c

+5 −0
Original line number Diff line number Diff line
@@ -341,6 +341,8 @@ static enum mlx5_sw_icm_type get_icm_type(int uapi_type) 
		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_ENCAP_SW_ICM:

		return MLX5_SW_ICM_TYPE_SW_ENCAP;

	case MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM:

	default:

		return MLX5_SW_ICM_TYPE_STEERING;
@@ -364,6 +366,7 @@ static struct ib_dm *handle_alloc_dm_sw_icm(struct ib_ucontext *ctx, 
	switch (type) {

	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_ENCAP_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) ||
@@ -438,6 +441,7 @@ struct ib_dm *mlx5_ib_alloc_dm(struct ib_device *ibdev, 
	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:

	case MLX5_IB_UAPI_DM_TYPE_ENCAP_SW_ICM:

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

	default:

		return ERR_PTR(-EOPNOTSUPP);
@@ -491,6 +495,7 @@ static int mlx5_ib_dealloc_dm(struct ib_dm *ibdm, 
	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:

	case MLX5_IB_UAPI_DM_TYPE_ENCAP_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
@@ -1347,6 +1347,7 @@ struct ib_mr *mlx5_ib_reg_dm_mr(struct ib_pd *pd, struct ib_dm *dm, 
	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:

	case MLX5_IB_UAPI_DM_TYPE_ENCAP_SW_ICM:

		if (attr->access_flags & ~MLX5_IB_DM_SW_ICM_ALLOWED_ACCESS)

			return ERR_PTR(-EINVAL);

include/linux/mlx5/driver.h

+1 −0
Original line number Diff line number Diff line
@@ -688,6 +688,7 @@ enum mlx5_sw_icm_type { 
	MLX5_SW_ICM_TYPE_STEERING,

	MLX5_SW_ICM_TYPE_HEADER_MODIFY,

	MLX5_SW_ICM_TYPE_HEADER_MODIFY_PATTERN,

	MLX5_SW_ICM_TYPE_SW_ENCAP,

};



#define MLX5_MAX_RESERVED_GIDS 8

include/uapi/rdma/mlx5_user_ioctl_verbs.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ enum mlx5_ib_uapi_dm_type { 
	MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM,

	MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_SW_ICM,

	MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_PATTERN_SW_ICM,

	MLX5_IB_UAPI_DM_TYPE_ENCAP_SW_ICM,

};



enum mlx5_ib_uapi_devx_create_event_channel_flags {