From: Moni Shoua <monis@xxxxxxxxxxxx>
Make changes in the flow of create_qp() to handle DC transport QPs.
Because DCT QP is a software abstraction to a DC target hardware object
the flow to create a DCT QPs takes almost nothing from the general flow
to create a QP. A DCI QP however, behaves almost like any other QP.
Signed-off-by: Moni Shoua <monis@xxxxxxxxxxxx>
Signed-off-by: Yishai Hadas <yishaih@xxxxxxxxxxxx>
---
providers/mlx5/mlx5-abi.h | 18 +++++++--
providers/mlx5/mlx5.h | 1 +
providers/mlx5/verbs.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 107 insertions(+), 5 deletions(-)
diff --git a/providers/mlx5/mlx5-abi.h b/providers/mlx5/mlx5-abi.h
index afc9e6f..016869c 100644
--- a/providers/mlx5/mlx5-abi.h
+++ b/providers/mlx5/mlx5-abi.h
@@ -44,6 +44,8 @@ enum {
MLX5_QP_FLAG_SIGNATURE = 1 << 0,
MLX5_QP_FLAG_SCATTER_CQE = 1 << 1,
MLX5_QP_FLAG_TUNNEL_OFFLOADS = 1 << 2,
+ MLX5_QP_FLAG_TYPE_DCT = 1 << 4,
+ MLX5_QP_FLAG_TYPE_DCI = 1 << 5,
};
enum {
@@ -166,8 +168,12 @@ struct mlx5_create_qp_drv_ex {
__u32 flags;
__u32 uidx;
__u32 reserved;
- /* SQ buffer address - used for Raw Packet QP */
- __u64 sq_buf_addr;
+ union {
+ /* SQ buffer address - used for Raw Packet QP */
+ __u64 sq_buf_addr;
+ /* DC access key - used to create a DCT QP */
+ __u64 access_key;
+ };
};
struct mlx5_create_qp_ex {
@@ -202,8 +208,12 @@ struct mlx5_create_qp {
__u32 flags;
__u32 uidx;
__u32 reserved;
- /* SQ buffer address - used for Raw Packet QP */
- __u64 sq_buf_addr;
+ union {
+ /* SQ buffer address - used for Raw Packet QP */
+ __u64 sq_buf_addr;
+ /* DC access key - used to create a DCT QP */
+ __u64 access_key;
+ };
};
struct mlx5_create_qp_resp {
diff --git a/providers/mlx5/mlx5.h b/providers/mlx5/mlx5.h
index 5a1f7c0..3f0ba26 100644
--- a/providers/mlx5/mlx5.h
+++ b/providers/mlx5/mlx5.h
@@ -488,6 +488,7 @@ struct mlx5_qp {
uint16_t max_tso_header;
int rss_qp;
uint32_t flags; /* Use enum mlx5_qp_flags */
+ enum mlx5dv_dc_type dc_type;
};
struct mlx5_ah {
diff --git a/providers/mlx5/verbs.c b/providers/mlx5/verbs.c
index 579c0f3..77c28e5 100644
--- a/providers/mlx5/verbs.c
+++ b/providers/mlx5/verbs.c
@@ -802,6 +802,12 @@ static int sq_overhead(struct mlx5_qp *qp, enum ibv_qp_type qp_type)
max_t(size_t, sizeof(struct mlx5_wqe_umr_klm_seg), 64);
switch (qp_type) {
+ case IBV_QPT_DRIVER:
+ if (qp->dc_type != MLX5DV_DCTYPE_DCI)
+ return -EINVAL;
+ size += sizeof(struct mlx5_wqe_datagram_seg);
+ SWITCH_FALLTHROUGH;
+
case IBV_QPT_RC:
size += sizeof(struct mlx5_wqe_ctrl_seg) +
max(sizeof(struct mlx5_wqe_atomic_seg) +
@@ -1282,7 +1288,8 @@ enum {
};
enum {
- MLX5_DV_CREATE_QP_SUP_COMP_MASK = MLX5DV_QP_INIT_ATTR_MASK_QP_CREATE_FLAGS
+ MLX5_DV_CREATE_QP_SUP_COMP_MASK = MLX5DV_QP_INIT_ATTR_MASK_QP_CREATE_FLAGS |
+ MLX5DV_QP_INIT_ATTR_MASK_DC
};
enum {
@@ -1292,6 +1299,60 @@ enum {
IBV_QP_INIT_ATTR_RX_HASH),
};
+static int create_dct(struct ibv_context *context,
+ struct ibv_qp_init_attr_ex *attr,
+ struct mlx5dv_qp_init_attr *mlx5_qp_attr,
+ struct mlx5_qp *qp)
+{
+ struct mlx5_create_qp cmd = {};
+ struct mlx5_create_qp_resp resp = {};
+ int ret;
+ struct mlx5_context *ctx = to_mctx(context);
+ int32_t usr_idx = 0xffffff;
+ FILE *fp = ctx->dbg_fp;
+
+ if (!check_comp_mask(attr->comp_mask, IBV_QP_INIT_ATTR_PD)) {
+ mlx5_dbg(fp, MLX5_DBG_QP,
+ "Unsupported comp_mask for %s\n", __func__);
+ errno = EINVAL;
+ return errno;
+ }
+
+ if (!check_comp_mask(mlx5_qp_attr->comp_mask, MLX5DV_QP_INIT_ATTR_MASK_DC)) {
+ mlx5_dbg(fp, MLX5_DBG_QP,
+ "Unsupported vendor comp_mask for %s\n", __func__);
+ errno = EINVAL;
+ return errno;
+ }
+
+ cmd.flags = MLX5_QP_FLAG_TYPE_DCT;
+ cmd.access_key = mlx5_qp_attr->dc_init_attr.dct_access_key;
+ if (ctx->cqe_version) {
+ usr_idx = mlx5_store_uidx(ctx, qp);
+ if (usr_idx < 0) {
+ mlx5_dbg(fp, MLX5_DBG_QP, "Couldn't find free user index\n");
+ errno = ENOMEM;
+ return errno;
+ }
+ cmd.uidx = usr_idx;
+ } else {
+ cmd.uidx = usr_idx;
+ }
+ ret = ibv_cmd_create_qp_ex(context, &qp->verbs_qp, sizeof(qp->verbs_qp),
+ attr, &cmd.ibv_cmd, sizeof(cmd),
+ &resp.ibv_resp, sizeof(resp));
+ if (ret) {
+ mlx5_dbg(fp, MLX5_DBG_QP, "Couldn't create dct, ret %d\n", ret);
+ return ret;
+ }
+
+ qp->dc_type = MLX5DV_DCTYPE_DCT;
+ qp->rsc.type = MLX5_RSC_TYPE_QP;
+ if (ctx->cqe_version)
+ qp->rsc.rsn = usr_idx;
+ return 0;
+}
+
static struct ibv_qp *create_qp(struct ibv_context *context,
struct ibv_qp_init_attr_ex *attr,
struct mlx5dv_qp_init_attr *mlx5_qp_attr)
@@ -1347,6 +1408,12 @@ static struct ibv_qp *create_qp(struct ibv_context *context,
goto err;
}
+ if ((mlx5_qp_attr->comp_mask & MLX5DV_QP_INIT_ATTR_MASK_DC) &&
+ (attr->qp_type != IBV_QPT_DRIVER)) {
+ mlx5_dbg(fp, MLX5_DBG_QP, "DC QP must be of type IBV_QPT_DRIVER\n");
+ errno = EINVAL;
+ goto err;
+ }
if (mlx5_qp_attr->comp_mask &
MLX5DV_QP_INIT_ATTR_MASK_QP_CREATE_FLAGS) {
if (mlx5_qp_attr->create_flags &
@@ -1359,6 +1426,30 @@ static struct ibv_qp *create_qp(struct ibv_context *context,
goto err;
}
}
+
+ if (attr->qp_type == IBV_QPT_DRIVER) {
+ if (mlx5_qp_attr->comp_mask & MLX5DV_QP_INIT_ATTR_MASK_DC) {
+ if (mlx5_qp_attr->dc_init_attr.dc_type == MLX5DV_DCTYPE_DCT) {
+ ret = create_dct(context, attr, mlx5_qp_attr, qp);
+ if (ret)
+ goto err;
+ return ibqp;
+ } else if (mlx5_qp_attr->dc_init_attr.dc_type == MLX5DV_DCTYPE_DCI) {
+ mlx5_create_flags |= MLX5_QP_FLAG_TYPE_DCI;
+ qp->dc_type = MLX5DV_DCTYPE_DCI;
+ } else {
+ errno = EINVAL;
+ goto err;
+ }
+ } else {
+ errno = EINVAL;
+ goto err;
+ }
+ }
+
+ } else {
+ if (attr->qp_type == IBV_QPT_DRIVER)
+ goto err;
}
if (attr->comp_mask & IBV_QP_INIT_ATTR_RX_HASH) {
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
