diff options
| author | Tony Lu <tonylu@linux.alibaba.com> | 2022-01-30 21:02:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-01-31 18:08:20 +0300 |
| commit | ea785a1a573b390a150010b3c5b81e1ccd8c98a8 (patch) | |
| tree | 08b9e9691157c96edd94279a6625591a27bcd05d /net/smc/smc_tx.h | |
| parent | 01b2a995156d11166da00ce254d59bd7f7cefb92 (diff) | |
| download | linux-ea785a1a573b390a150010b3c5b81e1ccd8c98a8.tar.xz | |
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/smc_tx.h')
| -rw-r--r-- | net/smc/smc_tx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/smc/smc_tx.h b/net/smc/smc_tx.h index 07e6ad76224a..a59f370b8b43 100644 --- a/net/smc/smc_tx.h +++ b/net/smc/smc_tx.h @@ -27,6 +27,7 @@ static inline int smc_tx_prepared_sends(struct smc_connection *conn) return smc_curs_diff(conn->sndbuf_desc->len, &sent, &prep); } +void smc_tx_pending(struct smc_connection *conn); void smc_tx_work(struct work_struct *work); void smc_tx_init(struct smc_sock *smc); int smc_tx_sendmsg(struct smc_sock *smc, struct msghdr *msg, size_t len); |