UCP/RNDV: Fix review comments

yosefe · Dec 8, 2021 · c6ecd5c · c6ecd5c
1 parent 2f82417
commit c6ecd5c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/src/ucp/core/ucp_request.c b/src/ucp/core/ucp_request.c
@@ -490,7 +490,7 @@ void ucp_request_handle_send_error(ucp_request_t *req, ucs_status_t status)
         }
     } else {
         if (req->flags & UCP_REQUEST_FLAG_SEND_RNDV) {
-            ucp_rndv_complete_send(req, UCS_ERR_CANCELED, "rndv_flush");
+            ucp_rndv_req_add_to_cancel_list(req, status);
        } else {
             ucp_request_complete_send(req, status);
         }

diff --git a/src/ucp/tag/rndv.c b/src/ucp/tag/rndv.c
@@ -202,8 +202,12 @@ size_t ucp_tag_rndv_rts_pack(void *dest, void *arg)
     return sizeof(*rndv_rts_hdr) + packed_rkey_size;
 }
 
-static void ucp_rndv_req_cancel(ucp_request_t *sreq, ucs_status_t status)
+void ucp_rndv_req_add_to_cancel_list(ucp_request_t *sreq, ucs_status_t status)
 {
+    if (sreq->flags & UCP_REQUEST_FLAG_CANCELED) {
+        return; /* already cancelled */
+    }
+
     sreq->status = status;
     sreq->flags |= UCP_REQUEST_FLAG_CANCELED;
     ucs_list_add_tail(&sreq->send.ep->worker->rndv_reqs_list,
@@ -243,7 +247,7 @@ UCS_PROFILE_FUNC(ucs_status_t, ucp_proto_progress_rndv_rts, (self),
         return UCS_ERR_NO_RESOURCE;
     } else {
         ucs_assert(UCS_STATUS_IS_ERR(status));
-        ucp_rndv_req_cancel(sreq, status);
+        ucp_rndv_complete_send(sreq, status, "rts_cancel");
         return UCS_OK;
     }
 }
@@ -273,12 +277,12 @@ UCS_PROFILE_FUNC(ucs_status_t, ucp_proto_progress_rndv_cancel, (self),
                                  UCP_AM_ID_RNDV_RTS, ucp_memcpy_pack, &ctx, 0);
     if (packed_len == UCS_ERR_NO_RESOURCE) {
         return UCS_ERR_NO_RESOURCE;
-    } else {
-        status = (packed_len >= 0) ? UCS_ERR_CANCELED :
-                                     (ucs_status_t)packed_len;
-        ucp_rndv_req_cancel(sreq, status);
-        return UCS_OK;
     }
+
+    status = (packed_len >= 0) ? UCS_ERR_CANCELED : (ucs_status_t)packed_len;
+    ucp_rndv_req_add_to_cancel_list(sreq, status);
+
+    return UCS_OK;
 }
 
 static size_t ucp_tag_rndv_rtr_pack(void *dest, void *arg)
@@ -409,15 +413,8 @@ ucs_status_t ucp_tag_send_start_rndv(ucp_request_t *sreq)
 
 void ucp_tag_rndv_cancel(ucp_request_t *sreq)
 {
-    if (!(sreq->send.ep->flags & UCP_EP_FLAG_REMOTE_CONNECTED)) {
-        if (sreq->flags & UCP_REQUEST_FLAG_RNDV_RTS_SENT) {
-            ucp_rndv_req_cancel(sreq, UCS_ERR_CANCELED);
-        }
-    } else {
-        sreq->send.uct.func = ucp_proto_progress_rndv_cancel;
-        if (sreq->flags & UCP_REQUEST_FLAG_RNDV_RTS_SENT) {
-            ucp_request_send(sreq, 0);
-        }
+    if (sreq->flags & UCP_REQUEST_FLAG_RNDV_RTS_SENT) {
+        ucp_rndv_req_add_to_cancel_list(sreq, UCS_ERR_CANCELED);
     }
 }
 

diff --git a/src/ucp/tag/rndv.h b/src/ucp/tag/rndv.h
@@ -65,6 +65,8 @@ ucs_status_t ucp_rndv_process_rts(void *arg, void *data, size_t length,
 
 size_t ucp_tag_rndv_rts_pack(void *dest, void *arg);
 
+void ucp_rndv_req_add_to_cancel_list(ucp_request_t *sreq, ucs_status_t status);
+
 ucs_status_t ucp_tag_rndv_reg_send_buffer(ucp_request_t *sreq);
 
 void ucp_ep_complete_rndv_reqs(ucp_ep_h ep);