Adds support for the new verb: create_qp_expanded
in libmlx4.
Changes in v2:
Minimized code duplications by calling mlx4_create_qp_expanded
from mlx4_create_qp.
Changes in v3:
Minimized code duplications by calling mlx4_create_qp_common.
Added compatibility for older kernels.
Signed-off-by: Ron Livne <[EMAIL PROTECTED]>
diff --git a/src/mlx4-abi.h b/src/mlx4-abi.h
index 1b1253c..729f4ee 100644
--- a/src/mlx4-abi.h
+++ b/src/mlx4-abi.h
@@ -98,6 +98,16 @@ struct mlx4_create_qp {
__u8 reserved[5];
};
+struct mlx4_create_qp_expanded {
+ struct ibv_create_qp_expanded ibv_cmd;
+ __u64 buf_addr;
+ __u64 db_addr;
+ __u8 log_sq_bb_count;
+ __u8 log_sq_stride;
+ __u8 sq_no_prefetch;
+ __u8 reserved[5];
+};
+
#ifdef HAVE_IBV_XRC_OPS
struct mlx4_open_xrc_domain_resp {
struct ibv_open_xrc_domain_resp ibv_resp;
diff --git a/src/mlx4.c b/src/mlx4.c
index 1f23144..bfcb7ec 100644
--- a/src/mlx4.c
+++ b/src/mlx4.c
@@ -79,6 +79,7 @@ static struct ibv_more_ops mlx4_more_ops = {
.query_xrc_rcv_qp = mlx4_query_xrc_rcv_qp,
.reg_xrc_rcv_qp = mlx4_reg_xrc_rcv_qp,
.unreg_xrc_rcv_qp = mlx4_unreg_xrc_rcv_qp,
+ .create_qp_expanded = mlx4_create_qp_expanded,
#endif
};
#endif
diff --git a/src/mlx4.h b/src/mlx4.h
index a2e3aec..7ed3ac8 100644
--- a/src/mlx4.h
+++ b/src/mlx4.h
@@ -427,6 +427,9 @@ int mlx4_reg_xrc_rcv_qp(struct ibv_xrc_domain *xrc_domain,
uint32_t xrc_qp_num);
int mlx4_unreg_xrc_rcv_qp(struct ibv_xrc_domain *xrc_domain,
uint32_t xrc_qp_num);
+struct ibv_qp *mlx4_create_qp_expanded(struct ibv_pd *pd,
+ struct ibv_qp_init_attr *attr,
+ uint32_t create_flags);
#endif
diff --git a/src/verbs.c b/src/verbs.c
index b1bad3c..1c4b662 100644
--- a/src/verbs.c
+++ b/src/verbs.c
@@ -402,23 +402,16 @@ int mlx4_destroy_srq(struct ibv_srq *ibsrq)
return 0;
}
-struct ibv_qp *mlx4_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *attr)
+static struct mlx4_qp *mlx4_create_qp_common(struct ibv_pd *pd,
+ struct ibv_qp_init_attr *attr,
+ struct mlx4_qp *qp)
{
- struct mlx4_create_qp cmd;
- struct ibv_create_qp_resp resp;
- struct mlx4_qp *qp;
- int ret;
-
/* Sanity check QP size before proceeding */
if (attr->cap.max_send_wr > 65536 ||
- attr->cap.max_recv_wr > 65536 ||
- attr->cap.max_send_sge > 64 ||
- attr->cap.max_recv_sge > 64 ||
- attr->cap.max_inline_data > 1024)
- return NULL;
-
- qp = malloc(sizeof *qp);
- if (!qp)
+ attr->cap.max_recv_wr > 65536 ||
+ attr->cap.max_send_sge > 64 ||
+ attr->cap.max_recv_sge > 64 ||
+ attr->cap.max_inline_data > 1024)
return NULL;
mlx4_calc_sq_wqe_size(&attr->cap, attr->qp_type, qp);
@@ -456,6 +449,32 @@ struct ibv_qp *mlx4_create_qp(struct ibv_pd *pd, struct
ibv_qp_init_attr *attr)
*qp->db = 0;
}
+ return qp;
+err_free:
+ free(qp->sq.wrid);
+ if (qp->rq.wqe_cnt)
+ free(qp->rq.wrid);
+ mlx4_free_buf(&qp->buf);
+
+err:
+ free(qp);
+
+ return NULL;
+}
+
+struct ibv_qp *mlx4_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *attr)
+{
+ struct mlx4_create_qp cmd;
+ struct ibv_create_qp_resp resp;
+ struct mlx4_qp *qp;
+ int ret;
+
+ qp = malloc(sizeof *qp);
+ if (!qp)
+ return NULL;
+ qp = mlx4_create_qp_common(pd, attr, qp);
+ if (!qp)
+ return NULL;
cmd.buf_addr = (uintptr_t) qp->buf.buf;
if (attr->srq || attr->qp_type == IBV_QPT_XRC)
@@ -467,7 +486,7 @@ struct ibv_qp *mlx4_create_qp(struct ibv_pd *pd, struct
ibv_qp_init_attr *attr)
qp->sq.wqe_cnt > 1 << cmd.log_sq_bb_count;
++cmd.log_sq_bb_count)
; /* nothing */
- cmd.sq_no_prefetch = 0; /* OK for ABI 2: just a reserved field */
+ cmd.sq_no_prefetch = 0; /* OK for ABI 2: just a reserved field */
memset(cmd.reserved, 0, sizeof cmd.reserved);
ret = ibv_cmd_create_qp(pd, &qp->ibv_qp, attr, &cmd.ibv_cmd, sizeof cmd,
@@ -497,14 +516,11 @@ err_destroy:
err_rq_db:
if (!attr->srq && attr->qp_type != IBV_QPT_XRC)
mlx4_free_db(to_mctx(pd->context), MLX4_DB_TYPE_RQ, qp->db);
-
-err_free:
free(qp->sq.wrid);
if (qp->rq.wqe_cnt)
free(qp->rq.wrid);
mlx4_free_buf(&qp->buf);
-err:
free(qp);
return NULL;
@@ -825,4 +841,72 @@ int mlx4_unreg_xrc_rcv_qp(struct ibv_xrc_domain
*xrc_domain,
return ibv_cmd_unreg_xrc_rcv_qp(xrc_domain, xrc_qp_num);
}
+struct ibv_qp *mlx4_create_qp_expanded(struct ibv_pd *pd,
+ struct ibv_qp_init_attr *attr,
+ uint32_t create_flags)
+{
+ struct mlx4_create_qp_expanded cmd;
+ struct ibv_create_qp_resp resp;
+ struct mlx4_qp *qp;
+ int ret;
+
+ qp = malloc(sizeof *qp);
+ if (!qp)
+ return NULL;
+ qp = mlx4_create_qp_common(pd, attr, qp);
+ if (!qp)
+ return NULL;
+
+ cmd.buf_addr = (uintptr_t) qp->buf.buf;
+ if (attr->srq || attr->qp_type == IBV_QPT_XRC)
+ cmd.db_addr = 0;
+ else
+ cmd.db_addr = (uintptr_t) qp->db;
+ cmd.log_sq_stride = qp->sq.wqe_shift;
+ for (cmd.log_sq_bb_count = 0;
+ qp->sq.wqe_cnt > 1 << cmd.log_sq_bb_count;
+ ++cmd.log_sq_bb_count)
+ ; /* nothing */
+ cmd.sq_no_prefetch = 0;
+
+ ret = ibv_cmd_create_qp_expanded(pd, &qp->ibv_qp, attr, create_flags,
+ &cmd.ibv_cmd,
+ sizeof cmd, &resp, sizeof resp);
+ if (ret)
+ goto err_rq_db;
+
+ ret = mlx4_store_qp(to_mctx(pd->context), qp->ibv_qp.qp_num, qp);
+ if (ret)
+ goto err_destroy;
+
+ qp->rq.wqe_cnt = qp->rq.max_post = attr->cap.max_recv_wr;
+ qp->rq.max_gs = attr->cap.max_recv_sge;
+ mlx4_set_sq_sizes(qp, &attr->cap, attr->qp_type);
+
+ qp->doorbell_qpn = htonl(qp->ibv_qp.qp_num << 8);
+ if (attr->sq_sig_all)
+ qp->sq_signal_bits = htonl(MLX4_WQE_CTRL_CQ_UPDATE);
+ else
+ qp->sq_signal_bits = 0;
+
+ return &qp->ibv_qp;
+
+err_destroy:
+ ibv_cmd_destroy_qp(&qp->ibv_qp);
+
+err_rq_db:
+ if (!attr->srq && attr->qp_type != IBV_QPT_XRC)
+ mlx4_free_db(to_mctx(pd->context), MLX4_DB_TYPE_RQ, qp->db);
+
+ free(qp->sq.wrid);
+ if (qp->rq.wqe_cnt)
+ free(qp->rq.wrid);
+ mlx4_free_buf(&qp->buf);
+
+ free(qp);
+
+ return NULL;
+}
+
+
#endif
_______________________________________________
general mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
