efa: Add direct verbs query QP and CQ

mrgolin · YonatanNachum · commit b41b4724d2f2 · 2025-07-24T12:06:06.000Z
Extend EFA direct verbs to allow querying of QP and CQ parameters. At
first stage those new verbs enable getting queues' virtual addresses
as well as their structure what can be used for accelerator driven
datapath.

Reviewed-by: Daniel Kranzdorf &lt;dkkranzd@amazon.com&gt;
Reviewed-by: Yonatan Nachum &lt;ynachum@amazon.com&gt;
Signed-off-by: Michael Margolin &lt;mrgolin@amazon.com&gt;
diff --git a/debian/ibverbs-providers.symbols b/debian/ibverbs-providers.symbols
@@ -170,13 +170,16 @@ libefa.so.1 ibverbs-providers #MINVER#
  EFA_1.1@EFA_1.1 26
  EFA_1.2@EFA_1.2 43
  EFA_1.3@EFA_1.3 50
+ EFA_1.4@EFA_1.4 59
  efadv_create_driver_qp@EFA_1.0 24
  efadv_create_qp_ex@EFA_1.1 26
  efadv_query_device@EFA_1.1 26
  efadv_query_ah@EFA_1.1 26
  efadv_cq_from_ibv_cq_ex@EFA_1.2 43
  efadv_create_cq@EFA_1.2 43
  efadv_query_mr@EFA_1.3 50
+ efadv_query_qp_wqs@EFA_1.4 59
+ efadv_query_cq@EFA_1.4 59
 libhns.so.1 ibverbs-providers #MINVER#
 * Build-Depends-Package: libibverbs-dev
  HNS_1.0@HNS_1.0 51
