Commit 323fd785 authored by Dean Luick's avatar Dean Luick Committed by Greg Kroah-Hartman

staging/rdma/hfi1: Fix downgrade race

A link downgrade can race with link up. Avoid the race
in two ways. First, by having the downgrade application logic
take the link state mutex for all of its checking. Second, by
waiting for the link to move out of the going up state.
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDean Luick <dean.luick@intel.com>
Signed-off-by: default avatarJubin John <jubin.john@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 699f6855
...@@ -3907,18 +3907,32 @@ void handle_verify_cap(struct work_struct *work) ...@@ -3907,18 +3907,32 @@ void handle_verify_cap(struct work_struct *work)
*/ */
void apply_link_downgrade_policy(struct hfi1_pportdata *ppd, int refresh_widths) void apply_link_downgrade_policy(struct hfi1_pportdata *ppd, int refresh_widths)
{ {
int skip = 1;
int do_bounce = 0; int do_bounce = 0;
u16 lwde = ppd->link_width_downgrade_enabled; int tries;
u16 lwde;
u16 tx, rx; u16 tx, rx;
/* use the hls lock to avoid a race with actual link up */
tries = 0;
retry:
mutex_lock(&ppd->hls_lock); mutex_lock(&ppd->hls_lock);
/* only apply if the link is up */ /* only apply if the link is up */
if (ppd->host_link_state & HLS_UP) if (!(ppd->host_link_state & HLS_UP)) {
skip = 0; /* still going up..wait and retry */
mutex_unlock(&ppd->hls_lock); if (ppd->host_link_state & HLS_GOING_UP) {
if (skip) if (++tries < 1000) {
return; mutex_unlock(&ppd->hls_lock);
usleep_range(100, 120); /* arbitrary */
goto retry;
}
dd_dev_err(ppd->dd,
"%s: giving up waiting for link state change\n",
__func__);
}
goto done;
}
lwde = ppd->link_width_downgrade_enabled;
if (refresh_widths) { if (refresh_widths) {
get_link_widths(ppd->dd, &tx, &rx); get_link_widths(ppd->dd, &tx, &rx);
...@@ -3956,6 +3970,9 @@ void apply_link_downgrade_policy(struct hfi1_pportdata *ppd, int refresh_widths) ...@@ -3956,6 +3970,9 @@ void apply_link_downgrade_policy(struct hfi1_pportdata *ppd, int refresh_widths)
do_bounce = 1; do_bounce = 1;
} }
done:
mutex_unlock(&ppd->hls_lock);
if (do_bounce) { if (do_bounce) {
set_link_down_reason(ppd, OPA_LINKDOWN_REASON_WIDTH_POLICY, 0, set_link_down_reason(ppd, OPA_LINKDOWN_REASON_WIDTH_POLICY, 0,
OPA_LINKDOWN_REASON_WIDTH_POLICY); OPA_LINKDOWN_REASON_WIDTH_POLICY);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment