proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 19:06:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: check LSP flags when deleting an LSP

Browse Source 
Check the LSP INSTALLED flag in delete apis, to ensure we
enqueue a delete operation for the lfib. Some apis were only
checking the nexthop/nhlfe INSTALLED flags, and those could be
unset if there's an in-flight dataplane update.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2020-06-30 12:47:46 -04:00
parent 08c4754bb1
commit 4a2a52369f
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
zebra/zebra_mpls.c
View File

@ -1425,6 +1425,9 @@ static int mpls_lsp_uninstall_all(struct hash *lsp_table, zebra_lsp_t *lsp,
int schedule_lsp = 0; int schedule_lsp = 0;
char buf[BUFSIZ]; char buf[BUFSIZ];
if (CHECK_FLAG(lsp->flags, LSP_FLAG_INSTALLED))
schedule_lsp = 1;
/* Mark NHLFEs for delete or directly delete, as appropriate. */ /* Mark NHLFEs for delete or directly delete, as appropriate. */
frr_each_safe(nhlfe_list, &lsp->nhlfe_list, nhlfe) { frr_each_safe(nhlfe_list, &lsp->nhlfe_list, nhlfe) {
/* Skip non-static NHLFEs */ /* Skip non-static NHLFEs */
@ -1470,6 +1473,10 @@ static int mpls_lsp_uninstall_all(struct hash *lsp_table, zebra_lsp_t *lsp,
/* Queue LSP for processing, if needed, else delete. */ /* Queue LSP for processing, if needed, else delete. */
if (schedule_lsp) { if (schedule_lsp) {
if (IS_ZEBRA_DEBUG_MPLS) {
zlog_debug("Schedule LSP in-label %u flags 0x%x",
lsp->ile.in_label, lsp->flags);
}
if (lsp_processq_add(lsp)) if (lsp_processq_add(lsp))
return -1; return -1;
} else { } else {
@ -3368,6 +3375,7 @@ int mpls_lsp_uninstall(struct zebra_vrf *zvrf, enum lsp_types_t type,
zebra_lsp_t *lsp; zebra_lsp_t *lsp;
zebra_nhlfe_t *nhlfe; zebra_nhlfe_t *nhlfe;
char buf[BUFSIZ]; char buf[BUFSIZ];
bool schedule_lsp = false;
/* Lookup table. */ /* Lookup table. */
lsp_table = zvrf->lsp_table; lsp_table = zvrf->lsp_table;
@ -3389,10 +3397,18 @@ int mpls_lsp_uninstall(struct zebra_vrf *zvrf, enum lsp_types_t type,
in_label, type, buf, nhlfe->flags); in_label, type, buf, nhlfe->flags);
} }
if (CHECK_FLAG(lsp->flags, LSP_FLAG_INSTALLED) ||
CHECK_FLAG(nhlfe->flags, NHLFE_FLAG_INSTALLED))
schedule_lsp = true;
/* Mark NHLFE for delete or directly delete, as appropriate. */ /* Mark NHLFE for delete or directly delete, as appropriate. */
if (CHECK_FLAG(nhlfe->flags, NHLFE_FLAG_INSTALLED)) { if (schedule_lsp) {
UNSET_FLAG(nhlfe->flags, NHLFE_FLAG_CHANGED);
SET_FLAG(nhlfe->flags, NHLFE_FLAG_DELETED); SET_FLAG(nhlfe->flags, NHLFE_FLAG_DELETED);
UNSET_FLAG(nhlfe->flags, NHLFE_FLAG_CHANGED);
if (IS_ZEBRA_DEBUG_MPLS)
zlog_debug("Schedule LSP in-label %u flags 0x%x",
lsp->ile.in_label, lsp->flags);
if (lsp_processq_add(lsp)) if (lsp_processq_add(lsp))
return -1; return -1;
} else { } else {
@ -3400,7 +3416,6 @@ int mpls_lsp_uninstall(struct zebra_vrf *zvrf, enum lsp_types_t type,
/* Free LSP entry if no other NHLFEs and not scheduled. */ /* Free LSP entry if no other NHLFEs and not scheduled. */
lsp_check_free(lsp_table, &lsp); lsp_check_free(lsp_table, &lsp);
} }
return 0; return 0;
} }