Skip to content

Commit

Permalink
netpoll: Remove strong unnecessary assumptions about skbs
Browse files Browse the repository at this point in the history
Remove the assumption that the skbs that make it to
netpoll_send_skb_on_dev are allocated with find_skb, such that
skb->users == 1 and nothing is attached that would prevent the skbs from
being freed from hard irq context.

Remove this assumption by replacing __kfree_skb on error paths with
dev_kfree_skb_irq (in hard irq context) and kfree_skb (in process
context).

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eric W. Biederman authored and David S. Miller committed Mar 29, 2014
1 parent 66b5552 commit 080b3c1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/core/netpoll.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ static void queue_process(struct work_struct *work)
struct netdev_queue *txq;

if (!netif_device_present(dev) || !netif_running(dev)) {
__kfree_skb(skb);
kfree_skb(skb);
continue;
}

Expand Down Expand Up @@ -332,7 +332,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,

npinfo = rcu_dereference_bh(np->dev->npinfo);
if (!npinfo || !netif_running(dev) || !netif_device_present(dev)) {
__kfree_skb(skb);
dev_kfree_skb_irq(skb);
return;
}

Expand Down

0 comments on commit 080b3c1

Please sign in to comment.