@@ -182,6 +182,60 @@ static int ucp_ep_failover_lane_complete(ucp_ep_failover_ctx_t *ctx,
182182}
183183
184184
185+ static void ucp_ep_failover_lane_fallback_discard (ucp_ep_h ep ,
186+ ucp_lane_index_t lane_index ,
187+ ucs_status_t discard_status )
188+ {
189+ ucp_ep_failover_ctx_t * ctx = ep -> ext -> failover .ctx ;
190+ ucp_ep_failover_lane_ctx_t * lane ;
191+ ucp_ep_failover_lane_done_cb_t done_cb ;
192+ ucp_rsc_index_t rsc_index ;
193+ uct_ep_h uct_ep ;
194+ void * done_arg ;
195+ ucs_status_t status ;
196+
197+ if ((ctx == NULL ) || !(ctx -> lane_map & UCS_BIT (lane_index ))) {
198+ return ;
199+ }
200+
201+ lane = & ctx -> lanes [lane_index ];
202+ uct_ep = lane -> uct_ep ;
203+ rsc_index = lane -> rsc_index ;
204+ done_cb = lane -> done_cb ;
205+ done_arg = lane -> done_arg ;
206+
207+ ucs_trace ("ep %p: fallback discard for failover lane %u status %s" , ep ,
208+ lane_index , ucs_status_string (discard_status ));
209+
210+ ucp_ep_failover_replay_purge (lane );
211+ ucs_free (lane -> rx_token );
212+ memset (lane , 0 , sizeof (* lane ));
213+ ctx -> lane_map &= ~UCS_BIT (lane_index );
214+ if (ctx -> lane_map == 0 ) {
215+ ep -> ext -> failover .ctx = NULL ;
216+ ucs_free (ctx );
217+ }
218+
219+ status = ucp_worker_discard_uct_ep (ep , uct_ep , rsc_index ,
220+ UCT_FLUSH_FLAG_CANCEL ,
221+ ucp_ep_err_pending_purge ,
222+ UCS_STATUS_PTR (discard_status ), done_cb ,
223+ done_arg );
224+ if ((status != UCS_OK ) && (status != UCS_INPROGRESS )) {
225+ ucs_debug ("ep %p: failed to discard failover lane %u uct_ep %p: %s" , ep ,
226+ lane_index , uct_ep , ucs_status_string (status ));
227+ ucp_ep_unprogress_uct_ep (ep , uct_ep , rsc_index );
228+ uct_ep_destroy (uct_ep );
229+ if (done_cb != NULL ) {
230+ done_cb (NULL , discard_status , done_arg );
231+ }
232+ }
233+
234+ ucp_worker_flush_ops_count_add (ep -> worker , -1 );
235+ ucp_ep_refcount_remove (ep , discard );
236+ }
237+
238+
185239ucs_status_t
186240ucp_ep_failover_add_lanes (ucp_ep_h ep , ucp_lane_map_t lane_map ,
187241 uct_ep_h * uct_eps , ucs_status_t discard_status ,
@@ -417,7 +471,10 @@ ucp_ep_failover_extract_lane(ucp_ep_failover_lane_ctx_t *lane)
417471 lane -> lane , ucs_status_string (status ));
418472 lane -> discard_status = status ;
419473 ucp_ep_failover_replay_purge (lane );
420- } else if (extract_arg .status != UCS_OK ) {
474+ return status ;
475+ }
476+
477+ if (extract_arg .status != UCS_OK ) {
421478 status = extract_arg .status ;
422479 lane -> discard_status = status ;
423480 ucp_ep_failover_replay_purge (lane );
@@ -432,8 +489,11 @@ ucp_ep_failover_extract_lane(ucp_ep_failover_lane_ctx_t *lane)
432489
433490static void ucp_ep_failover_abort_all (ucp_ep_h ep , ucs_status_t status )
434491{
492+ ucp_lane_map_t fallback_lanes = 0 ;
493+ int complete_lanes = 0 ;
435494 ucp_ep_failover_ctx_t * ctx ;
436495 ucp_ep_failover_lane_ctx_t * lane_ctx ;
496+ ucp_lane_map_t lane_map ;
437497 ucp_lane_index_t lane ;
438498
439499 ucs_assert (status != UCS_OK );
@@ -444,15 +504,26 @@ static void ucp_ep_failover_abort_all(ucp_ep_h ep, ucs_status_t status)
444504 return ;
445505 }
446506
447- ucs_for_each_bit (lane , ctx -> lane_map ) {
507+ lane_map = ctx -> lane_map ;
508+ ucs_for_each_bit (lane , lane_map ) {
448509 lane_ctx = & ctx -> lanes [lane ];
449- lane_ctx -> discard_status = status ;
450- lane_ctx -> flags |= UCP_EP_FAILOVER_LANE_FLAG_RX_TOKEN |
451- UCP_EP_FAILOVER_LANE_FLAG_EXTRACTED ;
452- ucp_ep_failover_replay_purge (lane_ctx );
510+ if (lane_ctx -> flags & UCP_EP_FAILOVER_LANE_FLAG_EXTRACTED ) {
511+ lane_ctx -> discard_status = status ;
512+ lane_ctx -> flags |= UCP_EP_FAILOVER_LANE_FLAG_RX_TOKEN ;
513+ ucp_ep_failover_replay_purge (lane_ctx );
514+ complete_lanes = 1 ;
515+ } else {
516+ fallback_lanes |= UCS_BIT (lane );
517+ }
453518 }
454519
455- ucp_ep_failover_schedule (ep );
520+ ucs_for_each_bit (lane , fallback_lanes ) {
521+ ucp_ep_failover_lane_fallback_discard (ep , lane , status );
522+ }
523+
524+ if (complete_lanes ) {
525+ ucp_ep_failover_schedule (ep );
526+ }
456527}
457528
458529
0 commit comments