Commit 20259d30 authored May 29, 2023 by Litao Jiao

net/smc: Call trace_smc_tx_sendmsg when data corked

mainline inclusion
from mainline-v5.18-rc1
commit 6900de50
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I78OQ2
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/net/smc?id=6900de507cd471492d83aabd48f13abb9c016d4d

--------------------------------

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: 139653bc ("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>
Signed-off-by: Litao Jiao <jiaolitao@sangfor.com.cn>

parent 8d1fa0a3

net/smc/smc_tx.c

+8 −9

Original line number	Diff line number	Diff line
		@@ -221,14 +221,13 @@ 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;
		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);
		} /* while (msg_data_left(msg)) */