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

[sonic-sairedis update] Support for SAI header v1.10.2 with BRCM SAI v7.1.0.0 and MLNX SAI v1.21.1.0 #10583

Merged
merged 4 commits into from
May 6, 2022

Conversation

vmittal-msft
Copy link
Contributor

@vmittal-msft vmittal-msft commented Apr 15, 2022

Signed-off-by: Vineet Mittal vineetmittal@microsoft.com

Why I did it

Support SAI header v1.10.2

How I did it

Integrated SAI header 1.10.2 with sonic-sairedis and made changes to vendor code in sonic
sonic-net/sonic-sairedis#1034
sonic-net/saibcm-modules@fb4cf12

How to verify it

Verified to be working fine on BRCM TD3/TH based HWSKUs.

BRCM SAI ver: [7.1.0.0], OCP SAI ver: [1.10.2], SDK ver: [sdk-6.5.24] CANCUN ver: [06.04.01]

show int status
Interface Lanes Speed MTU FEC Alias Vlan Oper Admin Type Asym PFC


 Ethernet0          1,2,3,4     100G   9100     rs   Ethernet1/1          routed    down     down  QSFP28 or later         off
 Ethernet4          5,6,7,8     100G   9100     rs   Ethernet2/1           trunk      up       up  QSFP28 or later         off
 Ethernet8       9,10,11,12     100G   9100     rs   Ethernet3/1           trunk      up       up  QSFP28 or later         off
Ethernet12      13,14,15,16     100G   9100     rs   Ethernet4/1           trunk      up       up  QSFP28 or later         off
Ethernet16      21,22,23,24     100G   9100     rs   Ethernet5/1           trunk      up       up  QSFP28 or later         off
Ethernet20      17,18,19,20     100G   9100     rs   Ethernet6/1           trunk      up       up  QSFP28 or later         off
Ethernet24      25,26,27,28     100G   9100     rs   Ethernet7/1           trunk      up       up  QSFP28 or later         off
Ethernet28      29,30,31,32     100G   9100     rs   Ethernet8/1           trunk      up       up  QSFP28 or later         off
Ethernet32      37,38,39,40     100G   9100     rs   Ethernet9/1           trunk      up       up  QSFP28 or later         off
Ethernet36      33,34,35,36     100G   9100     rs  Ethernet10/1           trunk      up       up  QSFP28 or later         off
Ethernet40      41,42,43,44     100G   9100     rs  Ethernet11/1           trunk      up       up  QSFP28 or later         off
Ethernet44      45,46,47,48     100G   9100     rs  Ethernet12/1           trunk      up       up  QSFP28 or later         off
Ethernet48      53,54,55,56     100G   9100     rs  Ethernet13/1           trunk      up       up  QSFP28 or later         off
Ethernet52      49,50,51,52     100G   9100     rs  Ethernet14/1           trunk      up       up  QSFP28 or later         off
Ethernet56      57,58,59,60     100G   9100     rs  Ethernet15/1           trunk      up       up  QSFP28 or later         off
Ethernet60      61,62,63,64     100G   9100     rs  Ethernet16/1           trunk      up       up  QSFP28 or later         off
Ethernet64      69,70,71,72     100G   9100     rs  Ethernet17/1           trunk      up       up  QSFP28 or later         off
Ethernet68      65,66,67,68     100G   9100     rs  Ethernet18/1           trunk      up       up  QSFP28 or later         off
Ethernet72      73,74,75,76     100G   9100     rs  Ethernet19/1           trunk      up       up  QSFP28 or later         off
Ethernet76      77,78,79,80     100G   9100     rs  Ethernet20/1           trunk      up       up  QSFP28 or later         off
Ethernet80      85,86,87,88     100G   9100     rs  Ethernet21/1           trunk      up       up  QSFP28 or later         off
Ethernet84      81,82,83,84     100G   9100     rs  Ethernet22/1           trunk      up       up  QSFP28 or later         off
Ethernet88      89,90,91,92     100G   9100     rs  Ethernet23/1           trunk      up       up  QSFP28 or later         off
Ethernet92      93,94,95,96     100G   9100     rs  Ethernet24/1           trunk      up       up  QSFP28 or later         off
Ethernet96  101,102,103,104     100G   9100     rs  Ethernet25/1           trunk      up       up  QSFP28 or later         off

