net/smc: move testlink work to system work queue

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>

diff --git a/net/smc/smc_llc.c b/net/smc/smc_llc.c
index c267f5006faa985d2524861108a50deec3a8d312..69cc0d65b437fe8d0269bc10a9282434efbd4730 100644 (file)
--- a/net/smc/smc_llc.c
+++ b/net/smc/smc_llc.c
@@ -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)
@@ -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);
        }
 }
 
@@ -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);
 }