diff options
author | Neale Ranns <nranns@cisco.com> | 2020-03-31 09:21:29 -0400 |
---|---|---|
committer | Damjan Marion <dmarion@me.com> | 2020-05-04 17:09:34 +0000 |
commit | 4ec36c5535849a4e456ed99b57968d54d5e03b62 (patch) | |
tree | 47c807c525858db02f7d1e0e4df32b14441ed5c8 /src/vnet/config.c | |
parent | b723ccf95ffd8581be15e0752eac2c5f7233b340 (diff) |
fib: midchain adjacency optimisations
Type: improvement
- inline some common encap fixup functions into the midchain
rewrite node so we don't incur the cost of the virtual function call
- change the copy 'guess' from ethernet_header (which will never happen) to an ip4 header
- add adj-midchain-tx to multiarch sources
- don't run adj-midchain-tx as a feature, instead put this node as the
adj's next and at the end of the feature arc.
- cache the feature arc config index (to save the cache miss going to fetch it)
- don't check if features are enabled when taking the arc (since we know they are)
the last two changes will also benefit normal adjacencies taking the arc (i.e. for NAT, ACLs, etc)
for IPSec:
- don't run esp_encrypt as a feature, instead when required insert this
node into the adj's next and into the end of the feature arc. this
implies that encrypt is always 'the last feature' run, which is
symmetric with decrypt always being the first.
- esp_encrpyt for tunnels has adj-midchain-tx as next node
Change-Id: Ida0af56a704302cf2d7797ded5f118a781e8acb7
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/config.c')
-rw-r--r-- | src/vnet/config.c | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/src/vnet/config.c b/src/vnet/config.c index 9beda4a5706..e341c697044 100644 --- a/src/vnet/config.c +++ b/src/vnet/config.c @@ -235,6 +235,62 @@ vnet_get_config_heap (vnet_config_main_t * cm, u32 ci) } u32 +vnet_config_modify_end_node (vlib_main_t * vm, + vnet_config_main_t * cm, + u32 config_string_heap_index, u32 end_node_index) +{ + vnet_config_feature_t *new_features; + vnet_config_t *old, *new; + + if (end_node_index == ~0) // feature node does not exist + return ~0; + + if (config_string_heap_index == ~0) + { + old = 0; + new_features = 0; + } + else + { + u32 *p = vnet_get_config_heap (cm, config_string_heap_index); + old = pool_elt_at_index (cm->config_pool, p[-1]); + new_features = old->features; + if (new_features) + new_features = duplicate_feature_vector (new_features); + } + + if (vec_len (new_features)) + { + /* is the last feature the cuurent end node */ + u32 last = vec_len (new_features) - 1; + if (new_features[last].node_index == cm->end_node_index) + { + vec_free (new_features->feature_config); + _vec_len (new_features) = last; + } + } + + if (old) + remove_reference (cm, old); + + cm->end_node_index = end_node_index; + + new = find_config_with_features (vm, cm, new_features); + new->reference_count += 1; + + /* + * User gets pointer to config string first element + * (which defines the pool index + * this config string comes from). + */ + vec_validate (cm->config_pool_index_by_user_index, + new->config_string_heap_index + 1); + cm->config_pool_index_by_user_index[new->config_string_heap_index + 1] + = new - cm->config_pool; + return new->config_string_heap_index + 1; +} + +u32 vnet_config_add_feature (vlib_main_t * vm, vnet_config_main_t * cm, u32 config_string_heap_index, |