udp: sk_drops handling

PATCH In review Eric Dumazet 3 participants 4 messages Jun 17, 2008 – Jun 18, 2008

Subsystems (4)

Networking Network drivers Sockets UDP

lore

Share & tools

lore

Eric Dumazet

author

2008-06-17 21:31 UTC #0 lore raw

PATCH 1/1 udp: sk_drops handling

In commits 33c732c36169d7022ad7d6eb474b0c9be43a2dc1 ([IPV4]: Add raw drops counter) and a92aa318b4b369091fd80433c80e62838db8bc1c ([IPV4]: Add raw drops counter),
Wang Chen added raw drops counter for /proc/net/raw & /proc/net/raw6

This patch adds this capability to UDP sockets too (/proc/net/udp & /proc/net/udp6).

This means that 'RcvbufErrors' errors found in /proc/net/snmp can be also be examined for each udp socket.

# grep Udp: /proc/net/snmp
Udp: InDatagrams NoPorts InErrors OutDatagrams RcvbufErrors SndbufErrors
Udp: 23971006 75 899420 16390693 146348 0

# cat /proc/net/udp
 sl  local_address rem_address   st tx_queue rx_queue tr tm->when retrnsmt  ---
uid  timeout inode ref pointer drops
 75: 00000000:02CB 00000000:0000 07 00000000:00000000 00:00000000 00000000  ---
  0        0 2358 2 ffff81082a538c80 0
111: 00000000:006F 00000000:0000 07 00000000:00000000 00:00000000 00000000  ---
  0        0 2286 2 ffff81042dd35c80 146348

In this example, only port 111 (0x006F) was flooded by messages that user program could not read fast enough. 146348 messages were lost.

Signed-off-by Eric Dumazet <[email protected]>

include/net/sock.h +1 -1

index 83f74b1..a7c3041 100644
@@ -166,7 +166,7 @@ struct sock_common {
  *	@sk_err: last error
  *	@sk_err_soft: errors that don't cause failure but are the cause of a
  *		      persistent failure not just 'timed out'
-  *	@sk_drops: raw drops counter
+  *	@sk_drops: raw/udp drops counter
  *	@sk_ack_backlog: current listen backlog
  *	@sk_max_ack_backlog: listen backlog set in listen()
  *	@sk_priority: %SO_PRIORITY setting

net/ipv4/raw.c +0 -0

index 7d44946..925fdf1 100644
@@ -944,7 +944,7 @@ static int raw_seq_show(struct seq_file *seq, void *v)

	if (v == SEQ_START_TOKEN)
		seq_printf(seq, "  sl  local_address rem_address   st tx_queue "
				"rx_queue tr tm->when retrnsmt   uid  timeout "
-				"inode  drops\n");
+				"inode ref pointer drops\n");
	else
		raw_sock_seq_show(seq, v, raw_seq_private(seq)->bucket);
	return 0;

net/ipv4/udp.c +0 -0

index 11eabf1..dd95e93 100644
@@ -1049,6 +1049,7 @@ int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)

drop:

	UDP_INC_STATS_BH(UDP_MIB_INERRORS, is_udplite);
+	atomic_inc(&sk->sk_drops);
	kfree_skb(skb);
	return -1;
}
@@ -1629,12 +1630,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
	__u16 srcp	  = ntohs(inet->sport);

	seq_printf(f, "%4d: %08X:%04X %08X:%04X"
-		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p%n",
+		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d%n",
		bucket, src, srcp, dest, destp, sp->sk_state,
		atomic_read(&sp->sk_wmem_alloc),
		atomic_read(&sp->sk_rmem_alloc),
		0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),

- atomic_read(&sp->sk_refcnt), sp, len);
+ atomic_read(&sp->sk_refcnt), sp,
+ atomic_read(&sp->sk_drops), len);
}

