Skip to contentSkip to conversation

libmlx5: Implement missing open_qp verb

PATCH In review Sébastien Dugué 2 participants 3 messages May 18, 2015 – May 26, 2015 1 message not in the archive InfiniBand

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libmlx5: Implement missing open_qp verb

Commit 0c7ac1083831 added XRC support for mlx5, however this is missing
the open_qp verb.

---
 src/mlx5.c  |  1 +
 src/mlx5.h  |  2 ++
 src/verbs.c | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
src/mlx5.c +1 -0
index d02328881992..39f59975d3d2 100644
@@ -579,6 +579,7 @@ static int mlx5_init_context(struct verbs_device *vdev,
 	context->ibv_ctx.ops = mlx5_ctx_ops;
 
 	verbs_set_ctx_op(v_ctx, create_qp_ex, mlx5_create_qp_ex);
+	verbs_set_ctx_op(v_ctx, open_qp, mlx5_open_qp);
 	verbs_set_ctx_op(v_ctx, open_xrcd, mlx5_open_xrcd);
 	verbs_set_ctx_op(v_ctx, close_xrcd, mlx5_close_xrcd);
 	verbs_set_ctx_op(v_ctx, create_srq_ex, mlx5_create_srq_ex);
src/mlx5.h +2 -0
index 6ad79fe324d3..f548e51ee338 100644
@@ -613,6 +613,8 @@ void *mlx5_get_send_wqe(struct mlx5_qp *qp, int n);
 int mlx5_copy_to_recv_wqe(struct mlx5_qp *qp, int idx, void *buf, int size);
 int mlx5_copy_to_send_wqe(struct mlx5_qp *qp, int idx, void *buf, int size);
 int mlx5_copy_to_recv_srq(struct mlx5_srq *srq, int idx, void *buf, int size);
+struct ibv_qp *mlx5_open_qp(struct ibv_context *context,
+			    struct ibv_qp_open_attr *attr);
 struct ibv_xrcd *mlx5_open_xrcd(struct ibv_context *context,
 				struct ibv_xrcd_init_attr *xrcd_init_attr);
 int mlx5_get_srq_num(struct ibv_srq *srq, uint32_t *srq_num);
src/verbs.c +38 -0
index 8ddf4e631c9f..dc899bce4e00 100644
@@ -1122,6 +1122,44 @@ int mlx5_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
 	return ret;
 }
 
+struct ibv_qp *mlx5_open_qp(struct ibv_context *context,
+			    struct ibv_qp_open_attr *attr)
+{
+	struct ibv_open_qp cmd;
+	struct ibv_create_qp_resp resp;
+	struct mlx5_qp *qp;
+	int ret;
+	struct mlx5_context *ctx = to_mctx(context);
+
+	qp = calloc(1, sizeof(*qp));
+
+	if (!qp)
+		return NULL;
+
+	ret = ibv_cmd_open_qp(context, &qp->verbs_qp, sizeof(qp->verbs_qp),
+			      attr, &cmd, sizeof(cmd), &resp, sizeof(resp));
+	if (ret)
+		goto err;
+
+	pthread_mutex_lock(&ctx->qp_table_mutex);
+	ret = mlx5_store_qp(ctx, qp->verbs_qp.qp.qp_num, qp);
+
+	if (ret) {
+		pthread_mutex_unlock(&ctx->qp_table_mutex);
+		fprintf(stderr, "mlx5_store_qp failed ret=%d\n", ret);
+		goto destroy;
+	}
+	pthread_mutex_unlock(&ctx->qp_table_mutex);
+
+	return (struct ibv_qp *)&qp->verbs_qp;
+
+destroy:
+	ibv_cmd_destroy_qp(&qp->verbs_qp.qp);
+err:
+	free(qp);
+	return NULL;
+}
+
 struct ibv_ah *mlx5_create_ah(struct ibv_pd *pd, struct ibv_ah_attr *attr)
 {
 	struct mlx5_ah *ah;
Signature · 6 lines
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#1 lore raw
Quoted 4 lines · Sébastien Dugué

Commit 0c7ac1083831 added XRC support for mlx5, however this is missing
the open_qp verb.

Patch looks reasonable. However, I didn't review it to make sure that it interacts with other libmlx5 internals properly, just for the obvious things (locks handled properly, proper error unwind, etc). I'm assuming Eli will process this, for now I'm removing it from patchworks (Eli isn't listed as a maintainer there so he can't remove it, which highlights one of the difficulties of this list being used for both kernel and user space patches...there are lots of user space maintainers and most of them aren't list as such in patchworks).

