This patch exposes an API named mlx5dv_create_cq_ex to enable creating a
CQ with some mlx5 private data.
Specifically, it enables creating a CQ in a mode that
few CQEs may be compressed into a single CQE.
To use the shared code of libibverbs when a CQ is created it:
- Registers some private create CQ API with libibverbs by using the
verbs_set_ctx_private_op macro.
- Calls ibv_vendor_create_cq_ex() API.
The above stuff was introduced in the previous patch
of this series.
Signed-off-by: Yishai Hadas <yishaih@xxxxxxxxxxxx>
---
providers/mlx5/libmlx5.map | 5 +++++
providers/mlx5/mlx5-abi.h | 3 +++
providers/mlx5/mlx5.c | 9 +++++++++
providers/mlx5/mlx5.h | 3 +++
providers/mlx5/mlx5dv.h | 13 +++++++++++++
providers/mlx5/verbs.c | 37 ++++++++++++++++++++++++++++++++++---
6 files changed, 67 insertions(+), 3 deletions(-)
diff --git a/providers/mlx5/libmlx5.map b/providers/mlx5/libmlx5.map
index 7ce3eb1..318b50c 100644
--- a/providers/mlx5/libmlx5.map
+++ b/providers/mlx5/libmlx5.map
@@ -6,3 +6,8 @@ MLX5_1.0 {
mlx5dv_init_obj;
local: *;
};
+
+MLX5_1.1 {
+ global:
+ mlx5dv_create_cq_ex;
+} MLX5_1.0;
diff --git a/providers/mlx5/mlx5-abi.h b/providers/mlx5/mlx5-abi.h
index 487de3a..d05cb40 100644
--- a/providers/mlx5/mlx5-abi.h
+++ b/providers/mlx5/mlx5-abi.h
@@ -119,6 +119,9 @@ struct mlx5_create_cq {
__u64 buf_addr;
__u64 db_addr;
__u32 cqe_size;
+ __u8 cqe_comp_en;
+ __u8 cqe_comp_res_format;
+ __u16 reserved;
};
struct mlx5_create_cq_resp {
diff --git a/providers/mlx5/mlx5.c b/providers/mlx5/mlx5.c
index edb6d35..dd3c40d 100644
--- a/providers/mlx5/mlx5.c
+++ b/providers/mlx5/mlx5.c
@@ -42,6 +42,7 @@
#include <sched.h>
#include <sys/param.h>
+#include <infiniband/driver.h>
#include "mlx5.h"
#include "mlx5-abi.h"
@@ -609,6 +610,13 @@ static int mlx5_map_internal_clock(struct mlx5_device *mdev,
return 0;
}
+struct ibv_cq_ex *mlx5dv_create_cq_ex(struct ibv_context *context,
+ struct ibv_cq_init_attr_ex *cq_attr,
+ struct mlx5dv_cq_init_attr_ex *mlx5_cq_attr)
+{
+ return ibv_vendor_create_cq_ex(context, cq_attr, mlx5_cq_attr);
+}
+
int mlx5dv_query_device(struct ibv_context *ctx_in,
struct mlx5dv_context *attrs_out)
{
@@ -917,6 +925,7 @@ static int mlx5_init_context(struct verbs_device *vdev,
verbs_set_ctx_op(v_ctx, destroy_wq, mlx5_destroy_wq);
verbs_set_ctx_op(v_ctx, create_rwq_ind_table, mlx5_create_rwq_ind_table);
verbs_set_ctx_op(v_ctx, destroy_rwq_ind_table, mlx5_destroy_rwq_ind_table);
+ verbs_set_ctx_private_op(v_ctx, create_cq_ex_vendor, mlx5_create_cq_ex_vendor);
memset(&device_attr, 0, sizeof(device_attr));
if (!mlx5_query_device_ex(ctx, NULL, &device_attr,
diff --git a/providers/mlx5/mlx5.h b/providers/mlx5/mlx5.h
index bb383d4..eae7b42 100644
--- a/providers/mlx5/mlx5.h
+++ b/providers/mlx5/mlx5.h
@@ -671,6 +671,9 @@ int mlx5_destroy_wq(struct ibv_wq *wq);
struct ibv_rwq_ind_table *mlx5_create_rwq_ind_table(struct ibv_context *context,
struct ibv_rwq_ind_table_init_attr *init_attr);
int mlx5_destroy_rwq_ind_table(struct ibv_rwq_ind_table *rwq_ind_table);
+struct ibv_cq_ex *mlx5_create_cq_ex_vendor(struct ibv_context *context,
+ struct ibv_cq_init_attr_ex *cq_attr,
+ void *vendor_data);
struct ibv_srq *mlx5_create_srq_ex(struct ibv_context *context,
struct ibv_srq_init_attr_ex *attr);
diff --git a/providers/mlx5/mlx5dv.h b/providers/mlx5/mlx5dv.h
index a2f7acf..defe378 100644
--- a/providers/mlx5/mlx5dv.h
+++ b/providers/mlx5/mlx5dv.h
@@ -82,6 +82,19 @@ enum mlx5dv_context_flags {
MLX5DV_CONTEXT_FLAGS_MPW = (1 << 1),
};
+enum mlx5dv_create_cq_vendor_data_mask {
+ MLX5DV_CREATE_CQ_MASK_COMPRESSED_CQE = 1 << 0,
+ MLX5DV_CREATE_CQ_MASK_RESERVED = 1 << 1,
+};
+
+struct mlx5dv_cq_init_attr_ex {
+ uint64_t comp_mask; /* Use enum mlx5dv_create_cq_vendor_data_mask */
+ uint8_t cqe_comp_res_format; /* Use enum mlx5dv_cqe_comp_res_format */
+};
+
+struct ibv_cq_ex *mlx5dv_create_cq_ex(struct ibv_context *context,
+ struct ibv_cq_init_attr_ex *cq_attr,
+ struct mlx5dv_cq_init_attr_ex *mlx5_cq_attr);
/*
* Most device capabilities are exported by ibv_query_device(...),
* but there is HW device-specific information which is important
diff --git a/providers/mlx5/verbs.c b/providers/mlx5/verbs.c
index 1b24846..eb35725 100644
--- a/providers/mlx5/verbs.c
+++ b/providers/mlx5/verbs.c
@@ -340,7 +340,8 @@ enum {
static struct ibv_cq_ex *create_cq(struct ibv_context *context,
const struct ibv_cq_init_attr_ex *cq_attr,
- int cq_alloc_flags)
+ int cq_alloc_flags,
+ struct mlx5dv_cq_init_attr_ex *mlx5cq_attr)
{
struct mlx5_create_cq cmd;
struct mlx5_create_cq_resp resp;
@@ -348,6 +349,7 @@ static struct ibv_cq_ex *create_cq(struct ibv_context *context,
int cqe_sz;
int ret;
int ncqe;
+ struct mlx5_context *mctx = to_mctx(context);
FILE *fp = to_mctx(context)->dbg_fp;
if (!cq_attr->cqe) {
@@ -427,6 +429,28 @@ static struct ibv_cq_ex *create_cq(struct ibv_context *context,
cmd.db_addr = (uintptr_t) cq->dbrec;
cmd.cqe_size = cqe_sz;
+ if (mlx5cq_attr) {
+ if (mlx5cq_attr->comp_mask & ~(MLX5DV_CREATE_CQ_MASK_RESERVED - 1)) {
+ mlx5_dbg(fp, MLX5_DBG_CQ,
+ "Unsupported vendor comp_mask for create_cq\n");
+ errno = EINVAL;
+ goto err_db;
+ }
+
+ if (mlx5cq_attr->comp_mask & MLX5DV_CREATE_CQ_MASK_COMPRESSED_CQE) {
+ if (mctx->cqe_comp_caps.max_num &&
+ (mlx5cq_attr->cqe_comp_res_format &
+ mctx->cqe_comp_caps.supported_format)) {
+ cmd.cqe_comp_en = 1;
+ cmd.cqe_comp_res_format = mlx5cq_attr->cqe_comp_res_format;
+ } else {
+ mlx5_dbg(fp, MLX5_DBG_CQ, "CQE Compression is not supported\n");
+ errno = EINVAL;
+ goto err_db;
+ }
+ }
+ }
+
ret = ibv_cmd_create_cq(context, ncqe - 1, cq_attr->channel,
cq_attr->comp_vector,
ibv_cq_ex_to_cq(&cq->ibv_cq), &cmd.ibv_cmd,
@@ -477,14 +501,21 @@ struct ibv_cq *mlx5_create_cq(struct ibv_context *context, int cqe,
return NULL;
}
- cq = create_cq(context, &cq_attr, 0);
+ cq = create_cq(context, &cq_attr, 0, NULL);
return cq ? ibv_cq_ex_to_cq(cq) : NULL;
}
+struct ibv_cq_ex *mlx5_create_cq_ex_vendor(struct ibv_context *context,
+ struct ibv_cq_init_attr_ex *cq_attr,
+ void *vendor_data)
+{
+ return create_cq(context, cq_attr, MLX5_CQ_FLAGS_EXTENDED, vendor_data);
+}
+
struct ibv_cq_ex *mlx5_create_cq_ex(struct ibv_context *context,
struct ibv_cq_init_attr_ex *cq_attr)
{
- return create_cq(context, cq_attr, MLX5_CQ_FLAGS_EXTENDED);
+ return create_cq(context, cq_attr, MLX5_CQ_FLAGS_EXTENDED, NULL);
}
int mlx5_resize_cq(struct ibv_cq *ibcq, int cqe)
--
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
