X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fl2%2Fl2_input.c;h=f94ef668c416e555e50bf7563c26f526e48597cc;hb=b474380f;hp=26c832adfb10e85ed32502168045715409a65566;hpb=beb0b2e346c63e21ffe892ae0e04b67bb10fba5e;p=vpp.git diff --git a/src/vnet/l2/l2_input.c b/src/vnet/l2/l2_input.c index 26c832adfb1..f94ef668c41 100644 --- a/src/vnet/l2/l2_input.c +++ b/src/vnet/l2/l2_input.c @@ -23,6 +23,8 @@ #include #include #include +#include +#include #include #include #include @@ -60,6 +62,29 @@ l2input_get_feat_names (void) return l2input_feat_names; } +u8 * +format_l2_input_features (u8 * s, va_list * args) +{ + static char *display_names[] = { +#define _(sym,name) #sym, + foreach_l2input_feat +#undef _ + }; + u32 feature_bitmap = va_arg (*args, u32); + + if (feature_bitmap == 0) + { + s = format (s, " none configured"); + return s; + } + + 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 { @@ -131,29 +156,12 @@ classify_and_dispatch (l2input_main_t * msm, vlib_buffer_t * b0, u32 * next0) * set tx sw-if-handle */ - u16 ethertype; - u8 protocol; - l2_input_config_t *config; - l2_bridge_domain_t *bd_config; - u16 bd_index0; - u32 feature_bitmap; - u32 feat_mask; - ethernet_header_t *h0; - u8 *l3h0; - u32 sw_if_index0; - -#define get_u16(addr) ( *((u16 *)(addr)) ) - - sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX]; - - h0 = vlib_buffer_get_current (b0); - l3h0 = (u8 *) h0 + vnet_buffer (b0)->l2.l2_len; - - ethertype = clib_net_to_host_u16 (get_u16 (l3h0 - 2)); - feat_mask = ~0; + u32 feat_mask = ~0; + u32 sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX]; + ethernet_header_t *h0 = vlib_buffer_get_current (b0); /* Get config for the input interface */ - config = vec_elt_at_index (msm->configs, sw_if_index0); + l2_input_config_t *config = vec_elt_at_index (msm->configs, sw_if_index0); /* Save split horizon group */ vnet_buffer (b0)->l2.shg = config->shg; @@ -161,21 +169,51 @@ classify_and_dispatch (l2input_main_t * msm, vlib_buffer_t * b0, u32 * next0) /* determine layer2 kind for stat and mask */ if (PREDICT_FALSE (ethernet_address_cast (h0->dst_address))) { - protocol = ((ip6_header_t *) l3h0)->protocol; + u8 *l3h0 = (u8 *) h0 + vnet_buffer (b0)->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); + 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 (b0)->sw_if_index[VLIB_TX] == + L2INPUT_BVI)) + { + if (ethertype == ETHERNET_TYPE_ARP) + { + ethernet_arp_header_t *arp0 = (ethernet_arp_header_t *) l3h0; + if (arp0->opcode == + clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_request)) + vnet_buffer (b0)->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 (b0)->l2.shg = 0; + } + } } else { /* - * Check for from-BVI processing - set SHG of unicast packets from BVI - * to 0 so it is not dropped for VXLAN tunnels or other ports with the + * 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 (vnet_buffer (b0)->sw_if_index[VLIB_TX] == @@ -187,12 +225,13 @@ classify_and_dispatch (l2input_main_t * msm, vlib_buffer_t * b0, u32 * next0) if (config->bridge) { /* Do bridge-domain processing */ - bd_index0 = config->bd_index; + u16 bd_index0 = config->bd_index; /* save BD ID for next feature graph nodes */ vnet_buffer (b0)->l2.bd_index = bd_index0; /* Get config for the bridge domain interface */ - bd_config = vec_elt_at_index (msm->bd_configs, bd_index0); + l2_bridge_domain_t *bd_config = + vec_elt_at_index (msm->bd_configs, bd_index0); /* Save bridge domain and interface seq_num */ /* *INDENT-OFF* */ @@ -202,6 +241,7 @@ classify_and_dispatch (l2input_main_t * msm, vlib_buffer_t * b0, u32 * next0) }; /* *INDENT-ON* */ vnet_buffer (b0)->l2.l2fib_sn = sn.as_u16;; + vnet_buffer (b0)->l2.bd_age = bd_config->mac_age; /* * Process bridge domain feature enables. @@ -221,7 +261,7 @@ classify_and_dispatch (l2input_main_t * msm, vlib_buffer_t * b0, u32 * next0) feat_mask = L2INPUT_FEAT_DROP; /* mask out features from bitmap using packet type and bd config */ - feature_bitmap = config->feature_bitmap & feat_mask; + u32 feature_bitmap = config->feature_bitmap & feat_mask; /* save for next feature graph nodes */ vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap; @@ -348,9 +388,6 @@ l2input_node_inline (vlib_main_t * vm, } } - vlib_node_increment_counter (vm, l2input_node.index, - L2INPUT_ERROR_L2INPUT, 4); - classify_and_dispatch (msm, b0, &next0); classify_and_dispatch (msm, b1, &next1); classify_and_dispatch (msm, b2, &next2); @@ -391,9 +428,6 @@ l2input_node_inline (vlib_main_t * vm, clib_memcpy (t->dst, h0->dst_address, 6); } - vlib_node_increment_counter (vm, l2input_node.index, - L2INPUT_ERROR_L2INPUT, 1); - classify_and_dispatch (msm, b0, &next0); /* verify speculative enqueue, maybe switch current next frame */ @@ -405,6 +439,9 @@ l2input_node_inline (vlib_main_t * vm, vlib_put_next_frame (vm, node, next_index, n_left_to_next); } + vlib_node_increment_counter (vm, l2input_node.index, + L2INPUT_ERROR_L2INPUT, frame->n_vectors); + return frame->n_vectors; } @@ -502,6 +539,27 @@ l2input_set_bridge_features (u32 bd_index, u32 feat_mask, u32 feat_value) return bd_config->feature_bitmap; } +void +l2input_interface_mac_change (u32 sw_if_index, + const u8 * old_address, const u8 * new_address) +{ + /* check if the sw_if_index passed is a BVI in a BD */ + l2_input_config_t *intf_config; + + intf_config = l2input_intf_config (sw_if_index); + + if (intf_config->bridge && intf_config->bvi) + { + /* delete and re-add l2fib entry for the bvi interface */ + l2fib_del_entry (old_address, intf_config->bd_index, sw_if_index); + l2fib_add_entry (new_address, + intf_config->bd_index, + sw_if_index, + L2FIB_ENTRY_RESULT_FLAG_BVI | + L2FIB_ENTRY_RESULT_FLAG_STATIC); + } +} + /** * Set the subinterface to run in l2 or l3 mode. * For L3 mode, just the sw_if_index is specified. @@ -515,7 +573,7 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /* */ 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 */ { @@ -526,9 +584,8 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /* */ l2_output_config_t *out_config; l2_input_config_t *config; l2_bridge_domain_t *bd_config; - u64 mac; i32 l2_if_adjust = 0; - u32 slot; + vnet_device_class_t *dev_class; hi = vnet_get_sup_hw_interface (vnet_main, sw_if_index); config = l2input_intf_config (sw_if_index); @@ -544,19 +601,22 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /* */ /* undo any BVI-related config */ if (bd_config->bvi_sw_if_index == sw_if_index) { + vnet_sw_interface_t *si; + bd_config->bvi_sw_if_index = ~0; config->bvi = 0; /* delete the l2fib entry for the bvi interface */ - mac = *((u64 *) hi->hw_address); - l2fib_del_entry (mac, config->bd_index); - - /* Make loop output node send packet back to ethernet-input node */ - slot = - vlib_node_add_named_next_with_slot (vm, hi->tx_node_index, - "ethernet-input", - VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT); - ASSERT (slot == VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT); + l2fib_del_entry (hi->hw_address, config->bd_index, sw_if_index); + + /* since this is a no longer BVI interface do not to flood to it */ + 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 */ @@ -602,6 +662,8 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /* */ 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. @@ -621,8 +683,12 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /* */ * 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_TERM); /* Make sure last-chance drop is configured */ config->feature_bitmap |= L2INPUT_FEAT_DROP; @@ -637,8 +703,10 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /* */ /* 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; + /* ensure BD has no bvi interface (or replace that one with this??) */ if (bd_config->bvi_sw_if_index != ~0) { @@ -648,28 +716,39 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /* */ config->bvi = 1; /* create the l2fib entry for the bvi interface */ - mac = *((u64 *) hi->hw_address); - l2fib_add_fwd_entry (mac, bd_index, sw_if_index, 1, 1); /* static + bvi */ + l2fib_add_entry (hi->hw_address, bd_index, sw_if_index, + L2FIB_ENTRY_RESULT_FLAG_BVI | + L2FIB_ENTRY_RESULT_FLAG_STATIC); /* Disable learning by default. no use since l2fib entry is static. */ config->feature_bitmap &= ~L2INPUT_FEAT_LEARN; - /* Make loop output node send packet to l2-input node */ - slot = - vlib_node_add_named_next_with_slot (vm, hi->tx_node_index, - "l2-input", - VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT); - ASSERT (slot == VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT); + /* 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) { @@ -753,6 +832,12 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /* */ /* Set up the L2/L3 flag in the interface parsing tables */ ethernet_sw_interface_set_l2_mode (vnm, sw_if_index, (mode != MODE_L3)); + dev_class = vnet_get_device_class (vnet_main, hi->dev_class_index); + if (dev_class->set_l2_mode_function) + { + dev_class->set_l2_mode_function (vnet_main, hi, l2_if_adjust); + } + return 0; } @@ -766,10 +851,10 @@ int_l2_bridge (vlib_main_t * vm, 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; @@ -796,7 +881,11 @@ int_l2_bridge (vlib_main_t * vm, 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; @@ -804,8 +893,8 @@ int_l2_bridge (vlib_main_t * vm, /* 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) { @@ -859,7 +948,7 @@ done: /* *INDENT-OFF* */ VLIB_CLI_COMMAND (int_l2_bridge_cli, static) = { .path = "set interface l2 bridge", - .short_help = "set interface l2 bridge [bvi] [shg]", + .short_help = "set interface l2 bridge [bvi|uu-fwd] [shg]", .function = int_l2_bridge, }; /* *INDENT-ON* */ @@ -895,7 +984,8 @@ int_l2_xc (vlib_main_t * vm, /* 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); @@ -908,7 +998,7 @@ done: /*? * 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. @@ -949,7 +1039,8 @@ int_l3 (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) } /* 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); @@ -1061,11 +1152,11 @@ done: } /*? - * 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: @@ -1080,7 +1171,7 @@ done: * 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 @@ -1100,14 +1191,13 @@ _(l2fib_init) \ _(l2_input_classify_init) \ _(l2bd_init) \ _(l2fwd_init) \ -_(l2_inacl_init) \ +_(l2_in_out_acl_init) \ _(l2input_init) \ _(l2_vtr_init) \ _(l2_invtr_init) \ _(l2_efp_filter_init) \ _(l2learn_init) \ _(l2flood_init) \ -_(l2_outacl_init) \ _(l2output_init) \ _(l2_patch_init) \ _(l2_xcrw_init)