diff --git a/providers/efa/CMakeLists.txt b/providers/efa/CMakeLists.txt
@@ -3,7 +3,7 @@ if (ENABLE_LTTNG AND LTTNGUST_FOUND)
 endif()
 
 rdma_shared_provider(efa libefa.map
-	1 1.3.${PACKAGE_VERSION}
+	1 1.4.${PACKAGE_VERSION}
 	${TRACE_FILE}
 	efa.c
 	verbs.c
diff --git a/providers/efa/efadv.h b/providers/efa/efadv.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */
 /*
- * Copyright 2019-2024 Amazon.com, Inc. or its affiliates. All rights reserved.
+ * Copyright 2019-2025 Amazon.com, Inc. or its affiliates. All rights reserved.
  */
 
 #ifndef __EFADV_H__
@@ -16,32 +16,6 @@
 extern "C" {
 #endif
 
-enum {
-	/* Values must match the values in efa-abi.h */
-	EFADV_QP_DRIVER_TYPE_SRD = 0,
-};
-
-struct ibv_qp *efadv_create_driver_qp(struct ibv_pd *ibvpd,
-				      struct ibv_qp_init_attr *attr,
-				      uint32_t driver_qp_type);
-
-enum {
-	EFADV_QP_FLAGS_UNSOLICITED_WRITE_RECV = 1 << 0,
-};
-
-struct efadv_qp_init_attr {
-	uint64_t comp_mask;
-	uint32_t driver_qp_type;
-	uint16_t flags;
-	uint8_t sl;
-	uint8_t reserved[1];
-};
-
-struct ibv_qp *efadv_create_qp_ex(struct ibv_context *ibvctx,
-				  struct ibv_qp_init_attr_ex *attr_ex,
-				  struct efadv_qp_init_attr *efa_attr,
-				  uint32_t inlen);
-
 enum {
 	EFADV_DEVICE_ATTR_CAPS_RDMA_READ = 1 << 0,
 	EFADV_DEVICE_ATTR_CAPS_RNR_RETRY = 1 << 1,
@@ -76,6 +50,45 @@ struct efadv_ah_attr {
 int efadv_query_ah(struct ibv_ah *ibvah, struct efadv_ah_attr *attr,
 		   uint32_t inlen);
 
+enum {
+	/* Values must match the values in efa-abi.h */
+	EFADV_QP_DRIVER_TYPE_SRD = 0,
+};
+
+struct ibv_qp *efadv_create_driver_qp(struct ibv_pd *ibvpd,
+				      struct ibv_qp_init_attr *attr,
+				      uint32_t driver_qp_type);
+
+enum {
+	EFADV_QP_FLAGS_UNSOLICITED_WRITE_RECV = 1 << 0,
+};
+
+struct efadv_qp_init_attr {
+	uint64_t comp_mask;
+	uint32_t driver_qp_type;
+	uint16_t flags;
+	uint8_t sl;
+	uint8_t reserved;
+};
+
+struct ibv_qp *efadv_create_qp_ex(struct ibv_context *ibvctx,
+				  struct ibv_qp_init_attr_ex *attr_ex,
+				  struct efadv_qp_init_attr *efa_attr,
+				  uint32_t inlen);
+
+struct efadv_wq_attr {
+	uint64_t comp_mask;
+	uint8_t *buffer;
+	uint32_t entry_size;
+	uint32_t num_entries;
+	uint32_t *doorbell;
+	uint32_t max_batch;
+	uint8_t reserved[4];
+};
+
+int efadv_query_qp_wqs(struct ibv_qp *ibvqp, struct efadv_wq_attr *sq_attr,
+		       struct efadv_wq_attr *rq_attr, uint32_t inlen);
+
 struct efadv_cq {
 	uint64_t comp_mask;
 	int (*wc_read_sgid)(struct efadv_cq *efadv_cq, union ibv_gid *sgid);
@@ -109,6 +122,15 @@ struct ibv_cq_ex *efadv_create_cq(struct ibv_context *ibvctx,
 				  struct efadv_cq_init_attr *efa_attr,
 				  uint32_t inlen);
 
+struct efadv_cq_attr {
+	uint64_t comp_mask;
+	uint8_t *buffer;
+	uint32_t entry_size;
+	uint32_t num_entries;
+};
+
+int efadv_query_cq(struct ibv_cq *ibvcq, struct efadv_cq_attr *attr, uint32_t inlen);
+
 struct efadv_cq *efadv_cq_from_ibv_cq_ex(struct ibv_cq_ex *ibvcqx);
 
 static inline int efadv_wc_read_sgid(struct efadv_cq *efadv_cq,
diff --git a/providers/efa/libefa.map b/providers/efa/libefa.map
@@ -23,3 +23,9 @@ EFA_1.3 {
 	global:
 		efadv_query_mr;
 } EFA_1.2;
+
+EFA_1.4 {
+	global:
+		efadv_query_qp_wqs;
+		efadv_query_cq;
+} EFA_1.3;
diff --git a/providers/efa/man/CMakeLists.txt b/providers/efa/man/CMakeLists.txt
@@ -3,6 +3,8 @@ rdma_man_pages(
   efadv_create_driver_qp.3.md
   efadv_create_qp_ex.3.md
   efadv_query_ah.3.md
+  efadv_query_cq.3.md
   efadv_query_device.3.md
   efadv_query_mr.3.md
+  efadv_query_qp_wqs.3.md
 )
diff --git a/providers/efa/man/efadv_query_cq.3.md b/providers/efa/man/efadv_query_cq.3.md
@@ -0,0 +1,69 @@
+---
+layout: page
+title: EFADV_QUERY_CQ
+section: 3
+tagline: Verbs
+date: 2025-04-15
+header: "EFA Direct Verbs Manual"
+footer: efa
+---
+
+# NAME
+
+efadv_query_cq - Query EFA specific Completion Queue attributes
+
+# SYNOPSIS
+
+```c
+#include <infiniband/efadv.h>
+
+int efadv_query_cq(struct ibv_cq *ibvcq, struct efadv_cq_attr *attr,
+                   uint32_t inlen);
+```
+
+# DESCRIPTION
+
+**efadv_query_cq()** queries device-specific Completion Queue attributes.
+
+Compatibility is handled using the comp_mask and inlen fields.
+
+```c
+struct efadv_cq_attr {
+	uint64_t comp_mask;
+	uint8_t *buffer;
+	uint32_t entry_size;
+	uint32_t num_entries;
+};
+```
+
+*inlen*
+:	In: Size of struct efadv_cq_attr.
+
+*comp_mask*
+:	Compatibility mask.
+
+*buffer*
+:	Completion queue buffer.
+
+*entry_size*
+:	Size of each completion queue entry.
+
+*num_entries*
+:	Maximal number of entries in the completion queue.
+
+# RETURN VALUE
+
+**efadv_query_cq()** returns 0 on success, or the value of errno on failure
+(which indicates the failure reason).
+
+# SEE ALSO
+
+**efadv**(7)
+
+# NOTES
+
+* Compatibility mask (comp_mask) is an out field and currently has no values.
+
+# AUTHORS
+
+Michael Margolin <mrgolin@amazon.com>
diff --git a/providers/efa/man/efadv_query_qp_wqs.3.md b/providers/efa/man/efadv_query_qp_wqs.3.md
@@ -0,0 +1,78 @@
+---
+layout: page
+title: EFADV_QUERY_QP_WQS
+section: 3
+tagline: Verbs
+date: 2025-05-14
+header: "EFA Direct Verbs Manual"
+footer: efa
+---
+
+# NAME
+
+efadv_query_qp_wqs - Query EFA specific Queue Pair work queue attributes
+
+# SYNOPSIS
+
+```c
+#include <infiniband/efadv.h>
+
+int efadv_query_qp_wqs(struct ibv_qp *ibvqp, struct efadv_wq_attr *sq_attr,
+                       struct efadv_wq_attr *rq_attr, uint32_t inlen);
+```
+
+# DESCRIPTION
+
+**efadv_query_qp_wqs()** queries device-specific Queue Pair work queue attributes.
+
+Compatibility is handled using the comp_mask and inlen fields.
+
+```c
+struct efadv_wq_attr {
+	uint64_t comp_mask;
+	uint8_t *buffer;
+	uint32_t entry_size;
+	uint32_t num_entries;
+	uint32_t *doorbell;
+	uint32_t max_batch;
+	uint8_t reserved[4];
+};
+```
+
+*inlen*
+:	In: Size of struct efadv_wq_attr.
+
+*comp_mask*
+:	Compatibility mask.
+
+*buffer*
+:	Queue buffer.
+
+*entry_size*
+:	Size of each entry in the queue.
+
+*num_entries*
+:	Maximal number of entries in the queue.
+
+*doorbell*
+:	Queue doorbell.
+
+*max_batch*
+:	Maximum batch size for queue submissions.
+
+# RETURN VALUE
+
+**efadv_query_qp_wqs()** returns 0 on success, or the value of errno on failure
+(which indicates the failure reason).
+
+# SEE ALSO
+
+**efadv**(7)
+
+# NOTES
+
+* Compatibility mask (comp_mask) is an out field and currently has no values.
+
+# AUTHORS
+
+Michael Margolin <mrgolin@amazon.com>
diff --git a/providers/efa/verbs.c b/providers/efa/verbs.c
@@ -1078,6 +1078,28 @@ struct ibv_cq_ex *efadv_create_cq(struct ibv_context *ibvctx,
 	return create_cq(ibvctx, attr_ex, &local_efa_attr);
 }
 
+int efadv_query_cq(struct ibv_cq *ibvcq, struct efadv_cq_attr *attr, uint32_t inlen)
+{
+	struct efa_cq *cq = to_efa_cq(ibvcq);
+
+	if (!is_efa_dev(ibvcq->context->device)) {
+		verbs_err(verbs_get_ctx(ibvcq->context), "Not an EFA device\n");
+		return EOPNOTSUPP;
+	}
+
+	if (!vext_field_avail(typeof(*attr), num_entries, inlen)) {
+		verbs_err(verbs_get_ctx(ibvcq->context), "Compatibility issues\n");
+		return EINVAL;
+	}
+
+	attr->comp_mask = 0;
+	attr->buffer = cq->buf;
+	attr->entry_size = cq->cqe_size;
+	attr->num_entries = ibvcq->cqe;
+
+	return 0;
+}
+
 struct efadv_cq *efadv_cq_from_ibv_cq_ex(struct ibv_cq_ex *ibvcqx)
 {
 	struct efa_cq *cq = to_efa_cq_ex(ibvcqx);
@@ -1655,7 +1677,7 @@ struct ibv_qp *efadv_create_qp_ex(struct ibv_context *ibvctx,
 	    !vext_field_avail(struct efadv_qp_init_attr,
 			      driver_qp_type, inlen) ||
 	    efa_attr->comp_mask ||
-	    !is_reserved_cleared(efa_attr->reserved) ||
+	    efa_attr->reserved ||
 	    (inlen > sizeof(*efa_attr) && !is_ext_cleared(efa_attr, inlen))) {
 		verbs_err(verbs_get_ctx(ibvctx), "Compatibility issues\n");
 		errno = EINVAL;
@@ -1699,6 +1721,38 @@ int efa_query_qp(struct ibv_qp *ibvqp, struct ibv_qp_attr *attr,
 				&cmd, sizeof(cmd));
 }
 
+int efadv_query_qp_wqs(struct ibv_qp *ibvqp, struct efadv_wq_attr *sq_attr,
+		       struct efadv_wq_attr *rq_attr, uint32_t inlen)
+{
+	struct efa_qp *qp = to_efa_qp(ibvqp);
+
+	if (!is_efa_dev(ibvqp->context->device)) {
+		verbs_err(verbs_get_ctx(ibvqp->context), "Not an EFA device\n");
+		return EOPNOTSUPP;
+	}
+
+	if (!vext_field_avail(typeof(*sq_attr), max_batch, inlen)) {
+		verbs_err(verbs_get_ctx(ibvqp->context), "Compatibility issues\n");
+		return EINVAL;
+	}
+
+	sq_attr->comp_mask = 0;
+	sq_attr->buffer = qp->sq.desc;
+	sq_attr->entry_size = sizeof(struct efa_io_tx_wqe);
+	sq_attr->num_entries = qp->sq.wq.wqe_cnt;
+	sq_attr->doorbell = qp->sq.wq.db;
+	sq_attr->max_batch = qp->sq.max_batch_wr;
+
+	rq_attr->comp_mask = 0;
+	rq_attr->buffer = qp->rq.buf;
+	rq_attr->entry_size = sizeof(struct efa_io_rx_desc);
+	rq_attr->num_entries = qp->rq.wq.desc_mask + 1;
+	rq_attr->doorbell = qp->rq.wq.db;
+	rq_attr->max_batch = rq_attr->num_entries;
+
+	return 0;
+}
+
 int efa_query_qp_data_in_order(struct ibv_qp *ibvqp, enum ibv_wr_opcode op,
 			       uint32_t flags)
 {

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@ rdma_man_pages(`
`3`	`3`	`efadv_create_driver_qp.3.md`
`4`	`4`	`efadv_create_qp_ex.3.md`
`5`	`5`	`efadv_query_ah.3.md`
	`6`	`+ efadv_query_cq.3.md`
`6`	`7`	`efadv_query_device.3.md`
`7`	`8`	`efadv_query_mr.3.md`
	`9`	`+ efadv_query_qp_wqs.3.md`
`8`	`10`	`)`