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.

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

Jump to bottom

Update Broadcom SAI to version 6.0.0.13 #9789

Merged
merged 3 commits into from
Jan 21, 2022
Merged

Update Broadcom SAI to version 6.0.0.13 #9789

merged 3 commits into from
Jan 21, 2022

Conversation

judyjoseph
Copy link
Contributor

@judyjoseph judyjoseph commented Jan 18, 2022 •
edited
Loading

Why I did it

Update Broadcom SAI to version 6.0.0.13, SDK 6.5.24, saibcm-modules to 6.5.24.gpl

How I did it

Brcm SAI 6.0 EA with fixes for CS00012203367, CS00012219613, CS00012213974, CS00012218290, CS00012217169, CS00012211718, CS00012213944, CS00012215529, CS00012218100, CS00012214196, CS00012212681, CS00012205138, CS00012208537, CS00012185316, CS00012208524, CS00012203367, CS00012197364.

How to verify it

On the XGS platform it looks good and able to boot up. Here are some show output I performed:

admin@str-s6100-acs-1:~$ bcmcmd bsv
bsv
BRCM SAI ver: [6.0.0.13], OCP SAI ver: [1.9.1], SDK ver: [sdk-6.5.24]
drivshell>
admin@str-s6100-acs-1:~$ docker ps 
CONTAINER ID   IMAGE                                COMMAND                  CREATED       STATUS       PORTS     NAMES
ca16a7d9c177   docker-sonic-telemetry:latest        "/usr/local/bin/supe…"   4 hours ago   Up 2 hours             telemetry
0fd98ac7881c   docker-sonic-mgmt-framework:latest   "/usr/local/bin/supe…"   4 hours ago   Up 2 hours             mgmt-framework
a57e1e4d5a84   docker-snmp:latest                   "/usr/local/bin/supe…"   4 hours ago   Up 2 hours             snmp
7468787f8046   8424eab0f82a                         "/usr/bin/docker_ini…"   4 hours ago   Up 2 hours             dhcp_relay
e9f0387f3be9   docker-router-advertiser:latest      "/usr/bin/docker-ini…"   4 hours ago   Up 2 hours             radv
bacdc699d239   docker-lldp:latest                   "/usr/bin/docker-lld…"   4 hours ago   Up 2 hours             lldp
55e984d8ea73   docker-syncd-brcm:latest             "/usr/local/bin/supe…"   4 hours ago   Up 2 hours             syncd
876cc3c05f19   docker-teamd:latest                  "/usr/local/bin/supe…"   4 hours ago   Up 2 hours             teamd
0119ac5f5f1a   docker-orchagent:latest              "/usr/bin/docker-ini…"   4 hours ago   Up 2 hours             swss
e7eed98fbc4d   docker-fpm-frr:latest                "/usr/bin/docker_ini…"   4 hours ago   Up 2 hours             bgp
b214eab231a6   docker-platform-monitor:latest       "/usr/bin/docker_ini…"   4 hours ago   Up 2 hours             pmon
23164051a6d3   docker-database:latest               "/usr/local/bin/dock…"   5 hours ago   Up 2 hours             database
admin@str-s6100-acs-1:~$ show ip bgp sum

IPv4 Unicast Summary:
BGP router identifier 10.1.0.32, local AS number 64601 vrf-id 0
BGP table version 12497
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.1       4  64802       5403       7882         0      0       0  01:49:55             6400  ARISTA01T1
10.0.0.5       4  64802       5403       7882         0      0       0  01:49:55             6400  ARISTA02T1
10.0.0.9       4  64802       5406       7884         0      0       0  01:49:55             6400  ARISTA03T1
10.0.0.13      4  64802       5406       7884         0      0       0  01:49:55             6400  ARISTA04T1

Total number of neighbors 4
admin@str-s6100-acs-1:~$ show ipv6 bgp sum

IPv6 Unicast Summary:
BGP router identifier 10.1.0.32, local AS number 64601 vrf-id 0
BGP table version 11886
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
-----------  ---  -----  ---------  ---------  --------  -----  ------  ---------  --------------  --------------
fc00::1a       4  64802       5404       9111         0      0       0  01:49:59             6400  ARISTA04T1
fc00::2        4  64802       5404       9111         0      0       0  01:49:59             6400  ARISTA01T1
fc00::12       4  64802       5404       9111         0      0       0  01:49:59             6400  ARISTA03T1
fc00::a        4  64802       5405       9111         0      0       0  01:50:00             6400  ARISTA02T1

Total number of neighbors 4
admin@str-s6100-acs-1:~$ show interface status
     Interface    Lanes    Speed    MTU    FEC            Alias            Vlan    Oper    Admin                                      Type    Asym PFC
