Merge pull request #5543 from jsquyres/pr/v4.0.x/vader-fix

gpaulsen · web-flow · commit 54c5aac93ff0 · 2018-08-15T16:21:44.000-05:00
v4.0.x: btl/vader: move memory barrier to where it belongs
diff --git a/opal/mca/btl/vader/btl_vader_fbox.h b/opal/mca/btl/vader/btl_vader_fbox.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights
+ * Copyright (c) 2011-2018 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
  *
@@ -51,8 +51,8 @@ static inline void mca_btl_vader_fbox_set_header (mca_btl_vader_fbox_hdr_t *hdr,
                                                   uint16_t seq, uint32_t size)
 {
     mca_btl_vader_fbox_hdr_t tmp = {.data = {.tag = tag, .seq = seq, .size = size}};
-    hdr->ival = tmp.ival;
     opal_atomic_wmb ();
+    hdr->ival = tmp.ival;
 }
 
 /* attempt to reserve a contiguous segment from the remote ep */

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* -- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -- */`
`2`	`2`	`/*`
`3`		`- * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights`
	`3`	`+ * Copyright (c) 2011-2018 Los Alamos National Security, LLC. All rights`
`4`	`4`	`* reserved.`
`5`	`5`	`* $COPYRIGHT$`
`6`	`6`	`*`
`@@ -51,8 +51,8 @@ static inline void mca_btl_vader_fbox_set_header (mca_btl_vader_fbox_hdr_t *hdr,`
`51`	`51`	`uint16_t seq, uint32_t size)`
`52`	`52`	`{`
`53`	`53`	`mca_btl_vader_fbox_hdr_t tmp = {.data = {.tag = tag, .seq = seq, .size = size}};`
`54`		`- hdr->ival = tmp.ival;`
`55`	`54`	`opal_atomic_wmb ();`
	`55`	`+ hdr->ival = tmp.ival;`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/* attempt to reserve a contiguous segment from the remote ep */`