From: Wang Chen <wangchen@cn.fujitsu.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, dada1@cosmosbay.com
Subject: [PATCH 2/2] SOCK: add raw6 drops counter
Date: Wed, 14 Nov 2007 11:15:57 +0800 [thread overview]
Message-ID: <473A686D.9020200@cn.fujitsu.com> (raw)
In-Reply-To: <473A6792.10405@cn.fujitsu.com>
Add raw drops counter for IPv6 in /proc/net/raw6 .
Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
---
raw.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff -Nurp linux-2.6.24-rc2.org/net/ipv6/raw.c linux-2.6.24-rc2/net/ipv6/raw.c
--- linux-2.6.24-rc2.org/net/ipv6/raw.c 2007-11-09 16:38:05.000000000 +0800
+++ linux-2.6.24-rc2/net/ipv6/raw.c 2007-11-14 09:46:54.000000000 +0800
@@ -354,14 +354,14 @@ static inline int rawv6_rcv_skb(struct s
{
if ((raw6_sk(sk)->checksum || sk->sk_filter) &&
skb_checksum_complete(skb)) {
- /* FIXME: increment a raw6 drops counter here */
+ atomic_inc(&sk->sk_drops);
kfree_skb(skb);
return 0;
}
/* Charge it to the socket. */
if (sock_queue_rcv_skb(sk,skb)<0) {
- /* FIXME: increment a raw6 drops counter here */
+ atomic_inc(&sk->sk_drops);
kfree_skb(skb);
return 0;
}
@@ -382,6 +382,7 @@ int rawv6_rcv(struct sock *sk, struct sk
struct raw6_sock *rp = raw6_sk(sk);
if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
+ atomic_inc(&sk->sk_drops);
kfree_skb(skb);
return NET_RX_DROP;
}
@@ -405,7 +406,7 @@ int rawv6_rcv(struct sock *sk, struct sk
if (inet->hdrincl) {
if (skb_checksum_complete(skb)) {
- /* FIXME: increment a raw6 drops counter here */
+ atomic_inc(&sk->sk_drops);
kfree_skb(skb);
return 0;
}
@@ -496,7 +497,7 @@ csum_copy_err:
as some normal condition.
*/
err = (flags&MSG_DONTWAIT) ? -EAGAIN : -EHOSTUNREACH;
- /* FIXME: increment a raw6 drops counter here */
+ atomic_inc(&sk->sk_drops);
goto out;
}
@@ -1251,7 +1252,7 @@ static void raw6_sock_seq_show(struct se
srcp = inet_sk(sp)->num;
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",
i,
src->s6_addr32[0], src->s6_addr32[1],
src->s6_addr32[2], src->s6_addr32[3], srcp,
@@ -1263,7 +1264,7 @@ static void raw6_sock_seq_show(struct se
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));
}
static int raw6_seq_show(struct seq_file *seq, void *v)
@@ -1274,7 +1275,7 @@ static int raw6_seq_show(struct seq_file
"local_address "
"remote_address "
"st tx_queue rx_queue tr tm->when retrnsmt"
- " uid timeout inode\n");
+ " uid timeout inode drops\n");
else
raw6_sock_seq_show(seq, v, raw6_seq_private(seq)->bucket);
return 0;
next prev parent reply other threads:[~2007-11-14 3:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-13 9:57 [PATCH] IPV4: add raw drops counter Wang Chen
2007-11-13 11:11 ` Eric Dumazet
2007-11-14 1:27 ` Wang Chen
2007-11-14 6:00 ` Eric Dumazet
2007-11-14 3:12 ` [PATCH 1/2] SOCK: " Wang Chen
2007-11-14 3:15 ` Wang Chen [this message]
2007-11-14 4:31 ` [PATCH 2/2] SOCK: add raw6 " David Miller
2007-11-14 4:50 ` Wang Chen
2007-11-14 5:48 ` Eric Dumazet
2007-11-14 6:45 ` Wang Chen
2007-11-14 4:30 ` [PATCH 1/2] SOCK: add raw " David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=473A686D.9020200@cn.fujitsu.com \
--to=wangchen@cn.fujitsu.com \
--cc=dada1@cosmosbay.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).