diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-14 14:49:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-14 15:05:22 -0700 |
| commit | 21d8c49e01a0c1c6eb6c750cd04110db4a539284 (patch) | |
| tree | 03e19c4f6f24fd67da407463508c0ee27f6f9785 /net/ipv4/route.c | |
| parent | 8849b720e9632acef139a349f9ec62e63ce7e497 (diff) | |
| download | op-kernel-dev-21d8c49e01a0c1c6eb6c750cd04110db4a539284.zip op-kernel-dev-21d8c49e01a0c1c6eb6c750cd04110db4a539284.tar.gz | |
ipv4: Call fib_select_default() only when actually necessary.
fib_select_default() is a complete NOP, and completely pointless
to invoke, when we have no more than 1 default route installed.
And this is far and away the common case.
So remember how many prefixlen==0 routes we have in the routing
table, and elide the call when we have no more than one of those.
This cuts output route creation time by 157 cycles on Niagara2+.
In order to add the new int to fib_table, we have to correct the type
of ->tb_data[] to unsigned long, otherwise the private area will be
unaligned on 64-bit systems.
Signed-off-by: David S. Miller <davem@davemloft.net>
Reviewed-by: Eric Dumazet <eric.dumazet@gmail.com>
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 0e7430c..e9aee81 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -2615,7 +2615,9 @@ static struct rtable *ip_route_output_slow(struct net *net, fib_select_multipath(&res); else #endif - if (!res.prefixlen && res.type == RTN_UNICAST && !fl4.flowi4_oif) + if (!res.prefixlen && + res.table->tb_num_default > 1 && + res.type == RTN_UNICAST && !fl4.flowi4_oif) fib_select_default(&res); if (!fl4.saddr) |
