Commit d737e5d4 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Set TCP_CORK until the transmit queue is empty 



When we have multiple RPC requests queued up, it makes sense to set the
TCP_CORK option while the transmit queue is non-empty.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 86438186

include/linux/sunrpc/xprt.h

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ struct rpc_xprt { 
	struct rpc_task *	snd_task;	/* Task blocked in send */



	struct list_head	xmit_queue;	/* Send queue */

	atomic_long_t		xmit_queuelen;



	struct svc_xprt		*bc_xprt;	/* NFSv4.1 backchannel */

#if defined(CONFIG_SUNRPC_BACKCHANNEL)

net/sunrpc/xprt.c

+2 −0
Original line number Diff line number Diff line
@@ -1352,6 +1352,7 @@ xprt_request_enqueue_transmit(struct rpc_task *task) 
		list_add_tail(&req->rq_xmit, &xprt->xmit_queue);

		INIT_LIST_HEAD(&req->rq_xmit2);

out:

		atomic_long_inc(&xprt->xmit_queuelen);

		set_bit(RPC_TASK_NEED_XMIT, &task->tk_runstate);

		spin_unlock(&xprt->queue_lock);

	}
@@ -1381,6 +1382,7 @@ xprt_request_dequeue_transmit_locked(struct rpc_task *task) 
		}

	} else

		list_del(&req->rq_xmit2);

	atomic_long_dec(&req->rq_xprt->xmit_queuelen);

}



/**

net/sunrpc/xprtsock.c

+4 −1
Original line number Diff line number Diff line
@@ -1018,6 +1018,7 @@ static int xs_tcp_send_request(struct rpc_rqst *req) 
	 * to cope with writespace callbacks arriving _after_ we have

	 * called sendmsg(). */

	req->rq_xtime = ktime_get();

	tcp_sock_set_cork(transport->inet, true);

	while (1) {

		status = xprt_sock_sendmsg(transport->sock, &msg, xdr,

					   transport->xmit.offset, rm, &sent);
@@ -1032,6 +1033,8 @@ static int xs_tcp_send_request(struct rpc_rqst *req) 
		if (likely(req->rq_bytes_sent >= msglen)) {

			req->rq_xmit_bytes_sent += transport->xmit.offset;

			transport->xmit.offset = 0;

			if (atomic_long_read(&xprt->xmit_queuelen) == 1)

				tcp_sock_set_cork(transport->inet, false);

			return 0;

		}
@@ -2163,6 +2166,7 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) 
		}



		xs_tcp_set_socket_timeouts(xprt, sock);

		tcp_sock_set_nodelay(sk);



		write_lock_bh(&sk->sk_callback_lock);
@@ -2177,7 +2181,6 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) 


		/* socket options */

		sock_reset_flag(sk, SOCK_LINGER);

		tcp_sk(sk)->nonagle |= TCP_NAGLE_OFF;



		xprt_clear_connected(xprt);