matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

*: Rearrange vrf_bitmap_X api to reduce memory footprint

Browse source 
When running all daemons with config for most of them, FRR has
sharpd@janelle:~/frr$ vtysh -c "show debug hashtable"  | grep "VRF BIT HASH" | wc -l
3570

3570 hashes for bitmaps associated with the vrf.  This is a very
large number of hashes.  Let's do two things:

a) Reduce the created size of the actually created hashes to 2
instead of 32.

b) Delay generation of the hash *until* a set operation happens.
As that no hash directly implies a unset value if/when checked.

This reduces the number of hashes to 61 in my setup for normal
operation.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2023-04-19 08:13:18 -04:00
parent dee79c33a4
commit 161972c9fe
19 changed files with 161 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
babeld/babeld.c
View file

@ -108,14 +108,14 @@ babel_config_write (struct vty *vty)
/* list redistributed protocols */ /* list redistributed protocols */
for (afi = AFI_IP; afi <= AFI_IP6; afi++) { for (afi = AFI_IP; afi <= AFI_IP6; afi++) {
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) { for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
if (i != zclient->redist_default && if (i != zclient->redist_default &&
vrf_bitmap_check (zclient->redist[afi][i], VRF_DEFAULT)) { vrf_bitmap_check(&zclient->redist[afi][i], VRF_DEFAULT)) {
vty_out (vty, " redistribute %s %s\n", vty_out(vty, " redistribute %s %s\n",
(afi == AFI_IP) ? "ipv4" : "ipv6", (afi == AFI_IP) ? "ipv4" : "ipv6",
zebra_route_string(i)); zebra_route_string(i));
lines++; lines++;
} }
} }
} }
lines += config_write_distribute (vty, babel_routing_process->distribute_ctx); lines += config_write_distribute (vty, babel_routing_process->distribute_ctx);

8
bgpd/bgp_zebra.c
View file

