Skip to content

Commit 0541db8

Browse files
Wen GuPaolo Abeni
authored andcommitted
net/smc: initialize close_work early to avoid warning
We encountered a warning that close_work was canceled before initialization. WARNING: CPU: 7 PID: 111103 at kernel/workqueue.c:3047 __flush_work+0x19e/0x1b0 Workqueue: events smc_lgr_terminate_work [smc] RIP: 0010:__flush_work+0x19e/0x1b0 Call Trace: ? __wake_up_common+0x7a/0x190 ? work_busy+0x80/0x80 __cancel_work_timer+0xe3/0x160 smc_close_cancel_work+0x1a/0x70 [smc] smc_close_active_abort+0x207/0x360 [smc] __smc_lgr_terminate.part.38+0xc8/0x180 [smc] process_one_work+0x19e/0x340 worker_thread+0x30/0x370 ? process_one_work+0x340/0x340 kthread+0x117/0x130 ? __kthread_cancel_work+0x50/0x50 ret_from_fork+0x22/0x30 This is because when smc_close_cancel_work is triggered, e.g. the RDMA driver is rmmod and the LGR is terminated, the conn->close_work is flushed before initialization, resulting in WARN_ON(!work->func). __smc_lgr_terminate | smc_connect_{rdma|ism} ------------------------------------------------------------- | smc_conn_create | \- smc_lgr_register_conn for conn in lgr->conns_all | \- smc_conn_kill | \- smc_close_active_abort | \- smc_close_cancel_work | \- cancel_work_sync | \- __flush_work | (close_work) | | smc_close_init | \- INIT_WORK(&close_work) So fix this by initializing close_work before establishing the connection. Fixes: 46c28db ("net/smc: no socket state changes in tasklet context") Fixes: 4134984 ("net/smc: add SMC-D support in af_smc") Signed-off-by: Wen Gu <guwen@linux.alibaba.com> Reviewed-by: Wenjia Zhang <wenjia@linux.ibm.com> Reviewed-by: Alexandra Winter <wintera@linux.ibm.com> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent 6a2fa13 commit 0541db8

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

net/smc/af_smc.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@ void smc_sk_init(struct net *net, struct sock *sk, int protocol)
383383
smc->limit_smc_hs = net->smc.limit_smc_hs;
384384
smc->use_fallback = false; /* assume rdma capability first */
385385
smc->fallback_rsn = 0;
386+
smc_close_init(smc);
386387
}
387388

388389
static struct sock *smc_sock_alloc(struct net *net, struct socket *sock,
@@ -1299,7 +1300,6 @@ static int smc_connect_rdma(struct smc_sock *smc,
12991300
goto connect_abort;
13001301
}
13011302

1302-
smc_close_init(smc);
13031303
smc_rx_init(smc);
13041304

13051305
if (ini->first_contact_local) {
@@ -1435,7 +1435,6 @@ static int smc_connect_ism(struct smc_sock *smc,
14351435
goto connect_abort;
14361436
}
14371437
}
1438-
smc_close_init(smc);
14391438
smc_rx_init(smc);
14401439
smc_tx_init(smc);
14411440

@@ -2479,7 +2478,6 @@ static void smc_listen_work(struct work_struct *work)
24792478
goto out_decl;
24802479

24812480
mutex_lock(&smc_server_lgr_pending);
2482-
smc_close_init(new_smc);
24832481
smc_rx_init(new_smc);
24842482
smc_tx_init(new_smc);
24852483

0 commit comments

Comments
 (0)