Commit 6900de50 authored by Tony Lu's avatar Tony Lu Committed by David S. Miller
Browse files

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: 139653bc ("net/smc: Remove corked dealyed work")
Suggested-by: default avatarStefan Raspl <raspl@linux.ibm.com>
Signed-off-by: default avatarTony Lu <tonylu@linux.alibaba.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c4eb058e

net/smc/smc_tx.c

+8 −9
Original line number Diff line number Diff line
@@ -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)

			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);



		trace_smc_tx_sendmsg(smc, copylen);