net/smc: move llc layer related init and clear into smc_llc.c
Introduce smc_llc_lgr_init() and smc_llc_lgr_clear() to implement all llc layer specific initialization and cleanup in module smc_llc.c. 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>
This commit is contained in:
parent
faca536008
commit
00a049cfde
|
@ -381,7 +381,6 @@ static int smcr_lgr_reg_rmbs(struct smc_link_group *lgr,
|
|||
|
||||
static int smcr_clnt_conf_first_link(struct smc_sock *smc)
|
||||
{
|
||||
struct net *net = sock_net(smc->clcsock->sk);
|
||||
struct smc_link *link = smc->conn.lnk;
|
||||
int rest;
|
||||
int rc;
|
||||
|
@ -433,7 +432,7 @@ static int smcr_clnt_conf_first_link(struct smc_sock *smc)
|
|||
if (rc < 0)
|
||||
return SMC_CLC_DECL_TIMEOUT_AL;
|
||||
|
||||
smc_llc_link_active(link, net->ipv4.sysctl_tcp_keepalive_time);
|
||||
smc_llc_link_active(link);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -1019,7 +1018,6 @@ void smc_close_non_accepted(struct sock *sk)
|
|||
|
||||
static int smcr_serv_conf_first_link(struct smc_sock *smc)
|
||||
{
|
||||
struct net *net = sock_net(smc->clcsock->sk);
|
||||
struct smc_link *link = smc->conn.lnk;
|
||||
int rest;
|
||||
int rc;
|
||||
|
@ -1065,7 +1063,7 @@ static int smcr_serv_conf_first_link(struct smc_sock *smc)
|
|||
return rc == -EAGAIN ? SMC_CLC_DECL_TIMEOUT_AL : rc;
|
||||
}
|
||||
|
||||
smc_llc_link_active(link, net->ipv4.sysctl_tcp_keepalive_time);
|
||||
smc_llc_link_active(link);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -412,8 +412,8 @@ static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini)
|
|||
lgr->role = smc->listen_smc ? SMC_SERV : SMC_CLNT;
|
||||
memcpy(lgr->peer_systemid, ini->ib_lcl->id_for_peer,
|
||||
SMC_SYSTEMID_LEN);
|
||||
INIT_LIST_HEAD(&lgr->llc_event_q);
|
||||
spin_lock_init(&lgr->llc_event_q_lock);
|
||||
smc_llc_lgr_init(lgr, smc);
|
||||
|
||||
link_idx = SMC_SINGLE_LINK;
|
||||
lnk = &lgr->lnk[link_idx];
|
||||
rc = smcr_link_init(lgr, lnk, link_idx, ini);
|
||||
|
@ -614,7 +614,7 @@ static void smc_lgr_free(struct smc_link_group *lgr)
|
|||
if (lgr->lnk[i].state != SMC_LNK_UNUSED)
|
||||
smcr_link_clear(&lgr->lnk[i]);
|
||||
}
|
||||
smc_llc_event_flush(lgr);
|
||||
smc_llc_lgr_clear(lgr);
|
||||
if (!atomic_dec_return(&lgr_cnt))
|
||||
wake_up(&lgrs_deleted);
|
||||
}
|
||||
|
|
|
@ -238,6 +238,8 @@ struct smc_link_group {
|
|||
/* protects llc_event_q */
|
||||
struct work_struct llc_event_work;
|
||||
/* llc event worker */
|
||||
int llc_testlink_time;
|
||||
/* link keep alive time */
|
||||
};
|
||||
struct { /* SMC-D */
|
||||
u64 peer_gid;
|
||||
|
|
|
@ -493,7 +493,7 @@ static void smc_llc_rx_delete_rkey(struct smc_link *link,
|
|||
}
|
||||
|
||||
/* flush the llc event queue */
|
||||
void smc_llc_event_flush(struct smc_link_group *lgr)
|
||||
static void smc_llc_event_flush(struct smc_link_group *lgr)
|
||||
{
|
||||
struct smc_llc_qentry *qentry, *q;
|
||||
|
||||
|
@ -669,6 +669,23 @@ out:
|
|||
schedule_delayed_work(&link->llc_testlink_wrk, next_interval);
|
||||
}
|
||||
|
||||
void smc_llc_lgr_init(struct smc_link_group *lgr, struct smc_sock *smc)
|
||||
{
|
||||
struct net *net = sock_net(smc->clcsock->sk);
|
||||
|
||||
INIT_WORK(&lgr->llc_event_work, smc_llc_event_work);
|
||||
INIT_LIST_HEAD(&lgr->llc_event_q);
|
||||
spin_lock_init(&lgr->llc_event_q_lock);
|
||||
lgr->llc_testlink_time = net->ipv4.sysctl_tcp_keepalive_time;
|
||||
}
|
||||
|
||||
/* called after lgr was removed from lgr_list */
|
||||
void smc_llc_lgr_clear(struct smc_link_group *lgr)
|
||||
{
|
||||
smc_llc_event_flush(lgr);
|
||||
cancel_work_sync(&lgr->llc_event_work);
|
||||
}
|
||||
|
||||
int smc_llc_link_init(struct smc_link *link)
|
||||
{
|
||||
init_completion(&link->llc_confirm);
|
||||
|
@ -679,16 +696,15 @@ int smc_llc_link_init(struct smc_link *link)
|
|||
init_completion(&link->llc_delete_rkey_resp);
|
||||
mutex_init(&link->llc_delete_rkey_mutex);
|
||||
init_completion(&link->llc_testlink_resp);
|
||||
INIT_WORK(&link->lgr->llc_event_work, smc_llc_event_work);
|
||||
INIT_DELAYED_WORK(&link->llc_testlink_wrk, smc_llc_testlink_work);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void smc_llc_link_active(struct smc_link *link, int testlink_time)
|
||||
void smc_llc_link_active(struct smc_link *link)
|
||||
{
|
||||
link->state = SMC_LNK_ACTIVE;
|
||||
if (testlink_time) {
|
||||
link->llc_testlink_time = testlink_time * HZ;
|
||||
if (link->lgr->llc_testlink_time) {
|
||||
link->llc_testlink_time = link->lgr->llc_testlink_time * HZ;
|
||||
schedule_delayed_work(&link->llc_testlink_wrk,
|
||||
link->llc_testlink_time);
|
||||
}
|
||||
|
|
|
@ -53,15 +53,16 @@ int smc_llc_send_add_link(struct smc_link *link, u8 mac[], u8 gid[],
|
|||
enum smc_llc_reqresp reqresp);
|
||||
int smc_llc_send_delete_link(struct smc_link *link,
|
||||
enum smc_llc_reqresp reqresp, bool orderly);
|
||||
void smc_llc_lgr_init(struct smc_link_group *lgr, struct smc_sock *smc);
|
||||
void smc_llc_lgr_clear(struct smc_link_group *lgr);
|
||||
int smc_llc_link_init(struct smc_link *link);
|
||||
void smc_llc_link_active(struct smc_link *link, int testlink_time);
|
||||
void smc_llc_link_active(struct smc_link *link);
|
||||
void smc_llc_link_deleting(struct smc_link *link);
|
||||
void smc_llc_link_clear(struct smc_link *link);
|
||||
int smc_llc_do_confirm_rkey(struct smc_link *link,
|
||||
struct smc_buf_desc *rmb_desc);
|
||||
int smc_llc_do_delete_rkey(struct smc_link *link,
|
||||
struct smc_buf_desc *rmb_desc);
|
||||
void smc_llc_event_flush(struct smc_link_group *lgr);
|
||||
int smc_llc_init(void) __init;
|
||||
|
||||
#endif /* SMC_LLC_H */
|
||||
|
|
Loading…
Reference in a new issue