Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
GBP: per-group EP retention policy
[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
..
dc44407
100644
(file)
--- a/
src/plugins/gbp/gbp_endpoint_group.c
+++ b/
src/plugins/gbp/gbp_endpoint_group.c
@@
-33,6
+33,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,7
+50,7
@@
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
+void
gbp_endpoint_group_lock (index_t i)
{
gbp_endpoint_group_t *gg;
gbp_endpoint_group_lock (index_t i)
{
gbp_endpoint_group_t *gg;
@@
-66,24
+72,13
@@
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
gbp_endpoint_group_add_and_lock (epg_id_t epg_id,
int
gbp_endpoint_group_add_and_lock (epg_id_t epg_id,
- u32 bd_id, u32 rd_id, u32 uplink_sw_if_index)
+ 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;
@@
-120,6
+115,11
@@
gbp_endpoint_group_add_and_lock (epg_id_t epg_id,
gg->gg_uplink_sw_if_index = uplink_sw_if_index;
gg->gg_locks = 1;
gg->gg_uplink_sw_if_index = uplink_sw_if_index;
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);
/*
* an egress DVR dpo for internal subnets to use when sending
/*
* an egress DVR dpo for internal subnets to use when sending
@@
-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--;
@@
-191,6
+194,8
@@
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);
+ 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);
pool_put (gbp_endpoint_group_pool, gg);
hash_unset (gbp_endpoint_group_db.gg_hash, gg->gg_id);
pool_put (gbp_endpoint_group_pool, gg);
@@
-227,7
+232,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
+242,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
+260,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 };
+ epg_id_t epg_id = EPG_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;
@@
-283,6
+279,8
@@
gbp_endpoint_group_cli (vlib_main_t * vm,
add = 0;
else if (unformat (input, "epg %d", &epg_id))
;
add = 0;
else if (unformat (input, "epg %d", &epg_id))
;
+ else if (unformat (input, "sclass %d", &sclass))
+ ;
else if (unformat (input, "bd %d", &bd_id))
;
else if (unformat (input, "rd %d", &rd_id))
else if (unformat (input, "bd %d", &bd_id))
;
else if (unformat (input, "rd %d", &rd_id))
@@
-303,8
+301,8
@@
gbp_endpoint_group_cli (vlib_main_t * vm,
if (~0 == rd_id)
return clib_error_return (0, "route-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 (epg_id,
sclass,
bd_id, rd_id,
+ uplink_sw_if_index
, &retention
);
}
else
gbp_endpoint_group_delete (epg_id);
}
else
gbp_endpoint_group_delete (epg_id);
@@
-333,8
+331,9
@@
format_gbp_endpoint_group (u8 * s, va_list * args)
vnet_main_t *vnm = vnet_get_main ();
if (NULL != gg)
vnet_main_t *vnm = vnet_get_main ();
if (NULL != gg)
- s = format (s, "%d, bd:[%d,%d], rd:[%d] uplink:%U locks:%d",
+ s = format (s, "%d,
sclass:%d
bd:[%d,%d], rd:[%d] uplink:%U locks:%d",
gg->gg_id,
gg->gg_id,
+ gg->gg_sclass,
gbp_endpoint_group_get_bd_id(gg), gg->gg_bd_index,
gg->gg_rd,
format_vnet_sw_if_index_name, vnm, gg->gg_uplink_sw_if_index,
gbp_endpoint_group_get_bd_id(gg), gg->gg_bd_index,
gg->gg_rd,
format_vnet_sw_if_index_name, vnm, gg->gg_uplink_sw_if_index,