Merge pull request #2169 from jsquyres/pr/v2.0.2/usnic-bug-fixes-2

v2.0.2: usnic bug fixes

Author: hppritcha

opal/mca/btl/usnic/btl_usnic.h

@@ -217,13 +217,6 @@ typedef struct opal_btl_usnic_component_t {
        the prefix is non-NULL) */
     char *connectivity_map_prefix;
 
-    /** Expected return value from fi_cq_readerr() upon success.  In
-        libfabric v1.0.0 / API v1.0, the usnic provider returned
-        sizeof(fi_cq_err_entry) upon success.  In libfabric >=v1.1 /
-        API >=v1.1, the usnic provider returned 1 upon success. */
-    ssize_t cq_readerr_success_value;
-    ssize_t cq_readerr_try_again_value;
-
     /** Offset into the send buffer where the payload will go.  For
         libfabric v1.0.0 / API v1.0, this is 0.  For libfabric >=v1.1
         / API >=v1.1, this is the endpoint.msg_prefix_size (i.e.,

opal/mca/btl/usnic/btl_usnic_cclient.c

@@ -197,7 +197,7 @@ int opal_btl_usnic_connectivity_listen(opal_btl_usnic_module_t *module)
     /* Ensure to NULL-terminate the passed strings */
     strncpy(cmd.nodename, opal_process_info.nodename,
             CONNECTIVITY_NODENAME_LEN - 1);
-    strncpy(cmd.usnic_name, module->fabric_info->fabric_attr->name,
+    strncpy(cmd.usnic_name, module->linux_device_name,
             CONNECTIVITY_IFNAME_LEN - 1);
 
     if (OPAL_SUCCESS != opal_fd_write(agent_fd, sizeof(cmd), &cmd)) {

opal/mca/btl/usnic/btl_usnic_compat.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2014-2016 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2015      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  *
@@ -535,7 +535,7 @@ opal_btl_usnic_prepare_src(
 
 #if MSGDEBUG2
     opal_output(0, "prep_src: %s %s frag %p, size=%d+%u (was %u), conv=%p\n",
-                module->fabric_info->fabric_attr->name,
+                module->linux_device_name,
                 (reserve + *size) <= module->max_frag_payload?"small":"large",
                 (void *)frag, (int)reserve, (unsigned)*size, (unsigned)osize,
                 (void *)convertor);
@@ -721,7 +721,7 @@ opal_btl_usnic_prepare_src(struct mca_btl_base_module_t *base_module,
 
 #if MSGDEBUG2
     opal_output(0, "prep_src: %s %s frag %p, size=%d+%u (was %u), conv=%p\n",
-                module->fabric_info->fabric_attr->name,
+                module->linux_device_name,
                 (reserve + *size) <= module->max_frag_payload?"small":"large",
                 (void *)frag, (int)reserve, (unsigned)*size, (unsigned)osize,
                 (void *)convertor);

opal/mca/btl/usnic/btl_usnic_component.c

@@ -162,7 +162,7 @@ static hwloc_obj_t find_device_numa(opal_btl_usnic_module_t *module)
     if (obj->type != HWLOC_OBJ_NODE) {
         opal_output_verbose(5, USNIC_OUT,
                             "btl:usnic:filter_numa: could not find NUMA node for %s; filtering by NUMA distance not possible",
-                            module->fabric_info->fabric_attr->name);
+                            module->linux_device_name);
         return NULL;
     }
 
@@ -218,7 +218,7 @@ int opal_btl_usnic_hwloc_distance(opal_btl_usnic_module_t *module)
 
         opal_output_verbose(5, USNIC_OUT,
                             "btl:usnic:filter_numa: %s is distance %d from me",
-                            module->fabric_info->fabric_attr->name,
+                            module->linux_device_name,
                             module->numa_distance);
     }
 

opal/mca/btl/usnic/btl_usnic_hwloc.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2013-2016 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2014      Intel, Inc. All rights reserved
  * $COPYRIGHT$
  *
@@ -30,8 +30,8 @@ static int map_compare_modules(const void *aa, const void *bb)
     opal_btl_usnic_module_t *a = *((opal_btl_usnic_module_t**) aa);
     opal_btl_usnic_module_t *b = *((opal_btl_usnic_module_t**) bb);
 
-    return strcmp(a->fabric_info->fabric_attr->name,
-                  b->fabric_info->fabric_attr->name);
+    return strcmp(a->linux_device_name,
+                  b->linux_device_name);
 }
 
 /*
@@ -74,7 +74,7 @@ static int map_output_modules(FILE *fp)
                                         prefix_len);
 
         fprintf(fp, "device=%s,ip=%s,mss=%" PRIsize_t "\n",
-                modules[i]->fabric_info->fabric_attr->name,
+                modules[i]->linux_device_name,
                 ipv4, modules[i]->fabric_info->ep_attr->max_msg_size);
     }
 
@@ -102,8 +102,8 @@ static int map_compare_endpoints(const void *aa, const void *bb)
         return -1;
     }
 
-    return strcmp(a->endpoint_module->fabric_info->fabric_attr->name,
-                  b->endpoint_module->fabric_info->fabric_attr->name);
+    return strcmp(a->endpoint_module->linux_device_name,
+                  b->endpoint_module->linux_device_name);
 }
 
 /*
@@ -148,7 +148,7 @@ static int map_output_endpoints(FILE *fp, opal_btl_usnic_proc_t *proc)
                                           eps[i]->endpoint_remote_modex.netmask);
 
         fprintf(fp, "device=%s@peer_ip=%s",
-                eps[i]->endpoint_module->fabric_info->fabric_attr->name,
+                eps[i]->endpoint_module->linux_device_name,
                 ipv4);
         ++num_output;
     }