X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fl2%2Fl2_bd.c;h=973beb71cd0b5550afb9c1644f21cfe44256e45d;hb=bdc0e6b7;hp=f68b66386183f5d4f3f2d72113a10b33501341be;hpb=9793477a28c45e4eb5bba3f2050fe415e57e8ad8;p=vpp.git diff --git a/src/vnet/l2/l2_bd.c b/src/vnet/l2/l2_bd.c index f68b6638618..973beb71cd0 100644 --- a/src/vnet/l2/l2_bd.c +++ b/src/vnet/l2/l2_bd.c @@ -58,6 +58,7 @@ bd_validate (l2_bridge_domain_t * bd_config) 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 +109,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 +129,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 +200,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); @@ -263,7 +277,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 +302,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 +368,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 +432,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 +498,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 +524,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 +563,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 +625,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,7 +727,7 @@ 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 @@ -727,7 +742,7 @@ bd_add_del_ip_mac (u32 bd_index, ASSERT (sizeof (uword) == sizeof (u64)); /* make sure uword is 8 bytes */ ASSERT (bd_is_valid (bd_cfg)); - mac16[3] = 0; /* Clear last 2 unsed bytes of the 8-byte MAC address */ + mac16[3] = 0; /* Clear last 2 unused bytes of the 8-byte MAC address */ if (is_ip6) { ip6_address_t *ip6_addr_key; @@ -736,7 +751,7 @@ bd_add_del_ip_mac (u32 bd_index, if (is_add) { if (old_mac == 0) - { /* new entry - allocate and craete ip6 address key */ + { /* 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)); } @@ -745,7 +760,7 @@ bd_add_del_ip_mac (u32 bd_index, return 0; } else - { /* updat mac for ip6 address */ + { /* update mac for ip6 address */ hp = hash_get_pair (bd_cfg->mac_by_ip6, ip_addr); ip6_addr_key = (ip6_address_t *) hp->key; } @@ -931,6 +946,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 +963,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, @@ -1019,8 +1037,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,7 +1050,7 @@ 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); @@ -1065,6 +1082,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 +1129,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* */ @@ -1160,6 +1183,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 { @@ -1178,8 +1205,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 * @@ -1192,6 +1219,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; @@ -1215,6 +1243,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; @@ -1241,6 +1271,11 @@ 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)); a->is_add = is_add; @@ -1251,6 +1286,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); @@ -1278,6 +1314,7 @@ bd_add_del_command_fn (vlib_main_t * vm, unformat_input_t * input, } done: + vec_free (bd_tag); unformat_free (line_input); return error; @@ -1317,7 +1354,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* */