Skip to content
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.

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

[FRR]Upgrade FRR to 8.5.4 #18669

Merged
merged 5 commits into from
Apr 29, 2024
Merged

Conversation

dgsudharsan
Copy link
Collaborator

@dgsudharsan dgsudharsan commented Apr 12, 2024

Addresses sonic-net/SONiC#1537

Why I did it

Upgrading FRR 8.5.4 to include latest fixes.

Work item tracking
  • Microsoft ADO (number only):

How I did it

New patches that were added:

Patch FRR Pull request Issue fixed
0024-lib-use-snmp-s-large-fd-sets-for-agentx.patch FRRouting/frr#13396 FRRouting/frr#14143
0025-bgp-community-memory-leak-fix.patch FRRouting/frr#15466 FRRouting/frr#15459
0026-bgp-fib-suppress-announce-fix.patch FRRouting/frr#15634 FRRouting/frr#15626
0027-lib-Do-not-convert-EVPN-prefixes-into-IPv4-IPv6-if-n.patch FRRouting/frr#15418 FRRouting/frr#14419

Removed patches:

Patch Upstream FRR commit that is present in 8.5.4
0019-zebra-Abstract-dplane_ctx_route_init-to-init-route-w.patch FRRouting/frr@3f01977
0020-zebra-Fix-crash-when-dplane_fpm_nl-fails-to-process-.patch FRRouting/frr@fe5f624
0022-bgpd-Don-t-read-the-first-byte-of-ORF-header-if-we-a.patch FRRouting/frr@3515178
0023-bgpd-Make-sure-we-have-enough-data-to-read-two-bytes.patch FRRouting/frr@460ee93
0024-bgpd-Do-not-process-NLRIs-if-the-attribute-length-is.patch FRRouting/frr@f291f1e
0025-bgpd-Use-treat-as-withdraw-for-tunnel-encapsulation-.patch FRRouting/frr@8a4a88c
0026-zebra-Add-encap-type-when-building-packet-for-FPM.patch FRRouting/frr@f0f7b28
0028-bgpd-Check-mandatory-attributes-more-carefully-for-U.patch FRRouting/frr@21418d6
0029-bgpd-Handle-MP_REACH_NLRI-malformed-packets-with-ses.patch FRRouting/frr@30b5c2a
0030-bgpd-Treat-EOR-as-withdrawn-to-avoid-unwanted-handli.patch FRRouting/frr@01f232c
0031-bgpd-Ignore-handling-NLRIs-if-we-received-MP_UNREACH.patch FRRouting/frr@a0c4ec2
0032-zebra-Fix-fpm-multipath-encap-addition.patch FRRouting/frr@10a9a5f

Realigned patches:

Old Patch New patch
0005-Add-support-of-bgp-l3vni-evpn.patch 0005-Add-support-of-bgp-l3vni-evpn.patch
0021-zebra-remove-duplicated-nexthops-when-sending-fpm-msg.patch 0019-zebra-remove-duplicated-nexthops-when-sending-fpm-msg.patch
0027-zebra-Fix-non-notification-of-better-admin-won.patch 0020-zebra-Fix-non-notification-of-better-admin-won.patch
Disable-ipv6-src-address-test-in-pceplib.patch 0021-Disable-ipv6-src-address-test-in-pceplib.patch
cross-compile-changes.patch 0022-cross-compile-changes.patch
0033-zebra-The-dplane_fpm_nl-return-path-leaks-memory.patch 0023-zebra-The-dplane_fpm_nl-return-path-leaks-memory.patch

How to verify it

Running sonic-mgmt test suite.

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@liat-grozovik
Copy link
Collaborator

@StormLiangMS please review and approve. final tests expected in few days. once completed i wish to merge it.

@robertvolkmann
Copy link

robertvolkmann commented Apr 15, 2024

@dgsudharsan FRR 8.5 has an urgent bug that prevents of using e.g. match evpn vni in a route-map. The fix was already merged into 9.0, 9.1 and 10.0, but it is still ongoing for 8.5.

PR for 8.5: FRRouting/frr#15418
Bug description: FRRouting/frr#14419 (comment)

@dgsudharsan
Copy link
Collaborator Author

@dgsudharsan FRR 8.5 has an urgent bug that prevents of using e.g. match evpn vni in a route-map. The fix was already merged into 9.0, 9.1 and 10.0, but it is still ongoing for 8.5.

PR for 8.5: FRRouting/frr#15418 Bug description: FRRouting/frr#14419 (comment)

Thanks for pointing out. I have taken this fix in the latest commit.

@donaldsharp
Copy link

@dgsudharsan FRR 8.5 has an urgent bug that prevents of using e.g. match evpn vni in a route-map. The fix was already merged into 9.0, 9.1 and 10.0, but it is still ongoing for 8.5.
PR for 8.5: FRRouting/frr#15418 Bug description: FRRouting/frr#14419 (comment)

Thanks for pointing out. I have taken this fix in the latest commit.

Isn't this true for the 8.4.1 based version of sonic too?

In any event, everything looks good to me.

@robertvolkmann
Copy link

@donaldsharp Yeah, the branches 202305 and 202311 with FRR 8.5.1 are also affected.

@dgsudharsan
Copy link
Collaborator Author

@donaldsharp Yeah, the branches 202305 and 202311 with FRR 8.5.1 are also affected.

Here is PR for 202311 #18732

@StormLiangMS please review

@dgsudharsan dgsudharsan marked this pull request as ready for review April 23, 2024 21:18
lguohan pushed a commit that referenced this pull request Apr 23, 2024
Backport based on comment #18669 (comment)

Why I did it
Fix the below FRR issues
FRRouting/frr#14419
FRRouting/frr#13792
Copy link

@donaldsharp donaldsharp left a comment

Choose a reason for hiding this comment

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

LGTM

@liat-grozovik
Copy link
Collaborator

@StormLiangMS kindly help to review and merge.

@StormLiangMS
Copy link
Contributor

StormLiangMS commented Apr 26, 2024

hi @dgsudharsan one question, there was memory leak issue with bgp suppresss enabled, for this upgrade, do we have the bgp fib suppress fully disabled by default?

FRRouting/frr#14797

@StormLiangMS
Copy link
Contributor

hi @dgsudharsan as we discussed in the email, beside the bgp fib suppress issue, others LGTM. Could you pls help to priority the separate PR to disable it from both SONiC and FRR level by default?

Copy link
Contributor

@StormLiangMS StormLiangMS left a comment

Choose a reason for hiding this comment

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

LGTM

@StormLiangMS StormLiangMS merged commit f1bc937 into sonic-net:master Apr 29, 2024
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants