X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fl2%2Fl2_bd.c;h=943385ccb7c34b65dfd6f7ab729c96487ab9b34e;hb=4d5b917;hp=351e69874468277c4bbb2723a9314b38096b0718;hpb=d48c8eb7354c6c8b5b875dc70d616d11c17e9fb8;p=vpp.git diff --git a/src/vnet/l2/l2_bd.c b/src/vnet/l2/l2_bd.c index 351e6987446..943385ccb7c 100644 --- a/src/vnet/l2/l2_bd.c +++ b/src/vnet/l2/l2_bd.c @@ -52,12 +52,14 @@ bd_validate (l2_bridge_domain_t * bd_config) { if (bd_is_valid (bd_config)) return; - bd_config->feature_bitmap = ~L2INPUT_FEAT_ARP_TERM; + bd_config->feature_bitmap = ~(L2INPUT_FEAT_ARP_TERM | L2INPUT_FEAT_UU_FWD); bd_config->bvi_sw_if_index = ~0; + bd_config->uu_fwd_sw_if_index = ~0; bd_config->members = 0; bd_config->flood_count = 0; bd_config->tun_master_count = 0; bd_config->tun_normal_count = 0; + bd_config->no_flood_count = 0; bd_config->mac_by_ip4 = 0; bd_config->mac_by_ip6 = hash_create_mem (0, sizeof (ip6_address_t), sizeof (uword)); @@ -108,6 +110,9 @@ bd_delete (bd_main_t * bdm, u32 bd_index) bd->bd_id = ~0; bd->feature_bitmap = 0; + /* free BD tag */ + vec_free (bd->bd_tag); + /* free memory used by BD */ vec_free (bd->members); hash_free (bd->mac_by_ip4); @@ -125,38 +130,46 @@ bd_delete (bd_main_t * bdm, u32 bd_index) static void update_flood_count (l2_bridge_domain_t * bd_config) { - bd_config->flood_count = vec_len (bd_config->members) - - (bd_config->tun_master_count ? bd_config->tun_normal_count : 0); + bd_config->flood_count = (vec_len (bd_config->members) - + (bd_config->tun_master_count ? + bd_config->tun_normal_count : 0)); + bd_config->flood_count -= bd_config->no_flood_count; } void bd_add_member (l2_bridge_domain_t * bd_config, l2_flood_member_t * member) { - u32 ix; + u32 ix = 0; vnet_sw_interface_t *sw_if = vnet_get_sw_interface (vnet_get_main (), member->sw_if_index); /* * Add one element to the vector - * vector is ordered [ bvi, normal/tun_masters..., tun_normals... ] + * vector is ordered [ bvi, normal/tun_masters..., tun_normals... no_flood] * When flooding, the bvi interface (if present) must be the last member * processed due to how BVI processing can change the packet. To enable * this order, we make the bvi interface the first in the vector and - * flooding walks the vector in reverse. + * flooding walks the vector in reverse. The flood-count determines where + * in the member list to start the walk from. */ switch (sw_if->flood_class) { + case VNET_FLOOD_CLASS_NO_FLOOD: + bd_config->no_flood_count++; + ix = vec_len (bd_config->members); + break; + case VNET_FLOOD_CLASS_BVI: + ix = 0; + break; case VNET_FLOOD_CLASS_TUNNEL_MASTER: bd_config->tun_master_count++; /* Fall through */ - default: - /* Fall through */ case VNET_FLOOD_CLASS_NORMAL: - ix = (member->flags & L2_FLOOD_MEMBER_BVI) ? 0 : - vec_len (bd_config->members) - bd_config->tun_normal_count; + ix = (vec_len (bd_config->members) - + bd_config->tun_normal_count - bd_config->no_flood_count); break; case VNET_FLOOD_CLASS_TUNNEL_NORMAL: - ix = vec_len (bd_config->members); + ix = (vec_len (bd_config->members) - bd_config->no_flood_count); bd_config->tun_normal_count++; break; } @@ -188,6 +201,8 @@ bd_remove_member (l2_bridge_domain_t * bd_config, u32 sw_if_index) bd_config->tun_master_count--; else if (sw_if->flood_class == VNET_FLOOD_CLASS_TUNNEL_NORMAL) bd_config->tun_normal_count--; + else if (sw_if->flood_class == VNET_FLOOD_CLASS_NO_FLOOD) + bd_config->no_flood_count--; } vec_delete (bd_config->members, 1, ix); update_flood_count (bd_config); @@ -226,7 +241,7 @@ VLIB_INIT_FUNCTION (l2bd_init); Return 0 if ok, non-zero if for an error. */ u32 -bd_set_flags (vlib_main_t * vm, u32 bd_index, u32 flags, u32 enable) +bd_set_flags (vlib_main_t * vm, u32 bd_index, bd_flags_t flags, u32 enable) { l2_bridge_domain_t *bd_config = l2input_bd_config (bd_index); @@ -263,7 +278,7 @@ bd_set_flags (vlib_main_t * vm, u32 bd_index, u32 flags, u32 enable) bd_config->feature_bitmap &= ~feature_bitmap; } - return 0; + return bd_config->feature_bitmap; } /** @@ -288,6 +303,32 @@ bd_set_mac_age (vlib_main_t * vm, u32 bd_index, u8 age) L2_MAC_AGE_PROCESS_EVENT_STOP, 0); } +/** + Set the tag for the bridge domain. +*/ + +static void +bd_set_bd_tag (vlib_main_t * vm, u32 bd_index, u8 * bd_tag) +{ + u8 *old; + l2_bridge_domain_t *bd_config; + vec_validate (l2input_main.bd_configs, bd_index); + bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index); + + old = bd_config->bd_tag; + + if (bd_tag[0]) + { + bd_config->bd_tag = format (0, "%s%c", bd_tag, 0); + } + else + { + bd_config->bd_tag = NULL; + } + + vec_free (old); +} + /** Set bridge-domain learn enable/disable. The CLI format is: @@ -328,12 +369,7 @@ bd_learn (vlib_main_t * vm, } /* set the bridge domain flag */ - if (bd_set_flags (vm, bd_index, L2_LEARN, enable)) - { - error = - clib_error_return (0, "bridge-domain id %d out of range", bd_index); - goto done; - } + bd_set_flags (vm, bd_index, L2_LEARN, enable); done: return error; @@ -397,12 +433,7 @@ bd_fwd (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) } /* set the bridge domain flag */ - if (bd_set_flags (vm, bd_index, L2_FWD, enable)) - { - error = - clib_error_return (0, "bridge-domain id %d out of range", bd_index); - goto done; - } + bd_set_flags (vm, bd_index, L2_FWD, enable); done: return error; @@ -468,12 +499,7 @@ bd_flood (vlib_main_t * vm, } /* set the bridge domain flag */ - if (bd_set_flags (vm, bd_index, L2_FLOOD, enable)) - { - error = - clib_error_return (0, "bridge-domain id %d out of range", bd_index); - goto done; - } + bd_set_flags (vm, bd_index, L2_FLOOD, enable); done: return error; @@ -499,7 +525,7 @@ VLIB_CLI_COMMAND (bd_flood_cli, static) = { /* *INDENT-ON* */ /** - Set bridge-domain unkown-unicast flood enable/disable. + Set bridge-domain unknown-unicast flood enable/disable. The CLI format is: set bridge-domain uu-flood [disable] */ @@ -538,12 +564,7 @@ bd_uu_flood (vlib_main_t * vm, } /* set the bridge domain flag */ - if (bd_set_flags (vm, bd_index, L2_UU_FLOOD, enable)) - { - error = - clib_error_return (0, "bridge-domain id %d out of range", bd_index); - goto done; - } + bd_set_flags (vm, bd_index, L2_UU_FLOOD, enable); done: return error; @@ -605,12 +626,7 @@ bd_arp_term (vlib_main_t * vm, enable = 0; /* set the bridge domain flag */ - if (bd_set_flags (vm, bd_index, L2_ARP_TERM, enable)) - { - error = - clib_error_return (0, "bridge-domain id %d out of range", bd_index); - goto done; - } + bd_set_flags (vm, bd_index, L2_ARP_TERM, enable); done: return error; @@ -712,41 +728,45 @@ VLIB_CLI_COMMAND (bd_arp_term_cli, static) = { * 6-byte MAC address directly in the hash table entry uword. * * @warning This only works for 64-bit processor with 8-byte uword; - * which means this code *WILL NOT WORK* for a 32-bit prcessor with + * which means this code *WILL NOT WORK* for a 32-bit processor with * 4-byte uword. */ u32 bd_add_del_ip_mac (u32 bd_index, - u8 * ip_addr, u8 * mac_addr, u8 is_ip6, u8 is_add) + ip46_type_t type, + const ip46_address_t * ip, + const mac_address_t * mac, u8 is_add) { l2_bridge_domain_t *bd_cfg = l2input_bd_config (bd_index); - u64 new_mac = *(u64 *) mac_addr; + u64 new_mac = mac_address_as_u64 (mac); u64 *old_mac; - u16 *mac16 = (u16 *) & new_mac; - ASSERT (sizeof (uword) == sizeof (u64)); /* make sure uword is 8 bytes */ + /* make sure uword is 8 bytes */ + ASSERT (sizeof (uword) == sizeof (u64)); ASSERT (bd_is_valid (bd_cfg)); - mac16[3] = 0; /* Clear last 2 unsed bytes of the 8-byte MAC address */ - if (is_ip6) + if (IP46_TYPE_IP6 == type) { ip6_address_t *ip6_addr_key; hash_pair_t *hp; - old_mac = (u64 *) hash_get_mem (bd_cfg->mac_by_ip6, ip_addr); + old_mac = (u64 *) hash_get_mem (bd_cfg->mac_by_ip6, &ip->ip6); if (is_add) { - if (old_mac == 0) - { /* new entry - allocate and craete ip6 address key */ + if (old_mac == NULL) + { + /* new entry - allocate and create ip6 address key */ ip6_addr_key = clib_mem_alloc (sizeof (ip6_address_t)); - clib_memcpy (ip6_addr_key, ip_addr, sizeof (ip6_address_t)); + clib_memcpy (ip6_addr_key, &ip->ip6, sizeof (ip6_address_t)); } else if (*old_mac == new_mac) - { /* same mac entry already exist for ip6 address */ + { + /* same mac entry already exist for ip6 address */ return 0; } else - { /* updat mac for ip6 address */ - hp = hash_get_pair (bd_cfg->mac_by_ip6, ip_addr); + { + /* update mac for ip6 address */ + hp = hash_get_pair (bd_cfg->mac_by_ip6, &ip->ip6); ip6_addr_key = (ip6_address_t *) hp->key; } hash_set_mem (bd_cfg->mac_by_ip6, ip6_addr_key, new_mac); @@ -755,9 +775,9 @@ bd_add_del_ip_mac (u32 bd_index, { if (old_mac && (*old_mac == new_mac)) { - hp = hash_get_pair (bd_cfg->mac_by_ip6, ip_addr); + hp = hash_get_pair (bd_cfg->mac_by_ip6, &ip->ip6); ip6_addr_key = (ip6_address_t *) hp->key; - hash_unset_mem (bd_cfg->mac_by_ip6, ip_addr); + hash_unset_mem (bd_cfg->mac_by_ip6, &ip->ip6); clib_mem_free (ip6_addr_key); } else @@ -766,18 +786,18 @@ bd_add_del_ip_mac (u32 bd_index, } else { - ip4_address_t ip4_addr = *(ip4_address_t *) ip_addr; - old_mac = (u64 *) hash_get (bd_cfg->mac_by_ip4, ip4_addr.as_u32); + old_mac = (u64 *) hash_get (bd_cfg->mac_by_ip4, ip->ip4.as_u32); if (is_add) { if (old_mac && (*old_mac == new_mac)) - return 0; /* mac entry already exist */ - hash_set (bd_cfg->mac_by_ip4, ip4_addr.as_u32, new_mac); + /* mac entry already exist */ + return 0; + hash_set (bd_cfg->mac_by_ip4, ip->ip4.as_u32, new_mac); } else { if (old_mac && (*old_mac == new_mac)) - hash_unset (bd_cfg->mac_by_ip4, ip4_addr.as_u32); + hash_unset (bd_cfg->mac_by_ip4, ip->ip4.as_u32); else return 1; } @@ -794,13 +814,13 @@ static clib_error_t * bd_arp_entry (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { + ip46_address_t ip_addr = ip46_address_initializer; + ip46_type_t type = IP46_TYPE_IP4; bd_main_t *bdm = &bd_main; clib_error_t *error = 0; u32 bd_index, bd_id; + mac_address_t mac; u8 is_add = 1; - u8 is_ip6 = 0; - u8 ip_addr[16]; - u8 mac_addr[6]; uword *p; if (!unformat (input, "%d", &bd_id)) @@ -821,13 +841,13 @@ bd_arp_entry (vlib_main_t * vm, else return clib_error_return (0, "No such bridge domain %d", bd_id); - if (unformat (input, "%U", unformat_ip4_address, ip_addr)) + if (unformat (input, "%U", unformat_ip4_address, &ip_addr.ip4)) { - is_ip6 = 0; + type = IP46_TYPE_IP4; } - else if (unformat (input, "%U", unformat_ip6_address, ip_addr)) + else if (unformat (input, "%U", unformat_ip6_address, &ip_addr.ip6)) { - is_ip6 = 1; + type = IP46_TYPE_IP6; } else { @@ -836,7 +856,7 @@ bd_arp_entry (vlib_main_t * vm, goto done; } - if (!unformat (input, "%U", unformat_ethernet_address, mac_addr)) + if (!unformat (input, "%U", unformat_mac_address_t, &mac)) { error = clib_error_return (0, "expecting MAC address but got `%U'", format_unformat_error, input); @@ -849,13 +869,12 @@ bd_arp_entry (vlib_main_t * vm, } /* set the bridge domain flagAdd IP-MAC entry into bridge domain */ - if (bd_add_del_ip_mac (bd_index, ip_addr, mac_addr, is_ip6, is_add)) + if (bd_add_del_ip_mac (bd_index, type, &ip_addr, &mac, is_add)) { error = clib_error_return (0, "MAC %s for IP %U and MAC %U failed", is_add ? "add" : "del", - is_ip6 ? - format_ip4_address : format_ip6_address, - ip_addr, format_ethernet_address, mac_addr); + format_ip46_address, &ip_addr, IP46_TYPE_ANY, + format_mac_address_t, &mac); } done: @@ -879,7 +898,7 @@ VLIB_CLI_COMMAND (bd_arp_entry_cli, static) = { }; /* *INDENT-ON* */ -u8 * +static u8 * format_vtr (u8 * s, va_list * args) { u32 vtr_op = va_arg (*args, u32); @@ -914,6 +933,20 @@ format_vtr (u8 * s, va_list * args) } } +static u8 * +format_uu_cfg (u8 * s, va_list * args) +{ + l2_bridge_domain_t *bd_config = va_arg (*args, l2_bridge_domain_t *); + + if (bd_config->feature_bitmap & L2INPUT_FEAT_UU_FWD) + return (format (s, "%U", format_vnet_sw_if_index_name_with_NA, + vnet_get_main (), bd_config->uu_fwd_sw_if_index)); + else if (bd_config->feature_bitmap & L2INPUT_FEAT_UU_FLOOD) + return (format (s, "flood")); + else + return (format (s, "drop")); +} + /** Show bridge-domain state. The CLI format is: @@ -931,6 +964,7 @@ bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) u32 detail = 0; u32 intf = 0; u32 arp = 0; + u32 bd_tag = 0; u32 bd_id = ~0; uword *p; @@ -947,6 +981,8 @@ bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) intf = 1; if (unformat (input, "arp")) arp = 1; + if (unformat (input, "bd-tag")) + bd_tag = 1; if (bd_id == 0) return clib_error_return (0, @@ -984,10 +1020,10 @@ bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { printed = 1; vlib_cli_output (vm, - "%=5s %=7s %=4s %=9s %=9s %=9s %=9s %=9s %=9s %=9s", - "ID", "Index", "BSN", "Age(min)", "Learning", - "U-Forwrd", "UU-Flood", "Flooding", "ARP-Term", - "BVI-Intf"); + "%=8s %=7s %=4s %=9s %=9s %=9s %=11s %=9s %=9s %=11s", + "BD-ID", "Index", "BSN", "Age(min)", + "Learning", "U-Forwrd", "UU-Flood", + "Flooding", "ARP-Term", "BVI-Intf"); } if (bd_config->mac_age) @@ -995,14 +1031,13 @@ bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) else as = format (as, "off"); vlib_cli_output (vm, - "%=5d %=7d %=4d %=9v %=9s %=9s %=9s %=9s %=9s %=9U", + "%=8d %=7d %=4d %=9v %=9s %=9s %=11U %=9s %=9s %=11U", bd_config->bd_id, bd_index, bd_config->seq_num, as, bd_config->feature_bitmap & L2INPUT_FEAT_LEARN ? "on" : "off", bd_config->feature_bitmap & L2INPUT_FEAT_FWD ? "on" : "off", - bd_config->feature_bitmap & L2INPUT_FEAT_UU_FLOOD ? - "on" : "off", + format_uu_cfg, bd_config, bd_config->feature_bitmap & L2INPUT_FEAT_FLOOD ? "on" : "off", bd_config->feature_bitmap & L2INPUT_FEAT_ARP_TERM ? @@ -1019,8 +1054,7 @@ bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { l2_flood_member_t *member = vec_elt_at_index (bd_config->members, i); - l2_input_config_t *int_config = - l2input_intf_config (member->sw_if_index); + u8 swif_seq_num = *l2fib_swif_seq_num (member->sw_if_index); u32 vtr_opr, dot1q, tag1, tag2; if (i == 0) { @@ -1033,11 +1067,18 @@ bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) vlib_cli_output (vm, "%=30U%=7d%=5d%=5d%=5s%=9s%=30U", format_vnet_sw_if_index_name, vnm, member->sw_if_index, member->sw_if_index, - int_config->seq_num, member->shg, + swif_seq_num, member->shg, member->flags & L2_FLOOD_MEMBER_BVI ? "*" : "-", i < bd_config->flood_count ? "*" : "-", format_vtr, vtr_opr, dot1q, tag1, tag2); } + if (~0 != bd_config->uu_fwd_sw_if_index) + vlib_cli_output (vm, "%=30U%=7d%=5d%=5d%=5s%=9s%=30s", + format_vnet_sw_if_index_name, vnm, + bd_config->uu_fwd_sw_if_index, + bd_config->uu_fwd_sw_if_index, + 0, 0, "uu", "-", "None"); + } if ((detail || arp) && @@ -1065,6 +1106,12 @@ bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) })); /* *INDENT-ON* */ } + + if ((detail || bd_tag) && (bd_config->bd_tag)) + { + vlib_cli_output (vm, "\n BD-Tag: %s", bd_config->bd_tag); + + } } } vec_free (as); @@ -1106,7 +1153,7 @@ done: /* *INDENT-OFF* */ VLIB_CLI_COMMAND (bd_show_cli, static) = { .path = "show bridge-domain", - .short_help = "show bridge-domain [bridge-domain-id [detail|int|arp]]", + .short_help = "show bridge-domain [bridge-domain-id [detail|int|arp|bd-tag]]", .function = bd_show, }; /* *INDENT-ON* */ @@ -1123,9 +1170,11 @@ bd_add_del (l2_bridge_domain_add_del_args_t * a) { if (bd_index != ~0) return VNET_API_ERROR_BD_ALREADY_EXISTS; + if (a->bd_id > L2_BD_ID_MAX) + return VNET_API_ERROR_BD_ID_EXCEED_MAX; bd_index = bd_add_bd_index (bdm, a->bd_id); - u32 enable_flags = 0, disable_flags = 0; + bd_flags_t enable_flags = 0, disable_flags = 0; if (a->flood) enable_flags |= L2_FLOOD; else @@ -1158,6 +1207,10 @@ bd_add_del (l2_bridge_domain_add_del_args_t * a) bd_set_flags (vm, bd_index, disable_flags, 0 /* disable */ ); bd_set_mac_age (vm, bd_index, a->mac_age); + + if (a->bd_tag) + bd_set_bd_tag (vm, bd_index, a->bd_tag); + } else { @@ -1176,8 +1229,8 @@ bd_add_del (l2_bridge_domain_add_del_args_t * a) /** Create or delete bridge-domain. The CLI format: - create bridge-domain [learn <0|1>] [forward <0|1>] [uu-flood <0|1>] - [flood <0|1>] [arp-term <0|1>] [mac-age ] [del] + create bridge-domain [learn <0|1>] [forward <0|1>] [uu-flood <0|1>] [flood <0|1>] + [arp-term <0|1>] [mac-age ] [bd-tag ] [del] */ static clib_error_t * @@ -1190,6 +1243,7 @@ bd_add_del_command_fn (vlib_main_t * vm, unformat_input_t * input, u32 bd_id = ~0; u32 flood = 1, forward = 1, learn = 1, uu_flood = 1, arp_term = 0; u32 mac_age = 0; + u8 *bd_tag = NULL; l2_bridge_domain_add_del_args_t _a, *a = &_a; int rv; @@ -1213,6 +1267,8 @@ bd_add_del_command_fn (vlib_main_t * vm, unformat_input_t * input, ; else if (unformat (line_input, "mac-age %d", &mac_age)) ; + else if (unformat (line_input, "bd-tag %s", &bd_tag)) + ; else if (unformat (line_input, "del")) { is_add = 0; @@ -1239,8 +1295,13 @@ bd_add_del_command_fn (vlib_main_t * vm, unformat_input_t * input, error = clib_error_return (0, "mac age must be less than 256"); goto done; } + if ((bd_tag) && (strlen ((char *) bd_tag) > 63)) + { + error = clib_error_return (0, "bd-tag cannot be longer than 63"); + goto done; + } - memset (a, 0, sizeof (*a)); + clib_memset (a, 0, sizeof (*a)); a->is_add = is_add; a->bd_id = bd_id; a->flood = (u8) flood; @@ -1249,6 +1310,7 @@ bd_add_del_command_fn (vlib_main_t * vm, unformat_input_t * input, a->learn = (u8) learn; a->arp_term = (u8) arp_term; a->mac_age = (u8) mac_age; + a->bd_tag = bd_tag; rv = bd_add_del (a); @@ -1262,17 +1324,21 @@ bd_add_del_command_fn (vlib_main_t * vm, unformat_input_t * input, error = clib_error_return (0, "bridge domain in use - remove members"); goto done; case VNET_API_ERROR_NO_SUCH_ENTRY: - error = clib_error_return (0, "bridge domain id does not exist"); + error = clib_error_return (0, "bridge domain ID does not exist"); goto done; case VNET_API_ERROR_BD_NOT_MODIFIABLE: error = clib_error_return (0, "bridge domain 0 can not be modified"); goto done; + case VNET_API_ERROR_BD_ID_EXCEED_MAX: + error = clib_error_return (0, "bridge domain ID exceed 16M limit"); + goto done; default: error = clib_error_return (0, "bd_add_del returned %d", rv); goto done; } done: + vec_free (bd_tag); unformat_free (line_input); return error; @@ -1312,7 +1378,7 @@ VLIB_CLI_COMMAND (bd_create_cli, static) = { .path = "create bridge-domain", .short_help = "create bridge-domain " " [learn <0|1>] [forward <0|1>] [uu-flood <0|1>] [flood <0|1>] [arp-term <0|1>]" - " [mac-age ] [del]", + " [mac-age ] [bd-tag ] [del]", .function = bd_add_del_command_fn, }; /* *INDENT-ON* */