diff options
| author | Tony Lu <tonylu@linux.alibaba.com> | 2022-02-25 15:34:21 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-02-28 11:32:42 +0000 |
| commit | 6900de507cd471492d83aabd48f13abb9c016d4d (patch) | |
| tree | 6bb13d6bb47642d829c57547bb47da9463b3ab77 /net | |
| parent | c4eb058ead1765662e77cf797f5035fbae1ffc24 (diff) | |
net/smc: Call trace_smc_tx_sendmsg when data corked
This also calls trace_smc_tx_sendmsg() even if data is corked. For ease
of understanding, if statements are not expanded here.
Link: https://lore.kernel.org/all/f4166712-9a1e-51a0-409d-b7df25a66c52@linux.ibm.com/
Fixes: 139653bc6635 ("net/smc: Remove corked dealyed work")
Suggested-by: Stefan Raspl <raspl@linux.ibm.com>
Signed-off-by: Tony Lu <tonylu@linux.alibaba.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/smc/smc_tx.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c index 5df3940d4543..436ac836f363 100644 --- a/net/smc/smc_tx.c +++ b/net/smc/smc_tx.c @@ -235,15 +235,14 @@ int smc_tx_sendmsg(struct smc_sock *smc, struct msghdr *msg, size_t len) */ if ((msg->msg_flags & MSG_OOB) && !send_remaining) conn->urg_tx_pend = true; - if ((msg->msg_flags & MSG_MORE || smc_tx_is_corked(smc) || - msg->msg_flags & MSG_SENDPAGE_NOTLAST) && - (atomic_read(&conn->sndbuf_space))) - /* for a corked socket defer the RDMA writes if - * sndbuf_space is still available. The applications - * should known how/when to uncork it. - */ - continue; - smc_tx_sndbuf_nonempty(conn); + /* for a corked socket defer the RDMA writes if + * sndbuf_space is still available. The applications + * should known how/when to uncork it. + */ + if (!((msg->msg_flags & MSG_MORE || smc_tx_is_corked(smc) || + msg->msg_flags & MSG_SENDPAGE_NOTLAST) && + atomic_read(&conn->sndbuf_space))) + smc_tx_sndbuf_nonempty(conn); trace_smc_tx_sendmsg(smc, copylen); } /* while (msg_data_left(msg)) */ |