OSHMEM: fixes potential deadlock in shmem_lock()

alex-mikheev · alex-mikheev · commit 63c45e9208b6 · 2016-11-02T18:57:10.000+02:00
Signed-off-by: Alex Mikheev &lt;alexm@mellanox.com&gt;
diff --git a/oshmem/shmem/c/shmem_lock.c b/oshmem/shmem/c/shmem_lock.c
@@ -270,7 +270,11 @@ static uint64_t shmem_lock_cswap(void *target,
 
         prev_value = prev_value_32;
     }
-
+    /* function is used to busy wait for the value. 
+     * Call opal_progress() so that ompi will no deadlock
+     * (for example may need to respond to rkey requests)
+     */
+    opal_progress();
     return prev_value;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,11 @@ static uint64_t shmem_lock_cswap(void *target,`
`270`	`270`
`271`	`271`	`prev_value = prev_value_32;`
`272`	`272`	`}`
`273`		`-`
	`273`	`+ /* function is used to busy wait for the value.`
	`274`	`+ * Call opal_progress() so that ompi will no deadlock`
	`275`	`+ * (for example may need to respond to rkey requests)`
	`276`	`+ */`
	`277`	`+ opal_progress();`
`274`	`278`	`return prev_value;`
`275`	`279`	`}`
`276`	`280`