Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4362a2c authored by Al Viro's avatar Al Viro
Browse files

switch tcp_sock->ucopy from iovec (ucopy.iov) to msghdr (ucopy.msg) 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent f69e6d13

include/linux/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ struct tcp_sock { 
	struct {

		struct sk_buff_head	prequeue;

		struct task_struct	*task;

		struct iovec		*iov;

		struct msghdr		*msg;

		int			memory;

		int			len;

	} ucopy;

net/ipv4/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -1729,7 +1729,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
			if (!user_recv && !(flags & (MSG_TRUNC | MSG_PEEK))) {

				user_recv = current;

				tp->ucopy.task = user_recv;

				tp->ucopy.iov = msg->msg_iov;

				tp->ucopy.msg = msg;

			}



			tp->ucopy.len = len;

net/ipv4/tcp_input.c

+3 −4
Original line number Diff line number Diff line
@@ -4421,7 +4421,7 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) 
			__set_current_state(TASK_RUNNING);



			local_bh_enable();

			if (!skb_copy_datagram_iovec(skb, 0, tp->ucopy.iov, chunk)) {

			if (!skb_copy_datagram_msg(skb, 0, tp->ucopy.msg, chunk)) {

				tp->ucopy.len -= chunk;

				tp->copied_seq += chunk;

				eaten = (chunk == skb->len);
@@ -4941,10 +4941,9 @@ static int tcp_copy_to_iovec(struct sock *sk, struct sk_buff *skb, int hlen) 


	local_bh_enable();

	if (skb_csum_unnecessary(skb))

		err = skb_copy_datagram_iovec(skb, hlen, tp->ucopy.iov, chunk);

		err = skb_copy_datagram_msg(skb, hlen, tp->ucopy.msg, chunk);

	else

		err = skb_copy_and_csum_datagram_iovec(skb, hlen,

						       tp->ucopy.iov);

		err = skb_copy_and_csum_datagram_msg(skb, hlen, tp->ucopy.msg);



	if (!err) {

		tp->ucopy.len -= chunk;