diff options
| author |   Neale Ranns <nranns@cisco.com> | 2020-02-18 13:56:24 +0000 |
|---|---|---|
| committer | Neale Ranns <nranns@cisco.com> | 2020-02-20 14:01:47 +0000 |
| commit | 3ebebc3a2fe47f1222ba035e04ccd8caed0cf58f (patch) | |
| tree | 3a42933b2731fba5c94e4ba287b63982d0f7edc5 /src/vnet/adj/adj_midchain.c | |
| parent | 98301bd5603ce691d809759ec444641953cb5caa (diff) | |
fib: adjacency midchain teardown (VPP-1841)
Type: fix
Change-Id: I57f8bfbce4feed9d2775875cb8b1b729a47900a4
Signed-off-by: Neale Ranns <nranns@cisco.com>
(cherry picked from commit 24064d02aa9810ebc64c16dc778a179bb0ef5483)
Diffstat (limited to 'src/vnet/adj/adj_midchain.c')
| -rw-r--r-- | src/vnet/adj/adj_midchain.c | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/src/vnet/adj/adj_midchain.c b/src/vnet/adj/adj_midchain.c index fcd6993586e..88648fea0a9 100644 --- a/src/vnet/adj/adj_midchain.c +++ b/src/vnet/adj/adj_midchain.c @@ -30,6 +30,8 @@ static u32 adj_midchain_tx_feature_node[VNET_LINK_NUM]; static u32 adj_midchain_tx_no_count_feature_node[VNET_LINK_NUM]; +static u32 *adj_midchain_feat_count_per_sw_if_index[VNET_LINK_NUM]; + /** * @brief Trace data for packets traversing the midchain tx node */ @@ -451,6 +453,30 @@ adj_nbr_midchain_get_feature_node (ip_adjacency_t *adj) * Setup the adj as a mid-chain */ void +adj_midchain_teardown (ip_adjacency_t *adj) +{ + u32 feature_index; + u8 arc_index; + + dpo_reset(&adj->sub_type.midchain.next_dpo); + + arc_index = adj_midchain_get_feature_arc_index_for_link_type (adj); + feature_index = adj_nbr_midchain_get_feature_node(adj); + + if (0 == --adj_midchain_feat_count_per_sw_if_index[adj->ia_link][adj->rewrite_header.sw_if_index]) + { + vnet_feature_enable_disable_with_index (arc_index, feature_index, + adj->rewrite_header.sw_if_index, + 0, 0, 0); + } +} + +/** + * adj_midchain_setup + * + * Setup the adj as a mid-chain + */ +void adj_midchain_setup (adj_index_t adj_index, adj_midchain_fixup_t fixup, const void *data, @@ -473,9 +499,15 @@ adj_midchain_setup (adj_index_t adj_index, feature_index = adj_nbr_midchain_get_feature_node(adj); tx_node = adj_nbr_midchain_get_tx_node(adj); - vnet_feature_enable_disable_with_index (arc_index, feature_index, - adj->rewrite_header.sw_if_index, - 1 /* enable */, 0, 0); + vec_validate (adj_midchain_feat_count_per_sw_if_index[adj->ia_link], + adj->rewrite_header.sw_if_index); + + if (0 == adj_midchain_feat_count_per_sw_if_index[adj->ia_link][adj->rewrite_header.sw_if_index]++) + { + vnet_feature_enable_disable_with_index (arc_index, feature_index, + adj->rewrite_header.sw_if_index, + 1 /* enable */, 0, 0); + } /* * stack the midchain on the drop so it's ready to forward in the adj-midchain-tx. |