--------------  -------  -------  -----  -----  ---------------  --------------  ------  -------  ----------------------------------------  ----------
     Ethernet0  101,102      40G   9100    N/A   fortyGigE1/1/1  PortChannel101      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
     Ethernet1  103,104      40G   9100    N/A   fortyGigE1/1/2  PortChannel101      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
     Ethernet2    97,98      40G   9100    N/A   fortyGigE1/1/3          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
     Ethernet3   99,100      40G   9100    N/A   fortyGigE1/1/4          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
     Ethernet4    69,70      40G   9100    N/A   fortyGigE1/1/5  PortChannel102      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
     Ethernet5    71,72      40G   9100    N/A   fortyGigE1/1/6  PortChannel102      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
     Ethernet6    65,66      40G   9100    N/A   fortyGigE1/1/7           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
     Ethernet7    67,68      40G   9100    N/A   fortyGigE1/1/8           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
     Ethernet8    53,54      40G   9100    N/A   fortyGigE1/1/9           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
     Ethernet9    55,56      40G   9100    N/A  fortyGigE1/1/10           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet10    49,50      40G   9100    N/A  fortyGigE1/1/11           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet11    51,52      40G   9100    N/A  fortyGigE1/1/12           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet12    21,22      40G   9100    N/A  fortyGigE1/1/13           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet13    23,24      40G   9100    N/A  fortyGigE1/1/14           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet14    17,18      40G   9100    N/A  fortyGigE1/1/15           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet15    19,20      40G   9100    N/A  fortyGigE1/1/16           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet16    25,26      40G   9100    N/A   fortyGigE1/2/1  PortChannel103      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet17    27,28      40G   9100    N/A   fortyGigE1/2/2  PortChannel103      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet18    29,30      40G   9100    N/A   fortyGigE1/2/3          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet19    31,32      40G   9100    N/A   fortyGigE1/2/4          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet20    57,58      40G   9100    N/A   fortyGigE1/2/5  PortChannel104      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet21    59,60      40G   9100    N/A   fortyGigE1/2/6  PortChannel104      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet22    61,62      40G   9100    N/A   fortyGigE1/2/7           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet23    63,64      40G   9100    N/A   fortyGigE1/2/8           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet24    73,74      40G   9100    N/A   fortyGigE1/2/9           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet25    75,76      40G   9100    N/A  fortyGigE1/2/10           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet26    77,78      40G   9100    N/A  fortyGigE1/2/11           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet27    79,80      40G   9100    N/A  fortyGigE1/2/12           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet28  105,106      40G   9100    N/A  fortyGigE1/2/13           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet29  107,108      40G   9100    N/A  fortyGigE1/2/14           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet30  109,110      40G   9100    N/A  fortyGigE1/2/15           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet31  111,112      40G   9100    N/A  fortyGigE1/2/16           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet32    13,14      40G   9100    N/A   fortyGigE1/3/1           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet33    15,16      40G   9100    N/A   fortyGigE1/3/2          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet34     9,10      40G   9100    N/A   fortyGigE1/3/3          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet35    11,12      40G   9100    N/A   fortyGigE1/3/4          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet36  125,126      40G   9100    N/A   fortyGigE1/3/5           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet37  127,128      40G   9100    N/A   fortyGigE1/3/6           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet38  121,122      40G   9100    N/A   fortyGigE1/3/7           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet39  123,124      40G   9100    N/A   fortyGigE1/3/8           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet40    93,94      40G   9100    N/A   fortyGigE1/3/9           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet41    95,96      40G   9100    N/A  fortyGigE1/3/10           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet42    89,90      40G   9100    N/A  fortyGigE1/3/11           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet43    91,92      40G   9100    N/A  fortyGigE1/3/12          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet44    45,46      40G   9100    N/A  fortyGigE1/3/13          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet45    47,48      40G   9100    N/A  fortyGigE1/3/14          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet46    41,42      40G   9100    N/A  fortyGigE1/3/15          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet47    43,44      40G   9100    N/A  fortyGigE1/3/16          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet48  113,114      40G   9100    N/A   fortyGigE1/4/1           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet49  115,116      40G   9100    N/A   fortyGigE1/4/2          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet50  117,118      40G   9100    N/A   fortyGigE1/4/3          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet51  119,120      40G   9100    N/A   fortyGigE1/4/4          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet52      1,2      40G   9100    N/A   fortyGigE1/4/5           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet53      3,4      40G   9100    N/A   fortyGigE1/4/6           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet54      5,6      40G   9100    N/A   fortyGigE1/4/7           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet55      7,8      40G   9100    N/A   fortyGigE1/4/8           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet56    33,34      40G   9100    N/A   fortyGigE1/4/9           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet57    35,36      40G   9100    N/A  fortyGigE1/4/10           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet58    37,38      40G   9100    N/A  fortyGigE1/4/11           trunk      up       up  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet59    39,40      40G   9100    N/A  fortyGigE1/4/12          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet60    81,82      40G   9100    N/A  fortyGigE1/4/13          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet61    83,84      40G   9100    N/A  fortyGigE1/4/14          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet62    85,86      40G   9100    N/A  fortyGigE1/4/15          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
    Ethernet63    87,88      40G   9100    N/A  fortyGigE1/4/16          routed    down     down  QSFP+ or later with SFF-8636 or SFF-8436         off
