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

zebra: Move clear_nhlfe_installed to calling functions

Browse Source 
The function clear_nhlfe_installed is to be called
when we get a install failure of some sort for
a lsp change.  Since an install failure can happen
in both linux and openBSD moving the function call
northbound is a good idea.

I've also added it to the kernel_del_lsp for completeness
on failure as well, even though neither linux or openBSD
currently can fail a uninstall.

This still leaves the hole where if we have multiple
nhlfes and have an install failure we are not quite
doing the right thing by just blanketly calling
clear_nhlfe_installed.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-10-23 10:10:06 -04:00
parent e4715aed63
commit 3d468f6604
4 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
zebra/rt_netlink.c
View File

@ -2474,23 +2474,4 @@ int netlink_mpls_multipath(int cmd, zebra_lsp_t *lsp)
return netlink_talk(netlink_talk_filter, &req.n, &zns->netlink_cmd, zns, return netlink_talk(netlink_talk_filter, &req.n, &zns->netlink_cmd, zns,
0); 0);
} }
/*
* Handle failure in LSP install, clear flags for NHLFE.
*/
void clear_nhlfe_installed(zebra_lsp_t *lsp)
{
zebra_nhlfe_t *nhlfe;
struct nexthop *nexthop;
for (nhlfe = lsp->nhlfe_list; nhlfe; nhlfe = nhlfe->next) {
nexthop = nhlfe->nexthop;
if (!nexthop)
continue;
UNSET_FLAG(nhlfe->flags, NHLFE_FLAG_INSTALLED);
UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB);
}
}
#endif /* HAVE_NETLINK */ #endif /* HAVE_NETLINK */

1
zebra/rt_netlink.h
View File

@ -54,7 +54,6 @@
void rt_netlink_init(void); void rt_netlink_init(void);
extern void clear_nhlfe_installed(zebra_lsp_t *lsp);
extern int netlink_mpls_multipath(int cmd, zebra_lsp_t *lsp); extern int netlink_mpls_multipath(int cmd, zebra_lsp_t *lsp);
extern int netlink_route_change(struct sockaddr_nl *snl, struct nlmsghdr *h, extern int netlink_route_change(struct sockaddr_nl *snl, struct nlmsghdr *h,

37
zebra/zebra_mpls.c
View File

@ -129,6 +129,24 @@ static int mpls_processq_init(struct zebra_t *zebra);
/* Static functions */ /* Static functions */
/*
* Handle failure in LSP install, clear flags for NHLFE.
*/
static void clear_nhlfe_installed(zebra_lsp_t *lsp)
{
zebra_nhlfe_t *nhlfe;
struct nexthop *nexthop;
for (nhlfe = lsp->nhlfe_list; nhlfe; nhlfe = nhlfe->next) {
nexthop = nhlfe->nexthop;
if (!nexthop)
continue;
UNSET_FLAG(nhlfe->flags, NHLFE_FLAG_INSTALLED);
UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB);
}
}
/* /*
* Install label forwarding entry based on labeled-route entry. * Install label forwarding entry based on labeled-route entry.
*/ */
@ -821,11 +839,16 @@ static void lsp_select_best_nhlfe(zebra_lsp_t *lsp)
*/ */
static void lsp_uninstall_from_kernel(struct hash_backet *backet, void *ctxt) static void lsp_uninstall_from_kernel(struct hash_backet *backet, void *ctxt)
{ {
int ret;
zebra_lsp_t *lsp; zebra_lsp_t *lsp;
lsp = (zebra_lsp_t *)backet->data; lsp = (zebra_lsp_t *)backet->data;
if (CHECK_FLAG(lsp->flags, LSP_FLAG_INSTALLED)) if (CHECK_FLAG(lsp->flags, LSP_FLAG_INSTALLED)) {
kernel_del_lsp(lsp); ret = kernel_del_lsp(lsp);
if (!ret)
clear_nhlfe_installed(lsp);
}
} }
/* /*
@ -846,6 +869,7 @@ static void lsp_schedule(struct hash_backet *backet, void *ctxt)
*/ */
static wq_item_status lsp_process(struct work_queue *wq, void *data) static wq_item_status lsp_process(struct work_queue *wq, void *data)
{ {
int ret = 1;
zebra_lsp_t *lsp; zebra_lsp_t *lsp;
zebra_nhlfe_t *oldbest, *newbest; zebra_nhlfe_t *oldbest, *newbest;
char buf[BUFSIZ], buf2[BUFSIZ]; char buf[BUFSIZ], buf2[BUFSIZ];
@ -877,20 +901,23 @@ static wq_item_status lsp_process(struct work_queue *wq, void *data)
if (!CHECK_FLAG(lsp->flags, LSP_FLAG_INSTALLED)) { if (!CHECK_FLAG(lsp->flags, LSP_FLAG_INSTALLED)) {
/* Not already installed */ /* Not already installed */
if (newbest) { if (newbest) {
kernel_add_lsp(lsp); ret = kernel_add_lsp(lsp);
zvrf->lsp_installs++; zvrf->lsp_installs++;
} }
} else { } else {
/* Installed, may need an update and/or delete. */ /* Installed, may need an update and/or delete. */
if (!newbest) { if (!newbest) {
kernel_del_lsp(lsp); ret = kernel_del_lsp(lsp);
zvrf->lsp_removals++; zvrf->lsp_removals++;
} else if (CHECK_FLAG(lsp->flags, LSP_FLAG_CHANGED)) { } else if (CHECK_FLAG(lsp->flags, LSP_FLAG_CHANGED)) {
kernel_upd_lsp(lsp); ret = kernel_upd_lsp(lsp);
zvrf->lsp_installs++; zvrf->lsp_installs++;
} }
} }
if (!ret)
clear_nhlfe_installed(lsp);
return WQ_SUCCESS; return WQ_SUCCESS;
} }

4
zebra/zebra_mpls_netlink.c
View File

@ -40,8 +40,6 @@ int kernel_add_lsp(zebra_lsp_t *lsp)
ret = netlink_mpls_multipath(RTM_NEWROUTE, lsp); ret = netlink_mpls_multipath(RTM_NEWROUTE, lsp);
if (!ret) if (!ret)
SET_FLAG(lsp->flags, LSP_FLAG_INSTALLED); SET_FLAG(lsp->flags, LSP_FLAG_INSTALLED);
else
clear_nhlfe_installed(lsp);
return ret; return ret;
} }
@ -74,8 +72,6 @@ int kernel_upd_lsp(zebra_lsp_t *lsp)
ret = netlink_mpls_multipath(RTM_NEWROUTE, lsp); ret = netlink_mpls_multipath(RTM_NEWROUTE, lsp);
if (!ret) if (!ret)
SET_FLAG(lsp->flags, LSP_FLAG_INSTALLED); SET_FLAG(lsp->flags, LSP_FLAG_INSTALLED);
else
clear_nhlfe_installed(lsp);
return ret; return ret;
} }