74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
34 lines
1,023 B
Diff
34 lines
1,023 B
Diff
From: Alexander Duyck <alexander.h.duyck@redhat.com>
|
|
Date: Thu, 22 Jan 2015 15:51:33 -0800
|
|
Subject: [PATCH] fib_trie: Use empty_children instead of counting empty nodes
|
|
in stats collection
|
|
|
|
It doesn't make much sense to count the pointers ourselves when
|
|
empty_children already has a count for the number of NULL pointers stored
|
|
in the tnode. As such save ourselves the cycles and just use
|
|
empty_children.
|
|
|
|
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
|
|
--- a/net/ipv4/fib_trie.c
|
|
+++ b/net/ipv4/fib_trie.c
|
|
@@ -1954,16 +1954,10 @@ static void trie_collect_stats(struct tr
|
|
hlist_for_each_entry_rcu(li, &n->list, hlist)
|
|
++s->prefixes;
|
|
} else {
|
|
- unsigned long i;
|
|
-
|
|
s->tnodes++;
|
|
if (n->bits < MAX_STAT_DEPTH)
|
|
s->nodesizes[n->bits]++;
|
|
-
|
|
- for (i = tnode_child_length(n); i--;) {
|
|
- if (!rcu_access_pointer(n->child[i]))
|
|
- s->nullpointers++;
|
|
- }
|
|
+ s->nullpointers += n->empty_children;
|
|
}
|
|
}
|
|
rcu_read_unlock();
|