Merge pull request #3692 from yosefe/topic/ibv-create-cq-ex-fallback-…

…v1.6.x UCT/IB: Fallback to ibv_create_cq() if ibv_create_cq_ex() returns ENOSYS - v1.6.x
openucx · Jun 12, 2019 · 82a0649 · 82a0649
2 parents c24e1c6 + e7cf1b7
commit 82a0649
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/NEWS b/NEWS
@@ -27,6 +27,7 @@ Bugfixes:
 - Fixing the wrong name of aliases
 - Fix data race in UCP wireup
 - Fix segfault when libuct.so is reloaded - issue #3558
+- Fallback to ibv_create_cq() if ibv_create_cq_ex() returns ENOSYS
 
 Tested configurations:
 - RDMA: MLNX_OFED 4.5, distribution inbox drivers, rdma-core 22.1

diff --git a/src/uct/ib/base/ib_iface.c b/src/uct/ib/base/ib_iface.c
@@ -588,16 +588,19 @@ ucs_status_t uct_ib_verbs_create_cq(struct ibv_context *context, int cqe,
     }
 
     cq = ibv_cq_ex_to_cq(ibv_create_cq_ex(context, &cq_attr));
-#else
-    cq = ibv_create_cq(context, cqe, NULL, channel, comp_vector);
+    if (!cq && (errno == ENOSYS))
 #endif
+    {
+        *inl = 0;
+        cq = ibv_create_cq(context, cqe, NULL, channel, comp_vector);
+    }
+
     if (!cq) {
         ucs_error("ibv_create_cq(cqe=%d) failed: %m", cqe);
         return UCS_ERR_IO_ERROR;
     }
 
     *cq_p = cq;
-    *inl  = 0;
     return UCS_OK;
 }