Skip to content

[FRR]: Bring bug fixes from FRR mainline#22593

Merged
lguohan merged 10 commits intosonic-net:masterfrom
cscarpitta:frr_fixes_from_mainline
May 14, 2025
Merged

[FRR]: Bring bug fixes from FRR mainline#22593
lguohan merged 10 commits intosonic-net:masterfrom
cscarpitta:frr_fixes_from_mainline

Conversation

@cscarpitta
Copy link
Copy Markdown
Contributor

Bring the following FPM bug fixes from FRR mainline and apply to dplane_fpm_sonic:

Bugfix FRR commit
zebra: avoid a race during FPM dplane plugin shutdown https://github.com/FRRouting/frr/commits/277784fe34d3036c9f6f37bc7deff7fb235012ee
zebra: fix incoming FPM message length validation https://github.com/FRRouting/frr/commits/28d2e126c7fea07de22e52201a70fbf0c94b5dc6
zebra: Prevent possible wedged fpm write https://github.com/FRRouting/frr/commits/3209ca4b0850f6ea4970304b172a43249e38e914
zebra: Use event_add_event instead of _timer https://github.com/FRRouting/frr/commits/61af06c8135437167fcc67c23986575ecde4a17f
zebra: Slow down fpm_process_queue https://github.com/FRRouting/frr/commits/8aa97a439fc21c66132fdaf8ce0113e16801be04
zebra: fnc->obuf could be accessed without a lock https://github.com/FRRouting/frr/commits/e7a1fbbcf64659ae2057a2e1e20a6c1f842522ab
zebra: Limit mutex for obuf to when we access obuf https://github.com/FRRouting/frr/commits/c58da10d2a700164e329352c5c22a924af3fa45c
zebra: Only notify dplane work pthread when needed https://github.com/FRRouting/frr/commits/963792e8c5ba834f1f7bb2555e90aa4b2ff6f33c

Bring the following bug fixes from FRR mainline:

Patch FRR Pull request
0028-zebra-ensure-proper-return-for-failure-for-Sid-allocation.patch FRRouting/frr#18367
0029-staticd-Fix-a-crash-that-occurs-when-modifying-an-SRv6-SID.patch FRRouting/frr#18360
0030-staticd-Avoid-requesting-SRv6-sid-from-zebra-when-loc-and-sid-block-dont-match.patch FRRouting/frr#18467
0031-isisd-fix-srv6-sid-memory-leak.patch FRRouting/frr#18580
0031-isisd-fix-srv6-sid-memory-leak.patch FRRouting/frr#18667
0032-show-ipv6-route-json-displays-seg6local-flavors.patch FRRouting/frr#18563
0033-staticd–Install-known-nexthops-upon-connection-with-zebra.patch FRRouting/frr#18367
0034-staticd-Fix-an-issue-where-SRv6-SIDs-may-not-be-allocated-on-heavily-loaded-systems.patch FRRouting/frr#18317

Bring the following fixes from FRR mainline and apply to dplane_fpm_sonic:
- zebra: avoid a race during FPM dplane plugin shutdown (FRRouting#277784f)

Signed-off-by: Carmine Scarpitta <[email protected]>
Bring the following fixes from FRR mainline and apply to dplane_fpm_sonic:
- zebra: avoid a race during FPM dplane plugin shutdown (FRRouting#28d2e12)

Signed-off-by: Carmine Scarpitta <[email protected]>
Bring the following fix from FRR mainline and apply to dplane_fpm_sonic:
- zebra: Prevent possible wedged fpm write (FRRouting#3209ca4)

Signed-off-by: Carmine Scarpitta <[email protected]>
Bring the following fix from FRR mainline and apply to dplane_fpm_sonic:
- zebra: Use event_add_event instead of _timer (FRRouting#61af06c)

Signed-off-by: Carmine Scarpitta <[email protected]>
Bring the following fix from FRR mainline and apply to dplane_fpm_sonic:
- zebra: Slow down fpm_process_queue (FRRouting#8aa97a4)

Signed-off-by: Carmine Scarpitta <[email protected]>
Bring the following fix from FRR mainline and apply to dplane_fpm_sonic:
- zebra: fnc->obuf could be accessed without a lock (FRRouting#e7a1fbb)

Signed-off-by: Carmine Scarpitta <[email protected]>
Bring the following fix from FRR mainline and apply to dplane_fpm_sonic:
- zebra: Limit mutex for obuf to when we access obuf (FRRouting#c58da10)

Signed-off-by: Carmine Scarpitta <[email protected]>
Bring the following fix from FRR mainline and apply to dplane_fpm_sonic:
- zebra: Only notify dplane work pthread when needed (FRRouting#963792e)

Signed-off-by: Carmine Scarpitta <[email protected]>
Bring the following fix from FRR mainline:

- staticd: Install known nexthops upon connection with zebra FRRouting#18367
- zebra: ensure proper return for failure for Sid allocation FRRouting#18360
- staticd: Fix a crash that occurs when modifying an SRv6 SID sonic-net#18467
- staticd: Avoid requesting SRv6 sid from zebra when loc and sid block dont match FRRouting#18580
- isisd: fix srv6_sid memory leak FRRouting#18667
- show ipv6 route [json] displays seg6local flavors FRRouting#18563
- staticd: Install known nexthops upon connection with zebra FRRouting#18367
- staticd: Fix an issue where SRv6 SIDs may not be allocated on heavily loaded systems FRRouting#18317

Signed-off-by: Carmine Scarpitta <[email protected]>
@cscarpitta cscarpitta requested a review from lguohan as a code owner May 11, 2025 13:55
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@BYGX-wcr
Copy link
Copy Markdown
Contributor

@liuh-80 , can you verify whether this PR fixed your issue?

@liuh-80
Copy link
Copy Markdown
Contributor

liuh-80 commented May 14, 2025

@liuh-80 , can you verify whether this PR fixed your issue?

@BYGX-wcr , @cscarpitta , I verified the test issue fixed. can this PR and the mirror test case PR merge? all sonic-swss repo PRs currently blocked.

@BYGX-wcr
Copy link
Copy Markdown
Contributor

@liuh-80 , can you verify whether this PR fixed your issue?

@BYGX-wcr , @cscarpitta , I verified the test issue fixed. can this PR and the mirror test case PR merge? all sonic-swss repo PRs currently blocked.

Thanks. Can you approve this PR? I can find someone to merge it.

Copy link
Copy Markdown
Contributor

@liuh-80 liuh-80 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified this PR can fix sonic-swss PR validation issue

@lguohan lguohan merged commit 3621165 into sonic-net:master May 14, 2025
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants