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

zebra: don't include backup nhs in main nhe dependency tree

Browse Source 
We don't want to install backup nexthops - yet - as part of the
nexthop-id-based kernel interactions on netlink platforms. Avoid
mixing backup and primary nexthops in the tree of dependencies
in the ecmp cases.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2020-03-13 16:52:53 -04:00
parent 377e29f7e7
commit 0328a5bd0d
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
zebra/zebra_nhg.c
View File

@ -638,7 +638,7 @@ static bool zebra_nhe_find(struct nhg_hash_entry **nhe, /* return value */
{ {
bool created = false; bool created = false;
bool recursive = false; bool recursive = false;
struct nhg_hash_entry *newnhe; struct nhg_hash_entry *newnhe, *backup_nhe;
struct nexthop *nh = NULL; struct nexthop *nh = NULL;
if (IS_ZEBRA_DEBUG_NHG_DETAIL) if (IS_ZEBRA_DEBUG_NHG_DETAIL)
@ -724,14 +724,20 @@ static bool zebra_nhe_find(struct nhg_hash_entry **nhe, /* return value */
} }
} }
/* If there are backup nexthops, add them to the if (recursive)
* depends tree also. The rules here are a little different. SET_FLAG((*nhe)->flags, NEXTHOP_GROUP_RECURSIVE);
*/
if (zebra_nhg_get_backup_nhg(newnhe) == NULL || if (zebra_nhg_get_backup_nhg(newnhe) == NULL ||
zebra_nhg_get_backup_nhg(newnhe)->nexthop == NULL) zebra_nhg_get_backup_nhg(newnhe)->nexthop == NULL)
goto backups_done; goto done;
nh = zebra_nhg_get_backup_nhg(newnhe)->nexthop; /* If there are backup nexthops, add them to the backup
* depends tree. The rules here are a little different.
*/
recursive = false;
backup_nhe = newnhe->backup_info->nhe;
nh = backup_nhe->nhg.nexthop;
/* Singleton recursive NH */ /* Singleton recursive NH */
if (nh->next == NULL && if (nh->next == NULL &&
@ -741,7 +747,7 @@ static bool zebra_nhe_find(struct nhg_hash_entry **nhe, /* return value */
__func__, nh); __func__, nh);
/* Single recursive nexthop */ /* Single recursive nexthop */
handle_recursive_depend(&newnhe->nhg_depends, handle_recursive_depend(&backup_nhe->nhg_depends,
nh->resolved, afi); nh->resolved, afi);
recursive = true; recursive = true;
} else { } else {
@ -754,15 +760,13 @@ static bool zebra_nhe_find(struct nhg_hash_entry **nhe, /* return value */
NEXTHOP_FLAG_RECURSIVE) ? NEXTHOP_FLAG_RECURSIVE) ?
"(R)" : ""); "(R)" : "");
depends_find_add(&newnhe->nhg_depends, depends_find_add(&backup_nhe->nhg_depends,
nh, afi); nh, afi);
} }
} }
backups_done:
if (recursive) if (recursive)
SET_FLAG((*nhe)->flags, NEXTHOP_GROUP_RECURSIVE); SET_FLAG(backup_nhe->flags, NEXTHOP_GROUP_RECURSIVE);
done: done:
@ -2402,6 +2406,16 @@ static uint8_t zebra_nhg_nhe2grp_internal(struct nh_grp *grp,
} }
} }
if (nhe->backup_info == NULL || nhe->backup_info->nhe == NULL)
goto done;
/* TODO -- For now, we are not trying to use or install any
* backup info in this nexthop-id path: we aren't prepared
* to use the backups here yet. We're just debugging what we find.
*/
if (IS_ZEBRA_DEBUG_NHG_DETAIL)
zlog_debug("%s: skipping backup nhe", __func__);
done: done:
return i; return i;
} }