Patchwork udp : increments sk_drops in __udp_queue_rcv_skb()

login
register
mail settings
Submitter Eric Dumazet
Date Feb. 2, 2009, 3:32 p.m.
Message ID <49871223.2000701@cosmosbay.com>
Download mbox | patch
Permalink /patch/21568/
State Accepted
Delegated to: David Miller
Headers show

Comments

Eric Dumazet - Feb. 2, 2009, 3:32 p.m.
Hi David

While investigating with Kenny Chang multicast drops problems, I found sk_drops
field was not anymore updated in current kernels for UDP IPV4 sockets.

Thank you

[PATCH] udp: increments sk_drops in __udp_queue_rcv_skb()

Commit 93821778def10ec1e69aa3ac10adee975dad4ff3
(udp: Fix rcv socket locking) accidentally removed sk_drops increments for
UDP IPV4 sockets.

This field can be used to detect incorrect sizing of socket receive buffers.

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
---
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Feb. 2, 2009, 9:42 p.m.
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Mon, 02 Feb 2009 16:32:51 +0100

> udp: increments sk_drops in __udp_queue_rcv_skb()
> 
> Commit 93821778def10ec1e69aa3ac10adee975dad4ff3
> (udp: Fix rcv socket locking) accidentally removed sk_drops increments for
> UDP IPV4 sockets.
> 
> This field can be used to detect incorrect sizing of socket receive buffers.
> 
> Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>

Yikes, good catch Eric.

Applied and queued up for -stable.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index b7faffe..997c418 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1015,9 +1015,11 @@  static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 
 	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;
 	}