dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

drop_monitor: convert some kfree_skb call sites to consume_skb 

Convert a few calls from kfree_skb to consume_skb

Noticed while I was working on dropwatch that I was detecting lots of internal
skb drops in several places.  While some are legitimate, several were not,
freeing skbs that were at the end of their life, rather than being discarded due
to an error.  This patch converts those calls sites from using kfree_skb to
consume_skb, which quiets the in-kernel drop_monitor code from detecting them as
drops.  Tested successfully by myself

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Neil Horman 2010-07-20 06:45:56 +00:00 committed by David S. Miller
parent 4b706372f1
commit 70d4bf6d46
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/audit.c
View File

@ -407,7 +407,7 @@ static void kauditd_send_skb(struct sk_buff *skb)
audit_hold_skb(skb);
} else
/* drop the extra reference if sent ok */
kfree_skb(skb);
consume_skb(skb);
}
static int kauditd_thread(void *dummy)

9
net/netlink/af_netlink.c
View File

@ -1076,14 +1076,15 @@ int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb, u32 pid,
sk_for_each_bound(sk, node, &nl_table[ssk->sk_protocol].mc_list)
do_one_broadcast(sk, &info);
kfree_skb(skb);
consume_skb(skb);
netlink_unlock_table();
kfree_skb(info.skb2);
if (info.delivery_failure)
if (info.delivery_failure) {
kfree_skb(info.skb2);
return -ENOBUFS;
} else
consume_skb(info.skb2);
if (info.delivered) {
if (info.congested && (allocation & __GFP_WAIT))

2
net/unix/af_unix.c
View File

@ -1906,7 +1906,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
break;
}
kfree_skb(skb);
consume_skb(skb);
if (siocb->scm->fp)
break;