Ethernet100 97,98,99,100 100G 9100 rs Ethernet26/1 routed down down QSFP28 or later off
Ethernet104 105,106,107,108 100G 9100 rs Ethernet27/1 routed down down QSFP28 or later off
Ethernet108 109,110,111,112 100G 9100 rs Ethernet28/1 routed down down QSFP28 or later off
Ethernet112 117,118,119,120 100G 9100 rs Ethernet29/1 PortChannel101 up up QSFP28 or later off
Ethernet116 113,114,115,116 100G 9100 rs Ethernet30/1 PortChannel102 up up QSFP28 or later off
Ethernet120 121,122,123,124 100G 9100 rs Ethernet31/1 PortChannel103 up up QSFP28 or later off
Ethernet124 125,126,127,128 100G 9100 rs Ethernet32/1 PortChannel104 up up QSFP28 or later off
Ethernet128 129 10G 9100 N/A Ethernet33 routed down down N/A off
Ethernet132 128 10G 9100 N/A Ethernet34 routed down down N/A off
PortChannel101 N/A 100G 9100 N/A N/A routed up up N/A N/A
PortChannel102 N/A 100G 9100 N/A N/A routed up up N/A N/A
PortChannel103 N/A 100G 9100 N/A N/A routed up up N/A N/A
PortChannel104 N/A 100G 9100 N/A N/A routed up up N/A N/A

show ip bgp sum

IPv4 Unicast Summary:
BGP router identifier 10.1.0.32, local AS number 65100 vrf-id 0
BGP table version 12806
RIB entries 12807, using 2458944 bytes of memory
Peers 4, using 87264 KiB of memory
Peer groups 4, using 256 bytes of memory

Neighbhor V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd NeighborName


10.0.0.57 4 64600 3231 3230 0 0 0 00:01:10 6400 ARISTA01T1
10.0.0.59 4 64600 3231 3230 0 0 0 00:01:10 6400 ARISTA02T1
10.0.0.61 4 64600 3228 3229 0 0 0 00:01:10 6400 ARISTA03T1
10.0.0.63 4 64600 3231 3230 0 0 0 00:01:11 6400 ARISTA04T1

Total number of neighbors 4

show ip route summary
Route Source Routes FIB (vrf default)
connected 7 7
ebgp 6403 6403
ibgp 0 0

Totals 6410 6410

show ipv6 route summary
Route Source Routes FIB (vrf default)
kernel 1 1
connected 43 43
static 1 1
ebgp 6403 6403
ibgp 0 0

Totals 6448 6448

Following sonic-mgmt tests are passing with this -
fib/test_fib.py
vxlan/test_vxlan_decap.py
fdb/test_fdb.py
decap/test_decap.py
ipfwd/test_dir_bcast.py
vlan/test_vlan.py

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111

Description for the changelog

SAI header tag v1.10.2 support

Link to config_db schema for YANG module changes

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

@vmittal-msft vmittal-msft marked this pull request as ready for review April 20, 2022 05:03
@vmittal-msft vmittal-msft changed the title Changes to support SAI header 1.10.2 Support for SAI header v1.10.2 Apr 20, 2022
@vmittal-msft vmittal-msft force-pushed the sai_1.10.2 branch 3 times, most recently from 76dfe1c to 269de28 Compare April 20, 2022 05:29
@vmittal-msft vmittal-msft changed the title Support for SAI header v1.10.2 [sonic-sairedis update] Support for SAI header v1.10.2 with BRCM SAI v7.1.0.0 and MLNX SAI v1.12.1.0 Apr 21, 2022
@vmittal-msft vmittal-msft force-pushed the sai_1.10.2 branch 5 times, most recently from 43563b8 to a08595b Compare April 22, 2022 00:27
@dgsudharsan
Copy link
Collaborator

@vmittal-msft Can you please correct the MLNX SAI version in the title to v1.21.1.0?

@vmittal-msft
Copy link
Contributor Author

@vmittal-msft Can you please correct the MLNX SAI version in the title to v1.21.1.0?

Done. Thanks.

@dgsudharsan
Copy link
Collaborator

@vmittal-msft Can you please correct the MLNX SAI version in the title to v1.21.1.0?

Done. Thanks.

Hi @vmittal-msft I still see the title with v1.12.1.0
[sonic-sairedis update] Support for SAI header v1.10.2 with BRCM SAI v7.1.0.0 and MLNX SAI v1.12.1.0

@vmittal-msft vmittal-msft changed the title [sonic-sairedis update] Support for SAI header v1.10.2 with BRCM SAI v7.1.0.0 and MLNX SAI v1.12.1.0 [sonic-sairedis update] Support for SAI header v1.10.2 with BRCM SAI v7.1.0.0 and MLNX SAI v1.21.1.0 Apr 22, 2022
@vmittal-msft
Copy link
Contributor Author

@vmittal-msft Can you please correct the MLNX SAI version in the title to v1.21.1.0?

Done. Thanks.

