From: Peter Oskolkov <posk@google•com>
To: David Miller <davem@davemloft•net>, netdev@vger•kernel.org
Cc: Eric Dumazet <edumazet@google•com>,
Florian Westphal <fw@strlen•de>, Peter Oskolkov <posk@google•com>
Subject: [PATCH net-next 2/3] net: modify skb_rbtree_purge to return the truesize of all purged skbs.
Date: Thu, 2 Aug 2018 22:45:59 +0000 [thread overview]
Message-ID: <20180802224600.43070-3-posk@google.com> (raw)
In-Reply-To: <20180802224600.43070-1-posk@google.com>
Suggested-by: Eric Dumazet <edumazet@google•com>
Signed-off-by: Peter Oskolkov <posk@google•com>
Signed-off-by: Eric Dumazet <edumazet@google•com>
Cc: Florian Westphal <fw@strlen•de>
---
include/linux/skbuff.h | 2 +-
net/core/skbuff.c | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index fd3cb1b247df..47848367c816 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2585,7 +2585,7 @@ static inline void __skb_queue_purge(struct sk_buff_head *list)
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);
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 51b0a9126e12..8d574a88125d 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2858,23 +2858,27 @@ EXPORT_SYMBOL(skb_queue_purge);
/**
* skb_rbtree_purge - empty a skb rbtree
* @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
* the list and one reference dropped. This function does not take
* any lock. Synchronization should be handled by the caller (e.g., TCP
* 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);
+ unsigned int sum = 0;
while (p) {
struct sk_buff *skb = rb_entry(p, struct sk_buff, rbnode);
p = rb_next(p);
rb_erase(&skb->rbnode, root);
+ sum += skb->truesize;
kfree_skb(skb);
}
+ return sum;
}
/**
--
2.18.0.597.ga71716f1ad-goog
next prev parent reply other threads:[~2018-08-03 0:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-02 22:45 [PATCH net-next 0/3] ip: Use rb trees for IP frag queue Peter Oskolkov
2018-08-02 22:45 ` [PATCH net-next 1/3] ip: discard IPv4 datagrams with overlapping segments Peter Oskolkov
2018-08-02 22:54 ` Stephen Hemminger
2018-08-02 23:33 ` Eric Dumazet
2018-08-02 23:56 ` Stephen Hemminger
2018-08-02 22:45 ` Peter Oskolkov [this message]
2018-08-02 22:46 ` [PATCH net-next 3/3] ip: use rb trees for IP frag queue Peter Oskolkov
2018-08-06 0:17 ` [PATCH net-next 0/3] ip: Use " 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=20180802224600.43070-3-posk@google.com \
--to=posk@google$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=fw@strlen$(echo .)de \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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