int udp4_seq_show(struct seq_file *seq, void *v)
@@ -1643,7 +1645,7 @@ int udp4_seq_show(struct seq_file *seq, void *v)

		seq_printf(seq, "%-127s\n",
			   "  sl  local_address rem_address   st tx_queue "
			   "rx_queue tr tm->when retrnsmt   uid  timeout "
-			   "inode");
+			   "inode ref pointer drops");
	else {
		struct udp_iter_state *state = seq->private;
		int len;

net/ipv6/raw.c +0 -0

index 456777d..34cfb3f 100644
@@ -1251,7 +1251,7 @@ static int raw6_seq_show(struct seq_file *seq, void *v)

			   "local_address                         "
			   "remote_address                        "
			   "st tx_queue rx_queue tr tm->when retrnsmt"
-			   "   uid  timeout inode  drops\n");
+			   "   uid  timeout inode ref pointer drops\n");
	else
		raw6_sock_seq_show(seq, v, raw_seq_private(seq)->bucket);
	return 0;

net/ipv6/udp.c +0 -0

index 432edaa..020e7f6 100644
@@ -305,6 +305,7 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)

	return 0;
drop:
	UDP6_INC_STATS_BH(UDP_MIB_INERRORS, is_udplite);
+	atomic_inc(&sk->sk_drops);
	kfree_skb(skb);
	return -1;
}
@@ -955,7 +956,7 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
	srcp  = ntohs(inet->sport);
	seq_printf(seq,
		   "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "
-		   "%02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p\n",
+		   "%02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d\n",
		   bucket,
		   src->s6_addr32[0], src->s6_addr32[1],
		   src->s6_addr32[2], src->s6_addr32[3], srcp,
@@ -967,7 +968,8 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
		   0, 0L, 0,
		   sock_i_uid(sp), 0,
		   sock_i_ino(sp),
-		   atomic_read(&sp->sk_refcnt), sp);
+		   atomic_read(&sp->sk_refcnt), sp,
+		   atomic_read(&sp->sk_drops));

}

int udp6_seq_show(struct seq_file *seq, void *v)
@@ -978,7 +980,7 @@ int udp6_seq_show(struct seq_file *seq, void *v)

			   "local_address                         "
			   "remote_address                        "
			   "st tx_queue rx_queue tr tm->when retrnsmt"
-			   "   uid  timeout inode\n");
+			   "   uid  timeout inode ref pointer drops\n");
	else
		udp6_sock_seq_show(seq, v, ((struct udp_iter_state *)seq->private)->bucket);
	return 0;

Wang Chen

2008-06-18 02:15 UTC #1 lore raw

Eric Dumazet said the following on 2008-6-18 5:31:

Quoted 27 lines

In commits 33c732c36169d7022ad7d6eb474b0c9be43a2dc1 ([IPV4]: Add raw drops counter) and a92aa318b4b369091fd80433c80e62838db8bc1c ([IPV4]: Add raw drops
counter),
Wang Chen added raw drops counter for /proc/net/raw & /proc/net/raw6
This patch adds this capability to UDP sockets too (/proc/net/udp & /proc/net/udp6).
This means that 'RcvbufErrors' errors found in /proc/net/snmp can be also be examined for each udp socket.
# grep Udp: /proc/net/snmp
Udp: InDatagrams NoPorts InErrors OutDatagrams RcvbufErrors SndbufErrors
Udp: 23971006 75 899420 16390693 146348 0
# cat /proc/net/udp
 sl  local_address rem_address   st tx_queue rx_queue tr tm->when
retrnsmt  ---
uid  timeout inode ref pointer drops
 75: 00000000:02CB 00000000:0000 07 00000000:00000000 00:00000000
00000000  ---
  0        0 2358 2 ffff81082a538c80 0
111: 00000000:006F 00000000:0000 07 00000000:00000000 00:00000000
00000000  ---
  0        0 2286 2 ffff81042dd35c80 146348

Quoted 4 lines

In this example, only port 111 (0x006F) was flooded by messages that user program
could not read fast enough. 146348 messages were lost.

How about other place, such as, rxrpc_data_ready() also inc UDP_MIB_INERRORS.

Eric Dumazet

author

2008-06-18 03:46 UTC #2 lore raw

Quoted 28 lines · Wang Chen

