diff options
| author | Ursula Braun <ubraun@linux.vnet.ibm.com> | 2018-01-26 09:28:49 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-26 10:41:56 -0500 |
| commit | 127f497058236e5f07672e11382232f80cb7e8c4 (patch) | |
| tree | 6725c4e961d04c93677b71ea4615985b6effdef6 /net/smc/af_smc.c | |
| parent | 51f1de79ad8ed3555fd01ae8fd432691d397684b (diff) | |
| download | op-kernel-dev-127f497058236e5f07672e11382232f80cb7e8c4.zip op-kernel-dev-127f497058236e5f07672e11382232f80cb7e8c4.tar.gz | |
net/smc: release clcsock from tcp_listen_worker
Closing a listen socket may hit the warning
WARN_ON(sock_owned_by_user(sk)) of tcp_close(), if the wake up of
the smc_tcp_listen_worker has not yet finished.
This patch introduces smc_close_wait_listen_clcsock() making sure
the listening internal clcsock has been closed in smc_tcp_listen_work(),
before the listening external SMC socket finishes closing.
Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc/af_smc.c')
| -rw-r--r-- | net/smc/af_smc.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index 732a37d..267e683 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -670,6 +670,10 @@ struct sock *smc_accept_dequeue(struct sock *parent, smc_accept_unlink(new_sk); if (new_sk->sk_state == SMC_CLOSED) { + if (isk->clcsock) { + sock_release(isk->clcsock); + isk->clcsock = NULL; + } new_sk->sk_prot->unhash(new_sk); sock_put(new_sk); /* final */ continue; @@ -969,8 +973,15 @@ static void smc_tcp_listen_work(struct work_struct *work) } out: + if (lsmc->clcsock) { + sock_release(lsmc->clcsock); + lsmc->clcsock = NULL; + } release_sock(lsk); - lsk->sk_data_ready(lsk); /* no more listening, wake accept */ + /* no more listening, wake up smc_close_wait_listen_clcsock and + * accept + */ + lsk->sk_state_change(lsk); sock_put(&lsmc->sk); /* sock_hold in smc_listen */ } |
