From a383312393fb8ffffcccbc01b563e524e441e281 Mon Sep 17 00:00:00 2001
From: Sergey Oblomov <sergeyo@mellanox.com>
Date: Mon, 29 Jun 2020 13:40:50 +0300
Subject: [PATCH] UCX/WPOOL: fixed potential deadlock

- fixed funcs:
  opal_common_ucx_wpmem_putget
  opal_common_ucx_wpmem_cmpswp
  opal_common_ucx_wpmem_post
  opal_common_ucx_wpmem_fetch
  opal_common_ucx_wpmem_fetch_nb

Signed-off-by: Sergey Oblomov <sergeyo@mellanox.com>
---
 opal/mca/common/ucx/common_ucx_wpool.h | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/opal/mca/common/ucx/common_ucx_wpool.h b/opal/mca/common/ucx/common_ucx_wpool.h
index fadd7ec66a..0990977ed6 100644
--- a/opal/mca/common/ucx/common_ucx_wpool.h
+++ b/opal/mca/common/ucx/common_ucx_wpool.h
@@ -376,14 +376,15 @@ opal_common_ucx_wpmem_putget(opal_common_ucx_wpmem_t *mem, opal_common_ucx_op_t
     if (OPAL_UNLIKELY(status != UCS_OK && status != UCS_INPROGRESS)) {
         MCA_COMMON_UCX_ERROR("%s failed: %d", called_func, status);
         rc = OPAL_ERROR;
+        goto out;
     }
 
     rc = _periodical_flush_nb(mem, winfo, target);
     if(OPAL_UNLIKELY(OPAL_SUCCESS != rc)){
         MCA_COMMON_UCX_VERBOSE(1, "_incr_and_check_inflight_ops failed: %d", rc);
-        return rc;
     }
 
+out:
     opal_mutex_unlock(&winfo->mutex);
 
     return rc;
@@ -416,14 +417,15 @@ opal_common_ucx_wpmem_cmpswp(opal_common_ucx_wpmem_t *mem, uint64_t compare,
     if (OPAL_UNLIKELY(status != UCS_OK)) {
         MCA_COMMON_UCX_ERROR("opal_common_ucx_atomic_cswap failed: %d", status);
         rc = OPAL_ERROR;
+        goto out;
     }
 
     rc = _periodical_flush_nb(mem, winfo, target);
     if(OPAL_UNLIKELY(OPAL_SUCCESS != rc)){
         MCA_COMMON_UCX_VERBOSE(1, "_incr_and_check_inflight_ops failed: %d", rc);
-        return rc;
     }
 
+out:
     opal_mutex_unlock(&winfo->mutex);
 
     return rc;
@@ -502,14 +504,15 @@ opal_common_ucx_wpmem_post(opal_common_ucx_wpmem_t *mem, ucp_atomic_post_op_t op
     if (OPAL_UNLIKELY(status != UCS_OK)) {
         MCA_COMMON_UCX_ERROR("ucp_atomic_post failed: %d", status);
         rc = OPAL_ERROR;
+        goto out;
     }
 
     rc = _periodical_flush_nb(mem, winfo, target);
     if(OPAL_UNLIKELY(OPAL_SUCCESS != rc)){
         MCA_COMMON_UCX_VERBOSE(1, "_incr_and_check_inflight_ops failed: %d", rc);
-        return rc;
     }
 
+out:
     opal_mutex_unlock(&winfo->mutex);
     return rc;
 }
@@ -541,14 +544,15 @@ opal_common_ucx_wpmem_fetch(opal_common_ucx_wpmem_t *mem,
     if (OPAL_UNLIKELY(status != UCS_OK)) {
         MCA_COMMON_UCX_ERROR("ucp_atomic_cswap64 failed: %d", status);
         rc = OPAL_ERROR;
+        goto out;
     }
 
     rc = _periodical_flush_nb(mem, winfo, target);
     if(OPAL_UNLIKELY(OPAL_SUCCESS != rc)){
         MCA_COMMON_UCX_VERBOSE(1, "_incr_and_check_inflight_ops failed: %d", rc);
-        return rc;
     }
 
+out:
     opal_mutex_unlock(&winfo->mutex);
 
     return rc;
@@ -592,7 +596,6 @@ opal_common_ucx_wpmem_fetch_nb(opal_common_ucx_wpmem_t *mem,
     rc = _periodical_flush_nb(mem, winfo, target);
     if(OPAL_UNLIKELY(OPAL_SUCCESS != rc)){
         MCA_COMMON_UCX_VERBOSE(1, "_incr_and_check_inflight_ops failed: %d", rc);
-        return rc;
     }
 
     opal_mutex_unlock(&winfo->mutex);