Skip to content

v3.0.x: 2 more vader fixes #5832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2018
Merged

v3.0.x: 2 more vader fixes #5832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02165ce
btl/vader: ensure the fast box tag is always read first
hjelmn Oct 2, 2018
c59d58a
btl/vader: work around Oracle compiler bug
hjelmn Oct 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion opal/mca/btl/vader/btl_vader_fbox.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ static inline void mca_btl_vader_fbox_set_header (mca_btl_vader_fbox_hdr_t *hdr,
hdr->data.tag = tag;
}

static inline mca_btl_vader_fbox_hdr_t mca_btl_vader_fbox_read_header (mca_btl_vader_fbox_hdr_t *hdr)
{
mca_btl_vader_fbox_hdr_t tmp;
uint16_t tag = hdr->data.tag;
opal_atomic_rmb ();
tmp.ival = hdr->ival;
tmp.data.tag = tag;
return tmp;
}

/* attempt to reserve a contiguous segment from the remote ep */
static inline bool mca_btl_vader_fbox_sendi (mca_btl_base_endpoint_t *ep, unsigned char tag,
void * restrict header, const size_t header_size,
Expand Down Expand Up @@ -175,7 +185,7 @@ static inline bool mca_btl_vader_check_fboxes (void)
int poll_count;

for (poll_count = 0 ; poll_count <= MCA_BTL_VADER_POLL_COUNT ; ++poll_count) {
const mca_btl_vader_fbox_hdr_t hdr = {.ival = MCA_BTL_VADER_FBOX_HDR(ep->fbox_in.buffer + start)->ival};
const mca_btl_vader_fbox_hdr_t hdr = mca_btl_vader_fbox_read_header (MCA_BTL_VADER_FBOX_HDR(ep->fbox_in.buffer + start));

/* check for a valid tag a sequence number */
if (0 == hdr.data.tag || hdr.data.seq != ep->fbox_in.seq) {
Expand Down
8 changes: 6 additions & 2 deletions opal/mca/btl/vader/btl_vader_fifo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* All rights reserved.
* Copyright (c) 2006-2007 Voltaire. All rights reserved.
* Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2010-2014 Los Alamos National Security, LLC.
* Copyright (c) 2010-2018 Los Alamos National Security, LLC.
* All rights reserved.
* $COPYRIGHT$
*
Expand Down Expand Up @@ -155,7 +155,11 @@ static inline mca_btl_vader_hdr_t *vader_fifo_read (vader_fifo_t *fifo, struct m

static inline void vader_fifo_init (vader_fifo_t *fifo)
{
fifo->fifo_head = fifo->fifo_tail = VADER_FIFO_FREE;
/* due to a compiler bug in Oracle C 5.15 the following line was broken into two. Not
* ideal but oh well. See #5814 */
/* fifo->fifo_head = fifo->fifo_tail = VADER_FIFO_FREE; */
fifo->fifo_head = VADER_FIFO_FREE;
fifo->fifo_tail = VADER_FIFO_FREE;
fifo->fbox_available = mca_btl_vader_component.fbox_max;
mca_btl_vader_component.my_fifo = fifo;
}
Expand Down