diff options
| author | Wang Chen <wangchen@cn.fujitsu.com> | 2007-11-13 20:30:01 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:53:33 -0800 |
| commit | 33c732c36169d7022ad7d6eb474b0c9be43a2dc1 (patch) | |
| tree | a9ac2b8a488cc288bfd2f407d8ad9dd592b29055 /net | |
| parent | 6ff7751d06f63131830102ffa0c9a38b313f100e (diff) | |
| download | linux-3.10-33c732c36169d7022ad7d6eb474b0c9be43a2dc1.tar.gz linux-3.10-33c732c36169d7022ad7d6eb474b0c9be43a2dc1.tar.bz2 linux-3.10-33c732c36169d7022ad7d6eb474b0c9be43a2dc1.zip | |
[IPV4]: Add raw drops counter.
Add raw drops counter for IPv4 in /proc/net/raw .
Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/sock.c | 1 | ||||
| -rw-r--r-- | net/ipv4/raw.c | 17 |
2 files changed, 11 insertions, 7 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index c519b439b8b..2029d095b4c 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1611,6 +1611,7 @@ void sock_init_data(struct socket *sock, struct sock *sk) sk->sk_stamp = ktime_set(-1L, -1L); atomic_set(&sk->sk_refcnt, 1); + atomic_set(&sk->sk_drops, 0); } void fastcall lock_sock_nested(struct sock *sk, int subclass) diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index e7050f8eabe..761056ef493 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -241,7 +241,7 @@ 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) { - /* FIXME: increment a raw drops counter here */ + atomic_inc(&sk->sk_drops); kfree_skb(skb); return NET_RX_DROP; } @@ -252,6 +252,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb) int raw_rcv(struct sock *sk, struct sk_buff *skb) { if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) { + atomic_inc(&sk->sk_drops); kfree_skb(skb); return NET_RX_DROP; } @@ -871,28 +872,30 @@ static __inline__ char *get_raw_sock(struct sock *sp, char *tmpbuf, int i) srcp = inet->num; sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X" - " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p", + " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d", i, 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); + atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops)); return tmpbuf; } +#define TMPSZ 128 + static int raw_seq_show(struct seq_file *seq, void *v) { - char tmpbuf[129]; + char tmpbuf[TMPSZ+1]; if (v == SEQ_START_TOKEN) - seq_printf(seq, "%-127s\n", + seq_printf(seq, "%-*s\n", TMPSZ-1, " sl local_address rem_address st tx_queue " "rx_queue tr tm->when retrnsmt uid timeout " - "inode"); + "inode drops"); else { struct raw_iter_state *state = raw_seq_private(seq); - seq_printf(seq, "%-127s\n", + seq_printf(seq, "%-*s\n", TMPSZ-1, get_raw_sock(v, tmpbuf, state->bucket)); } return 0; |