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

tcp: add tcp_sock_set_cork 



Add a helper to directly set the TCP_CORK 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>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe31a326

drivers/block/drbd/drbd_int.h

+0 −14
Original line number Diff line number Diff line
@@ -1570,20 +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_cork(struct socket *sock)

{

	int val = 1;

	(void) kernel_setsockopt(sock, SOL_TCP, TCP_CORK,

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

}



static inline void drbd_tcp_uncork(struct socket *sock)

{

	int val = 0;

	(void) kernel_setsockopt(sock, SOL_TCP, TCP_CORK,

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

}



static inline void drbd_tcp_nodelay(struct socket *sock)

{

	int val = 1;

drivers/block/drbd/drbd_receiver.c

+2 −2
Original line number Diff line number Diff line
@@ -6162,7 +6162,7 @@ void drbd_send_acks_wf(struct work_struct *ws) 
	rcu_read_unlock();



	if (tcp_cork)

		drbd_tcp_cork(connection->meta.socket);

		tcp_sock_set_cork(connection->meta.socket->sk, true);



	err = drbd_finish_peer_reqs(device);

	kref_put(&device->kref, drbd_destroy_device);
@@ -6175,7 +6175,7 @@ void drbd_send_acks_wf(struct work_struct *ws) 
	}



	if (tcp_cork)

		drbd_tcp_uncork(connection->meta.socket);

		tcp_sock_set_cork(connection->meta.socket->sk, false);



	return;

}

drivers/block/drbd/drbd_worker.c

+3 −3
Original line number Diff line number Diff line
@@ -2098,7 +2098,7 @@ static void wait_for_work(struct drbd_connection *connection, struct list_head * 
	if (uncork) {

		mutex_lock(&connection->data.mutex);

		if (connection->data.socket)

			drbd_tcp_uncork(connection->data.socket);

			tcp_sock_set_cork(connection->data.socket->sk, false);

		mutex_unlock(&connection->data.mutex);

	}
@@ -2153,9 +2153,9 @@ static void wait_for_work(struct drbd_connection *connection, struct list_head * 
	mutex_lock(&connection->data.mutex);

	if (connection->data.socket) {

		if (cork)

			drbd_tcp_cork(connection->data.socket);

			tcp_sock_set_cork(connection->data.socket->sk, true);

		else if (!uncork)

			drbd_tcp_uncork(connection->data.socket);

			tcp_sock_set_cork(connection->data.socket->sk, false);

	}

	mutex_unlock(&connection->data.mutex);

}

fs/cifs/transport.c

+2 −6
Original line number Diff line number Diff line
@@ -325,7 +325,6 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst, 
	size_t total_len = 0, sent, size;

	struct socket *ssocket = server->ssocket;

	struct msghdr smb_msg;

	int val = 1;

	__be32 rfc1002_marker;



	if (cifs_rdma_enabled(server)) {
@@ -345,8 +344,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst, 
	}



	/* cork the socket */

	kernel_setsockopt(ssocket, SOL_TCP, TCP_CORK,

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

	tcp_sock_set_cork(ssocket->sk, true);



	for (j = 0; j < num_rqst; j++)

		send_length += smb_rqst_len(server, &rqst[j]);
@@ -435,9 +433,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst, 
	}



	/* uncork it */

	val = 0;

	kernel_setsockopt(ssocket, SOL_TCP, TCP_CORK,

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

	tcp_sock_set_cork(ssocket->sk, false);



	if ((total_len > 0) && (total_len != send_length)) {

		cifs_dbg(FYI, "partial send (wanted=%u sent=%zu): terminating session\n",

include/linux/tcp.h

+2 −0
Original line number Diff line number Diff line
@@ -497,4 +497,6 @@ static inline u16 tcp_mss_clamp(const struct tcp_sock *tp, u16 mss) 
int tcp_skb_shift(struct sk_buff *to, struct sk_buff *from, int pcount,

		  int shiftlen);



void tcp_sock_set_cork(struct sock *sk, bool on);



#endif	/* _LINUX_TCP_H */