* Re: [Patch 2.5.43] IpInDelivers, IpInDiscards
@ 2002-10-17 23:47 Nivedita Singhvi
2002-10-17 23:43 ` David S. Miller
0 siblings, 1 reply; 6+ messages in thread
From: Nivedita Singhvi @ 2002-10-17 23:47 UTC (permalink / raw)
To: davem; +Cc: netdev
I made the changes, I think this is what you wanted..
If not, I'll gladly make any changes necessary..
However, note that IpInDiscards is meant to be
mutually exclusive with IpInHdrErrors. I interpreted
it to be a counter for stuff like being out of memory
etc, based on what the MIB spec says:
"The number of input IP datagrams for which no
problems were encountered to prevent their continued
processing, but which were discarded (e.g., for lack
of buffer space). Note that this counter does not
include any datagrams discarded while awaiting re-assembly."
However, I dont really object to it being a catchall
for IP discards..
thanks,
Nivedita
diff -urN linux-2.5.43/net/ipv4/ip_input.c linux-2.5.43s1/net/ipv4/ip_input.c
--- linux-2.5.43/net/ipv4/ip_input.c Tue Oct 15 20:27:12 2002
+++ linux-2.5.43s1/net/ipv4/ip_input.c Thu Oct 17 16:11:47 2002
@@ -237,11 +237,13 @@
protocol = -ret;
goto resubmit;
}
+ IP_INC_STATS_BH(IpInDelivers);
} else {
if (!raw_sk) {
icmp_send(skb, ICMP_DEST_UNREACH,
ICMP_PROT_UNREACH, 0);
- }
+ } else
+ IP_INC_STATS_BH(IpInDelivers);
kfree_skb(skb);
}
}
@@ -306,6 +308,7 @@
if (skb_cow(skb, skb_headroom(skb)))
goto drop;
+
iph = skb->nh.iph;
if (ip_options_compile(NULL, skb))
@@ -334,6 +337,7 @@
inhdr_error:
IP_INC_STATS_BH(IpInHdrErrors);
drop:
+ IP_INC_STATS_BH(IpInDiscards);
kfree_skb(skb);
return NET_RX_DROP;
}
@@ -407,6 +411,7 @@
drop:
kfree_skb(skb);
out:
+ IP_INC_STATS_BH(IpInDiscards);
return NET_RX_DROP;
}
diff -urN linux-2.5.43/net/ipv4/raw.c linux-2.5.43s1/net/ipv4/raw.c
--- linux-2.5.43/net/ipv4/raw.c Tue Oct 15 20:27:08 2002
+++ linux-2.5.43s1/net/ipv4/raw.c Thu Oct 17 09:55:03 2002
@@ -226,12 +226,11 @@
/* Charge it to the socket. */
if (sock_queue_rcv_skb(sk, skb) < 0) {
- IP_INC_STATS(IpInDiscards);
+ /* FIXME: increment a raw drops counter here */
kfree_skb(skb);
return NET_RX_DROP;
}
- IP_INC_STATS(IpInDelivers);
return NET_RX_SUCCESS;
}
diff -urN linux-2.5.43/net/ipv4/tcp_ipv4.c linux-2.5.43s1/net/ipv4/tcp_ipv4.c
--- linux-2.5.43/net/ipv4/tcp_ipv4.c Tue Oct 15 20:27:50 2002
+++ linux-2.5.43s1/net/ipv4/tcp_ipv4.c Wed Oct 16 18:39:30 2002
@@ -1674,8 +1674,6 @@
goto discard;
#endif /* CONFIG_FILTER */
- IP_INC_STATS_BH(IpInDelivers);
-
if (sk->state == TCP_ESTABLISHED) { /* Fast path */
TCP_CHECK_TIMER(sk);
if (tcp_rcv_established(sk, skb, skb->h.th, skb->len))
diff -urN linux-2.5.43/net/ipv4/udp.c linux-2.5.43s1/net/ipv4/udp.c
--- linux-2.5.43/net/ipv4/udp.c Tue Oct 15 20:27:19 2002
+++ linux-2.5.43s1/net/ipv4/udp.c Wed Oct 16 19:12:40 2002
@@ -819,8 +819,6 @@
if (sk->filter && skb->ip_summed != CHECKSUM_UNNECESSARY) {
if (__udp_checksum_complete(skb)) {
UDP_INC_STATS_BH(UdpInErrors);
- IP_INC_STATS_BH(IpInDiscards);
- ip_statistics[smp_processor_id()*2].IpInDelivers--;
kfree_skb(skb);
return -1;
}
@@ -830,8 +828,6 @@
if (sock_queue_rcv_skb(sk,skb)<0) {
UDP_INC_STATS_BH(UdpInErrors);
- IP_INC_STATS_BH(IpInDiscards);
- ip_statistics[smp_processor_id()*2].IpInDelivers--;
kfree_skb(skb);
return -1;
}
@@ -915,8 +911,6 @@
u32 daddr = skb->nh.iph->daddr;
int len = skb->len;
- IP_INC_STATS_BH(IpInDelivers);
-
/*
* Validate the packet and the UDP length.
*/
diff -urN linux-2.5.43/net/ipv6/ip6_input.c linux-2.5.43s1/net/ipv6/ip6_input.c
--- linux-2.5.43/net/ipv6/ip6_input.c Tue Oct 15 20:28:32 2002
+++ linux-2.5.43s1/net/ipv6/ip6_input.c Thu Oct 17 09:46:56 2002
@@ -60,8 +60,10 @@
IP6_INC_STATS_BH(Ip6InReceives);
- if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
+ if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
+ IP6_INC_STATS_BH(Ip6InDiscards);
goto out;
+ }
/* Store incoming device index. When the packet will
be queued, we cannot refer to skb->dev anymore.
@@ -175,11 +177,13 @@
nexthdr = -ret;
goto resubmit;
}
+ IP6_INC_STATS_BH(Ip6InDelivers);
} else {
if (!raw_sk) {
IP6_INC_STATS_BH(Ip6InUnknownProtos);
icmpv6_param_prob(skb, ICMPV6_UNK_NEXTHDR, nhoff);
- }
+ } else
+ IP6_INC_STATS_BH(Ip6InDelivers);
kfree_skb(skb);
}
diff -urN linux-2.5.43/net/ipv6/raw.c linux-2.5.43s1/net/ipv6/raw.c
--- linux-2.5.43/net/ipv6/raw.c Tue Oct 15 20:27:54 2002
+++ linux-2.5.43s1/net/ipv6/raw.c Thu Oct 17 10:05:10 2002
@@ -275,7 +275,7 @@
#if defined(CONFIG_FILTER)
if (sk->filter && skb->ip_summed != CHECKSUM_UNNECESSARY) {
if ((unsigned short)csum_fold(skb_checksum(skb, 0, skb->len, skb->csum))) {
- IP6_INC_STATS_BH(Ip6InDiscards);
+ /* FIXME: increment a raw6 drops counter here */
kfree_skb(skb);
return 0;
}
@@ -284,12 +284,11 @@
#endif
/* Charge it to the socket. */
if (sock_queue_rcv_skb(sk,skb)<0) {
- IP6_INC_STATS_BH(Ip6InDiscards);
+ /* FIXME: increment a raw6 drops counter here */
kfree_skb(skb);
return 0;
}
- IP6_INC_STATS_BH(Ip6InDelivers);
return 0;
}
@@ -327,7 +326,7 @@
if (inet->hdrincl) {
if (skb->ip_summed != CHECKSUM_UNNECESSARY &&
(unsigned short)csum_fold(skb_checksum(skb, 0, skb->len, skb->csum))) {
- IP6_INC_STATS_BH(Ip6InDiscards);
+ /* FIXME: increment a raw6 drops counter here */
kfree_skb(skb);
return 0;
}
@@ -427,7 +426,7 @@
as some normal condition.
*/
err = (flags&MSG_DONTWAIT) ? -EAGAIN : -EHOSTUNREACH;
- IP6_INC_STATS_USER(Ip6InDiscards);
+ /* FIXME: increment a raw6 drops counter here */
goto out_free;
}
diff -urN linux-2.5.43/net/ipv6/tcp_ipv6.c linux-2.5.43s1/net/ipv6/tcp_ipv6.c
--- linux-2.5.43/net/ipv6/tcp_ipv6.c Tue Oct 15 20:28:23 2002
+++ linux-2.5.43s1/net/ipv6/tcp_ipv6.c Wed Oct 16 18:40:38 2002
@@ -1470,8 +1470,6 @@
* is currently called with bh processing disabled.
*/
- IP6_INC_STATS_BH(Ip6InDelivers);
-
/* Do Stevens' IPV6_PKTOPTIONS.
Yes, guys, it is the only place in our code, where we
diff -urN linux-2.5.43/net/ipv6/udp.c linux-2.5.43s1/net/ipv6/udp.c
--- linux-2.5.43/net/ipv6/udp.c Tue Oct 15 20:27:48 2002
+++ linux-2.5.43s1/net/ipv6/udp.c Wed Oct 16 18:52:38 2002
@@ -512,7 +512,6 @@
if (sk->filter && skb->ip_summed != CHECKSUM_UNNECESSARY) {
if ((unsigned short)csum_fold(skb_checksum(skb, 0, skb->len, skb->csum))) {
UDP6_INC_STATS_BH(UdpInErrors);
- IP6_INC_STATS_BH(Ip6InDiscards);
kfree_skb(skb);
return 0;
}
@@ -521,11 +520,9 @@
#endif
if (sock_queue_rcv_skb(sk,skb)<0) {
UDP6_INC_STATS_BH(UdpInErrors);
- IP6_INC_STATS_BH(Ip6InDiscards);
kfree_skb(skb);
return 0;
}
- IP6_INC_STATS_BH(Ip6InDelivers);
UDP6_INC_STATS_BH(UdpInDatagrams);
return 0;
}
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Patch 2.5.43] IpInDelivers, IpInDiscards
2002-10-17 23:47 [Patch 2.5.43] IpInDelivers, IpInDiscards Nivedita Singhvi
@ 2002-10-17 23:43 ` David S. Miller
2002-10-18 0:10 ` Nivedita Singhvi
0 siblings, 1 reply; 6+ messages in thread
From: David S. Miller @ 2002-10-17 23:43 UTC (permalink / raw)
To: niv; +Cc: netdev
From: Nivedita Singhvi <niv@us.ibm.com>
Date: Thu, 17 Oct 2002 16:47:58 -0700 (PDT)
"The number of input IP datagrams for which no
problems were encountered to prevent their continued
processing, but which were discarded (e.g., for lack
of buffer space). Note that this counter does not
include any datagrams discarded while awaiting re-assembly."
However, I dont really object to it being a catchall
for IP discards..
No, you are right. We should match mib specs here.
I will take care of this myself, no need to repatch :)
Thanks a lot for your work, I'll post what I end up applying
to my tree.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Patch 2.5.43] IpInDelivers, IpInDiscards
2002-10-17 23:43 ` David S. Miller
@ 2002-10-18 0:10 ` Nivedita Singhvi
2002-10-28 12:50 ` David S. Miller
0 siblings, 1 reply; 6+ messages in thread
From: Nivedita Singhvi @ 2002-10-18 0:10 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev
"David S. Miller" wrote:
> I will take care of this myself, no need to repatch :)
>
> Thanks a lot for your work, I'll post what I end up applying
> to my tree.
Great :). Thanks much!
Nivedita
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Patch 2.5.43] IpInDelivers, IpInDiscards
2002-10-18 0:10 ` Nivedita Singhvi
@ 2002-10-28 12:50 ` David S. Miller
0 siblings, 0 replies; 6+ messages in thread
From: David S. Miller @ 2002-10-28 12:50 UTC (permalink / raw)
To: niv; +Cc: netdev
From: Nivedita Singhvi <niv@us.ibm.com>
Date: Thu, 17 Oct 2002 17:10:26 -0700
"David S. Miller" wrote:
> Thanks a lot for your work, I'll post what I end up applying
> to my tree.
Great :). Thanks much!
Here is what I applied. Thanks again.
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.835 -> 1.836
# net/ipv4/raw.c 1.17 -> 1.18
# net/ipv4/ip_input.c 1.7 -> 1.8
# net/ipv4/udp.c 1.23 -> 1.24
# net/ipv6/udp.c 1.16 -> 1.17
# net/ipv4/tcp_ipv4.c 1.33 -> 1.34
# net/ipv6/raw.c 1.17 -> 1.18
# net/ipv6/tcp_ipv6.c 1.29 -> 1.30
# net/ipv6/ip6_input.c 1.3 -> 1.4
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/28 niv@us.ibm.com 1.836
# [IPV{4,6}]: Clean up SNMP counter bumping.
# --------------------------------------------
#
diff -Nru a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
--- a/net/ipv4/ip_input.c Mon Oct 28 04:54:10 2002
+++ b/net/ipv4/ip_input.c Mon Oct 28 04:54:10 2002
@@ -237,11 +237,13 @@
protocol = -ret;
goto resubmit;
}
+ IP_INC_STATS_BH(IpInDelivers);
} else {
if (!raw_sk) {
icmp_send(skb, ICMP_DEST_UNREACH,
ICMP_PROT_UNREACH, 0);
- }
+ } else
+ IP_INC_STATS_BH(IpInDelivers);
kfree_skb(skb);
}
}
@@ -304,8 +306,10 @@
--ANK (980813)
*/
- if (skb_cow(skb, skb_headroom(skb)))
+ if (skb_cow(skb, skb_headroom(skb))) {
+ IP_INC_STATS_BH(IpInDiscards);
goto drop;
+ }
iph = skb->nh.iph;
if (ip_options_compile(NULL, skb))
@@ -353,8 +357,10 @@
IP_INC_STATS_BH(IpInReceives);
- if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
+ if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
+ IP_INC_STATS_BH(IpInDiscards);
goto out;
+ }
if (!pskb_may_pull(skb, sizeof(struct iphdr)))
goto inhdr_error;
diff -Nru a/net/ipv4/raw.c b/net/ipv4/raw.c
--- a/net/ipv4/raw.c Mon Oct 28 04:54:10 2002
+++ b/net/ipv4/raw.c Mon Oct 28 04:54:10 2002
@@ -227,12 +227,11 @@
/* Charge it to the socket. */
if (sock_queue_rcv_skb(sk, skb) < 0) {
- IP_INC_STATS(IpInDiscards);
+ /* FIXME: increment a raw drops counter here */
kfree_skb(skb);
return NET_RX_DROP;
}
- IP_INC_STATS(IpInDelivers);
return NET_RX_SUCCESS;
}
diff -Nru a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
--- a/net/ipv4/tcp_ipv4.c Mon Oct 28 04:54:10 2002
+++ b/net/ipv4/tcp_ipv4.c Mon Oct 28 04:54:10 2002
@@ -1700,8 +1700,6 @@
goto discard;
#endif /* CONFIG_FILTER */
- IP_INC_STATS_BH(IpInDelivers);
-
if (sk->state == TCP_ESTABLISHED) { /* Fast path */
TCP_CHECK_TIMER(sk);
if (tcp_rcv_established(sk, skb, skb->h.th, skb->len))
diff -Nru a/net/ipv4/udp.c b/net/ipv4/udp.c
--- a/net/ipv4/udp.c Mon Oct 28 04:54:10 2002
+++ b/net/ipv4/udp.c Mon Oct 28 04:54:10 2002
@@ -951,8 +951,6 @@
if (sk->filter && skb->ip_summed != CHECKSUM_UNNECESSARY) {
if (__udp_checksum_complete(skb)) {
UDP_INC_STATS_BH(UdpInErrors);
- IP_INC_STATS_BH(IpInDiscards);
- ip_statistics[smp_processor_id()*2].IpInDelivers--;
kfree_skb(skb);
return -1;
}
@@ -962,8 +960,6 @@
if (sock_queue_rcv_skb(sk,skb)<0) {
UDP_INC_STATS_BH(UdpInErrors);
- IP_INC_STATS_BH(IpInDiscards);
- ip_statistics[smp_processor_id()*2].IpInDelivers--;
kfree_skb(skb);
return -1;
}
@@ -1046,8 +1042,6 @@
u32 saddr = skb->nh.iph->saddr;
u32 daddr = skb->nh.iph->daddr;
int len = skb->len;
-
- IP_INC_STATS_BH(IpInDelivers);
/*
* Validate the packet and the UDP length.
diff -Nru a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
--- a/net/ipv6/ip6_input.c Mon Oct 28 04:54:10 2002
+++ b/net/ipv6/ip6_input.c Mon Oct 28 04:54:10 2002
@@ -60,8 +60,10 @@
IP6_INC_STATS_BH(Ip6InReceives);
- if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
+ if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
+ IP6_INC_STATS_BH(Ip6InDiscards);
goto out;
+ }
/* Store incoming device index. When the packet will
be queued, we cannot refer to skb->dev anymore.
@@ -175,11 +177,13 @@
nexthdr = -ret;
goto resubmit;
}
+ IP6_INC_STATS_BH(Ip6InDelivers);
} else {
if (!raw_sk) {
IP6_INC_STATS_BH(Ip6InUnknownProtos);
icmpv6_param_prob(skb, ICMPV6_UNK_NEXTHDR, nhoff);
- }
+ } else
+ IP6_INC_STATS_BH(Ip6InDelivers);
kfree_skb(skb);
}
diff -Nru a/net/ipv6/raw.c b/net/ipv6/raw.c
--- a/net/ipv6/raw.c Mon Oct 28 04:54:10 2002
+++ b/net/ipv6/raw.c Mon Oct 28 04:54:10 2002
@@ -275,7 +275,7 @@
#if defined(CONFIG_FILTER)
if (sk->filter && skb->ip_summed != CHECKSUM_UNNECESSARY) {
if ((unsigned short)csum_fold(skb_checksum(skb, 0, skb->len, skb->csum))) {
- IP6_INC_STATS_BH(Ip6InDiscards);
+ /* FIXME: increment a raw6 drops counter here */
kfree_skb(skb);
return 0;
}
@@ -284,12 +284,11 @@
#endif
/* Charge it to the socket. */
if (sock_queue_rcv_skb(sk,skb)<0) {
- IP6_INC_STATS_BH(Ip6InDiscards);
+ /* FIXME: increment a raw6 drops counter here */
kfree_skb(skb);
return 0;
}
- IP6_INC_STATS_BH(Ip6InDelivers);
return 0;
}
@@ -327,7 +326,7 @@
if (inet->hdrincl) {
if (skb->ip_summed != CHECKSUM_UNNECESSARY &&
(unsigned short)csum_fold(skb_checksum(skb, 0, skb->len, skb->csum))) {
- IP6_INC_STATS_BH(Ip6InDiscards);
+ /* FIXME: increment a raw6 drops counter here */
kfree_skb(skb);
return 0;
}
@@ -427,7 +426,7 @@
as some normal condition.
*/
err = (flags&MSG_DONTWAIT) ? -EAGAIN : -EHOSTUNREACH;
- IP6_INC_STATS_USER(Ip6InDiscards);
+ /* FIXME: increment a raw6 drops counter here */
goto out_free;
}
diff -Nru a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
--- a/net/ipv6/tcp_ipv6.c Mon Oct 28 04:54:10 2002
+++ b/net/ipv6/tcp_ipv6.c Mon Oct 28 04:54:10 2002
@@ -1497,8 +1497,6 @@
* is currently called with bh processing disabled.
*/
- IP6_INC_STATS_BH(Ip6InDelivers);
-
/* Do Stevens' IPV6_PKTOPTIONS.
Yes, guys, it is the only place in our code, where we
diff -Nru a/net/ipv6/udp.c b/net/ipv6/udp.c
--- a/net/ipv6/udp.c Mon Oct 28 04:54:10 2002
+++ b/net/ipv6/udp.c Mon Oct 28 04:54:10 2002
@@ -545,7 +545,6 @@
if (sk->filter && skb->ip_summed != CHECKSUM_UNNECESSARY) {
if ((unsigned short)csum_fold(skb_checksum(skb, 0, skb->len, skb->csum))) {
UDP6_INC_STATS_BH(UdpInErrors);
- IP6_INC_STATS_BH(Ip6InDiscards);
kfree_skb(skb);
return 0;
}
@@ -554,11 +553,9 @@
#endif
if (sock_queue_rcv_skb(sk,skb)<0) {
UDP6_INC_STATS_BH(UdpInErrors);
- IP6_INC_STATS_BH(Ip6InDiscards);
kfree_skb(skb);
return 0;
}
- IP6_INC_STATS_BH(Ip6InDelivers);
UDP6_INC_STATS_BH(UdpInDatagrams);
return 0;
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Patch 2.5.43] IpInDelivers, IpInDiscards
@ 2002-10-17 21:49 Nivedita Singhvi
2002-10-17 22:24 ` David S. Miller
0 siblings, 1 reply; 6+ messages in thread
From: Nivedita Singhvi @ 2002-10-17 21:49 UTC (permalink / raw)
To: davem; +Cc: netdev
This patch cleans up the use of the SNMP stats counters
IpInDelivers and IpInDiscards (and the v6 counterparts).
A patch to address some of this had been submitted a while
ago by Mark Price.
Specifically this patch:
- removes increments of IpInDelivers and IpInDiscards from
upper level protocols and moves them to the IP layer.
(upper layer protocols neednt know whether it was ip or
ip6 that delivered the packet (eg what we might have in sctp))
- it also eliminates the subsequent atomic decrement of
IpInDelivers when UDP drops a packet and the current
duplicate incrementing of IpInDelivers for multicast packets.
- leaves drops in raw sockets unaccounted for, at the moment.
(that, along with remaining stats stuff will be addressed in
subsequent patches if this is approved)
thanks,
Nivedita
diff -urN linux-2.5.43/net/ipv4/ip_input.c linux-2.5.43s1/net/ipv4/ip_input.c
--- linux-2.5.43/net/ipv4/ip_input.c Tue Oct 15 20:27:12 2002
+++ linux-2.5.43s1/net/ipv4/ip_input.c Thu Oct 17 14:23:51 2002
@@ -237,11 +237,13 @@
protocol = -ret;
goto resubmit;
}
+ IP_INC_STATS_BH(IpInDelivers);
} else {
if (!raw_sk) {
icmp_send(skb, ICMP_DEST_UNREACH,
ICMP_PROT_UNREACH, 0);
- }
+ } else
+ IP_INC_STATS_BH(IpInDelivers);
kfree_skb(skb);
}
}
@@ -304,8 +306,10 @@
--ANK (980813)
*/
- if (skb_cow(skb, skb_headroom(skb)))
+ if (skb_cow(skb, skb_headroom(skb))) {
+ IP_INC_STATS_BH(IpInDiscards);
goto drop;
+ }
iph = skb->nh.iph;
if (ip_options_compile(NULL, skb))
@@ -353,8 +357,10 @@
IP_INC_STATS_BH(IpInReceives);
- if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
+ if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
+ IP_INC_STATS_BH(IpInDiscards);
goto out;
+ }
if (!pskb_may_pull(skb, sizeof(struct iphdr)))
goto inhdr_error;
diff -urN linux-2.5.43/net/ipv4/raw.c linux-2.5.43s1/net/ipv4/raw.c
--- linux-2.5.43/net/ipv4/raw.c Tue Oct 15 20:27:08 2002
+++ linux-2.5.43s1/net/ipv4/raw.c Thu Oct 17 09:55:03 2002
@@ -226,12 +226,11 @@
/* Charge it to the socket. */
if (sock_queue_rcv_skb(sk, skb) < 0) {
- IP_INC_STATS(IpInDiscards);
+ /* FIXME: increment a raw drops counter here */
kfree_skb(skb);
return NET_RX_DROP;
}
- IP_INC_STATS(IpInDelivers);
return NET_RX_SUCCESS;
}
diff -urN linux-2.5.43/net/ipv4/tcp_ipv4.c linux-2.5.43s1/net/ipv4/tcp_ipv4.c
--- linux-2.5.43/net/ipv4/tcp_ipv4.c Tue Oct 15 20:27:50 2002
+++ linux-2.5.43s1/net/ipv4/tcp_ipv4.c Wed Oct 16 18:39:30 2002
@@ -1674,8 +1674,6 @@
goto discard;
#endif /* CONFIG_FILTER */
- IP_INC_STATS_BH(IpInDelivers);
-
if (sk->state == TCP_ESTABLISHED) { /* Fast path */
TCP_CHECK_TIMER(sk);
if (tcp_rcv_established(sk, skb, skb->h.th, skb->len))
diff -urN linux-2.5.43/net/ipv4/udp.c linux-2.5.43s1/net/ipv4/udp.c
--- linux-2.5.43/net/ipv4/udp.c Tue Oct 15 20:27:19 2002
+++ linux-2.5.43s1/net/ipv4/udp.c Wed Oct 16 19:12:40 2002
@@ -819,8 +819,6 @@
if (sk->filter && skb->ip_summed != CHECKSUM_UNNECESSARY) {
if (__udp_checksum_complete(skb)) {
UDP_INC_STATS_BH(UdpInErrors);
- IP_INC_STATS_BH(IpInDiscards);
- ip_statistics[smp_processor_id()*2].IpInDelivers--;
kfree_skb(skb);
return -1;
}
@@ -830,8 +828,6 @@
if (sock_queue_rcv_skb(sk,skb)<0) {
UDP_INC_STATS_BH(UdpInErrors);
- IP_INC_STATS_BH(IpInDiscards);
- ip_statistics[smp_processor_id()*2].IpInDelivers--;
kfree_skb(skb);
return -1;
}
@@ -915,8 +911,6 @@
u32 daddr = skb->nh.iph->daddr;
int len = skb->len;
- IP_INC_STATS_BH(IpInDelivers);
-
/*
* Validate the packet and the UDP length.
*/
diff -urN linux-2.5.43/net/ipv6/ip6_input.c linux-2.5.43s1/net/ipv6/ip6_input.c
--- linux-2.5.43/net/ipv6/ip6_input.c Tue Oct 15 20:28:32 2002
+++ linux-2.5.43s1/net/ipv6/ip6_input.c Thu Oct 17 09:46:56 2002
@@ -60,8 +60,10 @@
IP6_INC_STATS_BH(Ip6InReceives);
- if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
+ if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
+ IP6_INC_STATS_BH(Ip6InDiscards);
goto out;
+ }
/* Store incoming device index. When the packet will
be queued, we cannot refer to skb->dev anymore.
@@ -175,11 +177,13 @@
nexthdr = -ret;
goto resubmit;
}
+ IP6_INC_STATS_BH(Ip6InDelivers);
} else {
if (!raw_sk) {
IP6_INC_STATS_BH(Ip6InUnknownProtos);
icmpv6_param_prob(skb, ICMPV6_UNK_NEXTHDR, nhoff);
- }
+ } else
+ IP6_INC_STATS_BH(Ip6InDelivers);
kfree_skb(skb);
}
diff -urN linux-2.5.43/net/ipv6/raw.c linux-2.5.43s1/net/ipv6/raw.c
--- linux-2.5.43/net/ipv6/raw.c Tue Oct 15 20:27:54 2002
+++ linux-2.5.43s1/net/ipv6/raw.c Thu Oct 17 10:05:10 2002
@@ -275,7 +275,7 @@
#if defined(CONFIG_FILTER)
if (sk->filter && skb->ip_summed != CHECKSUM_UNNECESSARY) {
if ((unsigned short)csum_fold(skb_checksum(skb, 0, skb->len, skb->csum))) {
- IP6_INC_STATS_BH(Ip6InDiscards);
+ /* FIXME: increment a raw6 drops counter here */
kfree_skb(skb);
return 0;
}
@@ -284,12 +284,11 @@
#endif
/* Charge it to the socket. */
if (sock_queue_rcv_skb(sk,skb)<0) {
- IP6_INC_STATS_BH(Ip6InDiscards);
+ /* FIXME: increment a raw6 drops counter here */
kfree_skb(skb);
return 0;
}
- IP6_INC_STATS_BH(Ip6InDelivers);
return 0;
}
@@ -327,7 +326,7 @@
if (inet->hdrincl) {
if (skb->ip_summed != CHECKSUM_UNNECESSARY &&
(unsigned short)csum_fold(skb_checksum(skb, 0, skb->len, skb->csum))) {
- IP6_INC_STATS_BH(Ip6InDiscards);
+ /* FIXME: increment a raw6 drops counter here */
kfree_skb(skb);
return 0;
}
@@ -427,7 +426,7 @@
as some normal condition.
*/
err = (flags&MSG_DONTWAIT) ? -EAGAIN : -EHOSTUNREACH;
- IP6_INC_STATS_USER(Ip6InDiscards);
+ /* FIXME: increment a raw6 drops counter here */
goto out_free;
}
diff -urN linux-2.5.43/net/ipv6/tcp_ipv6.c linux-2.5.43s1/net/ipv6/tcp_ipv6.c
--- linux-2.5.43/net/ipv6/tcp_ipv6.c Tue Oct 15 20:28:23 2002
+++ linux-2.5.43s1/net/ipv6/tcp_ipv6.c Wed Oct 16 18:40:38 2002
@@ -1470,8 +1470,6 @@
* is currently called with bh processing disabled.
*/
- IP6_INC_STATS_BH(Ip6InDelivers);
-
/* Do Stevens' IPV6_PKTOPTIONS.
Yes, guys, it is the only place in our code, where we
diff -urN linux-2.5.43/net/ipv6/udp.c linux-2.5.43s1/net/ipv6/udp.c
--- linux-2.5.43/net/ipv6/udp.c Tue Oct 15 20:27:48 2002
+++ linux-2.5.43s1/net/ipv6/udp.c Wed Oct 16 18:52:38 2002
@@ -512,7 +512,6 @@
if (sk->filter && skb->ip_summed != CHECKSUM_UNNECESSARY) {
if ((unsigned short)csum_fold(skb_checksum(skb, 0, skb->len, skb->csum))) {
UDP6_INC_STATS_BH(UdpInErrors);
- IP6_INC_STATS_BH(Ip6InDiscards);
kfree_skb(skb);
return 0;
}
@@ -521,11 +520,9 @@
#endif
if (sock_queue_rcv_skb(sk,skb)<0) {
UDP6_INC_STATS_BH(UdpInErrors);
- IP6_INC_STATS_BH(Ip6InDiscards);
kfree_skb(skb);
return 0;
}
- IP6_INC_STATS_BH(Ip6InDelivers);
UDP6_INC_STATS_BH(UdpInDatagrams);
return 0;
}
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Patch 2.5.43] IpInDelivers, IpInDiscards
2002-10-17 21:49 Nivedita Singhvi
@ 2002-10-17 22:24 ` David S. Miller
0 siblings, 0 replies; 6+ messages in thread
From: David S. Miller @ 2002-10-17 22:24 UTC (permalink / raw)
To: niv; +Cc: netdev
From: Nivedita Singhvi <niv@us.ibm.com>
Date: Thu, 17 Oct 2002 14:49:04 -0700 (PDT)
This patch cleans up the use of the SNMP stats counters
IpInDelivers and IpInDiscards (and the v6 counterparts).
A patch to address some of this had been submitted a while
ago by Mark Price.
I agree with with. I just have some minor troubles with some of
the changes to ip_input.c
Specifically, the ip_rcv_finish() and ip_rcv() counter bumps
should all move to right below the drop: label which exists in
both functions.
Make this fixup, and I'll apply the patch.
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2002-10-28 12:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-10-17 23:47 [Patch 2.5.43] IpInDelivers, IpInDiscards Nivedita Singhvi
2002-10-17 23:43 ` David S. Miller
2002-10-18 0:10 ` Nivedita Singhvi
2002-10-28 12:50 ` David S. Miller
-- strict thread matches above, loose matches on Subject: below --
2002-10-17 21:49 Nivedita Singhvi
2002-10-17 22:24 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).