Skip to content
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.

Sign up for GitHub

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

Jump to bottom

UCP/FLUSH: Support set_ep_failed() during flush #90

Merged
merged 3 commits into from
Nov 12, 2020
Merged

UCP/FLUSH: Support set_ep_failed() during flush #90

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31754bf
UCP/FLUSH: Support set_ep_failed() during flush
yosefe Jun 10, 2020
868b5be
UCP/FLUSH: Fix assignment order
yosefe Jun 10, 2020
417839d
UCP/FLUSH: Add log for num_lanes changed during flush
yosefe Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions src/ucp/rma/flush.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ static int ucp_ep_flush_is_completed(ucp_request_t *req)

static void ucp_ep_flush_progress(ucp_request_t *req)
{
ucp_ep_h ep = req->send.ep;
ucp_lane_map_t all_lanes = UCS_MASK(ucp_ep_num_lanes(ep));
ucp_ep_h ep = req->send.ep;
unsigned num_lanes = ucp_ep_num_lanes(ep);
ucp_lane_map_t all_lanes = UCS_MASK(num_lanes);
ucp_ep_flush_state_t *flush_state;
ucp_lane_index_t lane;
ucs_status_t status;
Expand All @@ -42,19 +43,25 @@ static void ucp_ep_flush_progress(ucp_request_t *req)

/* If the number of lanes changed since flush operation was submitted, adjust
* the number of expected completions */
if (ucs_unlikely(req->send.flush.num_lanes != ucp_ep_num_lanes(ep))) {
diff = ucp_ep_num_lanes(ep) -
req->send.flush.num_lanes;
if (diff < 0) {
ucs_fatal("ep %p: unsupported endpoint reconfiguration from %d to %d"
" lanes during flush", ep, req->send.flush.num_lanes,
ucp_ep_num_lanes(ep));
if (ucs_unlikely(req->send.flush.num_lanes != num_lanes)) {
ucp_trace_req(req, "ep %p: number of lanes changed from %d to %d",
ep, req->send.flush.num_lanes, num_lanes);
diff = num_lanes - req->send.flush.num_lanes;
req->send.flush.num_lanes = num_lanes;
if (diff >= 0) {
ucp_trace_req(req,
"ep %p: adjusting expected flush completion count by %d",
ep, diff);
req->send.state.uct_comp.count += diff;
} else {
/* If we have less lanes, it means we are in error flow and
* ucp_worker_set_ep_failed() was completed, so we should have
* completed the flush on all lanes.
*/
ucs_assertv(req->send.state.uct_comp.count == 0,
"uct_comp.count=%d num_lanes=%d",
req->send.state.uct_comp.count, num_lanes);
}

req->send.state.uct_comp.count += diff;
req->send.flush.num_lanes = ucp_ep_num_lanes(ep);
ucs_trace_req("flush req %p: adjusting expected completion count by %d",
req, diff);
}

ucs_trace("ep %p: progress flush req %p, started_lanes 0x%x count %d", ep,
Expand Down