diff options
| author | Alexander Duyck <alexander.h.duyck@redhat.com> | 2015-03-06 13:47:00 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-11 16:22:14 -0400 |
| commit | 0ddcf43d5d4a03ded1ee3f6b3b72a0cbed4e90b1 (patch) | |
| tree | 28c93b0c6eb9389182f60736103b6bfc0b61cedc /include/net/fib_rules.h | |
| parent | 169bf9121b19dd6029e0a354d33513f61bfbe3d3 (diff) | |
| download | linux-0ddcf43d5d4a03ded1ee3f6b3b72a0cbed4e90b1.tar.bz2 | |
ipv4: FIB Local/MAIN table collapse
This patch is meant to collapse local and main into one by converting
tb_data from an array to a pointer. Doing this allows us to point the
local table into the main while maintaining the same variables in the
table.
As such the tb_data was converted from an array to a pointer, and a new
array called data is added in order to still provide an object for tb_data
to point to.
In order to track the origin of the fib aliases a tb_id value was added in
a hole that existed on 64b systems. Using this we can also reverse the
merge in the event that custom FIB rules are enabled.
With this patch I am seeing an improvement of 20ns to 30ns for routing
lookups as long as custom rules are not enabled, with custom rules enabled
we fall back to split tables and the original behavior.
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/fib_rules.h')
| -rw-r--r-- | include/net/fib_rules.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h index e584de16e4c3..88d2ae526961 100644 --- a/include/net/fib_rules.h +++ b/include/net/fib_rules.h @@ -58,7 +58,7 @@ struct fib_rules_ops { struct sk_buff *, struct fib_rule_hdr *, struct nlattr **); - void (*delete)(struct fib_rule *); + int (*delete)(struct fib_rule *); int (*compare)(struct fib_rule *, struct fib_rule_hdr *, struct nlattr **); |