Merge pull request #7134 from dmitrygx/topic/uct/verbs_err_handle

UCT/IB/RC/VERBS: Align WC error status with MLX5 error handling
openucx · Jul 22, 2021 · 99748da · 99748da
2 parents 0456074 + 0a3e7a7
commit 99748da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/uct/ib/rc/verbs/rc_verbs_iface.c b/src/uct/ib/rc/verbs/rc_verbs_iface.c
@@ -124,14 +124,18 @@ static void uct_rc_verbs_handle_failure(uct_ib_iface_t *ib_iface, void *arg,
             wc->wr_id, wc->vendor_err, peer_info);
 }
 
-ucs_status_t uct_rc_verbs_wc_to_ucs_status(enum ibv_wc_status status)
+static ucs_status_t uct_rc_verbs_wc_to_ucs_status(enum ibv_wc_status status)
 {
     switch (status)
     {
     case IBV_WC_SUCCESS:
         return UCS_OK;
+    case IBV_WC_REM_ACCESS_ERR:
+    case IBV_WC_REM_OP_ERR:
+        return UCS_ERR_CONNECTION_RESET;
     case IBV_WC_RETRY_EXC_ERR:
     case IBV_WC_RNR_RETRY_EXC_ERR:
+    case IBV_WC_REM_ABORT_ERR:
         return UCS_ERR_ENDPOINT_TIMEOUT;
     case IBV_WC_WR_FLUSH_ERR:
         return UCS_ERR_CANCELED;

diff --git a/src/uct/ib/rc/verbs/rc_verbs_impl.h b/src/uct/ib/rc/verbs/rc_verbs_impl.h
@@ -12,7 +12,6 @@
 #include <uct/ib/rc/base/rc_iface.h>
 #include <uct/ib/rc/base/rc_ep.h>
 
-ucs_status_t uct_rc_verbs_wc_to_ucs_status(enum ibv_wc_status status);
 
 static inline void
 uct_rc_verbs_txqp_posted(uct_rc_txqp_t *txqp, uct_rc_verbs_txcnt_t *txcnt,