From: Leon Romanovsky <leon-2ukJVAZIZ/Y@public.gmane.org>
To: yishaih-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
Subject: [PATCH libmlx5 V1 1/2] Add CQ ignore overrun creation flag
Date: Sat, 16 Jan 2016 17:55:57 +0200 [thread overview]
Message-ID: <1452959758-29611-2-git-send-email-leon@leon.nu> (raw)
In-Reply-To: <1452959758-29611-1-git-send-email-leon-2ukJVAZIZ/Y@public.gmane.org>
From: Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
In cross-channel mode, the send/receive queues will forward their
completions to managing QP. It can cause to overrun errors in
managed send/receive queues.
This patch adds ability to provide CQ flags for ibv_create_cq_ex calls
and new flag to disable CQ overrun checks.
Signed-off-by: Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
Reviewed-by: Sagi Grimberg <sagig-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
src/mlx5-abi.h | 14 ++++++++++++++
src/verbs.c | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
2 files changed, 56 insertions(+), 15 deletions(-)
diff --git a/src/mlx5-abi.h b/src/mlx5-abi.h
index 769ea811d26b..85f6ee3f691e 100644
--- a/src/mlx5-abi.h
+++ b/src/mlx5-abi.h
@@ -91,6 +91,20 @@ struct mlx5_create_cq_resp {
__u32 cqn;
};
+struct mlx5_create_cq_ex {
+ struct ibv_create_cq_ex ibv_cmd;
+ __u64 buf_addr;
+ __u64 db_addr;
+ __u32 cqe_size;
+ __u32 comp_mask;
+};
+
+struct mlx5_create_cq_resp_ex {
+ struct ibv_create_cq_resp_ex ibv_resp;
+ __u32 cqn;
+ __u32 comp_mask;
+};
+
struct mlx5_create_srq {
struct ibv_create_srq ibv_cmd;
__u64 buf_addr;
diff --git a/src/verbs.c b/src/verbs.c
index 94b4d8f2424f..064a500b0a06 100644
--- a/src/verbs.c
+++ b/src/verbs.c
@@ -250,17 +250,26 @@ enum {
};
enum {
- CREATE_CQ_SUPPORTED_FLAGS = IBV_CREATE_CQ_ATTR_COMPLETION_TIMESTAMP
+ CREATE_CQ_SUPPORTED_FLAGS = IBV_CREATE_CQ_ATTR_COMPLETION_TIMESTAMP |
+ IBV_CREATE_CQ_ATTR_IGNORE_OVERRUN
+};
+
+enum mlx5_cmd_type {
+ MLX5_LEGACY_CMD,
+ MLX5_EXTENDED_CMD
};
static struct ibv_cq *create_cq(struct ibv_context *context,
- const struct ibv_create_cq_attr_ex *cq_attr)
+ struct ibv_create_cq_attr_ex *cq_attr,
+ enum mlx5_cmd_type ctype)
{
struct mlx5_create_cq cmd;
+ struct mlx5_create_cq_ex cmd_ex;
struct mlx5_create_cq_resp resp;
+ struct mlx5_create_cq_resp_ex resp_ex;
struct mlx5_cq *cq;
int cqe_sz;
- int ret;
+ int ret = -1;
int ncqe;
#ifdef MLX5_DEBUG
FILE *fp = to_mctx(context)->dbg_fp;
@@ -299,7 +308,6 @@ static struct ibv_cq *create_cq(struct ibv_context *context,
return NULL;
}
- memset(&cmd, 0, sizeof cmd);
cq->cons_index = 0;
if (mlx5_spinlock_init(&cq->lock))
@@ -342,22 +350,41 @@ static struct ibv_cq *create_cq(struct ibv_context *context,
cq->arm_sn = 0;
cq->cqe_sz = cqe_sz;
- cmd.buf_addr = (uintptr_t) cq->buf_a.buf;
- cmd.db_addr = (uintptr_t) cq->dbrec;
- cmd.cqe_size = cqe_sz;
+ if (ctype == MLX5_LEGACY_CMD) {
+ memset(&cmd, 0, sizeof(cmd));
+ cmd.buf_addr = (uintptr_t) cq->buf_a.buf;
+ cmd.db_addr = (uintptr_t) cq->dbrec;
+ cmd.cqe_size = cqe_sz;
+
+ ret = ibv_cmd_create_cq(context, ncqe - 1, cq_attr->channel,
+ cq_attr->comp_vector,
+ &cq->ibv_cq, &cmd.ibv_cmd, sizeof cmd,
+ &resp.ibv_resp, sizeof resp);
+ cq->cqn = resp.cqn;
+
+ }
+ else if (ctype == MLX5_EXTENDED_CMD) {
+ memset(&cmd_ex, 0, sizeof(cmd_ex));
+ cmd_ex.buf_addr = (uintptr_t) cq->buf_a.buf;
+ cmd_ex.db_addr = (uintptr_t) cq->dbrec;
+ cmd_ex.cqe_size = cqe_sz;
+
+ ret = ibv_cmd_create_cq_ex(context, cq_attr,
+ &cq->ibv_cq, &cmd_ex.ibv_cmd,
+ sizeof(cmd_ex.ibv_cmd), sizeof(cmd_ex),
+ &resp_ex.ibv_resp,
+ sizeof(resp_ex.ibv_resp), sizeof(resp_ex));
+ cq->cqn = resp_ex.cqn;
+ }
- ret = ibv_cmd_create_cq(context, ncqe - 1, cq_attr->channel,
- cq_attr->comp_vector,
- &cq->ibv_cq, &cmd.ibv_cmd, sizeof cmd,
- &resp.ibv_resp, sizeof resp);
if (ret) {
- mlx5_dbg(fp, MLX5_DBG_CQ, "ret %d\n", ret);
+ mlx5_dbg(fp, MLX5_DBG_CQ, "ret %d, ctype = %d\n", ret, ctype);
goto err_db;
}
cq->active_buf = &cq->buf_a;
cq->resize_buf = NULL;
- cq->cqn = resp.cqn;
+
cq->stall_enable = to_mctx(context)->stall_enable;
cq->stall_adaptive_enable = to_mctx(context)->stall_adaptive_enable;
cq->stall_cycles = to_mctx(context)->stall_cycles;
@@ -390,13 +417,13 @@ struct ibv_cq *mlx5_create_cq(struct ibv_context *context, int cqe,
.comp_vector = comp_vector,
.wc_flags = IBV_WC_STANDARD_FLAGS};
- return create_cq(context, &cq_attr);
+ return create_cq(context, &cq_attr, MLX5_LEGACY_CMD);
}
struct ibv_cq *mlx5_create_cq_ex(struct ibv_context *context,
struct ibv_create_cq_attr_ex *cq_attr)
{
- return create_cq(context, cq_attr);
+ return create_cq(context, cq_attr, MLX5_EXTENDED_CMD);
}
int mlx5_resize_cq(struct ibv_cq *ibcq, int cqe)
--
1.7.12.4
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-01-16 15:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-16 15:55 [PATCH libmlx5 V1 0/2] Add cross-channel support Leon Romanovsky
[not found] ` <1452959758-29611-1-git-send-email-leon-2ukJVAZIZ/Y@public.gmane.org>
2016-01-16 15:55 ` Leon Romanovsky [this message]
2016-01-16 15:55 ` [PATCH libmlx5 V1 2/2] Add cross-channel work request opcodes Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452959758-29611-2-git-send-email-leon@leon.nu \
--to=leon-2ukjvaziz/y@public.gmane.org \
--cc=leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org \
--cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=yishaih-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.