Hi @vmittal-msft I still see the title with v1.12.1.0 [sonic-sairedis update] Support for SAI header v1.10.2 with BRCM SAI v7.1.0.0 and MLNX SAI v1.12.1.0

Done. Thanks.

Copy link
Contributor

@alexrallen alexrallen left a comment

Choose a reason for hiding this comment

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

@vmittal-msft Before you update the sonic-sairedis submodule pointer in sonic-buildimage you need to make sure the following PRs are merged from SAI and the pointer is updated in sonic-sairedis as the v1.10 is currently missing them and will cause regressions.

opencomputeproject/SAI#1473
opencomputeproject/SAI#1472

@vmittal-msft
Copy link
Contributor Author

@vmittal-msft
Copy link
Contributor Author

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: Vineet Mittal <vineetmittal@microsoft.com>

Changes for SAI header v1.10.2 and BRCM SAI v7.1

Update SDK/FW to 4.5.1500/2010.1500 and SAI version to 1.21.1.1

Updated sonic-sairedis submodule to include SAI fixes
@vmittal-msft vmittal-msft changed the title [sonic-sairedis update] Support for SAI header v1.10.2 with BRCM SAI v7.1.0.0 and MLNX SAI v1.21.1.0 [sonic-sairedis update] Support for SAI header v1.10.2 with BRCM SAI v7.1.0.0 and MLNX SAI v1.21.1.1 May 4, 2022
@vmittal-msft vmittal-msft changed the title [sonic-sairedis update] Support for SAI header v1.10.2 with BRCM SAI v7.1.0.0 and MLNX SAI v1.21.1.1 [sonic-sairedis update] Support for SAI header v1.10.2 with BRCM SAI v7.1.0.0 and MLNX SAI v1.21.1.0 May 4, 2022
@saiarcot895
Copy link
Contributor

/Azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@vmittal-msft vmittal-msft merged commit 9ae17e6 into sonic-net:master May 6, 2022
@vmittal-msft vmittal-msft deleted the sai_1.10.2 branch May 6, 2022 03:27
lolyu pushed a commit to lolyu/sonic-mgmt that referenced this pull request May 31, 2022
Add a hotfix for BCM SAI 7.1.0

We are seeing Mux tunnel creation failure after BCM SAI is upgrated to `7.1.0` in PR sonic-net/sonic-buildimage#10583.

This PR is to patch the `bcm.config` for `dualtor` deployment to workaround this issue until the issue is fixed in image.

This PR will add `sai_remap_prio_on_tnl_egress=1` into `bcm.config` if the device is running `master` image, and deployment is `dualtor`, and the SKU contains `arista`.

The change is validated by manually running `./testbed-cli.sh deploy-mg vms24-dual-t0-7050-2 str2 password.txt `

Signed-off-by: bingwang <bingwang@microsoft.com>
liushilongbuaa pushed a commit to liushilongbuaa/sonic-buildimage that referenced this pull request Jun 20, 2022
StormLiangMS pushed a commit to StormLiangMS/sonic-mgmt that referenced this pull request Jul 4, 2022
Add a hotfix for BCM SAI 7.1.0

We are seeing Mux tunnel creation failure after BCM SAI is upgrated to `7.1.0` in PR sonic-net/sonic-buildimage#10583.

This PR is to patch the `bcm.config` for `dualtor` deployment to workaround this issue until the issue is fixed in image.

This PR will add `sai_remap_prio_on_tnl_egress=1` into `bcm.config` if the device is running `master` image, and deployment is `dualtor`, and the SKU contains `arista`.

The change is validated by manually running `./testbed-cli.sh deploy-mg vms24-dual-t0-7050-2 str2 password.txt `

Signed-off-by: bingwang <bingwang@microsoft.com>"
StormLiangMS pushed a commit to StormLiangMS/sonic-mgmt that referenced this pull request Jul 4, 2022
**The hotfix is no longer required after PR sonic-net/sonic-buildimage#10962 is merged**

Add a hotfix for BCM SAI 7.1.0

We are seeing Mux tunnel creation failure after BCM SAI is upgrated to `7.1.0` in PR sonic-net/sonic-buildimage#10583.

This PR is to patch the `bcm.config` for `dualtor` deployment to workaround this issue until the issue is fixed in image.

This PR will add `sai_remap_prio_on_tnl_egress=1` into `bcm.config` if the device is running `master` image, and deployment is `dualtor`, and the SKU contains `arista`.

The change is validated by manually running `./testbed-cli.sh deploy-mg vms24-dual-t0-7050-2 str2 password.txt `

Signed-off-by: bingwang <bingwang@microsoft.com>

Reverts !577
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.

5 participants