Eric Dumazet said the following on 2008-6-18 5:31:
Quoted 27 lines
In commits 33c732c36169d7022ad7d6eb474b0c9be43a2dc1 ([IPV4]: Add raw drops counter) and a92aa318b4b369091fd80433c80e62838db8bc1c ([IPV4]: Add raw drops
counter),
Wang Chen added raw drops counter for /proc/net/raw & /proc/net/raw6
This patch adds this capability to UDP sockets too (/proc/net/udp & /proc/net/udp6).
This means that 'RcvbufErrors' errors found in /proc/net/snmp can be also be examined for each udp socket.
# grep Udp: /proc/net/snmp
Udp: InDatagrams NoPorts InErrors OutDatagrams RcvbufErrors SndbufErrors
Udp: 23971006 75 899420 16390693 146348 0
# cat /proc/net/udp
 sl  local_address rem_address   st tx_queue rx_queue tr tm->when
retrnsmt  ---
uid  timeout inode ref pointer drops
 75: 00000000:02CB 00000000:0000 07 00000000:00000000 00:00000000
00000000  ---
  0        0 2358 2 ffff81082a538c80 0
111: 00000000:006F 00000000:0000 07 00000000:00000000 00:00000000
00000000  ---
  0        0 2286 2 ffff81042dd35c80 146348

Quoted 6 lines

Quoted 4 lines
In this example, only port 111 (0x006F) was flooded by messages that user program
could not read fast enough. 146348 messages were lost.
How about other place, such as, rxrpc_data_ready() also inc UDP_MIB_INERRORS.

Hum... my intent was to only count UDP_MIB_RCVBUFFERRORS (to mimic raw sk_drops behavior)

Updated patch follows.

Thank you

[PATCH]udp: sk_drops handling
In commits 33c732c36169d7022ad7d6eb474b0c9be43a2dc1 ([IPV4]: Add raw drops counter) and a92aa318b4b369091fd80433c80e62838db8bc1c ([IPV4]: Add raw drops counter),
Wang Chen added raw drops counter for /proc/net/raw & /proc/net/raw6

This patch adds this capability to UDP sockets too (/proc/net/udp & /proc/net/udp6).

This means that 'RcvbufErrors' errors found in /proc/net/snmp can be also be examined for each udp socket.

# grep Udp: /proc/net/snmp
Udp: InDatagrams NoPorts InErrors OutDatagrams RcvbufErrors SndbufErrors
Udp: 23971006 75 899420 16390693 146348 0

# cat /proc/net/udp
sl  local_address rem_address   st tx_queue rx_queue tr tm->when retrnsmt  ---
uid  timeout inode ref pointer drops
75: 00000000:02CB 00000000:0000 07 00000000:00000000 00:00000000 00000000  ---
 0        0 2358 2 ffff81082a538c80 0
111: 00000000:006F 00000000:0000 07 00000000:00000000 00:00000000 00000000  ---
 0        0 2286 2 ffff81042dd35c80 146348

In this example, only port 111 (0x006F) was flooded by messages that user program could not read fast enough. 146348 messages were lost.

Signed-off-by Eric Dumazet <[email protected]>

include/net/sock.h +1 -1

index 83f74b1..a7c3041 100644
@@ -166,7 +166,7 @@ struct sock_common {
  *	@sk_err: last error
  *	@sk_err_soft: errors that don't cause failure but are the cause of a
  *		      persistent failure not just 'timed out'
-  *	@sk_drops: raw drops counter
+  *	@sk_drops: raw/udp drops counter
  *	@sk_ack_backlog: current listen backlog
  *	@sk_max_ack_backlog: listen backlog set in listen()
  *	@sk_priority: %SO_PRIORITY setting

net/ipv4/raw.c +0 -0

index 7d44946..925fdf1 100644
@@ -944,7 +944,7 @@ static int raw_seq_show(struct seq_file *seq, void *v)

	if (v == SEQ_START_TOKEN)
		seq_printf(seq, "  sl  local_address rem_address   st tx_queue "
				"rx_queue tr tm->when retrnsmt   uid  timeout "
-				"inode  drops\n");
+				"inode ref pointer drops\n");
	else
		raw_sock_seq_show(seq, v, raw_seq_private(seq)->bucket);
	return 0;

net/ipv4/udp.c +0 -0

