Commit 90a5df7a authored May 26, 2023 by Litao Jiao

net/smc: Remove corked dealyed work

mainline inclusion
from mainline-v5.18-rc1
commit 139653bc
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=139653bc6635bcf0923a1d4fa06d3ac594528dd9

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

Based on the manual of TCP_CORK [1] and MSG_MORE [2], these two options
have the same effect. Applications can set these options and informs the
kernel to pend the data, and send them out only when the socket or
syscall does not specify this flag. In other words, there's no need to
send data out by a delayed work, which will queue a lot of work.

This removes corked delayed work with SMC_TX_CORK_DELAY (250ms), and the
applications control how/when to send them out. It improves the
performance for sendfile and throughput, and remove unnecessary race of
lock_sock(). This also unlocks the limitation of sndbuf, and try to fill
it up before sending.

[1] https://linux.die.net/man/7/tcp
[2] https://man7.org/linux/man-pages/man2/send.2.html



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 30a916d3

net/smc/smc_tx.c

+6 −9

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@
		#include "smc_tx.h"

		#define SMC_TX_WORK_DELAY 0
		#define SMC_TX_CORK_DELAY (HZ >> 2) /* 250 ms */

		/*************************** sndbuf producer *****************************/

		@@ -223,14 +222,12 @@ 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)) &&
		(atomic_read(&conn->sndbuf_space) >
		(conn->sndbuf_desc->len >> 1)))
		/* for a corked socket defer the RDMA writes if there
		* is still sufficient sndbuf_space available
		(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.
		*/
		queue_delayed_work(conn->lgr->tx_wq, &conn->tx_work,
		SMC_TX_CORK_DELAY);
		else
		continue;
		smc_tx_sndbuf_nonempty(conn);
		} /* while (msg_data_left(msg)) */