@ -1911,7 +1911,7 @@ int bgp_redistribute_set(struct bgp *bgp, afi_t afi, int type,
redist_add_instance(&zclient->mi_redist[afi][type], instance); redist_add_instance(&zclient->mi_redist[afi][type], instance);
} else { } else {
if (vrf_bitmap_check(zclient->redist[afi][type], bgp->vrf_id)) if (vrf_bitmap_check(&zclient->redist[afi][type], bgp->vrf_id))
return CMD_WARNING; return CMD_WARNING;
#ifdef ENABLE_BGP_VNC #ifdef ENABLE_BGP_VNC
@ -1921,7 +1921,7 @@ int bgp_redistribute_set(struct bgp *bgp, afi_t afi, int type,
} }
#endif #endif
vrf_bitmap_set(zclient->redist[afi][type], bgp->vrf_id); vrf_bitmap_set(&zclient->redist[afi][type], bgp->vrf_id);
} }
/* /*
@ -2042,9 +2042,9 @@ int bgp_redistribute_unreg(struct bgp *bgp, afi_t afi, int type,
return CMD_WARNING; return CMD_WARNING;
redist_del_instance(&zclient->mi_redist[afi][type], instance); redist_del_instance(&zclient->mi_redist[afi][type], instance);
} else { } else {
if (!vrf_bitmap_check(zclient->redist[afi][type], bgp->vrf_id)) if (!vrf_bitmap_check(&zclient->redist[afi][type], bgp->vrf_id))
return CMD_WARNING; return CMD_WARNING;
vrf_bitmap_unset(zclient->redist[afi][type], bgp->vrf_id); vrf_bitmap_unset(&zclient->redist[afi][type], bgp->vrf_id);
} }
if (bgp_install_info_to_zebra(bgp)) { if (bgp_install_info_to_zebra(bgp)) {

4
bgpd/bgpd.c
View file

@ -3654,9 +3654,9 @@ static void bgp_zclient_set_redist(afi_t afi, int type, unsigned short instance,
instance); instance);
} else { } else {
if (set) if (set)
vrf_bitmap_set(zclient->redist[afi][type], vrf_id); vrf_bitmap_set(&zclient->redist[afi][type], vrf_id);
else else
vrf_bitmap_unset(zclient->redist[afi][type], vrf_id); vrf_bitmap_unset(&zclient->redist[afi][type], vrf_id);
} }
} }

18
bgpd/rfapi/vnc_zebra.c
View file

@ -560,9 +560,9 @@ static void vnc_zebra_add_del_prefix(struct bgp *bgp,
return; return;
} }
if (!vrf_bitmap_check( if (!vrf_bitmap_check(&zclient_vnc->redist[family2afi(p->family)]
zclient_vnc->redist[family2afi(p->family)][ZEBRA_ROUTE_VNC], [ZEBRA_ROUTE_VNC],
VRF_DEFAULT)) VRF_DEFAULT))
return; return;
if (!bgp->rfapi_cfg) { if (!bgp->rfapi_cfg) {
@ -622,7 +622,7 @@ static void vnc_zebra_add_del_nve(struct bgp *bgp, struct rfapi_descriptor *rfd,
if (zclient_vnc->sock < 0) if (zclient_vnc->sock < 0)
return; return;
if (!vrf_bitmap_check(zclient_vnc->redist[afi][ZEBRA_ROUTE_VNC], if (!vrf_bitmap_check(&zclient_vnc->redist[afi][ZEBRA_ROUTE_VNC],
VRF_DEFAULT)) VRF_DEFAULT))
return; return;
@ -819,12 +819,12 @@ int vnc_redistribute_set(struct bgp *bgp, afi_t afi, int type)
// bgp->redist[afi][type] = 1; // bgp->redist[afi][type] = 1;
/* Return if already redistribute flag is set. */ /* Return if already redistribute flag is set. */
if (vrf_bitmap_check(zclient_vnc->redist[afi][type], VRF_DEFAULT)) if (vrf_bitmap_check(&zclient_vnc->redist[afi][type], VRF_DEFAULT))
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
vrf_bitmap_set(zclient_vnc->redist[afi][type], VRF_DEFAULT); vrf_bitmap_set(&zclient_vnc->redist[afi][type], VRF_DEFAULT);
// vrf_bitmap_set(zclient_vnc->redist[afi][type], VRF_DEFAULT); // vrf_bitmap_set(&zclient_vnc->redist[afi][type], VRF_DEFAULT);
/* Return if zebra connection is not established. */ /* Return if zebra connection is not established. */
if (zclient_vnc->sock < 0) if (zclient_vnc->sock < 0)
@ -855,9 +855,9 @@ int vnc_redistribute_unset(struct bgp *bgp, afi_t afi, int type)
bgp->rfapi_cfg->redist[afi][type] = 0; bgp->rfapi_cfg->redist[afi][type] = 0;
/* Return if zebra connection is disabled. */ /* Return if zebra connection is disabled. */
if (!vrf_bitmap_check(zclient_vnc->redist[afi][type], VRF_DEFAULT)) if (!vrf_bitmap_check(&zclient_vnc->redist[afi][type], VRF_DEFAULT))
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
vrf_bitmap_unset(zclient_vnc->redist[afi][type], VRF_DEFAULT); vrf_bitmap_unset(&zclient_vnc->redist[afi][type], VRF_DEFAULT);
if (bgp->rfapi_cfg->redist[AFI_IP][type] == 0 if (bgp->rfapi_cfg->redist[AFI_IP][type] == 0
&& bgp->rfapi_cfg->redist[AFI_IP6][type] == 0 && bgp->rfapi_cfg->redist[AFI_IP6][type] == 0

2
eigrpd/eigrp_northbound.c
View file

@ -724,7 +724,7 @@ static int eigrpd_instance_redistribute_create(struct nb_cb_create_args *args)
else else
vrfid = VRF_DEFAULT; vrfid = VRF_DEFAULT;
if (vrf_bitmap_check(zclient->redist[AFI_IP][proto], vrfid)) if (vrf_bitmap_check(&zclient->redist[AFI_IP][proto], vrfid))
return NB_ERR_INCONSISTENCY; return NB_ERR_INCONSISTENCY;
break; break;
case NB_EV_PREPARE: case NB_EV_PREPARE:

6
eigrpd/eigrp_zebra.c
View file

@ -249,9 +249,9 @@ void eigrp_zebra_route_delete(struct eigrp *eigrp, struct prefix *p)
static int eigrp_is_type_redistributed(int type, vrf_id_t vrf_id) static int eigrp_is_type_redistributed(int type, vrf_id_t vrf_id)
{ {
return ((DEFAULT_ROUTE_TYPE(type)) return ((DEFAULT_ROUTE_TYPE(type))
? vrf_bitmap_check(zclient->default_information[AFI_IP], ? vrf_bitmap_check(
vrf_id) &zclient->default_information[AFI_IP], vrf_id)
: vrf_bitmap_check(zclient->redist[AFI_IP][type], : vrf_bitmap_check(&zclient->redist[AFI_IP][type],
vrf_id)); vrf_id));
} }

12
isisd/isisd.c
View file

@ -638,22 +638,22 @@ static void isis_set_redist_vrf_bitmaps(struct isis *isis, bool set)
if (type == DEFAULT_ROUTE) { if (type == DEFAULT_ROUTE) {
if (set) if (set)
vrf_bitmap_set( vrf_bitmap_set(
zclient->default_information &zclient->default_information
[afi], [afi],
isis->vrf_id); isis->vrf_id);
else else
vrf_bitmap_unset( vrf_bitmap_unset(
zclient->default_information &zclient->default_information
[afi], [afi],
isis->vrf_id); isis->vrf_id);
} else { } else {
if (set) if (set)
vrf_bitmap_set( vrf_bitmap_set(
zclient->redist[afi][type], &zclient->redist[afi][type],
isis->vrf_id); isis->vrf_id);
else else
vrf_bitmap_unset( vrf_bitmap_unset(
zclient->redist[afi][type], &zclient->redist[afi][type],
isis->vrf_id); isis->vrf_id);
} }
} }

56
lib/vrf.c
View file

