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]: Move to version 7.2 #3704

Merged
merged 3 commits into from
Nov 6, 2019

Conversation

pavel-shirshov
Copy link
Contributor

@pavel-shirshov pavel-shirshov commented Nov 5, 2019

- What I did
Moved to frr 7.2

- How I did it
Changed frr sources and adapted patches

- How to verify it
Build an image and run it on your dut

- Description for the changelog

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

@pavel-shirshov
Copy link
Contributor Author

@tylerlinp I've removed 0005-Support-VRF.patch from the patchset. I see that sonic-net/sonic-frr#15 you asked for RT_TABLE_COMPAT instead of RT_TABLE_UNSPEC from frr team. You referred to fpmsyncd compatibility. Is it still valid? Should I add an extrapatch for frr 7.2?
Thanks

@tylerlinp
Copy link
Contributor

tylerlinp commented Nov 5, 2019

@pavel-shirshov It doesn't matter RT_TABLE_UNSPEC or RT_TABLE_COMPAT, it would be ignored, so there is no need to change it again. Yes, a new patch is needed in frr 7.2 to revert the table_id to vrf_id. Now fpmsyncd codes are basing on vrf_id.

This is the part to revert:

@@ -224,14 +224,17 @@ static int netlink_route_info_fill(netlink_route_info_t *ri, int cmd,
				   rib_dest_t *dest, struct route_entry *re)
{
	struct nexthop *nexthop;
+	struct zebra_vrf *zvrf;

	memset(ri, 0, sizeof(*ri));

	ri->prefix = rib_dest_prefix(dest);
	ri->af = rib_dest_af(dest);

	ri->nlmsg_type = cmd;
-	ri->rtm_table = zvrf_id(rib_dest_vrf(dest));
+	zvrf = rib_dest_vrf(dest);
+	if (zvrf)
+		ri->rtm_table = zvrf->table_id;
	ri->rtm_protocol = RTPROT_UNSPEC;

@pavel-shirshov
Copy link
Contributor Author

@tylerlinp Thank you for your prompt reply.
Would it be better to change fpmsyncd to use table_id?
So we can use standard frr?
Thanks

@pavel-shirshov
Copy link
Contributor Author

retest vs please

@pavel-shirshov pavel-shirshov marked this pull request as ready for review November 5, 2019 19:02
@lguohan
Copy link
Collaborator

lguohan commented Nov 5, 2019

there are a few patches removed? can you explain why? because they are included in the frr 7.2?

@pavel-shirshov
Copy link
Contributor Author

pavel-shirshov commented Nov 5, 2019

Yes. All removed patches are parts of FRR 7.2 now.

@lguohan
Copy link
Collaborator

lguohan commented Nov 6, 2019

@tylerlinp , can you follow up on Pavel's question?

@tylerlinp
Copy link
Contributor

@tylerlinp Thank you for your prompt reply.
Would it be better to change fpmsyncd to use table_id?
So we can use standard frr?
Thanks

In my oponion using vrf_id is better. If to use table_id, it will get much more work and loss of efficiency. It is a subject deserved to discuss.

@pavel-shirshov pavel-shirshov merged commit aa1a136 into sonic-net:master Nov 6, 2019
@pavel-shirshov pavel-shirshov deleted the pavelsh/frr72 branch November 6, 2019 19:57
zhenggen-xu pushed a commit to zhenggen-xu/sonic-buildimage that referenced this pull request Jan 10, 2020
* Use 7.2 tree to generate frr packages

* Adapt patches for frr/7.2

* Use vrf_id
mssonicbld added a commit that referenced this pull request Mar 2, 2025
…atically (#21343)

#### Why I did it
src/sonic-utilities
```
* 899ed9b9 - (HEAD -> master, origin/master, origin/HEAD) Remove Multi ASIC namespace Check. (#3783) (3 days ago) [Xincun Li]
* 9f1eab43 - Memory Statistics Config and Show Commands (#3575) (3 days ago) [Kanza Latif]
* 595c2aaa - Utilities Changes for DHCP DoS Mitigation Feature (#3301) (3 days ago) [Asad Raza]
* a3d15bc1 - Add multi-asic support for dropconfig (#3735) (3 days ago) [HP]
* 5ce06b27 - Add golden config check (#3770) (4 days ago) [Xincun Li]
* 3c50deeb - Fix `vnet_route_check` for active and inactive routes, add `--all` option (#3763) (9 days ago) [mramezani95]
* 40ba225f - Revert "enable pfcwd for backplane ports (#3759)" (#3767) (13 days ago) [Dashuai Zhang]
* 2866ccd9 - enable pfcwd for backplane ports (#3759) (2 weeks ago) [Dashuai Zhang]
* 3abd19e3 - [FC] remove FC delay field (#3577) (3 weeks ago) [Stepan Blyshchak]
* 11c27163 - Improve SONiC disk checker to handle disk full case and mount overlay fs to allow remote user login. (#3700) (3 weeks ago) [Hua Liu]
* 13619aa2 - [QOS] Skip showing unnecessary warning message (#3708) (3 weeks ago) [Vivek]
* f4e6e5b8 - Fixing 'show ip bgp neighbor <ip>' in frr unified config mode (#3738) (3 weeks ago) [kalash-nexthop]
* 9a18155e - Optimize lag_keepalive by crafting the LACPDU packet ourselves (#3170) (3 weeks ago) [Saikrishna Arcot]
* a7deb8c0 - display proper message with proper errno for kvm. (#3750) (3 weeks ago) [Dawei Huang]
* 865f196d - [Mellanox] Add new SN5640 platform and HwSKU (#3742) (4 weeks ago) [Noa Or]
* 5fa85027 - [show_techsupport][pstore] Archive /var/lib/systemd/pstore info to techsupport (#3745) (4 weeks ago) [Marty Y. Lok]
* 8f69d5a6 - sonic-utilities: WRED stats feature changes on sonic-utilities (#2807) (4 weeks ago) [Rajesh Perumal R]
* 9d273f16 - Fix call for spanning-tree commands in dump script (#3723) (4 weeks ago) [DavidZagury]
* 6d95d9bd - Make 'show ip bgp summary' work even when we don't have any peer groups (#3739) (4 weeks ago) [kalash-nexthop]
* 7f3957c4 - Fix ssdhealth failure on VS platform (#3743) (4 weeks ago) [Vivek]
* 97b4e4b8 - Fix show interface counters for Chassis Packet Supervisor (#3734) (4 weeks ago) [anamehra]
* 414935b7 - Add recover asic_id config if load golden config. (#3711) (5 weeks ago) [Xincun Li]
* 973cfdc3 - Remove partially installer image when image install failed. (#3712) (5 weeks ago) [Hua Liu]
* 97c20ccd - CLI support for SmartSwitch PMON (#3271) (5 weeks ago) [rameshraghupathy]
* 752c3d49 - [ACL] Display rule and table info written to APP DB (#3713) (5 weeks ago) [Vivek]
* fbd0c3b1 - [show][interface] Add changes for show interface flap command (#3724) (5 weeks ago) [vdahiya12]
* ddccabee - [show][interface] Add changes for show interface errors command (#3721) (5 weeks ago) [vdahiya12]
* be870a6e - [config] Exit with non-zero when qos reload fail (#3710) (6 weeks ago) [Jianyue Wu]
* ffa66e96 - Remove debug dump import by default (#3715) (6 weeks ago) [Vivek]
* fc3a3cbe - [ssdhealth] Check for default device before falling back to discovery (#3693) (6 weeks ago) [Vivek]
* 782c33a1 - [yang] Enforce yang full support in full config command (#3716) (6 weeks ago) [jingwenxie]
* a5b7a904 - [show][interfaces] Add proposal for show interfaces flap (#3627) (6 weeks ago) [vdahiya12]
* 0083a124 - sonic-utilities: add th5 hwskus to gcu conf file (#3714) (7 weeks ago) [Chris]
* 81cf04f7 - [Mellanox] Add Mellanox-SN5610N-C256S2, Mellanox-SN5610N-C224O8 to GCU validators (#3658) (7 weeks ago) [noaOrMlnx]
* 349a1018 - [db_migrator] Migrate tunnel table (#3704) (7 weeks ago) [Longxiang Lyu]
* 0e327c5f - show ip interfaces: fix exception with BGP unnumbered (#3695) (8 weeks ago) [Brad House]
* 7100f73b - [show_tech] modify generate_dump to includes BERT data and also the platform specified hw-mgmt info (#3676) (8 weeks ago) [Marty Y. Lok]
* 80d46988 - Delete TRSNCEIVER tables while config reload (#3680) (8 weeks ago) [noaOrMlnx]
* bf6ff9f9 - Enable multi asic golden config YANG validation. (#3685) (8 weeks ago) [Xincun Li]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants