Repository navigation
UCP/FT/TF: Integrate lane hold, wireup reply, and token tests #12195
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
b9ce944
f4c5b10
9845903
ecfb222
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2128,6 +2128,7 @@ static void ucp_ep_recovery_arg_free(ucp_ep_h ep) | |
|
|
||
| seen_peer_id = arg->seen_peer_id; | ||
| ucp_ep_refcount_assert(ep, probe, ==, 0); | ||
| ucp_wireup_tf_reply_discard(ep); | ||
| ucp_ep_tf_cleanup(ep); | ||
| ucs_free(arg); | ||
| ep->ext->recovery_arg = NULL; | ||
|
|
@@ -2506,8 +2507,14 @@ int ucp_ep_recovery_progress(ucp_ep_h ep) | |
|
|
||
| failed = ucp_ep_get_failed_lanes(ep); | ||
| if (failed == 0) { | ||
| /* Recovery completed between rounds, the ep operates normally. */ | ||
| ucs_assert(ucp_ep_recovery_arg(ep) == NULL); | ||
| /* A peer request moves the queue pair to error and waits for that | ||
| * completion before this lane is failed. Recovery stays idle until | ||
| * the completion holds it. */ | ||
| if ((ucp_ep_recovery_arg(ep) == NULL) || | ||
| (ucp_ep_recovery_arg(ep)->tf_reply == NULL)) { | ||
| ucs_assert(ucp_ep_recovery_arg(ep) == NULL); | ||
| } | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Suggestion: The |
||
|
|
||
| goto done; | ||
| } | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -564,6 +564,9 @@ typedef struct ucp_ep_recovery_arg { | |
| * outstanding operations are resolved, | ||
| * outstanding re-posts also go here */ | ||
| ucs_queue_head_t tf_pending_q; | ||
| /* LANES_ADDR reply waiting for error completions. Owned by wireup. | ||
| * NULL when no reply is waiting. */ | ||
| void *tf_reply; | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. IMO pls forward-declare |
||
| } ucp_ep_recovery_arg_t; | ||
|
|
||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -18,6 +18,7 @@ | |||||||||
| #include <ucp/core/ucp_context.h> | ||||||||||
| #include <ucp/proto/proto_common.inl> | ||||||||||
| #include <ucp/wireup/address.h> | ||||||||||
| #include <ucp/wireup/wireup.h> | ||||||||||
| #include <ucp/wireup/wireup_cm.h> | ||||||||||
| #include <ucp/wireup/wireup_ep.h> | ||||||||||
| #include <ucp/wireup/wireup_lane_info.h> | ||||||||||
|
|
@@ -482,18 +483,22 @@ ucp_worker_iface_handle_uct_ep_failure(ucp_ep_h ucp_ep, ucp_lane_index_t lane, | |||||||||
| if (wireup_ep == NULL) { | ||||||||||
| /* This endpoint is already held. Keep it until its completion. */ | ||||||||||
| if (ucp_ep_tf_is_held(ucp_ep, lane, uct_ep)) { | ||||||||||
| ucp_wireup_tf_lane_errored(ucp_ep, lane); | ||||||||||
| return UCS_INPROGRESS; | ||||||||||
| } | ||||||||||
|
|
||||||||||
| if (ucp_ep_tf_hold(ucp_ep, lane, uct_ep) == UCS_OK) { | ||||||||||
| /* Purge after return, once the outstanding range is | ||||||||||
| * recorded. */ | ||||||||||
| * recorded. The hold is the error this request was waiting | ||||||||||
| * for. A deferred reply rebuilds the lane only after it. */ | ||||||||||
| ucp_ep_tf_schedule_token_purge(ucp_ep, lane); | ||||||||||
| ucp_wireup_tf_lane_errored(ucp_ep, lane); | ||||||||||
| return UCS_INPROGRESS; | ||||||||||
| } | ||||||||||
| } | ||||||||||
|
|
||||||||||
| ucp_ep_set_lanes_failed(ucp_ep, UCS_BIT(lane), status); | ||||||||||
| ucp_wireup_tf_lane_errored(ucp_ep, lane); | ||||||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. blocker:
Suggested change
|
||||||||||
| return UCS_OK; | ||||||||||
| } | ||||||||||
|
|
||||||||||
|
|
@@ -565,8 +570,8 @@ ucp_worker_iface_error_handler(void *arg, uct_ep_h uct_ep, ucs_status_t status) | |||||||||
|
|
||||||||||
| UCS_ASYNC_BLOCK(&worker->async); | ||||||||||
|
|
||||||||||
| ucs_debug("worker %p: error handler called for UCT EP %p: %s", | ||||||||||
| worker, uct_ep, ucs_status_string(status)); | ||||||||||
| ucs_debug("worker %p: error handler called for UCT EP %p: %s", worker, | ||||||||||
| uct_ep, ucs_status_string(status)); | ||||||||||
|
|
||||||||||
| if (ucp_worker_is_uct_ep_discarding(worker, uct_ep)) { | ||||||||||
| ucs_debug("UCT EP %p is being discarded on UCP Worker %p", | ||||||||||
|
|
@@ -588,6 +593,9 @@ ucp_worker_iface_error_handler(void *arg, uct_ep_h uct_ep, ucs_status_t status) | |||||||||
| } | ||||||||||
| } | ||||||||||
|
|
||||||||||
| ucs_debug("worker %p: uct_ep %p is ep %p lane %d slot %p", worker, uct_ep, | ||||||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. minor: this looks like leftover debugging and mostly repeats the debug message at the top of the handler, pls drop it. |
||||||||||
| ucp_ep, lane, ucp_ep_get_lane(ucp_ep, lane)); | ||||||||||
|
|
||||||||||
| status = ucp_worker_iface_handle_uct_ep_failure(ucp_ep, lane, uct_ep, | ||||||||||
| status); | ||||||||||
|
|
||||||||||
|
|
||||||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pls write this as one assert, the
if+assertform is hard to read: