Skip to content

Commit

Permalink
net/smc: move testlink work to system work queue
Browse files Browse the repository at this point in the history
The testlink work waits for a response to the testlink request and
blocks the single threaded llc_wq. This type of work does not have to be
serialized and can be moved to the system work queue.

Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Reviewed-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Karsten Graul authored and David S. Miller committed Apr 29, 2020
1 parent d854fcb commit 1020e1e
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions net/smc/smc_llc.c
Original file line number Diff line number Diff line change
Expand Up @@ -613,14 +613,15 @@ static void smc_llc_testlink_work(struct work_struct *work)
/* receive TEST LINK response over RoCE fabric */
rc = wait_for_completion_interruptible_timeout(&link->llc_testlink_resp,
SMC_LLC_WAIT_TIME);
if (link->state != SMC_LNK_ACTIVE)
return; /* link state changed */
if (rc <= 0) {
smc_lgr_terminate_sched(smc_get_lgr(link));
return;
}
next_interval = link->llc_testlink_time;
out:
queue_delayed_work(link->llc_wq, &link->llc_testlink_wrk,
next_interval);
schedule_delayed_work(&link->llc_testlink_wrk, next_interval);
}

int smc_llc_link_init(struct smc_link *link)
Expand Down Expand Up @@ -648,8 +649,8 @@ void smc_llc_link_active(struct smc_link *link, int testlink_time)
link->state = SMC_LNK_ACTIVE;
if (testlink_time) {
link->llc_testlink_time = testlink_time * HZ;
queue_delayed_work(link->llc_wq, &link->llc_testlink_wrk,
link->llc_testlink_time);
schedule_delayed_work(&link->llc_testlink_wrk,
link->llc_testlink_time);
}
}

Expand All @@ -665,7 +666,7 @@ void smc_llc_link_inactive(struct smc_link *link)
if (link->state == SMC_LNK_INACTIVE)
return;
link->state = SMC_LNK_INACTIVE;
cancel_delayed_work(&link->llc_testlink_wrk);
cancel_delayed_work_sync(&link->llc_testlink_wrk);
smc_wr_wakeup_reg_wait(link);
smc_wr_wakeup_tx_wait(link);
}
Expand Down

0 comments on commit 1020e1e

Please sign in to comment.