Skip to content

Commit 679e9dd

Browse files
GuangguanWangdavem330
authored andcommitted
net/smc: check sndbuf_space again after NOSPACE flag is set in smc_poll
When application sending data more than sndbuf_space, there have chances application will sleep in epoll_wait, and will never be wakeup again. This is caused by a race between smc_poll and smc_cdc_tx_handler. application tasklet smc_tx_sendmsg(len > sndbuf_space) | epoll_wait for EPOLL_OUT,timeout=0 | smc_poll | if (!smc->conn.sndbuf_space) | | smc_cdc_tx_handler | atomic_add sndbuf_space | smc_tx_sndbuf_nonfull | if (!test_bit SOCK_NOSPACE) | do not sk_write_space; set_bit SOCK_NOSPACE; | return mask=0; | Application will sleep in epoll_wait as smc_poll returns 0. And smc_cdc_tx_handler will not call sk_write_space because the SOCK_NOSPACE has not be set. If there is no inflight cdc msg, sk_write_space will not be called any more, and application will sleep in epoll_wait forever. So check sndbuf_space again after NOSPACE flag is set to break the race. Fixes: 8dce278 ("net/smc: smc_poll improvements") Signed-off-by: Guangguan Wang <[email protected]> Suggested-by: Paolo Abeni <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 2b33eb8 commit 679e9dd

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

net/smc/af_smc.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2881,6 +2881,13 @@ __poll_t smc_poll(struct file *file, struct socket *sock,
28812881
} else {
28822882
sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
28832883
set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
2884+
2885+
if (sk->sk_state != SMC_INIT) {
2886+
/* Race breaker the same way as tcp_poll(). */
2887+
smp_mb__after_atomic();
2888+
if (atomic_read(&smc->conn.sndbuf_space))
2889+
mask |= EPOLLOUT | EPOLLWRNORM;
2890+
}
28842891
}
28852892
if (atomic_read(&smc->conn.bytes_to_rcv))
28862893
mask |= EPOLLIN | EPOLLRDNORM;

0 commit comments

Comments
 (0)