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.

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

UCT/RC/MLX5: Fix keepalive send condition with CQ moderation #205

Merged
merged 1 commit into from
Sep 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/uct/ib/rc/accel/rc_mlx5_ep.c
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ ucs_status_t uct_rc_mlx5_ep_fc_ctrl(uct_ep_t *tl_ep, unsigned op,
NULL, 0,
UCT_RC_EP_FC_PURE_GRANT, 0, 0,
0, 0,
NULL, NULL, 0, 0,
NULL, NULL, 0, MLX5_WQE_CTRL_CQ_UPDATE,
INT_MAX);
return UCS_OK;
}
Expand Down
7 changes: 5 additions & 2 deletions src/uct/ib/rc/accel/rc_mlx5_iface.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,13 @@ uct_rc_mlx5_common_ka_progress(uct_rc_mlx5_iface_common_t *iface)

ucs_spin_lock(&iface->super.ep_list_lock);
ucs_list_for_each(ep, &iface->super.ep_list, super.list) {
if (ep->super.txqp.available < ep->tx.wq.bb_max) {
/* have outstanding operations */
if ((ep->super.txqp.available < ep->tx.wq.bb_max) &&
(ep->super.txqp.unsignaled == 0)) {
/* Have outstanding uncompleted operations - no need to send
keepalive message */
continue;
}

ucs_trace("send keepalive grant on ep %p", ep);
uct_rc_ep_fc_send_grant(&ep->super);
}
Expand Down