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

net: sk_drops consolidation 



sock_queue_rcv_skb() can update sk_drops itself, removing need for
callers to take care of it. This is more consistent since
sock_queue_rcv_skb() also reads sk_drops when queueing a skb.

This adds sk_drops managment to many protocols that not cared yet.

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

net/core/sock.c

+7 −8
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static void sock_disable_timestamp(struct sock *sk, int flag) 


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

{

	int err = 0;

	int err;

	int skb_len;

	unsigned long flags;

	struct sk_buff_head *list = &sk->sk_receive_queue;
@@ -284,17 +284,17 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 
	 */

	if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=

	    (unsigned)sk->sk_rcvbuf) {

		err = -ENOMEM;

		goto out;

		atomic_inc(&sk->sk_drops);

		return -ENOMEM;

	}



	err = sk_filter(sk, skb);

	if (err)

		goto out;

		return err;



	if (!sk_rmem_schedule(sk, skb->truesize)) {

		err = -ENOBUFS;

		goto out;

		atomic_inc(&sk->sk_drops);

		return -ENOBUFS;

	}



	skb->dev = NULL;
@@ -314,8 +314,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 


	if (!sock_flag(sk, SOCK_DEAD))

		sk->sk_data_ready(sk, skb_len);

out:

	return err;

	return 0;

}

EXPORT_SYMBOL(sock_queue_rcv_skb);

net/ieee802154/dgram.c

+0 −1
Original line number Diff line number Diff line
@@ -318,7 +318,6 @@ out: 
static int dgram_rcv_skb(struct sock *sk, struct sk_buff *skb)

{

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

		atomic_inc(&sk->sk_drops);

		kfree_skb(skb);

		return NET_RX_DROP;

	}

net/ieee802154/raw.c

+0 −1
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ out: 
static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)

{

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

		atomic_inc(&sk->sk_drops);

		kfree_skb(skb);

		return NET_RX_DROP;

	}

net/ipv4/raw.c

+0 −1
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ 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) {

		atomic_inc(&sk->sk_drops);

		kfree_skb(skb);

		return NET_RX_DROP;

	}

net/ipv4/udp.c

+8 −11
Original line number Diff line number Diff line
@@ -1063,25 +1063,22 @@ EXPORT_SYMBOL(udp_lib_unhash); 


static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)

{

	int rc = sock_queue_rcv_skb(sk, skb);



	if (rc < 0) {

		int is_udplite = IS_UDPLITE(sk);

	int rc;



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

		/* Note that an ENOMEM error is charged twice */

		if (rc == -ENOMEM) {

		if (rc == -ENOMEM)

			UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,

					 is_udplite);

			atomic_inc(&sk->sk_drops);

		}

		goto drop;

		UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);

		kfree_skb(skb);

		return -1;

	}



	return 0;



drop:

	UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);

	kfree_skb(skb);

	return -1;

}



/* returns:

CRA Git | Maintained and supported by SUSTech CRA and CCSE