Skip to content

Commit

Permalink
zebra: Cleanup ctx leak on shutdown and turn off event
Browse files Browse the repository at this point in the history
two things:

On shutdown cleanup any events associated with the update walker.
Also do not allow new events to be created.

Fixes this mem-leak:

./msdp_topo1.test_msdp_topo1/r2.zebra.asan.1117790:Direct leak of 8 byte(s) in 1 object(s) allocated from:
./msdp_topo1.test_msdp_topo1/r2.zebra.asan.1117790-    #0 0x7f0dd0b08037 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154
./msdp_topo1.test_msdp_topo1/r2.zebra.asan.1117790-    #1 0x7f0dd06c19f9 in qcalloc lib/memory.c:105
./msdp_topo1.test_msdp_topo1/r2.zebra.asan.1117790-    #2 0x55b42fb605bc in rib_update_ctx_init zebra/zebra_rib.c:4383
./msdp_topo1.test_msdp_topo1/r2.zebra.asan.1117790-    #3 0x55b42fb6088f in rib_update zebra/zebra_rib.c:4421
./msdp_topo1.test_msdp_topo1/r2.zebra.asan.1117790-    #4 0x55b42fa00344 in netlink_link_change zebra/if_netlink.c:2221
./msdp_topo1.test_msdp_topo1/r2.zebra.asan.1117790-    #5 0x55b42fa24622 in netlink_information_fetch zebra/kernel_netlink.c:399
./msdp_topo1.test_msdp_topo1/r2.zebra.asan.1117790-    #6 0x55b42fa28c02 in netlink_parse_info zebra/kernel_netlink.c:1183
./msdp_topo1.test_msdp_topo1/r2.zebra.asan.1117790-    #7 0x55b42fa24951 in kernel_read zebra/kernel_netlink.c:493
./msdp_topo1.test_msdp_topo1/r2.zebra.asan.1117790-    #8 0x7f0dd0797f0c in event_call lib/event.c:1995
./msdp_topo1.test_msdp_topo1/r2.zebra.asan.1117790-    #9 0x7f0dd0684fd9 in frr_run lib/libfrr.c:1185
./msdp_topo1.test_msdp_topo1/r2.zebra.asan.1117790-    #10 0x55b42fa30caa in main zebra/main.c:465
./msdp_topo1.test_msdp_topo1/r2.zebra.asan.1117790-    #11 0x7f0dd01b5d09 in __libc_start_main ../csu/libc-start.c:308
./msdp_topo1.test_msdp_topo1/r2.zebra.asan.1117790-
./msdp_topo1.test_msdp_topo1/r2.zebra.asan.1117790-SUMMARY: AddressSanitizer: 8 byte(s) leaked in 1 allocation(s).

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
  • Loading branch information
donaldsharp committed Mar 31, 2023
1 parent f3cf1bc commit 3cd0acc
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 0 deletions.
2 changes: 2 additions & 0 deletions zebra/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ static void sigint(void)
*/
zebra_routemap_finish();

rib_update_finish();

list_delete(&zrouter.client_list);

/* Indicate that all new dplane work has been enqueued. When that
Expand Down
1 change: 1 addition & 0 deletions zebra/rib.h
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ enum rib_update_event {
RIB_UPDATE_OTHER,
RIB_UPDATE_MAX
};
void rib_update_finish(void);

int route_entry_update_nhe(struct route_entry *re,
struct nhg_hash_entry *new_nhghe);
Expand Down
19 changes: 19 additions & 0 deletions zebra/zebra_rib.c
Original file line number Diff line number Diff line change
Expand Up @@ -4410,6 +4410,22 @@ static void rib_update_handler(struct event *thread)
*/
static struct event *t_rib_update_threads[RIB_UPDATE_MAX];

void rib_update_finish(void)
{
int i;

for (i = RIB_UPDATE_KERNEL; i < RIB_UPDATE_MAX; i++) {
if (event_is_scheduled(t_rib_update_threads[i])) {
struct rib_update_ctx *ctx;

ctx = EVENT_ARG(t_rib_update_threads[i]);

rib_update_ctx_fini(&ctx);
EVENT_OFF(t_rib_update_threads[i]);
}
}
}

/* Schedule a RIB update event for all vrfs */
void rib_update(enum rib_update_event event)
{
Expand All @@ -4418,6 +4434,9 @@ void rib_update(enum rib_update_event event)
if (event_is_scheduled(t_rib_update_threads[event]))
return;

if (zebra_router_in_shutdown())
return;

ctx = rib_update_ctx_init(0, event);

event_add_event(zrouter.master, rib_update_handler, ctx, 0,
Expand Down

0 comments on commit 3cd0acc

Please sign in to comment.