Commit 12abc5ee authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

tcp: add tcp_sock_set_nodelay 



Add a helper to directly set the TCP_NODELAY sockopt from kernel space
without going through a fake uaccess.  Cleanup the callers to avoid
pointless wrappers now that this is a simple function call.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarSagi Grimberg <sagi@grimberg.me>
Acked-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db10538a

drivers/block/drbd/drbd_int.h

+0 −7
Original line number Diff line number Diff line
@@ -1570,13 +1570,6 @@ extern void drbd_set_recv_tcq(struct drbd_device *device, int tcq_enabled); 
extern void _drbd_clear_done_ee(struct drbd_device *device, struct list_head *to_be_freed);

extern int drbd_connected(struct drbd_peer_device *);



static inline void drbd_tcp_nodelay(struct socket *sock)

{

	int val = 1;

	(void) kernel_setsockopt(sock, SOL_TCP, TCP_NODELAY,

			(char*)&val, sizeof(val));

}



static inline void drbd_tcp_quickack(struct socket *sock)

{

	int val = 2;

drivers/block/drbd/drbd_main.c

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ static int __send_command(struct drbd_connection *connection, int vnr, 
	/* DRBD protocol "pings" are latency critical.

	 * This is supposed to trigger tcp_push_pending_frames() */

	if (!err && (cmd == P_PING || cmd == P_PING_ACK))

		drbd_tcp_nodelay(sock->socket);

		tcp_sock_set_nodelay(sock->socket->sk);



	return err;

}

drivers/block/drbd/drbd_receiver.c

+2 −2
Original line number Diff line number Diff line
@@ -1051,8 +1051,8 @@ randomize: 


	/* we don't want delays.

	 * we use TCP_CORK where appropriate, though */

	drbd_tcp_nodelay(sock.socket);

	drbd_tcp_nodelay(msock.socket);

	tcp_sock_set_nodelay(sock.socket->sk);

	tcp_sock_set_nodelay(msock.socket->sk);



	connection->data.socket = sock.socket;

	connection->meta.socket = msock.socket;

drivers/infiniband/sw/siw/siw_cm.c

+4 −20
Original line number Diff line number Diff line
@@ -947,16 +947,8 @@ static void siw_accept_newconn(struct siw_cep *cep) 
	siw_cep_get(new_cep);

	new_s->sk->sk_user_data = new_cep;



	if (siw_tcp_nagle == false) {

		int val = 1;



		rv = kernel_setsockopt(new_s, SOL_TCP, TCP_NODELAY,

				       (char *)&val, sizeof(val));

		if (rv) {

			siw_dbg_cep(cep, "setsockopt NODELAY error: %d\n", rv);

			goto error;

		}

	}

	if (siw_tcp_nagle == false)

		tcp_sock_set_nodelay(new_s->sk);

	new_cep->state = SIW_EPSTATE_AWAIT_MPAREQ;



	rv = siw_cm_queue_work(new_cep, SIW_CM_WORK_MPATIMEOUT);
@@ -1386,16 +1378,8 @@ int siw_connect(struct iw_cm_id *id, struct iw_cm_conn_param *params) 
		siw_dbg_qp(qp, "kernel_bindconnect: error %d\n", rv);

		goto error;

	}

	if (siw_tcp_nagle == false) {

		int val = 1;



		rv = kernel_setsockopt(s, SOL_TCP, TCP_NODELAY, (char *)&val,

				       sizeof(val));

		if (rv) {

			siw_dbg_qp(qp, "setsockopt NODELAY error: %d\n", rv);

			goto error;

		}

	}

	if (siw_tcp_nagle == false)

		tcp_sock_set_nodelay(s->sk);

	cep = siw_cep_alloc(sdev);

	if (!cep) {

		rv = -ENOMEM;

drivers/nvme/host/tcp.c

+1 −8
Original line number Diff line number Diff line
@@ -1346,14 +1346,7 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, 
	}



	/* Set TCP no delay */

	opt = 1;

	ret = kernel_setsockopt(queue->sock, IPPROTO_TCP,

			TCP_NODELAY, (char *)&opt, sizeof(opt));

	if (ret) {

		dev_err(nctrl->device,

			"failed to set TCP_NODELAY sock opt %d\n", ret);

		goto err_sock;

	}

	tcp_sock_set_nodelay(queue->sock->sk);



	/*

	 * Cleanup whatever is sitting in the TCP transmit queue on socket

CRA Git | Maintained and supported by SUSTech CRA and CCSE