@ -384,54 +384,80 @@ static void vrf_hash_bitmap_free(void *data)
XFREE(MTYPE_VRF_BITMAP, bit); XFREE(MTYPE_VRF_BITMAP, bit);
} }
vrf_bitmap_t vrf_bitmap_init(void) void vrf_bitmap_init(vrf_bitmap_t *pbmap)
{ {
return hash_create_size(32, vrf_hash_bitmap_key, vrf_hash_bitmap_cmp, *pbmap = NULL;
"VRF BIT HASH");
} }
void vrf_bitmap_free(vrf_bitmap_t bmap) void vrf_bitmap_free(vrf_bitmap_t *pbmap)
{ {
struct hash *vrf_hash = bmap; struct hash *vrf_hash;
if (!*pbmap)
return;
vrf_hash = *pbmap;
hash_clean_and_free(&vrf_hash, vrf_hash_bitmap_free); hash_clean_and_free(&vrf_hash, vrf_hash_bitmap_free);
} }
void vrf_bitmap_set(vrf_bitmap_t bmap, vrf_id_t vrf_id) void vrf_bitmap_set(vrf_bitmap_t *pbmap, vrf_id_t vrf_id)
{ {
struct vrf_bit_set lookup = { .vrf_id = vrf_id }; struct vrf_bit_set lookup = { .vrf_id = vrf_id };
struct hash *vrf_hash = bmap; struct hash *vrf_hash;
struct vrf_bit_set *bit; struct vrf_bit_set *bit;
if (vrf_hash == NULL || vrf_id == VRF_UNKNOWN) if (vrf_id == VRF_UNKNOWN)
return; return;
if (!*pbmap)
*pbmap = vrf_hash =
hash_create_size(2, vrf_hash_bitmap_key,
vrf_hash_bitmap_cmp, "VRF BIT HASH");
else
vrf_hash = *pbmap;
bit = hash_get(vrf_hash, &lookup, vrf_hash_bitmap_alloc); bit = hash_get(vrf_hash, &lookup, vrf_hash_bitmap_alloc);
bit->set = true; bit->set = true;
} }
void vrf_bitmap_unset(vrf_bitmap_t bmap, vrf_id_t vrf_id) void vrf_bitmap_unset(vrf_bitmap_t *pbmap, vrf_id_t vrf_id)
{ {
struct vrf_bit_set lookup = { .vrf_id = vrf_id }; struct vrf_bit_set lookup = { .vrf_id = vrf_id };
struct hash *vrf_hash = bmap; struct hash *vrf_hash;
struct vrf_bit_set *bit; struct vrf_bit_set *bit;
if (vrf_hash == NULL || vrf_id == VRF_UNKNOWN) if (vrf_id == VRF_UNKNOWN)
return;
/*
* If the hash is not created then unsetting is unnecessary
*/
if (!*pbmap)
return;
vrf_hash = *pbmap;
/*
* If we can't look it up, no need to unset it!
*/
bit = hash_lookup(vrf_hash, &lookup);
if (!bit)
return; return;
bit = hash_get(vrf_hash, &lookup, vrf_hash_bitmap_alloc);
bit->set = false; bit->set = false;
} }
int vrf_bitmap_check(vrf_bitmap_t bmap, vrf_id_t vrf_id) int vrf_bitmap_check(vrf_bitmap_t *pbmap, vrf_id_t vrf_id)
{ {
struct vrf_bit_set lookup = { .vrf_id = vrf_id }; struct vrf_bit_set lookup = { .vrf_id = vrf_id };
struct hash *vrf_hash = bmap; struct hash *vrf_hash;
struct vrf_bit_set *bit; struct vrf_bit_set *bit;
if (vrf_hash == NULL || vrf_id == VRF_UNKNOWN) if (!*pbmap || vrf_id == VRF_UNKNOWN)
return 0; return 0;
vrf_hash = *pbmap;
bit = hash_lookup(vrf_hash, &lookup); bit = hash_lookup(vrf_hash, &lookup);
if (bit) if (bit)
return bit->set; return bit->set;

11
lib/vrf.h
View file

@ -167,15 +167,14 @@ extern void *vrf_info_lookup(vrf_id_t);
/* /*
* VRF bit-map: maintaining flags, one bit per VRF ID * VRF bit-map: maintaining flags, one bit per VRF ID
*/ */
typedef void *vrf_bitmap_t; typedef void *vrf_bitmap_t;
#define VRF_BITMAP_NULL NULL #define VRF_BITMAP_NULL NULL
extern vrf_bitmap_t vrf_bitmap_init(void); extern void vrf_bitmap_init(vrf_bitmap_t *pbmap);
extern void vrf_bitmap_free(vrf_bitmap_t); extern void vrf_bitmap_free(vrf_bitmap_t *pbmap);
extern void vrf_bitmap_set(vrf_bitmap_t, vrf_id_t); extern void vrf_bitmap_set(vrf_bitmap_t *pbmap, vrf_id_t vrf_id);
extern void vrf_bitmap_unset(vrf_bitmap_t, vrf_id_t); extern void vrf_bitmap_unset(vrf_bitmap_t *pbmap, vrf_id_t vrf_id);
extern int vrf_bitmap_check(vrf_bitmap_t, vrf_id_t); extern int vrf_bitmap_check(vrf_bitmap_t *pbmap, vrf_id_t vrf_id);
/* /*
* VRF initializer/destructor * VRF initializer/destructor

45
lib/zclient.c
View file

@ -180,14 +180,14 @@ void zclient_stop(struct zclient *zclient)
for (afi = AFI_IP; afi < AFI_MAX; afi++) { for (afi = AFI_IP; afi < AFI_MAX; afi++) {
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) { for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
vrf_bitmap_free(zclient->redist[afi][i]); vrf_bitmap_free(&zclient->redist[afi][i]);
zclient->redist[afi][i] = VRF_BITMAP_NULL; zclient->redist[afi][i] = VRF_BITMAP_NULL;
} }
redist_del_instance( redist_del_instance(
&zclient->mi_redist[afi][zclient->redist_default], &zclient->mi_redist[afi][zclient->redist_default],
zclient->instance); zclient->instance);
vrf_bitmap_free(zclient->default_information[afi]); vrf_bitmap_free(&zclient->default_information[afi]);
zclient->default_information[afi] = VRF_BITMAP_NULL; zclient->default_information[afi] = VRF_BITMAP_NULL;
} }
} }
@ -494,7 +494,7 @@ void zclient_send_reg_requests(struct zclient *zclient, vrf_id_t vrf_id)
/* Set unwanted redistribute route. */ /* Set unwanted redistribute route. */
for (afi = AFI_IP; afi < AFI_MAX; afi++) for (afi = AFI_IP; afi < AFI_MAX; afi++)
vrf_bitmap_set(zclient->redist[afi][zclient->redist_default], vrf_bitmap_set(&zclient->redist[afi][zclient->redist_default],
vrf_id); vrf_id);
/* Flush all redistribute request. */ /* Flush all redistribute request. */
@ -524,15 +524,15 @@ void zclient_send_reg_requests(struct zclient *zclient, vrf_id_t vrf_id)
/* Resend all redistribute request. */ /* Resend all redistribute request. */
for (afi = AFI_IP; afi < AFI_MAX; afi++) { for (afi = AFI_IP; afi < AFI_MAX; afi++) {
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
if (i != zclient->redist_default if (i != zclient->redist_default &&
&& vrf_bitmap_check(zclient->redist[afi][i], vrf_bitmap_check(&zclient->redist[afi][i], vrf_id))
vrf_id))
zebra_redistribute_send(ZEBRA_REDISTRIBUTE_ADD, zebra_redistribute_send(ZEBRA_REDISTRIBUTE_ADD,
zclient, afi, i, 0, zclient, afi, i, 0,
vrf_id); vrf_id);
/* If default information is needed. */ /* If default information is needed. */
if (vrf_bitmap_check(zclient->default_information[afi], vrf_id)) if (vrf_bitmap_check(&zclient->default_information[afi],
vrf_id))
zebra_redistribute_default_send( zebra_redistribute_default_send(
ZEBRA_REDISTRIBUTE_DEFAULT_ADD, zclient, afi, ZEBRA_REDISTRIBUTE_DEFAULT_ADD, zclient, afi,
vrf_id); vrf_id);
@ -561,7 +561,7 @@ void zclient_send_dereg_requests(struct zclient *zclient, vrf_id_t vrf_id)
/* Set unwanted redistribute route. */ /* Set unwanted redistribute route. */
for (afi = AFI_IP; afi < AFI_MAX; afi++) for (afi = AFI_IP; afi < AFI_MAX; afi++)
vrf_bitmap_unset(zclient->redist[afi][zclient->redist_default], vrf_bitmap_unset(&zclient->redist[afi][zclient->redist_default],
vrf_id); vrf_id);
/* Flush all redistribute request. */ /* Flush all redistribute request. */
@ -591,15 +591,15 @@ void zclient_send_dereg_requests(struct zclient *zclient, vrf_id_t vrf_id)
/* Flush all redistribute request. */ /* Flush all redistribute request. */
for (afi = AFI_IP; afi < AFI_MAX; afi++) { for (afi = AFI_IP; afi < AFI_MAX; afi++) {
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
if (i != zclient->redist_default if (i != zclient->redist_default &&
&& vrf_bitmap_check(zclient->redist[afi][i], vrf_bitmap_check(&zclient->redist[afi][i], vrf_id))
vrf_id))
zebra_redistribute_send( zebra_redistribute_send(
ZEBRA_REDISTRIBUTE_DELETE, zclient, afi, ZEBRA_REDISTRIBUTE_DELETE, zclient, afi,
i, 0, vrf_id); i, 0, vrf_id);
/* If default information is needed. */ /* If default information is needed. */
if (vrf_bitmap_check(zclient->default_information[afi], vrf_id)) if (vrf_bitmap_check(&zclient->default_information[afi],
vrf_id))
zebra_redistribute_default_send( zebra_redistribute_default_send(
ZEBRA_REDISTRIBUTE_DEFAULT_DELETE, zclient, afi, ZEBRA_REDISTRIBUTE_DEFAULT_DELETE, zclient, afi,
vrf_id); vrf_id);
@ -726,7 +726,7 @@ void zclient_init(struct zclient *zclient, int redist_default,
/* Clear redistribution flags. */ /* Clear redistribution flags. */
for (afi = AFI_IP; afi < AFI_MAX; afi++) for (afi = AFI_IP; afi < AFI_MAX; afi++)
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
zclient->redist[afi][i] = vrf_bitmap_init(); vrf_bitmap_init(&zclient->redist[afi][i]);
/* Set unwanted redistribute route. bgpd does not need BGP route /* Set unwanted redistribute route. bgpd does not need BGP route
redistribution. */ redistribution. */
@ -738,7 +738,7 @@ void zclient_init(struct zclient *zclient, int redist_default,
instance); instance);
/* Set default-information redistribute to zero. */ /* Set default-information redistribute to zero. */
zclient->default_information[afi] = vrf_bitmap_init(); vrf_bitmap_init(&zclient->default_information[afi]);
} }
if (zclient_debug) if (zclient_debug)
@ -4208,15 +4208,15 @@ void zclient_redistribute(int command, struct zclient *zclient, afi_t afi,
} else { } else {
if (command == ZEBRA_REDISTRIBUTE_ADD) { if (command == ZEBRA_REDISTRIBUTE_ADD) {
if (vrf_bitmap_check(zclient->redist[afi][type], if (vrf_bitmap_check(&zclient->redist[afi][type],
vrf_id)) vrf_id))
return; return;
vrf_bitmap_set(zclient->redist[afi][type], vrf_id); vrf_bitmap_set(&zclient->redist[afi][type], vrf_id);
} else { } else {
if (!vrf_bitmap_check(zclient->redist[afi][type], if (!vrf_bitmap_check(&zclient->redist[afi][type],
vrf_id)) vrf_id))
return; return;
vrf_bitmap_unset(zclient->redist[afi][type], vrf_id); vrf_bitmap_unset(&zclient->redist[afi][type], vrf_id);
} }
} }
@ -4231,14 +4231,15 @@ void zclient_redistribute_default(int command, struct zclient *zclient,
{ {
if (command == ZEBRA_REDISTRIBUTE_DEFAULT_ADD) { if (command == ZEBRA_REDISTRIBUTE_DEFAULT_ADD) {
if (vrf_bitmap_check(zclient->default_information[afi], vrf_id)) if (vrf_bitmap_check(&zclient->default_information[afi],
vrf_id))
return; return;
vrf_bitmap_set(zclient->default_information[afi], vrf_id); vrf_bitmap_set(&zclient->default_information[afi], vrf_id);
} else { } else {
if (!vrf_bitmap_check(zclient->default_information[afi], if (!vrf_bitmap_check(&zclient->default_information[afi],
vrf_id)) vrf_id))
return; return;
vrf_bitmap_unset(zclient->default_information[afi], vrf_id); vrf_bitmap_unset(&zclient->default_information[afi], vrf_id);
} }
if (zclient->sock > 0) if (zclient->sock > 0)

8
ospf6d/ospf6_top.c
View file

@ -140,20 +140,20 @@ static void ospf6_set_redist_vrf_bitmaps(struct ospf6 *ospf6, bool set)
"%s: setting redist vrf %d bitmap for type %d", "%s: setting redist vrf %d bitmap for type %d",
__func__, ospf6->vrf_id, type); __func__, ospf6->vrf_id, type);
if (set) if (set)
vrf_bitmap_set(zclient->redist[AFI_IP6][type], vrf_bitmap_set(&zclient->redist[AFI_IP6][type],
ospf6->vrf_id); ospf6->vrf_id);
else else
vrf_bitmap_unset(zclient->redist[AFI_IP6][type], vrf_bitmap_unset(&zclient->redist[AFI_IP6][type],
ospf6->vrf_id); ospf6->vrf_id);
} }
red_list = ospf6->redist[DEFAULT_ROUTE]; red_list = ospf6->redist[DEFAULT_ROUTE];
if (red_list) { if (red_list) {
if (set) if (set)
vrf_bitmap_set(zclient->default_information[AFI_IP6], vrf_bitmap_set(&zclient->default_information[AFI_IP6],
ospf6->vrf_id); ospf6->vrf_id);
else else
vrf_bitmap_unset(zclient->default_information[AFI_IP6], vrf_bitmap_unset(&zclient->default_information[AFI_IP6],
ospf6->vrf_id); ospf6->vrf_id);
} }
} }

