diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-09-25 09:14:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-28 09:40:59 -0700 |
| commit | 8f1975e31d8ed0c021a1993a4d9123dd39c740ea (patch) | |
| tree | c6a89ea132e322e203ae6cd3817819c71062f5fd /net/ipv4/inetpeer.c | |
| parent | a2e4a21906e1ff7d2db9ce2e446e76abc905b79f (diff) | |
| download | talos-op-linux-8f1975e31d8ed0c021a1993a4d9123dd39c740ea.tar.gz talos-op-linux-8f1975e31d8ed0c021a1993a4d9123dd39c740ea.zip | |
inetpeer: speed up inetpeer_invalidate_tree()
As measured in my prior patch ("sch_netem: faster rb tree removal"),
rbtree_postorder_for_each_entry_safe() is nice looking but much slower
than using rb_next() directly, except when tree is small enough
to fit in CPU caches (then the cost is the same)
From: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inetpeer.c')
| -rw-r--r-- | net/ipv4/inetpeer.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c index e7eb590c86ce..6e5626cc366c 100644 --- a/net/ipv4/inetpeer.c +++ b/net/ipv4/inetpeer.c @@ -284,14 +284,17 @@ EXPORT_SYMBOL(inet_peer_xrlim_allow); void inetpeer_invalidate_tree(struct inet_peer_base *base) { - struct inet_peer *p, *n; + struct rb_node *p = rb_first(&base->rb_root); - rbtree_postorder_for_each_entry_safe(p, n, &base->rb_root, rb_node) { - inet_putpeer(p); + while (p) { + struct inet_peer *peer = rb_entry(p, struct inet_peer, rb_node); + + p = rb_next(p); + rb_erase(&peer->rb_node, &base->rb_root); + inet_putpeer(peer); cond_resched(); } - base->rb_root = RB_ROOT; base->total = 0; } EXPORT_SYMBOL(inetpeer_invalidate_tree); |
