Commit 385114de authored by Peter Oskolkov's avatar Peter Oskolkov Committed by David S. Miller

net: modify skb_rbtree_purge to return the truesize of all purged skbs.

Tested: see the next patch is the series.
Suggested-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarPeter Oskolkov <posk@google.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Florian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7969e5c4
...@@ -2585,7 +2585,7 @@ static inline void __skb_queue_purge(struct sk_buff_head *list) ...@@ -2585,7 +2585,7 @@ static inline void __skb_queue_purge(struct sk_buff_head *list)
kfree_skb(skb); kfree_skb(skb);
} }
void skb_rbtree_purge(struct rb_root *root); unsigned int skb_rbtree_purge(struct rb_root *root);
void *netdev_alloc_frag(unsigned int fragsz); void *netdev_alloc_frag(unsigned int fragsz);
......
...@@ -2858,23 +2858,27 @@ EXPORT_SYMBOL(skb_queue_purge); ...@@ -2858,23 +2858,27 @@ EXPORT_SYMBOL(skb_queue_purge);
/** /**
* skb_rbtree_purge - empty a skb rbtree * skb_rbtree_purge - empty a skb rbtree
* @root: root of the rbtree to empty * @root: root of the rbtree to empty
* Return value: the sum of truesizes of all purged skbs.
* *
* Delete all buffers on an &sk_buff rbtree. Each buffer is removed from * Delete all buffers on an &sk_buff rbtree. Each buffer is removed from
* the list and one reference dropped. This function does not take * the list and one reference dropped. This function does not take
* any lock. Synchronization should be handled by the caller (e.g., TCP * any lock. Synchronization should be handled by the caller (e.g., TCP
* out-of-order queue is protected by the socket lock). * out-of-order queue is protected by the socket lock).
*/ */
void skb_rbtree_purge(struct rb_root *root) unsigned int skb_rbtree_purge(struct rb_root *root)
{ {
struct rb_node *p = rb_first(root); struct rb_node *p = rb_first(root);
unsigned int sum = 0;
while (p) { while (p) {
struct sk_buff *skb = rb_entry(p, struct sk_buff, rbnode); struct sk_buff *skb = rb_entry(p, struct sk_buff, rbnode);
p = rb_next(p); p = rb_next(p);
rb_erase(&skb->rbnode, root); rb_erase(&skb->rbnode, root);
sum += skb->truesize;
kfree_skb(skb); kfree_skb(skb);
} }
return sum;
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment