Skip to content

v3.0.x: btl/vader: fix race condition in writing header #5860

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 1 commit into from
Oct 9, 2018
Merged

v3.0.x: btl/vader: fix race condition in writing header #5860

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions 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 @@ -29,6 +29,10 @@ typedef union mca_btl_vader_fbox_hdr_t {
/** sequence number */
uint16_t seq;
} data;
struct {
uint32_t value0;
uint32_t value1;
} data_i32;
uint64_t ival;
} mca_btl_vader_fbox_hdr_t;

Expand All @@ -50,19 +54,20 @@ void mca_btl_vader_poll_handle_frag (mca_btl_vader_hdr_t *hdr, mca_btl_base_endp
static inline void mca_btl_vader_fbox_set_header (mca_btl_vader_fbox_hdr_t *hdr, uint16_t tag,
uint16_t seq, uint32_t size)
{
mca_btl_vader_fbox_hdr_t tmp = {.data = {.tag = 0, .seq = seq, .size = size}};
hdr->ival = tmp.ival;
mca_btl_vader_fbox_hdr_t tmp = {.data = {.tag = tag, .seq = seq, .size = size}};
/* clear out existing tag/seq */
hdr->data_i32.value1 = 0;
opal_atomic_wmb ();
hdr->data_i32.value0 = size;
opal_atomic_wmb ();
hdr->data.tag = tag;
hdr->data_i32.value1 = tmp.data_i32.value1;
}

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;
mca_btl_vader_fbox_hdr_t tmp = {.data_i32 = {.value1 = hdr->data_i32.value1}};;
opal_atomic_rmb ();
tmp.ival = hdr->ival;
tmp.data.tag = tag;
tmp.data_i32.value0 = hdr->data_i32.value0;
return tmp;
}

Expand Down