Skip to content

Commit ba429dc

Browse files
committed
usnic: temporarily disable the BTL put method
The usnic BTL put method is currently broken. Disable it until we can fix it properly.
1 parent f265358 commit ba429dc

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

opal/mca/btl/usnic/btl_usnic_compat.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,25 @@ opal_btl_usnic_put(struct mca_btl_base_module_t *base_module,
715715
sfrag->sf_size = size;
716716
sfrag->sf_ack_bytes_left = size;
717717

718+
719+
720+
/* JMS NOTE: This is currently broken, and is deactivated by
721+
removing the MCA_BTL_FLAGS_PUT from .btl_flags in btl_module.c.
722+
723+
Overwriting the uf_local_seg values is not a good idea, and
724+
doesn't do anything to actually send the data in the
725+
progression past finish_put_or_send().
726+
727+
The proper fix is to change the plumbing here to eventually
728+
call fi_sendv() with an iov[0] = the internal buffer that's
729+
already allocated, and iov[1] = the user's buffer. The usnic
730+
provider in fi_sendv() will be smart enough to figure out which
731+
is more performance: memcpy'ing the 2 buffers together and
732+
doing a single xfer down to the hardware, or actually doing a
733+
SG list down to the hardware. */
734+
735+
736+
718737
opal_btl_usnic_frag_t *frag;
719738
frag = &sfrag->sf_base;
720739
frag->uf_local_seg[0].seg_len = size;

opal/mca/btl/usnic/btl_usnic_module.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2338,7 +2338,6 @@ opal_btl_usnic_module_t opal_btl_usnic_module_template = {
23382338
.btl_exclusivity = MCA_BTL_EXCLUSIVITY_DEFAULT,
23392339
.btl_flags =
23402340
MCA_BTL_FLAGS_SEND |
2341-
MCA_BTL_FLAGS_PUT |
23422341
MCA_BTL_FLAGS_SEND_INPLACE,
23432342

23442343
.btl_add_procs = usnic_add_procs,

0 commit comments

Comments
 (0)