Skip to content

Commit 7f6311d

Browse files
authored
Merge pull request #2169 from jsquyres/pr/v2.0.2/usnic-bug-fixes-2
v2.0.2: usnic bug fixes
2 parents 0178585 + 9ed1145 commit 7f6311d

File tree

12 files changed

+227
-146
lines changed

12 files changed

+227
-146
lines changed

opal/mca/btl/usnic/btl_usnic.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,6 @@ typedef struct opal_btl_usnic_component_t {
217217
the prefix is non-NULL) */
218218
char *connectivity_map_prefix;
219219

220-
/** Expected return value from fi_cq_readerr() upon success. In
221-
libfabric v1.0.0 / API v1.0, the usnic provider returned
222-
sizeof(fi_cq_err_entry) upon success. In libfabric >=v1.1 /
223-
API >=v1.1, the usnic provider returned 1 upon success. */
224-
ssize_t cq_readerr_success_value;
225-
ssize_t cq_readerr_try_again_value;
226-
227220
/** Offset into the send buffer where the payload will go. For
228221
libfabric v1.0.0 / API v1.0, this is 0. For libfabric >=v1.1
229222
/ API >=v1.1, this is the endpoint.msg_prefix_size (i.e.,

opal/mca/btl/usnic/btl_usnic_cclient.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ int opal_btl_usnic_connectivity_listen(opal_btl_usnic_module_t *module)
197197
/* Ensure to NULL-terminate the passed strings */
198198
strncpy(cmd.nodename, opal_process_info.nodename,
199199
CONNECTIVITY_NODENAME_LEN - 1);
200-
strncpy(cmd.usnic_name, module->fabric_info->fabric_attr->name,
200+
strncpy(cmd.usnic_name, module->linux_device_name,
201201
CONNECTIVITY_IFNAME_LEN - 1);
202202

203203
if (OPAL_SUCCESS != opal_fd_write(agent_fd, sizeof(cmd), &cmd)) {

opal/mca/btl/usnic/btl_usnic_compat.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014-2015 Cisco Systems, Inc. All rights reserved.
2+
* Copyright (c) 2014-2016 Cisco Systems, Inc. All rights reserved.
33
* Copyright (c) 2015 Intel, Inc. All rights reserved.
44
* $COPYRIGHT$
55
*
@@ -535,7 +535,7 @@ opal_btl_usnic_prepare_src(
535535

536536
#if MSGDEBUG2
537537
opal_output(0, "prep_src: %s %s frag %p, size=%d+%u (was %u), conv=%p\n",
538-
module->fabric_info->fabric_attr->name,
538+
module->linux_device_name,
539539
(reserve + *size) <= module->max_frag_payload?"small":"large",
540540
(void *)frag, (int)reserve, (unsigned)*size, (unsigned)osize,
541541
(void *)convertor);
@@ -721,7 +721,7 @@ opal_btl_usnic_prepare_src(struct mca_btl_base_module_t *base_module,
721721

722722
#if MSGDEBUG2
723723
opal_output(0, "prep_src: %s %s frag %p, size=%d+%u (was %u), conv=%p\n",
724-
module->fabric_info->fabric_attr->name,
724+
module->linux_device_name,
725725
(reserve + *size) <= module->max_frag_payload?"small":"large",
726726
(void *)frag, (int)reserve, (unsigned)*size, (unsigned)osize,
727727
(void *)convertor);

opal/mca/btl/usnic/btl_usnic_component.c

Lines changed: 112 additions & 86 deletions
Large diffs are not rendered by default.

opal/mca/btl/usnic/btl_usnic_hwloc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ static hwloc_obj_t find_device_numa(opal_btl_usnic_module_t *module)
162162
if (obj->type != HWLOC_OBJ_NODE) {
163163
opal_output_verbose(5, USNIC_OUT,
164164
"btl:usnic:filter_numa: could not find NUMA node for %s; filtering by NUMA distance not possible",
165-
module->fabric_info->fabric_attr->name);
165+
module->linux_device_name);
166166
return NULL;
167167
}
168168

@@ -218,7 +218,7 @@ int opal_btl_usnic_hwloc_distance(opal_btl_usnic_module_t *module)
218218

219219
opal_output_verbose(5, USNIC_OUT,
220220
"btl:usnic:filter_numa: %s is distance %d from me",
221-
module->fabric_info->fabric_attr->name,
221+
module->linux_device_name,
222222
module->numa_distance);
223223
}
224224

opal/mca/btl/usnic/btl_usnic_map.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013-2015 Cisco Systems, Inc. All rights reserved.
2+
* Copyright (c) 2013-2016 Cisco Systems, Inc. All rights reserved.
33
* Copyright (c) 2014 Intel, Inc. All rights reserved
44
* $COPYRIGHT$
55
*
@@ -30,8 +30,8 @@ static int map_compare_modules(const void *aa, const void *bb)
3030
opal_btl_usnic_module_t *a = *((opal_btl_usnic_module_t**) aa);
3131
opal_btl_usnic_module_t *b = *((opal_btl_usnic_module_t**) bb);
3232

33-
return strcmp(a->fabric_info->fabric_attr->name,
34-
b->fabric_info->fabric_attr->name);
33+
return strcmp(a->linux_device_name,
34+
b->linux_device_name);
3535
}
3636

3737
/*
@@ -74,7 +74,7 @@ static int map_output_modules(FILE *fp)
7474
prefix_len);
7575

7676
fprintf(fp, "device=%s,ip=%s,mss=%" PRIsize_t "\n",
77-
modules[i]->fabric_info->fabric_attr->name,
77+
modules[i]->linux_device_name,
7878
ipv4, modules[i]->fabric_info->ep_attr->max_msg_size);
7979
}
8080

@@ -102,8 +102,8 @@ static int map_compare_endpoints(const void *aa, const void *bb)
102102
return -1;
103103
}
104104

105-
return strcmp(a->endpoint_module->fabric_info->fabric_attr->name,
106-
b->endpoint_module->fabric_info->fabric_attr->name);
105+
return strcmp(a->endpoint_module->linux_device_name,
106+
b->endpoint_module->linux_device_name);
107107
}
108108

109109
/*
@@ -148,7 +148,7 @@ static int map_output_endpoints(FILE *fp, opal_btl_usnic_proc_t *proc)
148148
eps[i]->endpoint_remote_modex.netmask);
149149

150150
fprintf(fp, "device=%s@peer_ip=%s",
151-
eps[i]->endpoint_module->fabric_info->fabric_attr->name,
151+
eps[i]->endpoint_module->linux_device_name,
152152
ipv4);
153153
++num_output;
154154
}

0 commit comments

Comments
 (0)