korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-30 07:34:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

net/smc: Call trace_smc_tx_sendmsg when data corked

Browse Source 
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: 139653bc66 ("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>
This commit is contained in:
Tony Lu 2022-02-25 15:34:21 +08:00 committed by David S. Miller
parent c4eb058ead
commit 6900de507c
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/smc/smc_tx.c
View File

@ -235,14 +235,13 @@ int smc_tx_sendmsg(struct smc_sock *smc, struct msghdr *msg, size_t len)
*/ */
if ((msg->msg_flags & MSG_OOB) && !send_remaining) if ((msg->msg_flags & MSG_OOB) && !send_remaining)
conn->urg_tx_pend = true; 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 /* for a corked socket defer the RDMA writes if
* sndbuf_space is still available. The applications * sndbuf_space is still available. The applications
* should known how/when to uncork it. * should known how/when to uncork it.
*/ */
continue; 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); smc_tx_sndbuf_nonempty(conn);
trace_smc_tx_sendmsg(smc, copylen); trace_smc_tx_sendmsg(smc, copylen);