}
}
+static_always_inline void
+l2output_vtr (vlib_node_runtime_t * node, l2_output_config_t * config,
+ u32 feature_bitmap, vlib_buffer_t * b, u32 * next)
+{
+ if (PREDICT_FALSE (config->out_vtr_flag))
+ {
+ /* Perform pre-vtr EFP filter check if configured */
+ if (config->output_vtr.push_and_pop_bytes)
+ {
+ /*
+ * Perform output vlan tag rewrite and the pre-vtr EFP filter check.
+ * The EFP Filter only needs to be run if there is an output VTR
+ * configured. The flag for the post-vtr EFP Filter node is used
+ * to trigger the pre-vtr check as well.
+ */
+ u32 failed1 = (feature_bitmap & L2OUTPUT_FEAT_EFP_FILTER)
+ && (l2_efp_filter_process (b, &(config->input_vtr)));
+ u32 failed2 = l2_vtr_process (b, &(config->output_vtr));
+
+ if (PREDICT_FALSE (failed1 | failed2))
+ {
+ *next = L2OUTPUT_NEXT_DROP;
+ if (failed2)
+ {
+ b->error = node->errors[L2OUTPUT_ERROR_VTR_DROP];
+ }
+ if (failed1)
+ {
+ b->error = node->errors[L2OUTPUT_ERROR_EFP_DROP];
+ }
+ }
+ }
+ // perform the PBB rewrite
+ else if (config->output_pbb_vtr.push_and_pop_bytes)
+ {
+ u32 failed = l2_pbb_process (b, &(config->output_pbb_vtr));
+ if (PREDICT_FALSE (failed))
+ {
+ *next = L2OUTPUT_NEXT_DROP;
+ b->error = node->errors[L2OUTPUT_ERROR_VTR_DROP];
+ }
+ }
+ }
+}
+
static vlib_node_registration_t l2output_node;
u32 n_left_from, *from, *to_next;
l2output_next_t next_index;
l2output_main_t *msm = &l2output_main;
- vlib_node_t *n = vlib_get_node (vm, l2output_node.index);
- u32 node_counter_base_index = n->error_heap_index;
- vlib_error_main_t *em = &vm->error_main;
u32 cached_sw_if_index;
u32 cached_next_index;
/* get space to enqueue frame to graph node "next_index" */
vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
- while (n_left_from >= 6 && n_left_to_next >= 2)
+ while (n_left_from >= 8 && n_left_to_next >= 4)
{
- u32 bi0, bi1;
- vlib_buffer_t *b0, *b1;
- u32 next0, next1;
- u32 sw_if_index0, sw_if_index1;
- ethernet_header_t *h0, *h1;
- l2_output_config_t *config0, *config1;
+ u32 bi0, bi1, bi2, bi3;
+ vlib_buffer_t *b0, *b1, *b2, *b3;
+ u32 next0, next1, next2, next3;
+ u32 sw_if_index0, sw_if_index1, sw_if_index2, sw_if_index3;
+ ethernet_header_t *h0, *h1, *h2, *h3;
+ l2_output_config_t *config0, *config1, *config2, *config3;
u32 feature_bitmap0, feature_bitmap1;
+ u32 feature_bitmap2, feature_bitmap3;
/* Prefetch next iteration. */
{
- vlib_buffer_t *p2, *p3, *p4, *p5;
- u32 sw_if_index2, sw_if_index3;
+ vlib_buffer_t *p4, *p5, *p6, *p7;
- p2 = vlib_get_buffer (vm, from[2]);
- p3 = vlib_get_buffer (vm, from[3]);
p4 = vlib_get_buffer (vm, from[4]);
p5 = vlib_get_buffer (vm, from[5]);
+ p6 = vlib_get_buffer (vm, from[6]);
+ p7 = vlib_get_buffer (vm, from[7]);
/* Prefetch the buffer header for the N+2 loop iteration */
vlib_prefetch_buffer_header (p4, LOAD);
vlib_prefetch_buffer_header (p5, LOAD);
- /*
- * Note: no need to prefetch packet data.
- * This node doesn't reference it.
- *
- * Prefetch the input config for the N+1 loop iteration
- * This depends on the buffer header above
- */
- sw_if_index2 = vnet_buffer (p2)->sw_if_index[VLIB_TX];
- sw_if_index3 = vnet_buffer (p3)->sw_if_index[VLIB_TX];
- CLIB_PREFETCH (&msm->configs[sw_if_index2], CLIB_CACHE_LINE_BYTES,
- LOAD);
- CLIB_PREFETCH (&msm->configs[sw_if_index3], CLIB_CACHE_LINE_BYTES,
- LOAD);
+ vlib_prefetch_buffer_header (p6, LOAD);
+ vlib_prefetch_buffer_header (p7, LOAD);
}
/* speculatively enqueue b0 and b1 to the current next frame */
/* bi is "buffer index", b is pointer to the buffer */
to_next[0] = bi0 = from[0];
to_next[1] = bi1 = from[1];
- from += 2;
- to_next += 2;
- n_left_from -= 2;
- n_left_to_next -= 2;
+ to_next[2] = bi2 = from[2];
+ to_next[3] = bi3 = from[3];
+ from += 4;
+ to_next += 4;
+ n_left_from -= 4;
+ n_left_to_next -= 4;
b0 = vlib_get_buffer (vm, bi0);
b1 = vlib_get_buffer (vm, bi1);
+ b2 = vlib_get_buffer (vm, bi2);
+ b3 = vlib_get_buffer (vm, bi3);
/* TX interface handles */
sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_TX];
+ sw_if_index2 = vnet_buffer (b2)->sw_if_index[VLIB_TX];
+ sw_if_index3 = vnet_buffer (b3)->sw_if_index[VLIB_TX];
if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
{
h0 = vlib_buffer_get_current (b0);
h1 = vlib_buffer_get_current (b1);
+ h2 = vlib_buffer_get_current (b2);
+ h3 = vlib_buffer_get_current (b3);
if (b0->flags & VLIB_BUFFER_IS_TRACED)
{
l2output_trace_t *t =
clib_memcpy (t->src, h1->src_address, 6);
clib_memcpy (t->dst, h1->dst_address, 6);
}
+ if (b2->flags & VLIB_BUFFER_IS_TRACED)
+ {
+ l2output_trace_t *t =
+ vlib_add_trace (vm, node, b2, sizeof (*t));
+ t->sw_if_index = sw_if_index2;
+ clib_memcpy (t->src, h2->src_address, 6);
+ clib_memcpy (t->dst, h2->dst_address, 6);
+ }
+ if (b3->flags & VLIB_BUFFER_IS_TRACED)
+ {
+ l2output_trace_t *t =
+ vlib_add_trace (vm, node, b3, sizeof (*t));
+ t->sw_if_index = sw_if_index3;
+ clib_memcpy (t->src, h3->src_address, 6);
+ clib_memcpy (t->dst, h3->dst_address, 6);
+ }
}
- em->counters[node_counter_base_index + L2OUTPUT_ERROR_L2OUTPUT] +=
- 2;
+ vlib_node_increment_counter (vm, l2output_node.index,
+ L2OUTPUT_ERROR_L2OUTPUT, 4);
/* Get config for the output interface */
config0 = vec_elt_at_index (msm->configs, sw_if_index0);
config1 = vec_elt_at_index (msm->configs, sw_if_index1);
+ config2 = vec_elt_at_index (msm->configs, sw_if_index2);
+ config3 = vec_elt_at_index (msm->configs, sw_if_index3);
/*
* Get features from the config
*/
feature_bitmap0 = config0->feature_bitmap;
feature_bitmap1 = config1->feature_bitmap;
+ feature_bitmap2 = config2->feature_bitmap;
+ feature_bitmap3 = config3->feature_bitmap;
/* Determine next node */
l2_output_dispatch (msm->vlib_main,
&msm->next_nodes,
b1, sw_if_index1, feature_bitmap1, &next1);
- if (PREDICT_FALSE (config0->out_vtr_flag))
- {
- /* Perform pre-vtr EFP filter check if configured */
- if (config0->output_vtr.push_and_pop_bytes)
- {
- /*
- * Perform output vlan tag rewrite and the pre-vtr EFP filter check.
- * The EFP Filter only needs to be run if there is an output VTR
- * configured. The flag for the post-vtr EFP Filter node is used
- * to trigger the pre-vtr check as well.
- */
- u32 failed1 = (feature_bitmap0 & L2OUTPUT_FEAT_EFP_FILTER)
- && (l2_efp_filter_process (b0, &(config0->input_vtr)));
- u32 failed2 = l2_vtr_process (b0, &(config0->output_vtr));
-
- if (PREDICT_FALSE (failed1 | failed2))
- {
- next0 = L2OUTPUT_NEXT_DROP;
- if (failed2)
- {
- b0->error = node->errors[L2OUTPUT_ERROR_VTR_DROP];
- }
- if (failed1)
- {
- b0->error = node->errors[L2OUTPUT_ERROR_EFP_DROP];
- }
- }
- }
- // perform the PBB rewrite
- else if (config0->output_pbb_vtr.push_and_pop_bytes)
- {
- u32 failed =
- l2_pbb_process (b0, &(config0->output_pbb_vtr));
- if (PREDICT_FALSE (failed))
- {
- next0 = L2OUTPUT_NEXT_DROP;
- b0->error = node->errors[L2OUTPUT_ERROR_VTR_DROP];
- }
- }
- }
- if (PREDICT_FALSE (config1->out_vtr_flag))
- {
- /* Perform pre-vtr EFP filter check if configured */
- if (config1->output_vtr.push_and_pop_bytes)
- {
- u32 failed1 = (feature_bitmap1 & L2OUTPUT_FEAT_EFP_FILTER)
- && (l2_efp_filter_process (b1, &(config1->input_vtr)));
- u32 failed2 = l2_vtr_process (b1, &(config1->output_vtr));
-
- if (PREDICT_FALSE (failed1 | failed2))
- {
- next1 = L2OUTPUT_NEXT_DROP;
- if (failed2)
- {
- b1->error = node->errors[L2OUTPUT_ERROR_VTR_DROP];
- }
- if (failed1)
- {
- b1->error = node->errors[L2OUTPUT_ERROR_EFP_DROP];
- }
- }
- }
- // perform the PBB rewrite
- else if (config1->output_pbb_vtr.push_and_pop_bytes)
- {
- u32 failed =
- l2_pbb_process (b0, &(config1->output_pbb_vtr));
- if (PREDICT_FALSE (failed))
- {
- next1 = L2OUTPUT_NEXT_DROP;
- b1->error = node->errors[L2OUTPUT_ERROR_VTR_DROP];
- }
- }
- }
+ l2_output_dispatch (msm->vlib_main,
+ msm->vnet_main,
+ node,
+ l2output_node.index,
+ &cached_sw_if_index,
+ &cached_next_index,
+ &msm->next_nodes,
+ b2, sw_if_index2, feature_bitmap2, &next2);
+
+ l2_output_dispatch (msm->vlib_main,
+ msm->vnet_main,
+ node,
+ l2output_node.index,
+ &cached_sw_if_index,
+ &cached_next_index,
+ &msm->next_nodes,
+ b3, sw_if_index3, feature_bitmap3, &next3);
+
+ l2output_vtr (node, config0, feature_bitmap0, b0, &next0);
+ l2output_vtr (node, config1, feature_bitmap1, b1, &next1);
+ l2output_vtr (node, config2, feature_bitmap2, b2, &next2);
+ l2output_vtr (node, config3, feature_bitmap3, b3, &next3);
/*
* Perform the split horizon check
* The check can only fail for non-zero shg's
*/
- if (PREDICT_FALSE (config0->shg + config1->shg))
+ if (PREDICT_FALSE (config0->shg + config1->shg +
+ config2->shg + config3->shg))
{
/* one of the checks might fail, check both */
if (split_horizon_violation
next1 = L2OUTPUT_NEXT_DROP;
b1->error = node->errors[L2OUTPUT_ERROR_SHG_DROP];
}
+ if (split_horizon_violation
+ (config2->shg, vnet_buffer (b2)->l2.shg))
+ {
+ next2 = L2OUTPUT_NEXT_DROP;
+ b2->error = node->errors[L2OUTPUT_ERROR_SHG_DROP];
+ }
+ if (split_horizon_violation
+ (config3->shg, vnet_buffer (b3)->l2.shg))
+ {
+ next3 = L2OUTPUT_NEXT_DROP;
+ b3->error = node->errors[L2OUTPUT_ERROR_SHG_DROP];
+ }
}
/* verify speculative enqueues, maybe switch current next frame */
/* if next0==next1==next_index then nothing special needs to be done */
- vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+ vlib_validate_buffer_enqueue_x4 (vm, node, next_index,
to_next, n_left_to_next,
- bi0, bi1, next0, next1);
+ bi0, bi1, bi2, bi3,
+ next0, next1, next2, next3);
}
while (n_left_from > 0 && n_left_to_next > 0)
clib_memcpy (t->dst, h0->dst_address, 6);
}
- em->counters[node_counter_base_index +
- L2OUTPUT_ERROR_L2OUTPUT] += 1;
+ vlib_node_increment_counter (vm, l2output_node.index,
+ L2OUTPUT_ERROR_L2OUTPUT, 1);
/* Get config for the output interface */
config0 = vec_elt_at_index (msm->configs, sw_if_index0);
&msm->next_nodes,
b0, sw_if_index0, feature_bitmap0, &next0);
- if (PREDICT_FALSE (config0->out_vtr_flag))
- {
- /*
- * Perform output vlan tag rewrite and the pre-vtr EFP filter check.
- * The EFP Filter only needs to be run if there is an output VTR
- * configured. The flag for the post-vtr EFP Filter node is used
- * to trigger the pre-vtr check as well.
- */
-
- if (config0->output_vtr.push_and_pop_bytes)
- {
- /* Perform pre-vtr EFP filter check if configured */
- u32 failed1 = (feature_bitmap0 & L2OUTPUT_FEAT_EFP_FILTER)
- && (l2_efp_filter_process (b0, &(config0->input_vtr)));
- u32 failed2 = l2_vtr_process (b0, &(config0->output_vtr));
-
- if (PREDICT_FALSE (failed1 | failed2))
- {
- next0 = L2OUTPUT_NEXT_DROP;
- if (failed2)
- {
- b0->error = node->errors[L2OUTPUT_ERROR_VTR_DROP];
- }
- if (failed1)
- {
- b0->error = node->errors[L2OUTPUT_ERROR_EFP_DROP];
- }
- }
- }
- // perform the PBB rewrite
- else if (config0->output_pbb_vtr.push_and_pop_bytes)
- {
- u32 failed =
- l2_pbb_process (b0, &(config0->output_pbb_vtr));
- if (PREDICT_FALSE (failed))
- {
- next0 = L2OUTPUT_NEXT_DROP;
- b0->error = node->errors[L2OUTPUT_ERROR_VTR_DROP];
- }
- }
- }
+ l2output_vtr (node, config0, feature_bitmap0, b0, &next0);
+
/* Perform the split horizon check */
if (PREDICT_FALSE
(split_horizon_violation
/* edit / add dispositions here */
.next_nodes = {
[L2OUTPUT_NEXT_DROP] = "error-drop",
- [L2OUTPUT_NEXT_DEL_TUNNEL] = "l2-output-del-tunnel",
+ [L2OUTPUT_NEXT_BAD_INTF] = "l2-output-bad-intf",
},
};
/* *INDENT-ON* */
-#define foreach_l2output_del_tunnel_error \
-_(DROP, "L2 output to deleted tunnel")
+#define foreach_l2output_bad_intf_error \
+_(DROP, "L2 output to interface not in L2 mode or deleted")
-static char *l2output_del_tunnel_error_strings[] = {
+static char *l2output_bad_intf_error_strings[] = {
#define _(sym,string) string,
- foreach_l2output_del_tunnel_error
+ foreach_l2output_bad_intf_error
#undef _
};
typedef enum
{
-#define _(sym,str) L2OUTPUT_DEL_TUNNEL_ERROR_##sym,
- foreach_l2output_del_tunnel_error
+#define _(sym,str) L2OUTPUT_BAD_INTF_ERROR_##sym,
+ foreach_l2output_bad_intf_error
#undef _
- L2OUTPUT_DEL_TUNNEL_N_ERROR,
-} l2output_del_tunnel_error_t;
+ L2OUTPUT_BAD_INTF_N_ERROR,
+} l2output_bad_intf_error_t;
/**
- * Output node for tunnels which was in L2 BD's but were deleted.
- * On deletion of any tunnel which was on a L2 BD, its entry in
- * l2_output_main table next_nodes.output_node_index_vec[sw_if_index]
- * MUST be set to the value of L2OUTPUT_NEXT_DEL_TUNNEL. Thus, if there
- * are stale entries in the L2FIB for this tunnel sw_if_index, l2-output
- * will send packets for this sw_if_index to the l2-output-tunnel-del
- * node which just setup the proper drop reason before sending packets
- * to the error-drop node to drop the packet. Then, stale L2FIB entries
- * for delted tunnels won't cause possible packet or memory corrpution.
+ * Output node for interfaces/tunnels which was in L2 mode but were changed
+ * to L3 mode or possibly deleted thereafter. On changing forwarding mode
+ * of any tunnel/interface from L2 to L3, its entry in l2_output_main table
+ * next_nodes.output_node_index_vec[sw_if_index] MUST be set to the value of
+ * L2OUTPUT_NEXT_BAD_INTF. Thus, if there are stale entries in the L2FIB for
+ * this sw_if_index, l2-output will send packets for this sw_if_index to the
+ * l2-output-bad-intf node which just setup the proper drop reason before
+ * sending packets to the error-drop node to drop the packet. Then, stale L2FIB
+ * entries for delted tunnels won't cause possible packet or memory corrpution.
*/
-static vlib_node_registration_t l2output_del_tunnel_node;
+static vlib_node_registration_t l2output_bad_intf_node;
static uword
-l2output_del_tunnel_node_fn (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * frame)
+l2output_bad_intf_node_fn (vlib_main_t * vm,
+ vlib_node_runtime_t * node, vlib_frame_t * frame)
{
u32 n_left_from, *from, *to_next;
l2output_next_t next_index = 0;
n_left_to_next -= 2;
b0 = vlib_get_buffer (vm, bi0);
b1 = vlib_get_buffer (vm, bi1);
- b0->error = node->errors[L2OUTPUT_DEL_TUNNEL_ERROR_DROP];
- b1->error = node->errors[L2OUTPUT_DEL_TUNNEL_ERROR_DROP];
+ b0->error = node->errors[L2OUTPUT_BAD_INTF_ERROR_DROP];
+ b1->error = node->errors[L2OUTPUT_BAD_INTF_ERROR_DROP];
}
while (n_left_from > 0 && n_left_to_next > 0)
n_left_from -= 1;
n_left_to_next -= 1;
b0 = vlib_get_buffer (vm, bi0);
- b0->error = node->errors[L2OUTPUT_DEL_TUNNEL_ERROR_DROP];
+ b0->error = node->errors[L2OUTPUT_BAD_INTF_ERROR_DROP];
}
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2output_del_tunnel_node,static) = {
- .function = l2output_del_tunnel_node_fn,
- .name = "l2-output-del-tunnel",
+VLIB_REGISTER_NODE (l2output_bad_intf_node,static) = {
+ .function = l2output_bad_intf_node_fn,
+ .name = "l2-output-bad-intf",
.vector_size = sizeof (u32),
.type = VLIB_NODE_TYPE_INTERNAL,
- .n_errors = ARRAY_LEN(l2output_del_tunnel_error_strings),
- .error_strings = l2output_del_tunnel_error_strings,
+ .n_errors = ARRAY_LEN(l2output_bad_intf_error_strings),
+ .error_strings = l2output_bad_intf_error_strings,
.n_next_nodes = 1,
u32 sw_if_index;
} output_node_mapping_rpc_args_t;
-#if DPDK > 0
static void output_node_rpc_callback (output_node_mapping_rpc_args_t * a);
static void
vl_api_rpc_call_main_thread (output_node_rpc_callback,
(u8 *) & args, sizeof (args));
}
-#endif
/** Create a mapping in the next node mapping table for the given sw_if_index. */
hw0 = vnet_get_sup_hw_interface (vnet_main, sw_if_index);
-#if DPDK > 0
uword cpu_number;
cpu_number = os_get_cpu_number ();
output_node_mapping_send_rpc (node_index, sw_if_index);
return L2OUTPUT_NEXT_DROP;
}
-#endif
/* dynamically create graph node arc */
next = vlib_node_add_next (vlib_main, node_index, hw0->output_node_index);
return next;
}
-#if DPDK > 0
void
output_node_rpc_callback (output_node_mapping_rpc_args_t * a)
{
(vm, vnm, a->node_index, mp->next_nodes.output_node_index_vec,
a->sw_if_index);
}
-#endif
/* Get a pointer to the config for the given interface */
l2_output_config_t *