PortChannel101      N/A      80G   9100    N/A              N/A          routed      up       up                                       N/A         N/A
PortChannel102      N/A      80G   9100    N/A              N/A          routed      up       up                                       N/A         N/A
PortChannel103      N/A      80G   9100    N/A              N/A          routed      up       up                                       N/A         N/A
PortChannel104      N/A      80G   9100    N/A              N/A          routed      up       up                                       N/A         N/A
admin@str-s6100-acs-1:~$

Also ran some manual tests and validated they are able to pass successfully:

     fib/test_fib.py
     vxlan/test_vxlan_decap.py
     fdb/test_fdb.py
     decap/test_decap.py
     ipfwd/test_dir_bcast.py

Most importantly this PR fixes issue (#9261) that has prevented user from using master branch on any BRCM Devices since last year November.

For DNX

admin:/home/admin# show int status | grep "up       up"
     Ethernet96  88,89,90,91,92,93,94,95     400G   9100    N/A  QSFPDD1           routed      up       up     N/A         N/A
    Ethernet112              72,73,74,75     100G   9100    N/A  QSFPDD3           routed      up       up     N/A         N/A
    Ethernet116              76,77,78,79     100G   9100    N/A  QSFPDD3           routed      up       up     N/A         N/A
    Ethernet128  56,57,58,59,60,61,62,63     400G   9100    N/A  QSFPDD5           routed      up       up     N/A         N/A
 
admin:/home/admin# bcmcmd "port sts" | grep up
| eth25(25) | up       | 400G  | SW       | No      | RS-544-2xN | NONE     |
| eth28(28) | up       | 100G  | SW       | No      | NONE       | NONE     |
| eth29(29) | up       | 100G  | SW       | No      | NONE       | NONE     |
| eth34(34) | up       | 400G  | SW       | No      | RS-544-2xN | NONE     |
 
admin:/home/admin# bcmcmd ver

Broadcom Command Monitor: Copyright (c) 1998-2022 Broadcom
Release: sdk-6.5.24 built 20220111 (Tue Jan 11 03:59:22 2022)
From root@4b459f2422b0:/__w/1/s/output/x86-dnx-deb/hsdk
Platform: X86
OS: Unix (Posix)
Chips:
       BCM88790_A0,
      
       BCM88690_A0, BCM88690_B0, BCM88800_A0,
       BCM88850_A0, BCM88480_A0, BCM88480_B0,
PHYs: 
drivshell>
 
admin:/home/admin# show version
 
SONiC Software Version: SONiC.master-9789.66024-bf5356932
Distribution: Debian 11.2
Kernel: 5.10.0-8-2-amd64
Build commit: bf5356932
Build date: Tue Jan 18 19:56:27 UTC 2022
Built by: AzDevOps@sonic-build-workers-001357
 
Platform: x86_64-cel_silverstone_dp-r0
HwSKU: Silverstone-DP
ASIC: broadcom
ASIC Count: 1
Serial Number: N/A
Model Number: N/A
Hardware Revision: N/A
Uptime: 11:24:43 up 15 min,  2 users,  load average: 0.57, 0.39, 0.25
 
Docker images:
REPOSITORY                    TAG                           IMAGE ID       SIZE
docker-syncd-brcm-dnx         latest                        d3f39c3c1626   808MB
docker-syncd-brcm-dnx         master-9789.66024-bf5356932   d3f39c3c1626   808MB
docker-fpm-frr                latest                        26e0c0a4e213   456MB
docker-fpm-frr                master-9789.66024-bf5356932   26e0c0a4e213   456MB
docker-sonic-mgmt-framework   latest                        1e461c0dcee9   578MB
docker-sonic-mgmt-framework   master-9789.66024-bf5356932   1e461c0dcee9   578MB
docker-sonic-telemetry        latest                        87f07e3d1539   512MB
docker-sonic-telemetry        master-9789.66024-bf5356932   87f07e3d1539   512MB
docker-sflow                  latest                        d6e1d44b299d   438MB
docker-sflow                  master-9789.66024-bf5356932   d6e1d44b299d   438MB
docker-orchagent              latest                        e7a7a8d7abcc   457MB
docker-orchagent              master-9789.66024-bf5356932   e7a7a8d7abcc   457MB
docker-nat                    latest                        b54f6a71ae4d   440MB
docker-nat                    master-9789.66024-bf5356932   b54f6a71ae4d   440MB
docker-macsec                 latest                        7f49196d3ca3   440MB
docker-macsec                 master-9789.66024-bf5356932   7f49196d3ca3   440MB
docker-teamd                  latest                        e7da4de20364   438MB
docker-teamd                  master-9789.66024-bf5356932   e7da4de20364   438MB
docker-dhcp-relay             latest                        8424eab0f82a   436MB
docker-snmp                   latest                        ef3d8241608a   465MB
docker-snmp                   master-9789.66024-bf5356932   ef3d8241608a   465MB
docker-platform-monitor       latest                        f5820ca627b1   538MB
docker-platform-monitor       master-9789.66024-bf5356932   f5820ca627b1   538MB
docker-lldp                   latest                        ce5ace4182ea   463MB
docker-lldp                   master-9789.66024-bf5356932   ce5ace4182ea   463MB
docker-mux                    latest                        f3381fb640e7   475MB
docker-mux                    master-9789.66024-bf5356932   f3381fb640e7   475MB
docker-router-advertiser      latest                        78d0afb97d9b   423MB
docker-router-advertiser      master-9789.66024-bf5356932   78d0afb97d9b   423MB
docker-database               latest                        f1a23d40b49c   423MB
docker-database               master-9789.66024-bf5356932   f1a23d40b49c   423MB
docker-gbsyncd-credo          latest                        e8873d120c5b   440MB
docker-gbsyncd-credo          master-9789.66024-bf5356932   e8873d120c5b   440MB

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106

Description for the changelog

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

@judyjoseph judyjoseph marked this pull request as ready for review January 20, 2022 03:07
gechiang
gechiang approved these changes Jan 21, 2022
View reviewed changes
Copy link
Collaborator

@gechiang gechiang left a comment

Choose a reason for hiding this comment

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

Validated this change on S6100 (XGS platform).
Not sure about DNX. @judyjoseph will perform the validation on DNX.

@judyjoseph
Copy link
Contributor Author

judyjoseph commented Jan 21, 2022 •
edited
Loading

We see an error with psample.ko module, which can be ignored as linux kernel has default psample module which gets loaded.

 opennsl-modules[712]: insmod: ERROR: could not load module /lib/modules/5.10.0-8-2-amd64/extra/psample.ko: No such file or directory

But psample module exists 

admin@str-a7280cr3-2:~$ lsmod | grep knet
linux_knet_cb          20480  0
psample                20480  1 linux_knet_cb
linux_bcm_knet         98304  1 linux_knet_cb
linux_kernel_bde       73728  2 linux_bcm_knet,linux_user_bde
admin@str-a7280cr3-2:~$

Building psample with opennsl was removed earlier for Bullseye upgrade #8191. Will take it up later if we really need this module to be build here.

@judyjoseph judyjoseph merged commit bfe9c49 into sonic-net:master Jan 21, 2022
@judyjoseph judyjoseph added Request for 202111 Branch For PRs being requested for 202111 branch and removed Request for 202111 Branch For PRs being requested for 202111 branch labels Jan 21, 2022
judyjoseph added a commit that referenced this pull request Jan 25, 2022
@judyjoseph
Update Broadcom SAI to version 6.0.0.13 (#9789)
e4239f8 
Why I did it
Update Broadcom SAI to version 6.0.0.13, SDK 6.5.24, saibcm-modules to 6.5.24.gpl

How I did it
Brcm SAI 6.0 EA with fixes for CS00012203367, CS00012219613, CS00012213974, CS00012218290, CS00012217169, CS00012211718, CS00012213944, CS00012215529, CS00012218100, CS00012214196, CS00012212681, CS00012205138, CS00012208537, CS00012185316, CS00012208524, CS00012203367, CS00012197364.
@judyjoseph judyjoseph deleted the sai_6.0.0.13 branch January 25, 2022 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gechiang gechiang gechiang approved these changes

@lguohan lguohan Awaiting requested review from lguohan lguohan is a code owner

Assignees
No one assigned
Labels
Included in 202111 Branch Request for 202111 Branch For PRs being requested for 202111 branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@judyjoseph @gechiang