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

Merge pull request #15345 from FRRouting/mergify/bp/stable/9.1/pr-15327

Browse Source 
pimd: re-evaluated S,G OILs upon RP changes and empty SG upstream oils (backport #15327)
This commit is contained in:
Donatas Abraitis 2024-02-10 16:55:35 +02:00 committed by GitHub
commit ac6a3bfc78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pimd/pim_mroute.c
View File

@ -1216,7 +1216,7 @@ int pim_upstream_mroute_add(struct channel_oil *c_oil, const char *name)
return pim_upstream_mroute_update(c_oil, name); return pim_upstream_mroute_update(c_oil, name);
} }
/* Look for IIF changes and update the dateplane entry only if the IIF /* Look for IIF changes and update the dataplane entry only if the IIF
* has changed. * has changed.
*/ */
int pim_upstream_mroute_iif_update(struct channel_oil *c_oil, const char *name) int pim_upstream_mroute_iif_update(struct channel_oil *c_oil, const char *name)

36
pimd/pim_upstream.c
View File

@ -1943,6 +1943,40 @@ void pim_upstream_terminate(struct pim_instance *pim)
wheel_delete(pim->upstream_sg_wheel); wheel_delete(pim->upstream_sg_wheel);
pim->upstream_sg_wheel = NULL; pim->upstream_sg_wheel = NULL;
} }
bool pim_sg_is_reevaluate_oil_req(struct pim_instance *pim,
struct pim_upstream *up)
{
struct pim_interface *pim_ifp = NULL;
/*
* Attempt to retrieve the PIM interface information if the RPF
* interface is present
*/
if (up->rpf.source_nexthop.interface) {
pim_ifp = up->rpf.source_nexthop.interface->info;
} else {
if (PIM_DEBUG_PIM_TRACE) {
zlog_debug("%s: up %s RPF is not present", __func__,
up->sg_str);
}
}
/*
* Determine if a reevaluation of the outgoing interface list (OIL) is
* required. This may be necessary in scenarios such as MSDP where the
* RP role for a group changes from secondary to primary. In such cases,
* SGRpt may receive a prune, resulting in an S,G entry with a NULL OIL.
* The S,G upstream should then inherit the OIL from *,G, which is
* particularly important for VXLAN setups.
*/
if (up->channel_oil->oil_inherited_rescan ||
(pim_ifp && I_am_RP(pim_ifp->pim, up->sg.grp)) ||
pim_upstream_empty_inherited_olist(up)) {
return true;
}
return false;
}
bool pim_upstream_equal(const void *arg1, const void *arg2) bool pim_upstream_equal(const void *arg1, const void *arg2)
{ {
@ -2078,7 +2112,7 @@ static void pim_upstream_sg_running(void *arg)
* only doing this at this point in time * only doing this at this point in time
* to get us up and working for the moment * to get us up and working for the moment
*/ */
if (up->channel_oil->oil_inherited_rescan) { if (pim_sg_is_reevaluate_oil_req(pim, up)) {
if (PIM_DEBUG_TRACE) if (PIM_DEBUG_TRACE)
zlog_debug( zlog_debug(
"%s: Handling unscanned inherited_olist for %s[%s]", "%s: Handling unscanned inherited_olist for %s[%s]",

2
pimd/pim_upstream.h
View File

@ -383,4 +383,6 @@ uint32_t pim_up_mlag_local_cost(struct pim_upstream *up);
uint32_t pim_up_mlag_peer_cost(struct pim_upstream *up); uint32_t pim_up_mlag_peer_cost(struct pim_upstream *up);
void pim_upstream_reeval_use_rpt(struct pim_instance *pim); void pim_upstream_reeval_use_rpt(struct pim_instance *pim);
int pim_upstream_could_register(struct pim_upstream *up); int pim_upstream_could_register(struct pim_upstream *up);
bool pim_sg_is_reevaluate_oil_req(struct pim_instance *pim,
struct pim_upstream *up);
#endif /* PIM_UPSTREAM_H */ #endif /* PIM_UPSTREAM_H */