summaryrefslogtreecommitdiffstats
path: root/src/vnet/l2/l2_output.h
diff options
context:
space:
mode:
authorJohn Lo <loj@cisco.com>2017-07-12 19:56:45 -0400
committerJohn Lo <loj@cisco.com>2017-07-13 11:52:24 +0000
commitb2fd6cb586fe69082cc12995910c65843fc5bb4a (patch)
tree6ff8c02296daf90b786c26685862c5155a2cb5aa /src/vnet/l2/l2_output.h
parent8ae1873a3f3368a942a1b02e7d4b60b005364a90 (diff)
Fix crash with worker threads on 4K VXLAN/BD setup (VPP-907)
Cleanup mapping of interface output node for the l2-output node when interface is configured to L2 or L3 modes. The mapping is now always done in the main thread as part of API/CLI processing, instead of initiate mapping in the forwarding path which can be in the worker threads. Change-Id: Ia789493e7d9f5c76d68edfaf34db43f3e3f53506 Signed-off-by: John Lo <loj@cisco.com> (cherry picked from commit bea5ebf205e0bec922bf26c6c1a6a9392b4cad67)
Diffstat (limited to 'src/vnet/l2/l2_output.h')
-rw-r--r--src/vnet/l2/l2_output.h68
1 files changed, 8 insertions, 60 deletions
diff --git a/src/vnet/l2/l2_output.h b/src/vnet/l2/l2_output.h
index 9597205caed..82cefd2cbaa 100644
--- a/src/vnet/l2/l2_output.h
+++ b/src/vnet/l2/l2_output.h
@@ -130,7 +130,7 @@ _(EFP_DROP, "L2 EFP filter pre-rewrite drops") \
_(VTR_DROP, "L2 output tag rewrite drops") \
_(SHG_DROP, "L2 split horizon drops") \
_(DROP, "L2 output drops") \
-_(MAPPING_DROP, "L2 Output interface mapping in progress")
+_(MAPPING_DROP, "L2 Output interface not valid")
typedef enum
{
@@ -159,52 +159,9 @@ char **l2output_get_feat_names (void);
*/
/* Create a mapping to the output graph node for the given sw_if_index */
-u32 l2output_create_output_node_mapping (vlib_main_t * vlib_main, vnet_main_t * vnet_main, u32 node_index, /* index of current node */
- u32 * output_node_index_vec,
- u32 sw_if_index);
-
-/* Initialize the next node mapping table */
-always_inline void
-l2output_init_output_node_vec (u32 ** output_node_index_vec)
-{
-
- /*
- * Size it at 100 sw_if_indexes initially
- * Uninitialized mappings are set to ~0
- */
- vec_validate_init_empty (*output_node_index_vec, 100, ~0);
-}
-
-
-/**
- * Get a mapping from the output node mapping table,
- * creating the entry if necessary.
- */
-always_inline u32
-l2output_get_output_node (vlib_main_t * vlib_main, vnet_main_t * vnet_main, u32 node_index, /* index of current node */
- u32 sw_if_index, u32 ** output_node_index_vec) /* may be updated */
-{
- u32 next; /* index of next graph node */
-
- /* Insure the vector is big enough */
- vec_validate_init_empty (*output_node_index_vec, sw_if_index, ~0);
-
- /* Get the mapping for the sw_if_index */
- next = vec_elt (*output_node_index_vec, sw_if_index);
-
- if (next == ~0)
- {
- /* Mapping doesn't exist so create it */
- next = l2output_create_output_node_mapping (vlib_main,
- vnet_main,
- node_index,
- *output_node_index_vec,
- sw_if_index);
- }
-
- return next;
-}
-
+void l2output_create_output_node_mapping (vlib_main_t * vlib_main,
+ vnet_main_t * vnet_main,
+ u32 sw_if_index);
/** Determine the next L2 node based on the output feature bitmap */
always_inline void
@@ -257,21 +214,12 @@ l2_output_dispatch (vlib_main_t * vlib_main,
}
else
{
- /* Look up the output TX node */
- *next0 = l2output_get_output_node (vlib_main,
- vnet_main,
- node_index,
- sw_if_index,
- &next_nodes->output_node_index_vec);
+ /* Look up the output TX node for the sw_if_index */
+ *next0 = vec_elt (l2output_main.next_nodes.output_node_index_vec,
+ sw_if_index);
if (*next0 == L2OUTPUT_NEXT_DROP)
- {
- vnet_hw_interface_t *hw0;
- hw0 = vnet_get_sup_hw_interface (vnet_main, sw_if_index);
-
- if (hw0->flags & VNET_HW_INTERFACE_FLAG_L2OUTPUT_MAPPED)
- b0->error = node->errors[L2OUTPUT_ERROR_MAPPING_DROP];
- }
+ b0->error = node->errors[L2OUTPUT_ERROR_MAPPING_DROP];
/* Update the one-entry cache */
*cached_sw_if_index = sw_if_index;