Skip to content

zebra: Only notify dplane work pthread when needed #17062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ton31337 merged 3 commits into from
Oct 14, 2024
Merged

zebra: Only notify dplane work pthread when needed #17062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
963792e
zebra: Only notify dplane work pthread when needed
donaldsharp Oct 10, 2024
8aa97a4
zebra: Slow down fpm_process_queue
donaldsharp Oct 11, 2024
cf2624a
fpm: Allow max fpm message size to float based on ecmp
donaldsharp Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fpm/fpm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
/*
* Largest message that can be sent to or received from the FPM.
*/
#define FPM_MAX_MSG_LEN 4096
#define FPM_MAX_MSG_LEN MAX(MULTIPATH_NUM * 32, 4096)

#ifdef __SUNPRO_C
#pragma pack(1)
Expand Down
10 changes: 7 additions & 3 deletions zebra/dplane_fpm_nl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1512,8 +1512,12 @@ static void fpm_process_queue(struct event *t)

/* Re-schedule if we ran out of buffer space */
if (no_bufs) {
event_add_event(fnc->fthread->master, fpm_process_queue, fnc, 0,
&fnc->t_dequeue);
if (processed_contexts)
event_add_event(fnc->fthread->master, fpm_process_queue, fnc, 0,
&fnc->t_dequeue);
else
event_add_timer_msec(fnc->fthread->master, fpm_process_queue, fnc, 10,
&fnc->t_dequeue);
event_add_timer(fnc->fthread->master, fpm_process_wedged, fnc,
DPLANE_FPM_NL_WEDGIE_TIME, &fnc->t_wedged);
} else
Expand All @@ -1525,7 +1529,7 @@ static void fpm_process_queue(struct event *t)
* until the dataplane thread gets scheduled for new,
* unrelated work.
*/
if (dplane_provider_out_ctx_queue_len(fnc->prov) > 0)
if (processed_contexts)
dplane_provider_work_ready();
}

Expand Down