Commit 97cdbc42 authored by Karsten Graul's avatar Karsten Graul Committed by David S. Miller

net/smc: schedule free_work when link group is terminated

The free_work worker must be scheduled when the link group is
abnormally terminated.
Signed-off-by: default avatarKarsten Graul <kgraul@linux.vnet.ibm.com>
Signed-off-by: default avatarUrsula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 268ffcc4
...@@ -32,6 +32,17 @@ ...@@ -32,6 +32,17 @@
static u32 smc_lgr_num; /* unique link group number */ static u32 smc_lgr_num; /* unique link group number */
static void smc_lgr_schedule_free_work(struct smc_link_group *lgr)
{
/* client link group creation always follows the server link group
* creation. For client use a somewhat higher removal delay time,
* otherwise there is a risk of out-of-sync link groups.
*/
mod_delayed_work(system_wq, &lgr->free_work,
lgr->role == SMC_CLNT ? SMC_LGR_FREE_DELAY_CLNT :
SMC_LGR_FREE_DELAY_SERV);
}
/* Register connection's alert token in our lookup structure. /* Register connection's alert token in our lookup structure.
* To use rbtrees we have to implement our own insert core. * To use rbtrees we have to implement our own insert core.
* Requires @conns_lock * Requires @conns_lock
...@@ -111,13 +122,7 @@ static void smc_lgr_unregister_conn(struct smc_connection *conn) ...@@ -111,13 +122,7 @@ static void smc_lgr_unregister_conn(struct smc_connection *conn)
write_unlock_bh(&lgr->conns_lock); write_unlock_bh(&lgr->conns_lock);
if (!reduced || lgr->conns_num) if (!reduced || lgr->conns_num)
return; return;
/* client link group creation always follows the server link group smc_lgr_schedule_free_work(lgr);
* creation. For client use a somewhat higher removal delay time,
* otherwise there is a risk of out-of-sync link groups.
*/
mod_delayed_work(system_wq, &lgr->free_work,
lgr->role == SMC_CLNT ? SMC_LGR_FREE_DELAY_CLNT :
SMC_LGR_FREE_DELAY_SERV);
} }
static void smc_lgr_free_work(struct work_struct *work) static void smc_lgr_free_work(struct work_struct *work)
...@@ -344,6 +349,7 @@ void smc_lgr_terminate(struct smc_link_group *lgr) ...@@ -344,6 +349,7 @@ void smc_lgr_terminate(struct smc_link_group *lgr)
} }
write_unlock_bh(&lgr->conns_lock); write_unlock_bh(&lgr->conns_lock);
wake_up(&lgr->lnk[SMC_SINGLE_LINK].wr_reg_wait); wake_up(&lgr->lnk[SMC_SINGLE_LINK].wr_reg_wait);
smc_lgr_schedule_free_work(lgr);
} }
/* Determine vlan of internal TCP socket. /* Determine vlan of internal TCP socket.
......
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