Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ip: Replace Sematics for Interface IP addresses
[vpp.git]
/
src
/
plugins
/
gbp
/
gbp_endpoint_group.c
diff --git
a/src/plugins/gbp/gbp_endpoint_group.c
b/src/plugins/gbp/gbp_endpoint_group.c
index
ee4af2c
..
92bad37
100644
(file)
--- a/
src/plugins/gbp/gbp_endpoint_group.c
+++ b/
src/plugins/gbp/gbp_endpoint_group.c
@@
-19,6
+19,7
@@
#include <plugins/gbp/gbp_endpoint.h>
#include <plugins/gbp/gbp_bridge_domain.h>
#include <plugins/gbp/gbp_route_domain.h>
#include <plugins/gbp/gbp_endpoint.h>
#include <plugins/gbp/gbp_bridge_domain.h>
#include <plugins/gbp/gbp_route_domain.h>
+#include <plugins/gbp/gbp_itf.h>
#include <vnet/dpo/dvr_dpo.h>
#include <vnet/fib/fib_table.h>
#include <vnet/dpo/dvr_dpo.h>
#include <vnet/fib/fib_table.h>
@@
-33,6
+34,12
@@
gbp_endpoint_group_t *gbp_endpoint_group_pool;
* DB of endpoint_groups
*/
gbp_endpoint_group_db_t gbp_endpoint_group_db;
* DB of endpoint_groups
*/
gbp_endpoint_group_db_t gbp_endpoint_group_db;
+
+/**
+ * Map sclass to EPG
+ */
+uword *gbp_epg_sclass_db;
+
vlib_log_class_t gg_logger;
#define GBP_EPG_DBG(...) \
vlib_log_class_t gg_logger;
#define GBP_EPG_DBG(...) \
@@
-44,21
+51,24
@@
gbp_endpoint_group_get (index_t i)
return (pool_elt_at_index (gbp_endpoint_group_pool, i));
}
return (pool_elt_at_index (gbp_endpoint_group_pool, i));
}
-
static
void
-gbp_endpoint_group_lock (index_t i)
+void
+gbp_endpoint_group_lock (index_t
gg
i)
{
gbp_endpoint_group_t *gg;
{
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
gg->gg_locks++;
}
index_t
-gbp_endpoint_group_find (
epg_id_t epg_id
)
+gbp_endpoint_group_find (
sclass_t sclass
)
{
uword *p;
{
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];
if (NULL != p)
return p[0];
@@
-66,33
+76,21
@@
gbp_endpoint_group_find (epg_id_t epg_id)
return (INDEX_INVALID);
}
return (INDEX_INVALID);
}
-index_t
-gbp_endpoint_group_find_and_lock (epg_id_t epg_id)
-{
- uword *p;
-
- p = hash_get (gbp_endpoint_group_db.gg_hash, epg_id);
-
- if (NULL != p)
- {
- gbp_endpoint_group_lock (p[0]);
- return p[0];
- }
- return (INDEX_INVALID);
-}
-
int
int
-gbp_endpoint_group_add_and_lock (epg_id_t epg_id,
- u32 bd_id, u32 rd_id, u32 uplink_sw_if_index)
+gbp_endpoint_group_add_and_lock (vnid_t vnid,
+ u16 sclass,
+ u32 bd_id,
+ u32 rd_id,
+ u32 uplink_sw_if_index,
+ const gbp_endpoint_retention_t * retention)
{
gbp_endpoint_group_t *gg;
index_t ggi;
{
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)
{
if (INDEX_INVALID == ggi)
{
- gbp_bridge_domain_t *gb;
fib_protocol_t fproto;
index_t gbi, grdi;
fib_protocol_t fproto;
index_t gbi, grdi;
@@
-109,17
+107,20
@@
gbp_endpoint_group_add_and_lock (epg_id_t epg_id,
return (VNET_API_ERROR_NO_SUCH_FIB);
}
return (VNET_API_ERROR_NO_SUCH_FIB);
}
- gb = gbp_bridge_domain_get (gbi);
-
pool_get_zero (gbp_endpoint_group_pool, gg);
pool_get_zero (gbp_endpoint_group_pool, gg);
- gg->gg_
id = epg_
id;
+ gg->gg_
vnid = vn
id;
gg->gg_rd = grdi;
gg->gg_gbd = gbi;
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;
gg->gg_uplink_sw_if_index = uplink_sw_if_index;
+ gbp_itf_hdl_reset (&gg->gg_uplink_itf);
gg->gg_locks = 1;
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_vnid);
/*
* an egress DVR dpo for internal subnets to use when sending
/*
* 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
*/
* 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
{
}
else
{
@@
-165,6
+165,9
@@
gbp_endpoint_group_unlock (index_t ggi)
{
gbp_endpoint_group_t *gg;
{
gbp_endpoint_group_t *gg;
+ if (INDEX_INVALID == ggi)
+ return;
+
gg = gbp_endpoint_group_get (ggi);
gg->gg_locks--;
gg = gbp_endpoint_group_get (ggi);
gg->gg_locks--;
@@
-175,15
+178,8
@@
gbp_endpoint_group_unlock (index_t ggi)
gg = pool_elt_at_index (gbp_endpoint_group_pool, 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]);
FOR_EACH_FIB_IP_PROTOCOL (fproto)
{
dpo_reset (&gg->gg_dpo[fproto]);
@@
-191,18
+187,20
@@
gbp_endpoint_group_unlock (index_t ggi)
gbp_bridge_domain_unlock (gg->gg_gbd);
gbp_route_domain_unlock (gg->gg_rd);
gbp_bridge_domain_unlock (gg->gg_gbd);
gbp_route_domain_unlock (gg->gg_rd);
- hash_unset (gbp_endpoint_group_db.gg_hash, gg->gg_id);
+ if (SCLASS_INVALID != gg->gg_sclass)
+ hash_unset (gbp_epg_sclass_db, gg->gg_sclass);
+ hash_unset (gbp_endpoint_group_db.gg_hash_sclass, gg->gg_sclass);
pool_put (gbp_endpoint_group_pool, gg);
}
}
int
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;
{
index_t ggi;
- ggi = gbp_endpoint_group_find (
epg_id
);
+ ggi = gbp_endpoint_group_find (
sclass
);
if (INDEX_INVALID != ggi)
{
if (INDEX_INVALID != ggi)
{
@@
-227,7
+225,7
@@
gbp_endpoint_group_get_bd_id (const gbp_endpoint_group_t * gg)
}
index_t
}
index_t
-gbp_endpoint_group_get_fib_index (gbp_endpoint_group_t * gg,
+gbp_endpoint_group_get_fib_index (
const
gbp_endpoint_group_t * gg,
fib_protocol_t fproto)
{
const gbp_route_domain_t *grd;
fib_protocol_t fproto)
{
const gbp_route_domain_t *grd;
@@
-237,16
+235,6
@@
gbp_endpoint_group_get_fib_index (gbp_endpoint_group_t * gg,
return (grd->grd_fib_index[fproto]);
}
return (grd->grd_fib_index[fproto]);
}
-u32
-gbp_endpoint_group_get_bvi (gbp_endpoint_group_t * gg)
-{
- const gbp_bridge_domain_t *gb;
-
- gb = gbp_bridge_domain_get (gg->gg_gbd);
-
- return (gb->gb_bvi_sw_if_index);
-}
-
void
gbp_endpoint_group_walk (gbp_endpoint_group_cb_t cb, void *ctx)
{
void
gbp_endpoint_group_walk (gbp_endpoint_group_cb_t cb, void *ctx)
{
@@
-265,8
+253,9
@@
static clib_error_t *
gbp_endpoint_group_cli (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
{
gbp_endpoint_group_cli (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
{
+ gbp_endpoint_retention_t retention = { 0 };
+ vnid_t vnid = VNID_INVALID, sclass;
vnet_main_t *vnm = vnet_get_main ();
vnet_main_t *vnm = vnet_get_main ();
- epg_id_t epg_id = EPG_INVALID;
u32 uplink_sw_if_index = ~0;
u32 bd_id = ~0;
u32 rd_id = ~0;
u32 uplink_sw_if_index = ~0;
u32 bd_id = ~0;
u32 rd_id = ~0;
@@
-281,7
+270,9
@@
gbp_endpoint_group_cli (vlib_main_t * vm,
add = 1;
else if (unformat (input, "del"))
add = 0;
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))
;
else if (unformat (input, "bd %d", &bd_id))
;
;
else if (unformat (input, "bd %d", &bd_id))
;
@@
-291,23
+282,21
@@
gbp_endpoint_group_cli (vlib_main_t * vm,
break;
}
break;
}
- if (
EPG_INVALID == epg_
id)
+ if (
VNID_INVALID == vn
id)
return clib_error_return (0, "EPG-ID must be specified");
if (add)
{
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");
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
, bd_id, rd_id,
- uplink_sw_if_index);
+ gbp_endpoint_group_add_and_lock (
vnid, sclass
, bd_id, rd_id,
+ uplink_sw_if_index
, &retention
);
}
else
}
else
- gbp_endpoint_group_delete (
epg_
id);
+ gbp_endpoint_group_delete (
vn
id);
return (NULL);
}
return (NULL);
}
@@
-316,28
+305,40
@@
gbp_endpoint_group_cli (vlib_main_t * vm,
* Configure a GBP Endpoint Group
*
* @cliexpar
* Configure a GBP Endpoint Group
*
* @cliexpar
- * @cliexstart{
set gbp endpoint-group [del] epg <ID> bd <ID> <interface>
}
+ * @cliexstart{
gbp endpoint-group [del] epg <ID> bd <ID> rd <ID> [sclass <ID>] [<interface>]
}
* @cliexend
?*/
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (gbp_endpoint_group_cli_node, static) = {
.path = "gbp endpoint-group",
* @cliexend
?*/
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (gbp_endpoint_group_cli_node, static) = {
.path = "gbp endpoint-group",
- .short_help = "gbp endpoint-group [del] epg <ID> bd <ID> rd <ID>
<interface>
",
+ .short_help = "gbp endpoint-group [del] epg <ID> bd <ID> rd <ID>
[sclass <ID>] [<interface>]
",
.function = gbp_endpoint_group_cli,
};
.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*);
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)
if (NULL != gg)
- s = format (s, "%d, bd:[%d,%d], rd:[%d] uplink:%U locks:%d",
- gg->gg_id,
- gbp_endpoint_group_get_bd_id(gg), gg->gg_bd_index,
+ 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,
+ gg->gg_gbd,
gg->gg_rd,
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");
gg->gg_locks);
else
s = format (s, "NULL");