Quoted 80 lines
---
 src/mlx5.c  |  1 +
 src/mlx5.h  |  2 ++
 src/verbs.c | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
src/mlx5.c +1 -0
index d02328881992..39f59975d3d2 100644
@@ -579,6 +579,7 @@ static int mlx5_init_context(struct verbs_device *vdev,
 	context->ibv_ctx.ops = mlx5_ctx_ops;
 
 	verbs_set_ctx_op(v_ctx, create_qp_ex, mlx5_create_qp_ex);
+	verbs_set_ctx_op(v_ctx, open_qp, mlx5_open_qp);
 	verbs_set_ctx_op(v_ctx, open_xrcd, mlx5_open_xrcd);
 	verbs_set_ctx_op(v_ctx, close_xrcd, mlx5_close_xrcd);
 	verbs_set_ctx_op(v_ctx, create_srq_ex, mlx5_create_srq_ex);
src/mlx5.h +2 -0
index 6ad79fe324d3..f548e51ee338 100644
@@ -613,6 +613,8 @@ void *mlx5_get_send_wqe(struct mlx5_qp *qp, int n);
 int mlx5_copy_to_recv_wqe(struct mlx5_qp *qp, int idx, void *buf, int size);
 int mlx5_copy_to_send_wqe(struct mlx5_qp *qp, int idx, void *buf, int size);
 int mlx5_copy_to_recv_srq(struct mlx5_srq *srq, int idx, void *buf, int size);
+struct ibv_qp *mlx5_open_qp(struct ibv_context *context,
+			    struct ibv_qp_open_attr *attr);
 struct ibv_xrcd *mlx5_open_xrcd(struct ibv_context *context,
 				struct ibv_xrcd_init_attr *xrcd_init_attr);
 int mlx5_get_srq_num(struct ibv_srq *srq, uint32_t *srq_num);
src/verbs.c +38 -0
index 8ddf4e631c9f..dc899bce4e00 100644
@@ -1122,6 +1122,44 @@ int mlx5_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
 	return ret;
 }
 
+struct ibv_qp *mlx5_open_qp(struct ibv_context *context,
+			    struct ibv_qp_open_attr *attr)
+{
+	struct ibv_open_qp cmd;
+	struct ibv_create_qp_resp resp;
+	struct mlx5_qp *qp;
+	int ret;
+	struct mlx5_context *ctx = to_mctx(context);
+
+	qp = calloc(1, sizeof(*qp));
+
+	if (!qp)
+		return NULL;
+
+	ret = ibv_cmd_open_qp(context, &qp->verbs_qp, sizeof(qp->verbs_qp),
+			      attr, &cmd, sizeof(cmd), &resp, sizeof(resp));
+	if (ret)
+		goto err;
+
+	pthread_mutex_lock(&ctx->qp_table_mutex);
+	ret = mlx5_store_qp(ctx, qp->verbs_qp.qp.qp_num, qp);
+
+	if (ret) {
+		pthread_mutex_unlock(&ctx->qp_table_mutex);
+		fprintf(stderr, "mlx5_store_qp failed ret=%d\n", ret);
+		goto destroy;
+	}
+	pthread_mutex_unlock(&ctx->qp_table_mutex);
+
+	return (struct ibv_qp *)&qp->verbs_qp;
+
+destroy:
+	ibv_cmd_destroy_qp(&qp->verbs_qp.qp);
+err:
+	free(qp);
+	return NULL;
+}
+
 struct ibv_ah *mlx5_create_ah(struct ibv_pd *pd, struct ibv_ah_attr *attr)
 {
 	struct mlx5_ah *ah;
Signature · 2 lines
Doug Ledford <[email protected]>
              GPG KeyID: 0E572FDD

_______________________________________________
ewg mailing list [email protected]
http://lists.openfabrics.org/mailman/listinfo/ewg

A message that is not in the archive (sent off-list or not yet received): 1432655263.28905.115.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org

#3 lore raw

Hi Doug,

Quoted 6 lines · On Tue, 26 May 2015 11:47:43 -0400 Doug Ledford…
Quoted 4 lines · Sébastien Dugué

Commit 0c7ac1083831 added XRC support for mlx5, however this is missing
the open_qp verb.

Quoted 8 lines

Patch looks reasonable. However, I didn't review it to make sure that it interacts with other libmlx5 internals properly, just for the obvious things (locks handled properly, proper error unwind, etc). I'm assuming Eli will process this, for now I'm removing it from patchworks (Eli isn't listed as a maintainer there so he can't remove it, which highlights one of the difficulties of this list being used for both kernel and user space patches...there are lots of user space maintainers and most of them aren't list as such in patchworks).

