diff options
| author | Tony Lu <tonylu@linux.alibaba.com> | 2022-01-31 02:02:55 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-01-31 15:08:20 +0000 |
| commit | ea785a1a573b390a150010b3c5b81e1ccd8c98a8 (patch) | |
| tree | 08b9e9691157c96edd94279a6625591a27bcd05d /net/smc/af_smc.c | |
| parent | 01b2a995156d11166da00ce254d59bd7f7cefb92 (diff) | |
net/smc: Send directly when TCP_CORK is cleared
According to the man page of TCP_CORK [1], if set, don't send out
partial frames. All queued partial frames are sent when option is
cleared again.
When applications call setsockopt to disable TCP_CORK, this call is
protected by lock_sock(), and tries to mod_delayed_work() to 0, in order
to send pending data right now. However, the delayed work smc_tx_work is
also protected by lock_sock(). There introduces lock contention for
sending data.
To fix it, send pending data directly which acts like TCP, without
lock_sock() protected in the context of setsockopt (already lock_sock()ed),
and cancel unnecessary dealyed work, which is protected by lock.
[1] https://linux.die.net/man/7/tcp
Signed-off-by: Tony Lu <tonylu@linux.alibaba.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index d5ea62b82bb8..3137d8e5956d 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -2523,8 +2523,8 @@ static int smc_setsockopt(struct socket *sock, int level, int optname, sk->sk_state != SMC_CLOSED) { if (!val) { SMC_STAT_INC(smc, cork_cnt); - mod_delayed_work(smc->conn.lgr->tx_wq, - &smc->conn.tx_work, 0); + smc_tx_pending(&smc->conn); + cancel_delayed_work(&smc->conn.tx_work); } } break; |