#include <vlib/vlib.h>
#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
#include <vnet/ethernet/ethernet.h>
#include <vnet/ethernet/packet.h>
#include <vnet/ip/ip_packet.h>
}
u8 *
-format_l2_input_features (u8 * s, va_list * args)
+format_l2_input_feature_bitmap (u8 * s, va_list * args)
{
static char *display_names[] = {
#define _(sym,name) #sym,
#undef _
};
u32 feature_bitmap = va_arg (*args, u32);
+ u32 verbose = va_arg (*args, u32);
if (feature_bitmap == 0)
{
feature_bitmap &= ~L2INPUT_FEAT_DROP; /* Not a feature */
int i;
- for (i = L2INPUT_N_FEAT; i >= 0; i--)
- if (feature_bitmap & (1 << i))
- s = format (s, "%10s (%s)\n", display_names[i], l2input_feat_names[i]);
- return s;
-}
-
-typedef struct
-{
- /* per-pkt trace data */
- u8 src[6];
- u8 dst[6];
- u32 next_index;
- u32 sw_if_index;
-} l2input_trace_t;
-
-/* packet trace format function */
-static u8 *
-format_l2input_trace (u8 * s, va_list * args)
-{
- CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
- CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
- l2input_trace_t *t = va_arg (*args, l2input_trace_t *);
-
- s = format (s, "l2-input: sw_if_index %d dst %U src %U",
- t->sw_if_index,
- format_ethernet_address, t->dst,
- format_ethernet_address, t->src);
- return s;
-}
-
-l2input_main_t l2input_main;
-
-#define foreach_l2input_error \
-_(L2INPUT, "L2 input packets") \
-_(DROP, "L2 input drops")
-
-typedef enum
-{
-#define _(sym,str) L2INPUT_ERROR_##sym,
- foreach_l2input_error
-#undef _
- L2INPUT_N_ERROR,
-} l2input_error_t;
-
-static char *l2input_error_strings[] = {
-#define _(sym,string) string,
- foreach_l2input_error
-#undef _
-};
-
-typedef enum
-{ /* */
- L2INPUT_NEXT_LEARN,
- L2INPUT_NEXT_FWD,
- L2INPUT_NEXT_DROP,
- L2INPUT_N_NEXT,
-} l2input_next_t;
-
-static_always_inline u32
-l2_input_classiy_unicast (vlib_buffer_t * b, const ethernet_header_t * h0)
-{
- u32 feat_mask = ~0;
- u8 *l3h0 = (u8 *) h0 + vnet_buffer (b)->l2.l2_len;
-
-#define get_u16(addr) ( *((u16 *)(addr)) )
- u16 ethertype = clib_net_to_host_u16 (get_u16 (l3h0 - 2));
- u8 protocol = ((ip6_header_t *) l3h0)->protocol;
-
- /* Disable bridge forwarding (flooding will execute instead if not xconnect) */
- feat_mask &= ~(L2INPUT_FEAT_FWD |
- L2INPUT_FEAT_UU_FLOOD | L2INPUT_FEAT_GBP_FWD);
-
- /* Disable ARP-term for non-ARP and non-ICMP6 packet */
- if (ethertype != ETHERNET_TYPE_ARP &&
- (ethertype != ETHERNET_TYPE_IP6 || protocol != IP_PROTOCOL_ICMP6))
- feat_mask &= ~(L2INPUT_FEAT_ARP_TERM);
-
- /*
- * For packet from BVI - set SHG of ARP request or ICMPv6 neighbor
- * solicitation packet from BVI to 0 so it can also flood to VXLAN
- * tunnels or other ports with the same SHG as that of the BVI.
- */
- else if (PREDICT_FALSE (vnet_buffer (b)->sw_if_index[VLIB_TX] ==
- L2INPUT_BVI))
+ for (i = L2INPUT_N_FEAT - 1; i >= 0; i--)
{
- if (ethertype == ETHERNET_TYPE_ARP)
+ if (feature_bitmap & (1 << i))
{
- ethernet_arp_header_t *arp0 = (ethernet_arp_header_t *) l3h0;
- if (arp0->opcode ==
- clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_request))
- vnet_buffer (b)->l2.shg = 0;
- }
- else /* must be ICMPv6 */
- {
- ip6_header_t *iph0 = (ip6_header_t *) l3h0;
- icmp6_neighbor_solicitation_or_advertisement_header_t *ndh0;
- ndh0 = ip6_next_header (iph0);
- if (ndh0->icmp.type == ICMP6_neighbor_solicitation)
- vnet_buffer (b)->l2.shg = 0;
+ if (verbose)
+ s = format (s, "%17s (%s)\n",
+ display_names[i], l2input_feat_names[i]);
+ else
+ s = format (s, "%s ", l2input_feat_names[i]);
}
}
-
- return (feat_mask);
-}
-
-static_always_inline void
-l2_input_classify_bridge (l2_bridge_domain_t * bd_config,
- u16 bd_index,
- u32 sw_if_index, vlib_buffer_t * b, u32 * feat_mask)
-{
- /* save BD ID for next feature graph nodes */
- vnet_buffer (b)->l2.bd_index = bd_index;
-
- /* Save bridge domain and interface seq_num */
- /* *INDENT-OFF* */
- l2fib_seq_num_t sn = {
- .swif = *l2fib_swif_seq_num(sw_if_index),
- .bd = bd_config->seq_num,
- };
- /* *INDENT-ON* */
- vnet_buffer (b)->l2.l2fib_sn = sn.as_u16;;
- vnet_buffer (b)->l2.bd_age = bd_config->mac_age;
-
- /*
- * Process bridge domain feature enables.
- * To perform learning/flooding/forwarding, the corresponding bit
- * must be enabled in both the input interface config and in the
- * bridge domain config. In the bd_bitmap, bits for features other
- * than learning/flooding/forwarding should always be set.
- */
- *feat_mask = *feat_mask & bd_config->feature_bitmap;
+ return s;
}
-static_always_inline void
-classify_and_dispatch (l2input_main_t * msm,
- u16 n_left,
- u32 sw_if_index, vlib_buffer_t ** b, u16 * next)
+u8 *
+format_l2_input_features (u8 * s, va_list * args)
{
- /*
- * Load L2 input feature struct
- * Load bridge domain struct
- * Parse ethernet header to determine unicast/mcast/broadcast
- * take L2 input stat
- * classify packet as IP/UDP/TCP, control, other
- * mask feature bitmap
- * go to first node in bitmap
- * Later: optimize VTM
- *
- * For L2XC,
- * set tx sw-if-handle
- */
+ u32 sw_if_index = va_arg (*args, u32);
+ u32 verbose = va_arg (*args, u32);
- l2_input_config_t *config;
-
- /* Get config for the input interface */
- config = vec_elt_at_index (msm->configs, sw_if_index);
-
- while (n_left > 8)
- {
- const ethernet_header_t *h0, *h1, *h2, *h3;
- u32 fm0, fm1, fm2, fm3;
- u32 fb0, fb1, fb2, fb3;
-
- if (n_left >= 4)
- {
- vlib_prefetch_buffer_header (b[0], LOAD);
- vlib_prefetch_buffer_header (b[1], LOAD);
- vlib_prefetch_buffer_header (b[2], LOAD);
- vlib_prefetch_buffer_header (b[3], LOAD);
- }
+ l2_input_config_t *l2_input = l2input_intf_config (sw_if_index);
+ u32 fb = l2_input->feature_bitmap;
- fm0 = fm1 = fm2 = fm3 = ~0;
- h0 = vlib_buffer_get_current (b[0]);
- h1 = vlib_buffer_get_current (b[1]);
- h2 = vlib_buffer_get_current (b[2]);
- h3 = vlib_buffer_get_current (b[3]);
+ /* intf input features are masked by bridge domain */
+ if (l2_input_is_bridge (l2_input))
+ fb &= l2_input->bd_feature_bitmap;
- /* Save split horizon group */
- vnet_buffer (b[0])->l2.shg = config->shg;
- vnet_buffer (b[1])->l2.shg = config->shg;
- vnet_buffer (b[2])->l2.shg = config->shg;
- vnet_buffer (b[3])->l2.shg = config->shg;
+ s =
+ format (s, "\nl2-input:\n%U", format_l2_input_feature_bitmap, fb,
+ verbose);
- /* determine layer2 kind for stat and mask */
- if (PREDICT_FALSE (ethernet_address_cast (h0->dst_address)))
- {
- fm0 = l2_input_classiy_unicast (b[0], h0);
- }
- else
- {
- if (PREDICT_FALSE (sw_if_index == L2INPUT_BVI))
- vnet_buffer (b[0])->l2.shg = 0;
- }
- if (PREDICT_FALSE (ethernet_address_cast (h1->dst_address)))
- {
- fm1 = l2_input_classiy_unicast (b[1], h1);
- }
- else
- {
- if (PREDICT_FALSE (sw_if_index == L2INPUT_BVI))
- vnet_buffer (b[1])->l2.shg = 0;
- }
- if (PREDICT_FALSE (ethernet_address_cast (h2->dst_address)))
- {
- fm2 = l2_input_classiy_unicast (b[2], h2);
- }
- else
- {
- if (PREDICT_FALSE (sw_if_index == L2INPUT_BVI))
- vnet_buffer (b[1])->l2.shg = 0;
- }
- if (PREDICT_FALSE (ethernet_address_cast (h3->dst_address)))
- {
- fm3 = l2_input_classiy_unicast (b[3], h3);
- }
- else
- {
- if (PREDICT_FALSE (sw_if_index == L2INPUT_BVI))
- vnet_buffer (b[1])->l2.shg = 0;
- }
-
- if (config->bridge)
- {
- /* Do bridge-domain processing */
- l2_bridge_domain_t *bd_config;
- u16 bd_index;
-
- bd_index = config->bd_index;
- bd_config = vec_elt_at_index (msm->bd_configs, bd_index);
-
- l2_input_classify_bridge (bd_config, bd_index, sw_if_index,
- b[0], &fm0);
- l2_input_classify_bridge (bd_config, bd_index, sw_if_index,
- b[1], &fm1);
- l2_input_classify_bridge (bd_config, bd_index, sw_if_index,
- b[2], &fm2);
- l2_input_classify_bridge (bd_config, bd_index, sw_if_index,
- b[3], &fm3);
- }
- else if (config->xconnect)
- {
- /* Set the output interface */
- vnet_buffer (b[0])->sw_if_index[VLIB_TX] =
- config->output_sw_if_index;
- vnet_buffer (b[1])->sw_if_index[VLIB_TX] =
- config->output_sw_if_index;
- vnet_buffer (b[2])->sw_if_index[VLIB_TX] =
- config->output_sw_if_index;
- vnet_buffer (b[3])->sw_if_index[VLIB_TX] =
- config->output_sw_if_index;
- }
- else
- {
- fm0 = L2INPUT_FEAT_DROP;
- fm1 = L2INPUT_FEAT_DROP;
- fm2 = L2INPUT_FEAT_DROP;
- fm3 = L2INPUT_FEAT_DROP;
- }
-
- /* mask out features from bitmap using packet type and bd config */
- fb0 = config->feature_bitmap & fm0;
- fb1 = config->feature_bitmap & fm1;
- fb2 = config->feature_bitmap & fm2;
- fb3 = config->feature_bitmap & fm3;
-
- /* save for next feature graph nodes */
- vnet_buffer (b[0])->l2.feature_bitmap = fb0;
- vnet_buffer (b[1])->l2.feature_bitmap = fb1;
- vnet_buffer (b[2])->l2.feature_bitmap = fb2;
- vnet_buffer (b[3])->l2.feature_bitmap = fb3;
-
- /* Determine the next node */
- *next = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
- fb0);
- next++;
- *next = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
- fb1);
- next++;
- *next = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
- fb2);
- next++;
- *next = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
- fb3);
- next++;
-
- b += 4;
- n_left -= 4;
- }
- while (n_left)
- {
- const ethernet_header_t *h0;
- u32 fm0, fb0;
-
- fm0 = ~0;
- h0 = vlib_buffer_get_current (b[0]);
-
- /* Save split horizon group */
- vnet_buffer (b[0])->l2.shg = config->shg;
-
- /* determine layer2 kind for stat and mask */
- if (PREDICT_FALSE (ethernet_address_cast (h0->dst_address)))
- {
- fm0 = l2_input_classiy_unicast (b[0], h0);
- }
- else
- {
- /*
- * For packet from BVI - set SHG of unicast packet from BVI to 0 so it
- * is not dropped on output to VXLAN tunnels or other ports with the
- * same SHG as that of the BVI.
- */
- if (PREDICT_FALSE (sw_if_index == L2INPUT_BVI))
- vnet_buffer (b[0])->l2.shg = 0;
- }
-
- if (config->bridge)
- {
- /* Do bridge-domain processing */
- u16 bd_index = config->bd_index;
- l2_bridge_domain_t *bd_config =
- vec_elt_at_index (msm->bd_configs, bd_index);
-
- l2_input_classify_bridge (bd_config, bd_index, sw_if_index,
- b[0], &fm0);
- }
- else if (config->xconnect)
- {
- /* Set the output interface */
- vnet_buffer (b[0])->sw_if_index[VLIB_TX] =
- config->output_sw_if_index;
- }
- else
- fm0 = L2INPUT_FEAT_DROP;
-
- /* mask out features from bitmap using packet type and bd config */
- fb0 = config->feature_bitmap & fm0;
-
- /* save for next feature graph nodes */
- vnet_buffer (b[0])->l2.feature_bitmap = fb0;
-
- /* Determine the next node */
- *next = feat_bitmap_get_next_node_index (msm->feat_next_node_index,
- fb0);
-
- next += 1;
- b += 1;
- n_left -= 1;
- }
+ return (s);
}
-static_always_inline uword
-l2input_node_inline (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * frame,
- int do_trace)
+u8 *
+format_l2_input (u8 * s, va_list * args)
{
- u32 n_left, *from;
- l2input_main_t *msm = &l2input_main;
- vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b;
- u16 nexts[VLIB_FRAME_SIZE];
- u32 sw_if_indices[VLIB_FRAME_SIZE], *sw_if_index;
-
- from = vlib_frame_vector_args (frame);
- n_left = frame->n_vectors; /* number of packets to process */
- vlib_get_buffers (vm, from, bufs, n_left);
- b = bufs;
- sw_if_index = sw_if_indices;
-
- /* extract data from buffer metadata */
- while (n_left >= 8)
- {
- /* Prefetch the buffer header for the N+2 loop iteration */
- vlib_prefetch_buffer_header (b[4], LOAD);
- vlib_prefetch_buffer_header (b[5], LOAD);
- vlib_prefetch_buffer_header (b[6], LOAD);
- vlib_prefetch_buffer_header (b[7], LOAD);
-
- sw_if_index[0] = vnet_buffer (b[0])->sw_if_index[VLIB_RX];
- sw_if_index[1] = vnet_buffer (b[1])->sw_if_index[VLIB_RX];
- sw_if_index[2] = vnet_buffer (b[2])->sw_if_index[VLIB_RX];
- sw_if_index[3] = vnet_buffer (b[3])->sw_if_index[VLIB_RX];
-
- /* next */
- sw_if_index += 4;
- n_left -= 4;
- b += 4;
- }
- while (n_left)
- {
- sw_if_index[0] = vnet_buffer (b[0])->sw_if_index[VLIB_RX];
-
- /* next */
- sw_if_index += 1;
- n_left -= 1;
- b += 1;
- }
-
- n_left = frame->n_vectors;
-
- while (n_left)
- {
- u16 count, *next;
- u16 off = frame->n_vectors - n_left;
- b = bufs + off;
-
- sw_if_index = sw_if_indices + off;
- next = nexts + off;
+ u32 sw_if_index = va_arg (*args, u32);
+ l2_input_config_t *l2_input = l2input_intf_config (sw_if_index);
- count = clib_count_equal_u32 (sw_if_index, n_left);
- n_left -= count;
-
- classify_and_dispatch (msm, count, sw_if_index[0], b, next);
- }
-
- if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+ /* intf input features are masked by bridge domain */
+ if (l2_input_is_bridge (l2_input))
{
- n_left = frame->n_vectors; /* number of packets to process */
- b = bufs;
-
- while (n_left)
- {
- if (PREDICT_FALSE (b[0]->flags & VLIB_BUFFER_IS_TRACED))
- {
- ethernet_header_t *h0 = vlib_buffer_get_current (b[0]);
- l2input_trace_t *t =
- vlib_add_trace (vm, node, b[0], sizeof (*t));
+ bd_main_t *bdm = &bd_main;
+ u32 bd_id = l2input_main.bd_configs[l2_input->bd_index].bd_id;
- t->sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_RX];
- clib_memcpy (t->src, h0->src_address, 6);
- clib_memcpy (t->dst, h0->dst_address, 6);
- }
- /* next */
- n_left--;
- b++;
- }
+ s = format (s, " L2 bridge bd-id %d idx %d shg %d %s",
+ bd_id, bd_find_index (bdm, bd_id), l2_input->shg,
+ l2_input_is_bvi (l2_input) ? "bvi" : " ");
}
+ else if (l2_input_is_xconnect (l2_input))
+ s = format (s, " L2 xconnect %U",
+ format_vnet_sw_if_index_name, vnet_get_main (),
+ l2_input->output_sw_if_index);
- vlib_buffer_enqueue_to_next (vm, node, from, nexts, frame->n_vectors);
- vlib_node_increment_counter (vm, l2input_node.index,
- L2INPUT_ERROR_L2INPUT, frame->n_vectors);
-
- return frame->n_vectors;
-}
-
-static uword
-l2input_node_fn (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
- if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
- return l2input_node_inline (vm, node, frame, 1 /* do_trace */ );
- return l2input_node_inline (vm, node, frame, 0 /* do_trace */ );
+ return (s);
}
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2input_node) = {
- .function = l2input_node_fn,
- .name = "l2-input",
- .vector_size = sizeof (u32),
- .format_trace = format_l2input_trace,
- .format_buffer = format_ethernet_header_with_length,
- .type = VLIB_NODE_TYPE_INTERNAL,
-
- .n_errors = ARRAY_LEN(l2input_error_strings),
- .error_strings = l2input_error_strings,
-
- .n_next_nodes = L2INPUT_N_NEXT,
-
- /* edit / add dispositions here */
- .next_nodes = {
- [L2INPUT_NEXT_LEARN] = "l2-learn",
- [L2INPUT_NEXT_FWD] = "l2-fwd",
- [L2INPUT_NEXT_DROP] = "error-drop",
- },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2input_node, l2input_node_fn)
- clib_error_t *l2input_init (vlib_main_t * vm)
+clib_error_t *
+l2input_init (vlib_main_t * vm)
{
l2input_main_t *mp = &l2input_main;
/* Get packets RX'd from L2 interfaces */
ethernet_register_l2_input (vm, l2input_node.index);
- /* Create the config vector */
- vec_validate (mp->configs, 100);
- /* create 100 sw interface entries and zero them */
-
/* Initialize the feature next-node indexes */
feat_bitmap_init_next_nodes (vm,
l2input_node.index,
/** Enable (or disable) the feature in the bitmap for the given interface. */
u32
-l2input_intf_bitmap_enable (u32 sw_if_index, u32 feature_bitmap, u32 enable)
+l2input_intf_bitmap_enable (u32 sw_if_index,
+ l2input_feat_masks_t feature_bitmap, u32 enable)
{
l2_input_config_t *config = l2input_intf_config (sw_if_index);
intf_config = l2input_intf_config (sw_if_index);
- if (intf_config->bridge && intf_config->bvi)
+ if (l2_input_is_bridge (intf_config) && l2_input_is_bvi (intf_config))
{
/* delete and re-add l2fib entry for the bvi interface */
l2fib_del_entry (old_address, intf_config->bd_index, sw_if_index);
}
}
+walk_rc_t
+l2input_recache (u32 bd_index, u32 sw_if_index)
+{
+ l2_input_config_t *input;
+ l2_bridge_domain_t *bd;
+
+ bd = bd_get (bd_index);
+ input = l2input_intf_config (sw_if_index);
+
+ input->bd_mac_age = bd->mac_age;
+ input->bd_seq_num = bd->seq_num;
+ input->bd_feature_bitmap = bd->feature_bitmap;
+
+ return (WALK_CONTINUE);
+}
+
+void
+l2_input_seq_num_inc (u32 sw_if_index)
+{
+ l2_input_config_t *input;
+
+ input = vec_elt_at_index (l2input_main.configs, sw_if_index);
+
+ input->seq_num++;
+}
+
/**
* Set the subinterface to run in l2 or l3 mode.
* For L3 mode, just the sw_if_index is specified.
u32 mode, /* One of L2 modes or back to L3 mode */
u32 sw_if_index, /* sw interface index */
u32 bd_index, /* for bridged interface */
- u32 bvi, /* the bridged interface is the BVI */
+ l2_bd_port_type_t port_type, /* port_type */
u32 shg, /* the bridged interface split horizon group */
u32 xc_sw_if_index) /* peer interface for xconnect */
{
- l2input_main_t *mp = &l2input_main;
l2output_main_t *l2om = &l2output_main;
vnet_main_t *vnm = vnet_get_main ();
vnet_hw_interface_t *hi;
hi = vnet_get_sup_hw_interface (vnet_main, sw_if_index);
config = l2input_intf_config (sw_if_index);
- if (config->bridge)
+ if (l2fib_main.mac_table_initialized == 0)
+ l2fib_table_init ();
+
+ if (l2_input_is_bridge (config))
{
/* Interface is already in bridge mode. Undo the existing config. */
- bd_config = vec_elt_at_index (mp->bd_configs, config->bd_index);
+ bd_config = bd_get (config->bd_index);
/* remove interface from flood vector */
bd_remove_member (bd_config, sw_if_index);
vnet_sw_interface_t *si;
bd_config->bvi_sw_if_index = ~0;
- config->bvi = 0;
+ config->flags &= ~L2_INPUT_FLAG_BVI;
/* delete the l2fib entry for the bvi interface */
l2fib_del_entry (hi->hw_address, config->bd_index, sw_if_index);
si = vnet_get_sw_interface (vnm, sw_if_index);
si->flood_class = VNET_FLOOD_CLASS_NO_FLOOD;
}
+ if (bd_config->uu_fwd_sw_if_index == sw_if_index)
+ {
+ bd_config->uu_fwd_sw_if_index = ~0;
+ bd_config->feature_bitmap &= ~L2INPUT_FEAT_UU_FWD;
+ }
/* Clear MACs learned on the interface */
if ((config->feature_bitmap & L2INPUT_FEAT_LEARN) ||
(bd_config->feature_bitmap & L2INPUT_FEAT_LEARN))
l2fib_flush_int_mac (vm, sw_if_index);
+ bd_input_walk (config->bd_index, l2input_recache, NULL);
l2_if_adjust--;
}
- else if (config->xconnect)
+ else if (l2_input_is_xconnect (config))
{
l2_if_adjust--;
}
{
/* Set L2 config to BD index 0 so that if any packet accidentally
* came in on L2 path, it will be dropped in BD 0 */
- config->xconnect = 0;
- config->bridge = 0;
+ config->flags = L2_INPUT_FLAG_NONE;
config->shg = 0;
config->bd_index = 0;
config->feature_bitmap = L2INPUT_FEAT_DROP;
/* Clear L2 output config */
out_config = l2output_intf_config (sw_if_index);
- memset (out_config, 0, sizeof (l2_output_config_t));
+ clib_memset (out_config, 0, sizeof (l2_output_config_t));
/* Make sure any L2-output packet to this interface now in L3 mode is
* dropped. This may happen if L2 FIB MAC entry is stale */
if (mode == MODE_L2_BRIDGE)
{
+ u8 member_flags;
+
/*
* Remove a check that the interface must be an Ethernet.
* Specifically so we can bridge to L3 tunnel interfaces.
if (!hi)
return MODE_ERROR_ETH; /* non-ethernet */
- config->xconnect = 0;
- config->bridge = 1;
+ config->flags = L2_INPUT_FLAG_BRIDGE;
config->bd_index = bd_index;
- *l2fib_valid_swif_seq_num (sw_if_index) += 1;
+ l2_input_seq_num_inc (sw_if_index);
/*
* Enable forwarding, flooding, learning and ARP termination by default
* (note that ARP term is disabled on BD feature bitmap by default)
*/
- config->feature_bitmap |= L2INPUT_FEAT_FWD | L2INPUT_FEAT_UU_FLOOD |
- L2INPUT_FEAT_FLOOD | L2INPUT_FEAT_LEARN | L2INPUT_FEAT_ARP_TERM;
+ config->feature_bitmap |= (L2INPUT_FEAT_FWD |
+ L2INPUT_FEAT_UU_FLOOD |
+ L2INPUT_FEAT_UU_FWD |
+ L2INPUT_FEAT_FLOOD |
+ L2INPUT_FEAT_LEARN |
+ L2INPUT_FEAT_ARP_UFWD |
+ L2INPUT_FEAT_ARP_TERM);
/* Make sure last-chance drop is configured */
config->feature_bitmap |= L2INPUT_FEAT_DROP;
/* TODO: think: add l2fib entry even for non-bvi interface? */
/* Do BVI interface initializations */
- if (bvi)
+ if (L2_BD_PORT_TYPE_BVI == port_type)
{
vnet_sw_interface_t *si;
return MODE_ERROR_BVI_DEF; /* bd already has a bvi interface */
}
bd_config->bvi_sw_if_index = sw_if_index;
- config->bvi = 1;
+ config->flags |= L2_INPUT_FLAG_BVI;
/* create the l2fib entry for the bvi interface */
l2fib_add_entry (hi->hw_address, bd_index, sw_if_index,
/* since this is a BVI interface we want to flood to it */
si = vnet_get_sw_interface (vnm, sw_if_index);
si->flood_class = VNET_FLOOD_CLASS_BVI;
+ member_flags = L2_FLOOD_MEMBER_BVI;
+ }
+ else if (L2_BD_PORT_TYPE_UU_FWD == port_type)
+ {
+ bd_config->uu_fwd_sw_if_index = sw_if_index;
+ bd_config->feature_bitmap |= L2INPUT_FEAT_UU_FWD;
+ }
+ else
+ {
+ member_flags = L2_FLOOD_MEMBER_NORMAL;
}
- /* Add interface to bridge-domain flood vector */
- l2_flood_member_t member = {
- .sw_if_index = sw_if_index,
- .flags = bvi ? L2_FLOOD_MEMBER_BVI : L2_FLOOD_MEMBER_NORMAL,
- .shg = shg,
- };
- bd_add_member (bd_config, &member);
-
+ if (L2_BD_PORT_TYPE_NORMAL == port_type ||
+ L2_BD_PORT_TYPE_BVI == port_type)
+ {
+ /* Add interface to bridge-domain flood vector */
+ l2_flood_member_t member = {
+ .sw_if_index = sw_if_index,
+ .flags = member_flags,
+ .shg = shg,
+ };
+ bd_add_member (bd_config, &member);
+ }
}
else if (mode == MODE_L2_XC)
{
- config->xconnect = 1;
- config->bridge = 0;
+ config->flags = L2_INPUT_FLAG_XCONNECT;
config->output_sw_if_index = xc_sw_if_index;
/* Make sure last-chance drop is configured */
}
else if (mode == MODE_L2_CLASSIFY)
{
- config->xconnect = 1;
- config->bridge = 0;
+ config->flags = L2_INPUT_FLAG_XCONNECT;
config->output_sw_if_index = xc_sw_if_index;
/* Make sure last-chance drop is configured */
config->feature_bitmap &=
~(L2INPUT_FEAT_LEARN | L2INPUT_FEAT_FWD | L2INPUT_FEAT_FLOOD);
shg = 0; /* not used in xconnect */
-
- /* Insure all packets go to ethernet-input */
- ethernet_set_rx_redirect (vnet_main, hi, 1);
}
/* set up split-horizon group and set output feature bit */
*/
l2_if_adjust++;
+
+ bd_input_walk (bd_index, l2input_recache, NULL);
}
/* Adjust count of L2 interfaces */
{
if ((hi->l2_if_count == 1) && (l2_if_adjust == 1))
{
- /* Just added first L2 interface on this port */
-
- /* Set promiscuous mode on the l2 interface */
+ /* Just added first L2 interface on this port
+ * Set promiscuous mode on the l2 interface */
ethernet_set_flags (vnet_main, hi->hw_if_index,
ETHERNET_INTERFACE_FLAG_ACCEPT_ALL);
-
- /* ensure all packets go to ethernet-input */
- ethernet_set_rx_redirect (vnet_main, hi, 1);
-
}
else if ((hi->l2_if_count == 0) && (l2_if_adjust == -1))
{
- /* Just removed only L2 subinterface on this port */
-
- /* Disable promiscuous mode on the l2 interface */
- ethernet_set_flags (vnet_main, hi->hw_if_index, 0);
+ /* Just removed only L2 subinterface on this port
+ * Disable promiscuous mode on the l2 interface */
+ ethernet_set_flags (vnet_main, hi->hw_if_index,
+ /*ETHERNET_INTERFACE_FLAG_DEFAULT_L3 */ 0);
- /* Allow ip packets to go directly to ip4-input etc */
- ethernet_set_rx_redirect (vnet_main, hi, 0);
}
}
return 0;
}
+static clib_error_t *
+l2_input_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
+{
+ if (!is_add)
+ {
+ vlib_main_t *vm = vlib_get_main ();
+ l2_input_config_t *config;
+
+ if (sw_if_index < vec_len (l2input_main.configs))
+ {
+ config = vec_elt_at_index (l2input_main.configs, sw_if_index);
+ if (l2_input_is_xconnect (config))
+ set_int_l2_mode (vm, vnm, MODE_L3, config->output_sw_if_index, 0,
+ L2_BD_PORT_TYPE_NORMAL, 0, 0);
+ if (l2_input_is_xconnect (config) || l2_input_is_bridge (config))
+ set_int_l2_mode (vm, vnm, MODE_L3, sw_if_index, 0,
+ L2_BD_PORT_TYPE_NORMAL, 0, 0);
+ }
+ }
+
+ return (NULL);
+}
+
+VNET_SW_INTERFACE_ADD_DEL_FUNCTION (l2_input_interface_add_del);
+
/**
* Set subinterface in bridging mode with a bridge-domain ID.
* The CLI format is:
unformat_input_t * input, vlib_cli_command_t * cmd)
{
vnet_main_t *vnm = vnet_get_main ();
+ l2_bd_port_type_t port_type;
clib_error_t *error = 0;
u32 bd_index, bd_id;
u32 sw_if_index;
- u32 bvi;
u32 rc;
u32 shg;
bd_index = bd_find_or_add_bd_index (&bd_main, bd_id);
/* optional bvi */
- bvi = unformat (input, "bvi");
+ port_type = L2_BD_PORT_TYPE_NORMAL;
+ if (unformat (input, "bvi"))
+ port_type = L2_BD_PORT_TYPE_BVI;
+ if (unformat (input, "uu-fwd"))
+ port_type = L2_BD_PORT_TYPE_UU_FWD;
/* optional split horizon group */
shg = 0;
/* set the interface mode */
if ((rc =
- set_int_l2_mode (vm, vnm, MODE_L2_BRIDGE, sw_if_index, bd_index, bvi,
- shg, 0)))
+ set_int_l2_mode (vm, vnm, MODE_L2_BRIDGE, sw_if_index, bd_index,
+ port_type, shg, 0)))
{
if (rc == MODE_ERROR_ETH)
{
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (int_l2_bridge_cli, static) = {
.path = "set interface l2 bridge",
- .short_help = "set interface l2 bridge <interface> <bridge-domain-id> [bvi] [shg]",
+ .short_help = "set interface l2 bridge <interface> <bridge-domain-id> [bvi|uu-fwd] [shg]",
.function = int_l2_bridge,
};
/* *INDENT-ON* */
/* set the interface mode */
if (set_int_l2_mode
- (vm, vnm, MODE_L2_XC, sw_if_index, 0, 0, 0, xc_sw_if_index))
+ (vm, vnm, MODE_L2_XC, sw_if_index, 0, L2_BD_PORT_TYPE_NORMAL,
+ 0, xc_sw_if_index))
{
error = clib_error_return (0, "invalid configuration for interface",
format_unformat_error, input);
/*?
* Use this command put an interface into Layer 2 cross-connect mode.
- * Both interfaces must be in this mode for bi-directioal traffic. All
+ * Both interfaces must be in this mode for bi-directional traffic. All
* packets received on one interface will be transmitted to the other.
* To remove the Layer 2 cross-connect, put the interface in a different
* mode, for example Layer 3 mode.
}
/* set the interface mode */
- if (set_int_l2_mode (vm, vnm, MODE_L3, sw_if_index, 0, 0, 0, 0))
+ if (set_int_l2_mode (vm, vnm, MODE_L3, sw_if_index, 0,
+ L2_BD_PORT_TYPE_NORMAL, 0, 0))
{
error = clib_error_return (0, "invalid configuration for interface",
format_unformat_error, input);
sis = vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces));
_vec_len (sis) = 0;
/* *INDENT-OFF* */
- pool_foreach (si, im->sw_interfaces, ({ vec_add1 (sis, si[0]); }));
+ pool_foreach (si, im->sw_interfaces) { vec_add1 (sis, si[0]); }
/* *INDENT-ON* */
}
vec_foreach (si, sis)
{
l2_input_config_t *config = l2input_intf_config (si->sw_if_index);
- if (config->bridge)
+ if (l2_input_is_bridge (config))
{
u32 bd_id;
mode = "l2 bridge";
bd_id = l2input_main.bd_configs[config->bd_index].bd_id;
- args = format (0, "bd_id %d%s%d", bd_id,
- config->bvi ? " bvi shg " : " shg ", config->shg);
+ args = format (0, "bd_id %d%s shg %d", bd_id,
+ l2_input_is_bvi (config) ? " bvi" : "", config->shg);
}
- else if (config->xconnect)
+ else if (l2_input_is_xconnect (config))
{
mode = "l2 xconnect";
args = format (0, "%U",
}
/*?
- * Show the packet processing mode (Layer2 xcross-onnect, Layer 2 bridge,
+ * Show the packet processing mode (Layer2 cross-connect, Layer 2 bridge,
* Layer 3 routed) of all interfaces and sub-interfaces, or limit the
* output to just the provided list of interfaces and sub-interfaces.
* The output shows the mode, the interface, and if the interface is
- * a member of a bridge, the bridge-domain-id and the split horizen group (shg).
+ * a member of a bridge, the bridge-domain-id and the split horizon group (shg).
*
* @cliexpar
* Example of displaying the mode of all interfaces:
* l2 xconnect GigabitEthernet0/8/0.300 GigabitEthernet0/9/0.300
* l2 xconnect GigabitEthernet0/9/0.300 GigabitEthernet0/8/0.300
* @cliexend
- * Example of displaying the mode of a seleted list of interfaces:
+ * Example of displaying the mode of a selected list of interfaces:
* @cliexstart{show mode GigabitEthernet0/8/0 GigabitEthernet0/8/0.200}
* l3 GigabitEthernet0/8/0
* l2 bridge GigabitEthernet0/8/0.200 bd_id 200 shg 0