Yep, I was hoping for Eli to acknowledge it one way or the other, but still
no news so far.

Thanks.

Sébastien.

Quoted 73 lines
Quoted 73 lines
---
 src/mlx5.c  |  1 +
 src/mlx5.h  |  2 ++
 src/verbs.c | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
src/mlx5.c +1 -0
index d02328881992..39f59975d3d2 100644
@@ -579,6 +579,7 @@ static int mlx5_init_context(struct verbs_device *vdev,
 	context->ibv_ctx.ops = mlx5_ctx_ops;
 
 	verbs_set_ctx_op(v_ctx, create_qp_ex, mlx5_create_qp_ex);
+	verbs_set_ctx_op(v_ctx, open_qp, mlx5_open_qp);
 	verbs_set_ctx_op(v_ctx, open_xrcd, mlx5_open_xrcd);
 	verbs_set_ctx_op(v_ctx, close_xrcd, mlx5_close_xrcd);
 	verbs_set_ctx_op(v_ctx, create_srq_ex, mlx5_create_srq_ex);
src/mlx5.h +2 -0
index 6ad79fe324d3..f548e51ee338 100644
@@ -613,6 +613,8 @@ void *mlx5_get_send_wqe(struct mlx5_qp *qp, int n);
 int mlx5_copy_to_recv_wqe(struct mlx5_qp *qp, int idx, void *buf, int size);
 int mlx5_copy_to_send_wqe(struct mlx5_qp *qp, int idx, void *buf, int size);
 int mlx5_copy_to_recv_srq(struct mlx5_srq *srq, int idx, void *buf, int size);
+struct ibv_qp *mlx5_open_qp(struct ibv_context *context,
+			    struct ibv_qp_open_attr *attr);
 struct ibv_xrcd *mlx5_open_xrcd(struct ibv_context *context,
 				struct ibv_xrcd_init_attr *xrcd_init_attr);
 int mlx5_get_srq_num(struct ibv_srq *srq, uint32_t *srq_num);
src/verbs.c +33 -0
index 8ddf4e631c9f..dc899bce4e00 100644
@@ -1122,6 +1122,44 @@ int mlx5_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
 	return ret;
 }
 
+struct ibv_qp *mlx5_open_qp(struct ibv_context *context,
+			    struct ibv_qp_open_attr *attr)
+{
+	struct ibv_open_qp cmd;
+	struct ibv_create_qp_resp resp;
+	struct mlx5_qp *qp;
+	int ret;
+	struct mlx5_context *ctx = to_mctx(context);
+
+	qp = calloc(1, sizeof(*qp));
+
+	if (!qp)
+		return NULL;
+
+	ret = ibv_cmd_open_qp(context, &qp->verbs_qp, sizeof(qp->verbs_qp),
+			      attr, &cmd, sizeof(cmd), &resp, sizeof(resp));
+	if (ret)
+		goto err;
+
+	pthread_mutex_lock(&ctx->qp_table_mutex);
+	ret = mlx5_store_qp(ctx, qp->verbs_qp.qp.qp_num, qp);
+
+	if (ret) {
+		pthread_mutex_unlock(&ctx->qp_table_mutex);
+		fprintf(stderr, "mlx5_store_qp failed ret=%d\n", ret);
+		goto destroy;
+	}
+	pthread_mutex_unlock(&ctx->qp_table_mutex);
+
+	return (struct ibv_qp *)&qp->verbs_qp;
+
+destroy:
+	ibv_cmd_destroy_qp(&qp->verbs_qp.qp);
Quoted 10 lines

src/verbs.c int mlx5_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr, · line 1165

Quoted 8 lines
src/verbs.c +5 -0
+err:
+	free(qp);
+	return NULL;
+}
+
 struct ibv_ah *mlx5_create_ah(struct ibv_pd *pd, struct ibv_ah_attr *attr)
 {
 	struct mlx5_ah *ah;

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html