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

Merge pull request #8531 from mjstapp/fix_backups_misc

Browse Source 
zebra: Misc fixups for backup nexthops
This commit is contained in:
Russ White 2021-04-27 16:04:24 -04:00 committed by GitHub
commit d8c3daca19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zebra/zebra_mpls.c
View File

@ -2018,6 +2018,7 @@ void zebra_mpls_process_dplane_notify(struct zebra_dplane_ctx *ctx)
int start_count = 0, end_count = 0; /* Installed counts */
bool changed_p = false;
bool is_debug = (IS_ZEBRA_DEBUG_DPLANE | IS_ZEBRA_DEBUG_MPLS);
enum zebra_sr_policy_update_label_mode update_mode;
if (is_debug)
zlog_debug("LSP dplane notif, in-label %u",
@ -2091,10 +2092,21 @@ void zebra_mpls_process_dplane_notify(struct zebra_dplane_ctx *ctx)
if (end_count > 0) {
SET_FLAG(lsp->flags, LSP_FLAG_INSTALLED);
/* SR-TE update too */
if (start_count == 0)
update_mode = ZEBRA_SR_POLICY_LABEL_CREATED;
else
update_mode = ZEBRA_SR_POLICY_LABEL_UPDATED;
zebra_sr_policy_label_update(lsp->ile.in_label, update_mode);
if (changed_p)
dplane_lsp_notif_update(lsp, DPLANE_OP_LSP_UPDATE, ctx);
} else {
/* SR-TE update too */
zebra_sr_policy_label_update(lsp->ile.in_label,
ZEBRA_SR_POLICY_LABEL_REMOVED);
UNSET_FLAG(lsp->flags, LSP_FLAG_INSTALLED);
clear_nhlfe_installed(lsp);
}

47
zebra/zebra_nhg.c
View File

@ -1820,12 +1820,11 @@ static int resolve_backup_nexthops(const struct nexthop *nexthop,
int i, j, idx;
const struct nexthop *bnh;
struct nexthop *nh, *newnh;
mpls_label_t labels[MPLS_MAX_LABELS];
uint8_t num_labels;
assert(nexthop->backup_num <= NEXTHOP_MAX_BACKUPS);
if (resolve_nhe->backup_info->nhe == NULL)
resolve_nhe->backup_info->nhe = zebra_nhg_alloc();
/* Locate backups from the original nexthop's backup index and nhe */
for (i = 0; i < nexthop->backup_num; i++) {
idx = nexthop->backup_idx[i];
@ -1841,6 +1840,8 @@ static int resolve_backup_nexthops(const struct nexthop *nexthop,
map->map[j].new_idx;
resolved->backup_num++;
SET_FLAG(resolved->flags, NEXTHOP_FLAG_HAS_BACKUP);
if (IS_ZEBRA_DEBUG_RIB_DETAILED)
zlog_debug("%s: found map idx orig %d, new %d",
__func__, map->map[j].orig_idx,
@ -1865,9 +1866,46 @@ static int resolve_backup_nexthops(const struct nexthop *nexthop,
if (bnh == NULL)
continue;
if (resolve_nhe->backup_info == NULL)
resolve_nhe->backup_info = zebra_nhg_backup_alloc();
/* Update backup info in the resolving nexthop and its nhe */
newnh = nexthop_dup_no_recurse(bnh, NULL);
/* We may need some special handling for mpls labels: the new
* backup needs to carry the recursive nexthop's labels,
* if any: they may be vrf labels e.g.
* The original/inner labels are in the stack of 'resolve_nhe',
* if that is longer than the stack in 'nexthop'.
*/
if (newnh->nh_label && resolved->nh_label &&
nexthop->nh_label) {
if (resolved->nh_label->num_labels >
nexthop->nh_label->num_labels) {
/* Prepare new label stack */
num_labels = 0;
for (j = 0; j < newnh->nh_label->num_labels;
j++) {
labels[j] = newnh->nh_label->label[j];
num_labels++;
}
/* Include inner labels */
for (j = nexthop->nh_label->num_labels;
j < resolved->nh_label->num_labels;
j++) {
labels[num_labels] =
resolved->nh_label->label[j];
num_labels++;
}
/* Replace existing label stack in the backup */
nexthop_del_labels(newnh);
nexthop_add_labels(newnh, bnh->nh_label_type,
num_labels, labels);
}
}
/* Need to compute the new backup index in the new
* backup list, and add to map struct.
*/
@ -1880,6 +1918,7 @@ static int resolve_backup_nexthops(const struct nexthop *nexthop,
}
nh->next = newnh;
j++;
} else /* First one */
resolve_nhe->backup_info->nhe->nhg.nexthop = newnh;
@ -1888,6 +1927,8 @@ static int resolve_backup_nexthops(const struct nexthop *nexthop,
resolved->backup_idx[resolved->backup_num] = j;
resolved->backup_num++;
SET_FLAG(resolved->flags, NEXTHOP_FLAG_HAS_BACKUP);
if (IS_ZEBRA_DEBUG_RIB_DETAILED)
zlog_debug("%s: added idx orig %d, new %d",
__func__, idx, j);