16
ospf6d/ospf6_zebra.c
View file

@ -97,9 +97,9 @@ static int ospf6_router_id_update_zebra(ZAPI_CALLBACK_ARGS)
/* redistribute function */ /* redistribute function */
void ospf6_zebra_redistribute(int type, vrf_id_t vrf_id) void ospf6_zebra_redistribute(int type, vrf_id_t vrf_id)
{ {
if (vrf_bitmap_check(zclient->redist[AFI_IP6][type], vrf_id)) if (vrf_bitmap_check(&zclient->redist[AFI_IP6][type], vrf_id))
return; return;
vrf_bitmap_set(zclient->redist[AFI_IP6][type], vrf_id); vrf_bitmap_set(&zclient->redist[AFI_IP6][type], vrf_id);
if (zclient->sock > 0) if (zclient->sock > 0)
zebra_redistribute_send(ZEBRA_REDISTRIBUTE_ADD, zclient, zebra_redistribute_send(ZEBRA_REDISTRIBUTE_ADD, zclient,
@ -108,9 +108,9 @@ void ospf6_zebra_redistribute(int type, vrf_id_t vrf_id)
void ospf6_zebra_no_redistribute(int type, vrf_id_t vrf_id) void ospf6_zebra_no_redistribute(int type, vrf_id_t vrf_id)
{ {
if (!vrf_bitmap_check(zclient->redist[AFI_IP6][type], vrf_id)) if (!vrf_bitmap_check(&zclient->redist[AFI_IP6][type], vrf_id))
return; return;
vrf_bitmap_unset(zclient->redist[AFI_IP6][type], vrf_id); vrf_bitmap_unset(&zclient->redist[AFI_IP6][type], vrf_id);
if (zclient->sock > 0) if (zclient->sock > 0)
zebra_redistribute_send(ZEBRA_REDISTRIBUTE_DELETE, zclient, zebra_redistribute_send(ZEBRA_REDISTRIBUTE_DELETE, zclient,
AFI_IP6, type, 0, vrf_id); AFI_IP6, type, 0, vrf_id);
@ -333,10 +333,10 @@ DEFUN(show_zebra,
json_object_int_add(json_zebra, "fail", zclient->fail); json_object_int_add(json_zebra, "fail", zclient->fail);
json_object_int_add( json_object_int_add(
json_zebra, "redistributeDefault", json_zebra, "redistributeDefault",
vrf_bitmap_check(zclient->default_information[AFI_IP6], vrf_bitmap_check(&zclient->default_information[AFI_IP6],
VRF_DEFAULT)); VRF_DEFAULT));
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) { for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
if (vrf_bitmap_check(zclient->redist[AFI_IP6][i], if (vrf_bitmap_check(&zclient->redist[AFI_IP6][i],
VRF_DEFAULT)) VRF_DEFAULT))
json_object_array_add( json_object_array_add(
json_array, json_array,
@ -351,11 +351,11 @@ DEFUN(show_zebra,
vty_out(vty, "Zebra Information\n"); vty_out(vty, "Zebra Information\n");
vty_out(vty, " fail: %d\n", zclient->fail); vty_out(vty, " fail: %d\n", zclient->fail);
vty_out(vty, " redistribute default: %d\n", vty_out(vty, " redistribute default: %d\n",
vrf_bitmap_check(zclient->default_information[AFI_IP6], vrf_bitmap_check(&zclient->default_information[AFI_IP6],
VRF_DEFAULT)); VRF_DEFAULT));
vty_out(vty, " redistribute:"); vty_out(vty, " redistribute:");
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) { for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
if (vrf_bitmap_check(zclient->redist[AFI_IP6][i], if (vrf_bitmap_check(&zclient->redist[AFI_IP6][i],
VRF_DEFAULT)) VRF_DEFAULT))
vty_out(vty, " %s", zebra_route_string(i)); vty_out(vty, " %s", zebra_route_string(i));
} }

2
ospf6d/ospf6_zebra.h
View file

@ -38,7 +38,7 @@ extern void ospf6_zebra_route_update_remove(struct ospf6_route *request,
extern void ospf6_zebra_redistribute(int, vrf_id_t vrf_id); extern void ospf6_zebra_redistribute(int, vrf_id_t vrf_id);
extern void ospf6_zebra_no_redistribute(int, vrf_id_t vrf_id); extern void ospf6_zebra_no_redistribute(int, vrf_id_t vrf_id);
#define ospf6_zebra_is_redistribute(type, vrf_id) \ #define ospf6_zebra_is_redistribute(type, vrf_id) \
vrf_bitmap_check(zclient->redist[AFI_IP6][type], vrf_id) vrf_bitmap_check(&zclient->redist[AFI_IP6][type], vrf_id)
extern void ospf6_zebra_init(struct event_loop *tm); extern void ospf6_zebra_init(struct event_loop *tm);
extern void ospf6_zebra_import_default_route(struct ospf6 *ospf6, bool unreg); extern void ospf6_zebra_import_default_route(struct ospf6 *ospf6, bool unreg);
extern void ospf6_zebra_add_discard(struct ospf6_route *request, extern void ospf6_zebra_add_discard(struct ospf6_route *request,

10
ospfd/ospf_flood.c
View file

@ -154,11 +154,11 @@ struct external_info *ospf_external_info_check(struct ospf *ospf,
redist_on = redist_on =
is_default_prefix4(&p) is_default_prefix4(&p)
? vrf_bitmap_check( ? vrf_bitmap_check(
zclient->default_information[AFI_IP], &zclient->default_information[AFI_IP],
ospf->vrf_id) ospf->vrf_id)
: (zclient->mi_redist[AFI_IP][type].enabled : (zclient->mi_redist[AFI_IP][type].enabled ||
|| vrf_bitmap_check( vrf_bitmap_check(
zclient->redist[AFI_IP][type], &zclient->redist[AFI_IP][type],
ospf->vrf_id)); ospf->vrf_id));
// Pending: check for MI above. // Pending: check for MI above.
if (redist_on) { if (redist_on) {

18
ospfd/ospf_zebra.c
View file

@ -814,16 +814,16 @@ int ospf_is_type_redistributed(struct ospf *ospf, int type,
unsigned short instance) unsigned short instance)
{ {
return (DEFAULT_ROUTE_TYPE(type) return (DEFAULT_ROUTE_TYPE(type)
? vrf_bitmap_check(zclient->default_information[AFI_IP], ? vrf_bitmap_check(
ospf->vrf_id) &zclient->default_information[AFI_IP],
: ((instance ospf->vrf_id)
&& redist_check_instance( : ((instance &&
redist_check_instance(
&zclient->mi_redist[AFI_IP][type], &zclient->mi_redist[AFI_IP][type],
instance)) instance)) ||
|| (!instance (!instance &&
&& vrf_bitmap_check( vrf_bitmap_check(&zclient->redist[AFI_IP][type],
zclient->redist[AFI_IP][type], ospf->vrf_id))));
ospf->vrf_id))));
} }
int ospf_redistribute_update(struct ospf *ospf, struct ospf_redist *red, int ospf_redistribute_update(struct ospf *ospf, struct ospf_redist *red,

8
ospfd/ospfd.c
View file

@ -2284,20 +2284,20 @@ static void ospf_set_redist_vrf_bitmaps(struct ospf *ospf, bool set)
"%s: setting redist vrf %d bitmap for type %d", "%s: setting redist vrf %d bitmap for type %d",
__func__, ospf->vrf_id, type); __func__, ospf->vrf_id, type);
if (set) if (set)
vrf_bitmap_set(zclient->redist[AFI_IP][type], vrf_bitmap_set(&zclient->redist[AFI_IP][type],
ospf->vrf_id); ospf->vrf_id);
else else
vrf_bitmap_unset(zclient->redist[AFI_IP][type], vrf_bitmap_unset(&zclient->redist[AFI_IP][type],
ospf->vrf_id); ospf->vrf_id);
} }
red_list = ospf->redist[DEFAULT_ROUTE]; red_list = ospf->redist[DEFAULT_ROUTE];
if (red_list) { if (red_list) {
if (set) if (set)
vrf_bitmap_set(zclient->default_information[AFI_IP], vrf_bitmap_set(&zclient->default_information[AFI_IP],
ospf->vrf_id); ospf->vrf_id);
else else
vrf_bitmap_unset(zclient->default_information[AFI_IP], vrf_bitmap_unset(&zclient->default_information[AFI_IP],
ospf->vrf_id); ospf->vrf_id);
} }
} }

18
zebra/redistribute.c
View file

@ -60,7 +60,7 @@ static void zebra_redistribute_default(struct zserv *client, vrf_id_t vrf_id)
for (afi = AFI_IP; afi <= AFI_IP6; afi++) { for (afi = AFI_IP; afi <= AFI_IP6; afi++) {
if (!vrf_bitmap_check(client->redist_default[afi], vrf_id)) if (!vrf_bitmap_check(&client->redist_default[afi], vrf_id))
continue; continue;
/* Lookup table. */ /* Lookup table. */
@ -151,11 +151,11 @@ static bool zebra_redistribute_check(const struct route_node *rn,
/* If default route and redistributed */ /* If default route and redistributed */
if (is_default_prefix(&rn->p) && if (is_default_prefix(&rn->p) &&
vrf_bitmap_check(client->redist_default[afi], re->vrf_id)) vrf_bitmap_check(&client->redist_default[afi], re->vrf_id))
return true; return true;
/* If redistribute in enabled for zebra route all */ /* If redistribute in enabled for zebra route all */
if (vrf_bitmap_check(client->redist[afi][ZEBRA_ROUTE_ALL], re->vrf_id)) if (vrf_bitmap_check(&client->redist[afi][ZEBRA_ROUTE_ALL], re->vrf_id))
return true; return true;
/* /*
@ -171,7 +171,7 @@ static bool zebra_redistribute_check(const struct route_node *rn,
} }
/* If redistribution is enabled for give route type. */ /* If redistribution is enabled for give route type. */
if (vrf_bitmap_check(client->redist[afi][re->type], re->vrf_id)) if (vrf_bitmap_check(&client->redist[afi][re->type], re->vrf_id))
return true; return true;
return false; return false;
@ -331,14 +331,14 @@ void zebra_redistribute_add(ZAPI_HANDLER_ARGS)
zvrf_id(zvrf), afi); zvrf_id(zvrf), afi);
} }
} else { } else {
if (!vrf_bitmap_check(client->redist[afi][type], if (!vrf_bitmap_check(&client->redist[afi][type],
zvrf_id(zvrf))) { zvrf_id(zvrf))) {
if (IS_ZEBRA_DEBUG_EVENT) if (IS_ZEBRA_DEBUG_EVENT)
zlog_debug( zlog_debug(
"%s: setting vrf %s(%u) redist bitmap", "%s: setting vrf %s(%u) redist bitmap",
__func__, VRF_LOGNAME(zvrf->vrf), __func__, VRF_LOGNAME(zvrf->vrf),
zvrf_id(zvrf)); zvrf_id(zvrf));
vrf_bitmap_set(client->redist[afi][type], vrf_bitmap_set(&client->redist[afi][type],
zvrf_id(zvrf)); zvrf_id(zvrf));
zebra_redistribute(client, type, 0, zvrf_id(zvrf), afi); zebra_redistribute(client, type, 0, zvrf_id(zvrf), afi);
} }
@ -387,7 +387,7 @@ void zebra_redistribute_delete(ZAPI_HANDLER_ARGS)
if (instance) if (instance)
redist_del_instance(&client->mi_redist[afi][type], instance); redist_del_instance(&client->mi_redist[afi][type], instance);
else else
vrf_bitmap_unset(client->redist[afi][type], zvrf_id(zvrf)); vrf_bitmap_unset(&client->redist[afi][type], zvrf_id(zvrf));
stream_failure: stream_failure:
return; return;
@ -405,7 +405,7 @@ void zebra_redistribute_default_add(ZAPI_HANDLER_ARGS)
return; return;
} }
vrf_bitmap_set(client->redist_default[afi], zvrf_id(zvrf)); vrf_bitmap_set(&client->redist_default[afi], zvrf_id(zvrf));
zebra_redistribute_default(client, zvrf_id(zvrf)); zebra_redistribute_default(client, zvrf_id(zvrf));
stream_failure: stream_failure:
@ -424,7 +424,7 @@ void zebra_redistribute_default_delete(ZAPI_HANDLER_ARGS)
return; return;
} }
vrf_bitmap_unset(client->redist_default[afi], zvrf_id(zvrf)); vrf_bitmap_unset(&client->redist_default[afi], zvrf_id(zvrf));
stream_failure: stream_failure:
return; return;

21
zebra/zapi_msg.c
View file

@ -995,7 +995,7 @@ void zsend_nhrp_neighbor_notify(int cmd, struct interface *ifp,
family2addrsize(sockunion_family(&ip))); family2addrsize(sockunion_family(&ip)));
for (ALL_LIST_ELEMENTS(zrouter.client_list, node, nnode, client)) { for (ALL_LIST_ELEMENTS(zrouter.client_list, node, nnode, client)) {
if (!vrf_bitmap_check(client->nhrp_neighinfo[afi], if (!vrf_bitmap_check(&client->nhrp_neighinfo[afi],
ifp->vrf->vrf_id)) ifp->vrf->vrf_id))
continue; continue;
@ -1016,7 +1016,7 @@ int zsend_router_id_update(struct zserv *client, afi_t afi, struct prefix *p,
struct stream *s; struct stream *s;
/* Check this client need interface information. */ /* Check this client need interface information. */
if (!vrf_bitmap_check(client->ridinfo[afi], vrf_id)) if (!vrf_bitmap_check(&client->ridinfo[afi], vrf_id))
return 0; return 0;
s = stream_new(ZEBRA_MAX_PACKET_SIZ); s = stream_new(ZEBRA_MAX_PACKET_SIZ);
@ -2281,7 +2281,7 @@ static void zread_router_id_add(ZAPI_HANDLER_ARGS)
} }
/* Router-id information is needed. */ /* Router-id information is needed. */
vrf_bitmap_set(client->ridinfo[afi], zvrf_id(zvrf)); vrf_bitmap_set(&client->ridinfo[afi], zvrf_id(zvrf));
router_id_get(afi, &p, zvrf); router_id_get(afi, &p, zvrf);
@ -2317,7 +2317,7 @@ static void zread_router_id_delete(ZAPI_HANDLER_ARGS)
goto stream_failure; goto stream_failure;
} }
vrf_bitmap_unset(client->ridinfo[afi], zvrf_id(zvrf)); vrf_bitmap_unset(&client->ridinfo[afi], zvrf_id(zvrf));
stream_failure: stream_failure:
return; return;
@ -2407,10 +2407,11 @@ static void zread_vrf_unregister(ZAPI_HANDLER_ARGS)
for (afi = AFI_IP; afi < AFI_MAX; afi++) { for (afi = AFI_IP; afi < AFI_MAX; afi++) {
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
vrf_bitmap_unset(client->redist[afi][i], zvrf_id(zvrf)); vrf_bitmap_unset(&client->redist[afi][i],
vrf_bitmap_unset(client->redist_default[afi], zvrf_id(zvrf)); zvrf_id(zvrf));
vrf_bitmap_unset(client->ridinfo[afi], zvrf_id(zvrf)); vrf_bitmap_unset(&client->redist_default[afi], zvrf_id(zvrf));
vrf_bitmap_unset(client->nhrp_neighinfo[afi], zvrf_id(zvrf)); vrf_bitmap_unset(&client->ridinfo[afi], zvrf_id(zvrf));
vrf_bitmap_unset(&client->nhrp_neighinfo[afi], zvrf_id(zvrf));
} }
} }
@ -3563,7 +3564,7 @@ static inline void zebra_neigh_register(ZAPI_HANDLER_ARGS)
afi); afi);
goto stream_failure; goto stream_failure;
} }
vrf_bitmap_set(client->nhrp_neighinfo[afi], zvrf_id(zvrf)); vrf_bitmap_set(&client->nhrp_neighinfo[afi], zvrf_id(zvrf));
stream_failure: stream_failure:
return; return;
} }
@ -3579,7 +3580,7 @@ static inline void zebra_neigh_unregister(ZAPI_HANDLER_ARGS)
afi); afi);
goto stream_failure; goto stream_failure;
} }
vrf_bitmap_unset(client->nhrp_neighinfo[afi], zvrf_id(zvrf)); vrf_bitmap_unset(&client->nhrp_neighinfo[afi], zvrf_id(zvrf));
stream_failure: stream_failure:
return; return;
} }

