proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 04:50:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: handle gracefulRS/retain with proto NHGs

Browse Source 
Properly handle refcounting of Proto-owned NHGs when
zebra is operating under graceful restart and retain
conditions.

We have an extra refcnt of 1 we keep for proto-owned NHGs to
indicate the upper level proto has created and owns it.

When we are reading these in from the kernel, we need to set them
to 1 as appropriate. Without this, we fail in the assert() during
zebra_nhg_proto_add() after the owning daemons resends the NHG
and the refcnts are off by one.

Also add in the same logic we use for routes when sweeping with
respect to uptimes.

Signed-off-by: Stephen Worley <sworley@nvidia.com>
This commit is contained in:
Stephen Worley 2021-04-22 17:21:12 -04:00
parent 45691de9a0
commit dc65cd999d
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
zebra/zebra_nhg.c
View File

@ -1193,6 +1193,13 @@ static int nhg_ctx_process_new(struct nhg_ctx *ctx)
if (IS_ZEBRA_DEBUG_NHG_DETAIL) if (IS_ZEBRA_DEBUG_NHG_DETAIL)
zlog_debug("%s: nhe %p (%u) is new", __func__, nhe, nhe->id); zlog_debug("%s: nhe %p (%u) is new", __func__, nhe, nhe->id);
/*
* If daemon nhg from the kernel, add a refcnt here to indicate the
* daemon owns it.
*/
if (PROTO_OWNED(nhe))
zebra_nhg_increment_ref(nhe);
SET_FLAG(nhe->flags, NEXTHOP_GROUP_VALID); SET_FLAG(nhe->flags, NEXTHOP_GROUP_VALID);
SET_FLAG(nhe->flags, NEXTHOP_GROUP_INSTALLED); SET_FLAG(nhe->flags, NEXTHOP_GROUP_INSTALLED);
@ -2929,7 +2936,31 @@ static void zebra_nhg_sweep_entry(struct hash_bucket *bucket, void *arg)
nhe = (struct nhg_hash_entry *)bucket->data; nhe = (struct nhg_hash_entry *)bucket->data;
/* If its being ref'd, just let it be uninstalled via a route removal */ /*
* same logic as with routes.
*
* If older than startup time, we know we read them in from the
* kernel and have not gotten and update for them since startup
* from an upper level proto.
*/
if (zrouter.startup_time < nhe->uptime)
return;
/*
* If it's proto-owned and not being used by a route, remove it since
* we haven't gotten an update about it from the proto since startup.
* This means that either the config for it was removed or the daemon
* didn't get started. This handles graceful restart & retain scenario.
*/
if (PROTO_OWNED(nhe) && nhe->refcnt == 1) {
zebra_nhg_decrement_ref(nhe);
return;
}
/*
* If its being ref'd by routes, just let it be uninstalled via a route
* removal.
*/
if (ZEBRA_NHG_CREATED(nhe) && nhe->refcnt <= 0) if (ZEBRA_NHG_CREATED(nhe) && nhe->refcnt <= 0)
zebra_nhg_uninstall_kernel(nhe); zebra_nhg_uninstall_kernel(nhe);
} }