index 11eabf1..3bbf6fb 100644
@@ -1040,8 +1040,10 @@ 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(UDP_MIB_RCVBUFERRORS, is_udplite);
+			atomic_inc(&sk->sk_drops);
+		}
		goto drop;
	}

@@ -1629,12 +1631,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,

	__u16 srcp	  = ntohs(inet->sport);

	seq_printf(f, "%4d: %08X:%04X %08X:%04X"
-		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p%n",
+		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d%n",
		bucket, src, srcp, dest, destp, sp->sk_state,
		atomic_read(&sp->sk_wmem_alloc),
		atomic_read(&sp->sk_rmem_alloc),
		0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),

- atomic_read(&sp->sk_refcnt), sp, len);
+ atomic_read(&sp->sk_refcnt), sp,
+ atomic_read(&sp->sk_drops), len);
}

int udp4_seq_show(struct seq_file *seq, void *v)
@@ -1643,7 +1646,7 @@ int udp4_seq_show(struct seq_file *seq, void *v)

		seq_printf(seq, "%-127s\n",
			   "  sl  local_address rem_address   st tx_queue "
			   "rx_queue tr tm->when retrnsmt   uid  timeout "
-			   "inode");
+			   "inode ref pointer drops");
	else {
		struct udp_iter_state *state = seq->private;
		int len;

net/ipv6/raw.c +0 -0

index 456777d..34cfb3f 100644
@@ -1251,7 +1251,7 @@ static int raw6_seq_show(struct seq_file *seq, void *v)

			   "local_address                         "
			   "remote_address                        "
			   "st tx_queue rx_queue tr tm->when retrnsmt"
-			   "   uid  timeout inode  drops\n");
+			   "   uid  timeout inode ref pointer drops\n");
	else
		raw6_sock_seq_show(seq, v, raw_seq_private(seq)->bucket);
	return 0;

net/ipv6/udp.c +0 -0

index 432edaa..f91e1df 100644
@@ -297,8 +297,10 @@ int udpv6_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) {
			UDP6_INC_STATS_BH(UDP_MIB_RCVBUFERRORS, is_udplite);
+			atomic_inc(&sk->sk_drops);
+		}
		goto drop;
	}

@@ -955,7 +957,7 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket

	srcp  = ntohs(inet->sport);
	seq_printf(seq,
		   "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "
-		   "%02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p\n",
+		   "%02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d\n",
		   bucket,
		   src->s6_addr32[0], src->s6_addr32[1],
		   src->s6_addr32[2], src->s6_addr32[3], srcp,
@@ -967,7 +969,8 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
		   0, 0L, 0,
		   sock_i_uid(sp), 0,
		   sock_i_ino(sp),
-		   atomic_read(&sp->sk_refcnt), sp);
+		   atomic_read(&sp->sk_refcnt), sp,
+		   atomic_read(&sp->sk_drops));

}

int udp6_seq_show(struct seq_file *seq, void *v)
@@ -978,7 +981,7 @@ int udp6_seq_show(struct seq_file *seq, void *v)

			   "local_address                         "
			   "remote_address                        "
			   "st tx_queue rx_queue tr tm->when retrnsmt"
-			   "   uid  timeout inode\n");
+			   "   uid  timeout inode ref pointer drops\n");
	else
		udp6_sock_seq_show(seq, v, ((struct udp_iter_state *)seq->private)->bucket);
	return 0;

David Miller

maintainer

2008-06-18 04:05 UTC #3 lore raw

From: Eric Dumazet <[email protected]>
Date: Wed, 18 Jun 2008 05:46:21 +0200

Quoted 9 lines

Updated patch follows.
Thank you
[PATCH]udp: sk_drops handling
In commits 33c732c36169d7022ad7d6eb474b0c9be43a2dc1 ([IPV4]: Add raw drops counter) and a92aa318b4b369091fd80433c80e62838db8bc1c ([IPV4]: Add raw drops counter),
Wang Chen added raw drops counter for /proc/net/raw & /proc/net/raw6

Typo, second commit header line is "IPV6..." not "IPV4...". I fixed this when committing your change to net-next-2.6.

Thanks.