From: Dmitry Safonov <dima@arista.com>
To: linux-kernel@vger.kernel.org
Cc: Dmitry Safonov <dima@arista.com>,
Alexander Duyck <alexander.h.duyck@linux.intel.com>,
Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
David Ahern <dsahern@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Ido Schimmel <idosch@mellanox.com>,
netdev@vger.kernel.org
Subject: [RFC 3/4] net/fib: Check budget before should_{inflate,halve}()
Date: Tue, 26 Mar 2019 15:30:24 +0000 [thread overview]
Message-ID: <20190326153026.24493-4-dima@arista.com> (raw)
In-Reply-To: <20190326153026.24493-1-dima@arista.com>
Those functions are compute-costly, if we're out of budget - better
omit additional computations.
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
net/ipv4/fib_trie.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index d90cf9dfd443..2ce2739e7693 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -868,7 +868,7 @@ static struct key_vector *resize(struct trie *t, struct key_vector *tn,
/* Double as long as the resulting node has a number of
* nonempty nodes that are above the threshold.
*/
- while (should_inflate(tp, tn) && *budget) {
+ while (*budget && should_inflate(tp, tn)) {
tp = inflate(t, tn, budget);
if (!tp) {
#ifdef CONFIG_IP_FIB_TRIE_STATS
@@ -894,7 +894,7 @@ static struct key_vector *resize(struct trie *t, struct key_vector *tn,
/* Halve as long as the number of empty children in this
* node is above threshold.
*/
- while (should_halve(tp, tn) && *budget) {
+ while (*budget && should_halve(tp, tn)) {
tp = halve(t, tn, budget);
if (!tp) {
#ifdef CONFIG_IP_FIB_TRIE_STATS
--
2.21.0
next prev parent reply other threads:[~2019-03-26 15:30 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-26 15:30 [RFC 0/4] net/fib: Speed up trie rebalancing for full view Dmitry Safonov
2019-03-26 15:30 ` [RFC 1/4] net/ipv4/fib: Remove run-time check in tnode_alloc() Dmitry Safonov
2019-04-01 15:40 ` Alexander Duyck
2019-04-01 15:55 ` Dmitry Safonov
2019-04-01 17:50 ` Alexander Duyck
2019-04-04 16:33 ` Dmitry Safonov
2019-03-26 15:30 ` [RFC 2/4] net/fib: Provide fib_balance_budget sysctl Dmitry Safonov
2019-04-01 18:09 ` Alexander Duyck
2019-04-04 18:31 ` Dmitry Safonov
2019-03-26 15:30 ` Dmitry Safonov [this message]
2019-04-01 18:20 ` [RFC 3/4] net/fib: Check budget before should_{inflate,halve}() Alexander Duyck
2019-03-26 15:30 ` [RFC 4/4] net/ipv4/fib: Don't synchronise_rcu() every 512Kb Dmitry Safonov
2019-03-26 15:39 ` David Ahern
2019-03-26 17:15 ` Dmitry Safonov
2019-03-26 17:57 ` David Ahern
2019-03-26 18:17 ` Dmitry Safonov
2019-03-26 23:14 ` Dmitry Safonov
2019-03-27 3:33 ` Paul E. McKenney
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=20190326153026.24493-4-dima@arista.com \
--to=dima@arista.com \
--cc=alexander.h.duyck@linux.intel.com \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=edumazet@google.com \
--cc=idosch@mellanox.com \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).