Merge pull request #2443 from alinask/topic/dc_fix_vers_1_3_x

IB/DC: new vendor_part_id for ConnectX-5 and enable dc for a Generic HCA - v1.3.x
openucx · Mar 23, 2018 · f8064fa · f8064fa
2 parents 8bf5730 + ae744b8
commit f8064fa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/src/uct/ib/base/ib_device.c b/src/uct/ib/base/ib_device.c
@@ -54,6 +54,9 @@ static uct_ib_device_spec_t uct_ib_builtin_device_specs[] = {
   {0x02c9, 4120, "ConnectX-5",
    UCT_IB_DEVICE_FLAG_MELLANOX | UCT_IB_DEVICE_FLAG_MLX5_PRM |
    UCT_IB_DEVICE_FLAG_DC_V2, 39},
+  {0x02c9, 41682, "ConnectX-5",
+   UCT_IB_DEVICE_FLAG_MELLANOX | UCT_IB_DEVICE_FLAG_MLX5_PRM |
+   UCT_IB_DEVICE_FLAG_DC_V2, 37},
   {0, 0, "Generic HCA", 0, 0}
 };
 

diff --git a/src/uct/ib/dc/base/dc_iface.c b/src/uct/ib/dc/base/dc_iface.c
@@ -219,27 +219,24 @@ void uct_dc_iface_set_quota(uct_dc_iface_t *iface, uct_dc_iface_config_t *config
                                 ucs_min(iface->super.config.tx_qp_len, config->quota);
 }
 
-static ucs_status_t uct_dc_iface_init_version(uct_dc_iface_t *iface,
-                                              uct_md_h md)
+static void uct_dc_iface_init_version(uct_dc_iface_t *iface, uct_md_h md)
 {
     uct_ib_device_t *dev;
     unsigned         ver;
 
     dev = &ucs_derived_of(md, uct_ib_md_t)->dev;
     ver = uct_ib_device_spec(dev)->flags & UCT_IB_DEVICE_FLAG_DC;
+    ucs_assert(ver != UCT_IB_DEVICE_FLAG_DC);
+
+    iface->version_flag = 0;
 
     if (ver & UCT_IB_DEVICE_FLAG_DC_V2) {
         iface->version_flag = UCT_DC_IFACE_ADDR_DC_V2;
-        return UCS_OK;
     }
 
     if (ver & UCT_IB_DEVICE_FLAG_DC_V1) {
         iface->version_flag = UCT_DC_IFACE_ADDR_DC_V1;
-        return UCS_OK;
     }
-
-    iface->version_flag = 0;
-    return UCS_ERR_UNSUPPORTED;
 }
 
 UCS_CLASS_INIT_FUNC(uct_dc_iface_t, uct_dc_iface_ops_t *ops, uct_md_h md,
@@ -265,10 +262,7 @@ UCS_CLASS_INIT_FUNC(uct_dc_iface_t, uct_dc_iface_ops_t *ops, uct_md_h md,
         return UCS_ERR_INVALID_PARAM;
     }
 
-    status = uct_dc_iface_init_version(self, md);
-    if (status != UCS_OK) {
-        return status;
-    }
+    uct_dc_iface_init_version(self, md);
 
     self->tx.ndci                    = config->ndci;
     self->tx.policy                  = config->tx_policy;
@@ -361,7 +355,7 @@ int uct_dc_iface_is_reachable(const uct_iface_h tl_iface,
 
     ucs_assert_always(iface_addr != NULL);
 
-    return (addr->flags & iface->version_flag) &&
+    return ((addr->flags & UCT_DC_IFACE_ADDR_DC_VERS) == iface->version_flag) &&
            (UCT_DC_IFACE_ADDR_TM_ENABLED(addr) ==
             UCT_RC_IFACE_TM_ENABLED(&iface->super)) &&
            uct_ib_iface_is_reachable(tl_iface, dev_addr, iface_addr);

diff --git a/src/uct/ib/dc/base/dc_iface.h b/src/uct/ib/dc/base/dc_iface.h
@@ -23,9 +23,11 @@ typedef struct uct_dc_iface  uct_dc_iface_t;
 
 
 typedef enum {
-    UCT_DC_IFACE_ADDR_HW_TM = UCS_BIT(0),
-    UCT_DC_IFACE_ADDR_DC_V1 = UCS_BIT(1),
-    UCT_DC_IFACE_ADDR_DC_V2 = UCS_BIT(2)
+    UCT_DC_IFACE_ADDR_HW_TM   = UCS_BIT(0),
+    UCT_DC_IFACE_ADDR_DC_V1   = UCS_BIT(1),
+    UCT_DC_IFACE_ADDR_DC_V2   = UCS_BIT(2),
+    UCT_DC_IFACE_ADDR_DC_VERS = UCT_DC_IFACE_ADDR_DC_V1 |
+                                UCT_DC_IFACE_ADDR_DC_V2
 } uct_dc_iface_addr_flags_t;