Commit 624d1164 authored by Chris Leech's avatar Chris Leech Committed by David S. Miller
Browse files

[I/OAT]: Make sk_eat_skb I/OAT aware. 



Add an extra argument to sk_eat_skb, and make it move early copied
packets to the async_wait_queue instead of freeing them.

Signed-off-by: default avatarChris Leech <christopher.leech@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e4b4992

include/net/sock.h

+12 −1
Original line number Diff line number Diff line
@@ -1273,11 +1273,22 @@ sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb) 
 * This routine must be called with interrupts disabled or with the socket

 * locked so that the sk_buff queue operation is ok.

*/

static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb)

#ifdef CONFIG_NET_DMA

static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, int copied_early)

{

	__skb_unlink(skb, &sk->sk_receive_queue);

	if (!copied_early)

		__kfree_skb(skb);

	else

		__skb_queue_tail(&sk->sk_async_wait_queue, skb);

}

#else

static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, int copied_early)

{

	__skb_unlink(skb, &sk->sk_receive_queue);

	__kfree_skb(skb);

}

#endif



extern void sock_enable_timestamp(struct sock *sk);

extern int sock_get_timestamp(struct sock *, struct timeval __user *);

net/dccp/proto.c

+2 −2
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ int dccp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
		}

		dccp_pr_debug("packet_type=%s\n",

			      dccp_packet_name(dh->dccph_type));

		sk_eat_skb(sk, skb);

		sk_eat_skb(sk, skb, 0);

verify_sock_status:

		if (sock_flag(sk, SOCK_DONE)) {

			len = 0;
@@ -773,7 +773,7 @@ int dccp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
		}

	found_fin_ok:

		if (!(flags & MSG_PEEK))

			sk_eat_skb(sk, skb);

			sk_eat_skb(sk, skb, 0);

		break;

	} while (1);

out:

net/ipv4/tcp.c

+4 −4
Original line number Diff line number Diff line
@@ -1072,11 +1072,11 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc, 
				break;

		}

		if (skb->h.th->fin) {

			sk_eat_skb(sk, skb);

			sk_eat_skb(sk, skb, 0);

			++seq;

			break;

		}

		sk_eat_skb(sk, skb);

		sk_eat_skb(sk, skb, 0);

		if (!desc->count)

			break;

	}
@@ -1356,14 +1356,14 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
		if (skb->h.th->fin)

			goto found_fin_ok;

		if (!(flags & MSG_PEEK))

			sk_eat_skb(sk, skb);

			sk_eat_skb(sk, skb, 0);

		continue;



	found_fin_ok:

		/* Process the FIN. */

		++*seq;

		if (!(flags & MSG_PEEK))

			sk_eat_skb(sk, skb);

			sk_eat_skb(sk, skb, 0);

		break;

	} while (len > 0);

net/llc/af_llc.c

+1 −1
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock, 
			continue;



		if (!(flags & MSG_PEEK)) {

			sk_eat_skb(sk, skb);

			sk_eat_skb(sk, skb, 0);

			*seq = 0;

		}

	} while (len > 0);