proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-10 22:26:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17504 from mjstapp/fix_fpm_cancel_race

Browse Source 
zebra: avoid a race during FPM dplane plugin shutdown
This commit is contained in:
Donald Sharp 2024-11-26 08:32:54 -05:00 committed by GitHub
commit e8fdbbeb7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
zebra/dplane_fpm_nl.c
View File

@ -68,6 +68,8 @@
static const char *prov_name = "dplane_fpm_nl"; static const char *prov_name = "dplane_fpm_nl";
static atomic_bool fpm_cleaning_up;
struct fpm_nl_ctx { struct fpm_nl_ctx {
/* data plane connection. */ /* data plane connection. */
int socket; int socket;
@ -524,6 +526,16 @@ static void fpm_connect(struct event *t);
static void fpm_reconnect(struct fpm_nl_ctx *fnc) static void fpm_reconnect(struct fpm_nl_ctx *fnc)
{ {
bool cleaning_p = false;
/* This is being called in the FPM pthread: ensure we don't deadlock
* with similar code that may be run in the main pthread.
*/
if (!atomic_compare_exchange_strong_explicit(
&fpm_cleaning_up, &cleaning_p, true, memory_order_seq_cst,
memory_order_seq_cst))
return;
/* Cancel all zebra threads first. */ /* Cancel all zebra threads first. */
event_cancel_async(zrouter.master, &fnc->t_lspreset, NULL); event_cancel_async(zrouter.master, &fnc->t_lspreset, NULL);
event_cancel_async(zrouter.master, &fnc->t_lspwalk, NULL); event_cancel_async(zrouter.master, &fnc->t_lspwalk, NULL);
@ -551,6 +563,12 @@ static void fpm_reconnect(struct fpm_nl_ctx *fnc)
EVENT_OFF(fnc->t_read); EVENT_OFF(fnc->t_read);
EVENT_OFF(fnc->t_write); EVENT_OFF(fnc->t_write);
/* Reset the barrier value */
cleaning_p = true;
atomic_compare_exchange_strong_explicit(
&fpm_cleaning_up, &cleaning_p, false, memory_order_seq_cst,
memory_order_seq_cst);
/* FPM is disabled, don't attempt to connect. */ /* FPM is disabled, don't attempt to connect. */
if (fnc->disabled) if (fnc->disabled)
return; return;
@ -1624,6 +1642,16 @@ static int fpm_nl_start(struct zebra_dplane_provider *prov)
static int fpm_nl_finish_early(struct fpm_nl_ctx *fnc) static int fpm_nl_finish_early(struct fpm_nl_ctx *fnc)
{ {
bool cleaning_p = false;
/* This is being called in the main pthread: ensure we don't deadlock
* with similar code that may be run in the FPM pthread.
*/
if (!atomic_compare_exchange_strong_explicit(
&fpm_cleaning_up, &cleaning_p, true, memory_order_seq_cst,
memory_order_seq_cst))
return 0;
/* Disable all events and close socket. */ /* Disable all events and close socket. */
EVENT_OFF(fnc->t_lspreset); EVENT_OFF(fnc->t_lspreset);
EVENT_OFF(fnc->t_lspwalk); EVENT_OFF(fnc->t_lspwalk);
@ -1644,6 +1672,12 @@ static int fpm_nl_finish_early(struct fpm_nl_ctx *fnc)
fnc->socket = -1; fnc->socket = -1;
} }
/* Reset the barrier value */
cleaning_p = true;
atomic_compare_exchange_strong_explicit(
&fpm_cleaning_up, &cleaning_p, false, memory_order_seq_cst,
memory_order_seq_cst);
return 0; return 0;
} }