X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fgbp%2Fgbp_endpoint_group.c;h=92bad373c32614d78738bd4d9564fd54b4e5ad37;hb=59f71132e;hp=dc4440743c7f76c9308f03de1c9ccad42dd58466;hpb=32f6d8e0ca39483f706dc3a1c28223e9fe028f06;p=vpp.git diff --git a/src/plugins/gbp/gbp_endpoint_group.c b/src/plugins/gbp/gbp_endpoint_group.c index dc4440743c7..92bad373c32 100644 --- a/src/plugins/gbp/gbp_endpoint_group.c +++ b/src/plugins/gbp/gbp_endpoint_group.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -51,20 +52,23 @@ gbp_endpoint_group_get (index_t i) } void -gbp_endpoint_group_lock (index_t i) +gbp_endpoint_group_lock (index_t ggi) { gbp_endpoint_group_t *gg; - gg = gbp_endpoint_group_get (i); + if (INDEX_INVALID == ggi) + return; + + gg = gbp_endpoint_group_get (ggi); gg->gg_locks++; } index_t -gbp_endpoint_group_find (epg_id_t epg_id) +gbp_endpoint_group_find (sclass_t sclass) { uword *p; - p = hash_get (gbp_endpoint_group_db.gg_hash, epg_id); + p = hash_get (gbp_endpoint_group_db.gg_hash_sclass, sclass); if (NULL != p) return p[0]; @@ -73,7 +77,7 @@ gbp_endpoint_group_find (epg_id_t epg_id) } int -gbp_endpoint_group_add_and_lock (epg_id_t epg_id, +gbp_endpoint_group_add_and_lock (vnid_t vnid, u16 sclass, u32 bd_id, u32 rd_id, @@ -83,11 +87,10 @@ gbp_endpoint_group_add_and_lock (epg_id_t epg_id, gbp_endpoint_group_t *gg; index_t ggi; - ggi = gbp_endpoint_group_find (epg_id); + ggi = gbp_endpoint_group_find (sclass); if (INDEX_INVALID == ggi) { - gbp_bridge_domain_t *gb; fib_protocol_t fproto; index_t gbi, grdi; @@ -104,22 +107,20 @@ gbp_endpoint_group_add_and_lock (epg_id_t epg_id, return (VNET_API_ERROR_NO_SUCH_FIB); } - gb = gbp_bridge_domain_get (gbi); - pool_get_zero (gbp_endpoint_group_pool, gg); - gg->gg_id = epg_id; + gg->gg_vnid = vnid; gg->gg_rd = grdi; gg->gg_gbd = gbi; - gg->gg_bd_index = gb->gb_bd_index; gg->gg_uplink_sw_if_index = uplink_sw_if_index; + gbp_itf_hdl_reset (&gg->gg_uplink_itf); gg->gg_locks = 1; gg->gg_sclass = sclass; gg->gg_retention = *retention; if (SCLASS_INVALID != gg->gg_sclass) - hash_set (gbp_epg_sclass_db, gg->gg_sclass, gg->gg_id); + hash_set (gbp_epg_sclass_db, gg->gg_sclass, gg->gg_vnid); /* * an egress DVR dpo for internal subnets to use when sending @@ -138,16 +139,15 @@ gbp_endpoint_group_add_and_lock (epg_id_t epg_id, * Add the uplink to the BD * packets direct from the uplink have had policy applied */ - set_int_l2_mode (vlib_get_main (), vnet_get_main (), - MODE_L2_BRIDGE, gg->gg_uplink_sw_if_index, - gg->gg_bd_index, L2_BD_PORT_TYPE_NORMAL, 0, 0); - l2input_intf_bitmap_enable (gg->gg_uplink_sw_if_index, - L2INPUT_FEAT_GBP_NULL_CLASSIFY, 1); - } + gg->gg_uplink_itf = + gbp_itf_l2_add_and_lock (gg->gg_uplink_sw_if_index, gbi); - hash_set (gbp_endpoint_group_db.gg_hash, - gg->gg_id, gg - gbp_endpoint_group_pool); + gbp_itf_l2_set_input_feature (gg->gg_uplink_itf, + L2INPUT_FEAT_GBP_NULL_CLASSIFY); + } + hash_set (gbp_endpoint_group_db.gg_hash_sclass, + gg->gg_sclass, gg - gbp_endpoint_group_pool); } else { @@ -178,15 +178,8 @@ gbp_endpoint_group_unlock (index_t ggi) gg = pool_elt_at_index (gbp_endpoint_group_pool, ggi); - if (~0 != gg->gg_uplink_sw_if_index) - { - set_int_l2_mode (vlib_get_main (), vnet_get_main (), - MODE_L3, gg->gg_uplink_sw_if_index, - gg->gg_bd_index, L2_BD_PORT_TYPE_NORMAL, 0, 0); + gbp_itf_unlock (&gg->gg_uplink_itf); - l2input_intf_bitmap_enable (gg->gg_uplink_sw_if_index, - L2INPUT_FEAT_GBP_NULL_CLASSIFY, 0); - } FOR_EACH_FIB_IP_PROTOCOL (fproto) { dpo_reset (&gg->gg_dpo[fproto]); @@ -196,18 +189,18 @@ gbp_endpoint_group_unlock (index_t ggi) if (SCLASS_INVALID != gg->gg_sclass) hash_unset (gbp_epg_sclass_db, gg->gg_sclass); - hash_unset (gbp_endpoint_group_db.gg_hash, gg->gg_id); + hash_unset (gbp_endpoint_group_db.gg_hash_sclass, gg->gg_sclass); pool_put (gbp_endpoint_group_pool, gg); } } int -gbp_endpoint_group_delete (epg_id_t epg_id) +gbp_endpoint_group_delete (sclass_t sclass) { index_t ggi; - ggi = gbp_endpoint_group_find (epg_id); + ggi = gbp_endpoint_group_find (sclass); if (INDEX_INVALID != ggi) { @@ -261,7 +254,7 @@ gbp_endpoint_group_cli (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { gbp_endpoint_retention_t retention = { 0 }; - epg_id_t epg_id = EPG_INVALID, sclass; + vnid_t vnid = VNID_INVALID, sclass; vnet_main_t *vnm = vnet_get_main (); u32 uplink_sw_if_index = ~0; u32 bd_id = ~0; @@ -277,7 +270,7 @@ gbp_endpoint_group_cli (vlib_main_t * vm, add = 1; else if (unformat (input, "del")) add = 0; - else if (unformat (input, "epg %d", &epg_id)) + else if (unformat (input, "epg %d", &vnid)) ; else if (unformat (input, "sclass %d", &sclass)) ; @@ -289,23 +282,21 @@ gbp_endpoint_group_cli (vlib_main_t * vm, break; } - if (EPG_INVALID == epg_id) + if (VNID_INVALID == vnid) return clib_error_return (0, "EPG-ID must be specified"); if (add) { - if (~0 == uplink_sw_if_index) - return clib_error_return (0, "interface must be specified"); if (~0 == bd_id) return clib_error_return (0, "Bridge-domain must be specified"); if (~0 == rd_id) return clib_error_return (0, "route-domain must be specified"); - gbp_endpoint_group_add_and_lock (epg_id, sclass, bd_id, rd_id, + gbp_endpoint_group_add_and_lock (vnid, sclass, bd_id, rd_id, uplink_sw_if_index, &retention); } else - gbp_endpoint_group_delete (epg_id); + gbp_endpoint_group_delete (vnid); return (NULL); } @@ -314,29 +305,40 @@ gbp_endpoint_group_cli (vlib_main_t * vm, * Configure a GBP Endpoint Group * * @cliexpar - * @cliexstart{set gbp endpoint-group [del] epg bd } + * @cliexstart{gbp endpoint-group [del] epg bd rd [sclass ] []} * @cliexend ?*/ /* *INDENT-OFF* */ VLIB_CLI_COMMAND (gbp_endpoint_group_cli_node, static) = { .path = "gbp endpoint-group", - .short_help = "gbp endpoint-group [del] epg bd rd ", + .short_help = "gbp endpoint-group [del] epg bd rd [sclass ] []", .function = gbp_endpoint_group_cli, }; +static u8 * +format_gbp_endpoint_retention (u8 * s, va_list * args) +{ + gbp_endpoint_retention_t *rt = va_arg (*args, gbp_endpoint_retention_t*); + + s = format (s, "[remote-EP-timeout:%d]", rt->remote_ep_timeout); + + return (s); +} + u8 * format_gbp_endpoint_group (u8 * s, va_list * args) { gbp_endpoint_group_t *gg = va_arg (*args, gbp_endpoint_group_t*); - vnet_main_t *vnm = vnet_get_main (); if (NULL != gg) - s = format (s, "%d, sclass:%d bd:[%d,%d], rd:[%d] uplink:%U locks:%d", - gg->gg_id, + s = format (s, "[%d] %d, sclass:%d bd:%d rd:%d uplink:%U retention:%U locks:%d", + gg - gbp_endpoint_group_pool, + gg->gg_vnid, gg->gg_sclass, - gbp_endpoint_group_get_bd_id(gg), gg->gg_bd_index, + gg->gg_gbd, gg->gg_rd, - format_vnet_sw_if_index_name, vnm, gg->gg_uplink_sw_if_index, + format_gbp_itf_hdl, gg->gg_uplink_itf, + format_gbp_endpoint_retention, &gg->gg_retention, gg->gg_locks); else s = format (s, "NULL");