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

zebra: fix route deletion during zebra shutdown

Browse Source 
Split zebra's vrf_terminate() into disable() and delete() stages.
The former enqueues all events for the dplane thread.
Memory freeing is performed in the second stage.

Signed-off-by: Alexander Skorichenko <askorichenko@netgate.com>
(cherry picked from commit 444ce317b2)
This commit is contained in:
Alexander Skorichenko 2024-02-28 20:34:06 +01:00 committed by Mergify
parent ca2d6f0f1e
commit 69f07fab28
3 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/vrf.c
View File

@ -325,6 +325,33 @@ void vrf_disable(struct vrf *vrf)
(*vrf_master.vrf_disable_hook)(vrf);
}
void vrf_iterate(vrf_iter_func fnc)
{
struct vrf *vrf, *tmp;
if (debug_vrf)
zlog_debug("%s: vrf subsystem iteration", __func__);
RB_FOREACH_SAFE (vrf, vrf_id_head, &vrfs_by_id, tmp) {
if (vrf->vrf_id == VRF_DEFAULT)
continue;
fnc(vrf);
}
RB_FOREACH_SAFE (vrf, vrf_name_head, &vrfs_by_name, tmp) {
if (vrf->vrf_id == VRF_DEFAULT)
continue;
fnc(vrf);
}
/* Finally process default VRF */
vrf = vrf_lookup_by_id(VRF_DEFAULT);
if (vrf)
fnc(vrf);
}
const char *vrf_id_to_name(vrf_id_t vrf_id)
{
struct vrf *vrf;
@ -541,32 +568,12 @@ static void vrf_terminate_single(struct vrf *vrf)
vrf_delete(vrf);
}
/* Terminate VRF module. */
void vrf_terminate(void)
{
struct vrf *vrf, *tmp;
if (debug_vrf)
zlog_debug("%s: Shutting down vrf subsystem", __func__);
RB_FOREACH_SAFE (vrf, vrf_id_head, &vrfs_by_id, tmp) {
if (vrf->vrf_id == VRF_DEFAULT)
continue;
vrf_terminate_single(vrf);
}
RB_FOREACH_SAFE (vrf, vrf_name_head, &vrfs_by_name, tmp) {
if (vrf->vrf_id == VRF_DEFAULT)
continue;
vrf_terminate_single(vrf);
}
/* Finally terminate default VRF */
vrf = vrf_lookup_by_id(VRF_DEFAULT);
if (vrf)
vrf_terminate_single(vrf);
vrf_iterate(vrf_terminate_single);
}
int vrf_socket(int domain, int type, int protocol, vrf_id_t vrf_id,

6
lib/vrf.h
View File

@ -201,6 +201,12 @@ extern void vrf_init(int (*create)(struct vrf *vrf),
int (*disable)(struct vrf *vrf),
int (*destroy)(struct vrf *vrf));
/*
* Iterate over custom VRFs and round up by processing the default VRF.
*/
typedef void (*vrf_iter_func)(struct vrf *vrf);
extern void vrf_iterate(vrf_iter_func fnc);
/*
* Call vrf_terminate when the protocol is being shutdown
*/

6
zebra/main.c
View File

@ -195,6 +195,12 @@ static void sigint(void)
list_delete(&zrouter.client_list);
/*
* Besides other clean-ups zebra's vrf_disable() also enqueues installed
* routes for removal from the kernel, unless ZEBRA_VRF_RETAIN is set.
*/
vrf_iterate(vrf_disable);
/* Indicate that all new dplane work has been enqueued. When that
* work is complete, the dataplane will enqueue an event
* with the 'finalize' function.