16
zebra/zserv.c
View file

@ -634,13 +634,13 @@ static void zserv_client_free(struct zserv *client)
/* Free bitmaps. */ /* Free bitmaps. */
for (afi_t afi = AFI_IP; afi < AFI_MAX; afi++) { for (afi_t afi = AFI_IP; afi < AFI_MAX; afi++) {
for (int i = 0; i < ZEBRA_ROUTE_MAX; i++) { for (int i = 0; i < ZEBRA_ROUTE_MAX; i++) {
vrf_bitmap_free(client->redist[afi][i]); vrf_bitmap_free(&client->redist[afi][i]);
redist_del_all_instances(&client->mi_redist[afi][i]); redist_del_all_instances(&client->mi_redist[afi][i]);
} }
vrf_bitmap_free(client->redist_default[afi]); vrf_bitmap_free(&client->redist_default[afi]);
vrf_bitmap_free(client->ridinfo[afi]); vrf_bitmap_free(&client->ridinfo[afi]);
vrf_bitmap_free(client->nhrp_neighinfo[afi]); vrf_bitmap_free(&client->nhrp_neighinfo[afi]);
} }
/* /*
@ -758,10 +758,10 @@ static struct zserv *zserv_client_create(int sock)
/* Initialize flags */ /* Initialize flags */
for (afi = AFI_IP; afi < AFI_MAX; afi++) { for (afi = AFI_IP; afi < AFI_MAX; afi++) {
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
client->redist[afi][i] = vrf_bitmap_init(); vrf_bitmap_init(&client->redist[afi][i]);
client->redist_default[afi] = vrf_bitmap_init(); vrf_bitmap_init(&client->redist_default[afi]);
client->ridinfo[afi] = vrf_bitmap_init(); vrf_bitmap_init(&client->ridinfo[afi]);
client->nhrp_neighinfo[afi] = vrf_bitmap_init(); vrf_bitmap_init(&client->nhrp_neighinfo[afi]);
} }
/* Add this client to linked list. */ /* Add this client to linked list. */