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

Commit f84af32c authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: ip_queue_rcv_skb() helper 



When queueing a skb to socket, we can immediately release its dst if
target socket do not use IP_CMSG_PKTINFO.

tcp_data_queue() can drop dst too.

This to benefit from a hot cache line and avoid the receiver, possibly
on another cpu, to dirty this cache line himself.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4b0b72f7

include/net/ip.h

+1 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ extern int ip_options_rcv_srr(struct sk_buff *skb); 
 *	Functions provided by ip_sockglue.c

 */



extern int	ip_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);

extern void	ip_cmsg_recv(struct msghdr *msg, struct sk_buff *skb);

extern int	ip_cmsg_send(struct net *net,

			     struct msghdr *msg, struct ipcm_cookie *ipc);

net/ipv4/ip_sockglue.c

+16 −0
Original line number Diff line number Diff line
@@ -954,6 +954,22 @@ static int do_ip_setsockopt(struct sock *sk, int level, 
	return -EINVAL;

}



/**

 * ip_queue_rcv_skb - Queue an skb into sock receive queue

 * @sk: socket

 * @skb: buffer

 *

 * Queues an skb into socket receive queue. If IP_CMSG_PKTINFO option

 * is not set, we drop skb dst entry now, while dst cache line is hot.

 */

int ip_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)

{

	if (!(inet_sk(sk)->cmsg_flags & IP_CMSG_PKTINFO))

		skb_dst_drop(skb);

	return sock_queue_rcv_skb(sk, skb);

}

EXPORT_SYMBOL(ip_queue_rcv_skb);



int ip_setsockopt(struct sock *sk, int level,

		int optname, char __user *optval, unsigned int optlen)

{

net/ipv4/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb) 
{

	/* Charge it to the socket. */



	if (sock_queue_rcv_skb(sk, skb) < 0) {

	if (ip_queue_rcv_skb(sk, skb) < 0) {

		kfree_skb(skb);

		return NET_RX_DROP;

	}

net/ipv4/tcp_input.c

+1 −0
Original line number Diff line number Diff line
@@ -4367,6 +4367,7 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) 
	if (TCP_SKB_CB(skb)->seq == TCP_SKB_CB(skb)->end_seq)

		goto drop;



	skb_dst_drop(skb);

	__skb_pull(skb, th->doff * 4);



	TCP_ECN_accept_cwr(tp, skb);

net/ipv4/udp.c

+1 −1
Original line number Diff line number Diff line
@@ -1264,7 +1264,7 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 
	if (inet_sk(sk)->inet_daddr)

		sock_rps_save_rxhash(sk, skb->rxhash);



	rc = sock_queue_rcv_skb(sk, skb);

	rc = ip_queue_rcv_skb(sk, skb);

	if (rc < 0) {

		int is_udplite = IS_UDPLITE(sk);