Skip to content

Update Arista7060X6-PE 256x200G mmu configuration. #19570

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

Merged
merged 3 commits into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"size": "165660324",
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe these values should now be reverted back to reflect the production bcm config, e.g. 121964196 here

Copy link
Contributor Author

@r12f r12f Jul 16, 2024

Choose a reason for hiding this comment

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

not all numbers, these values are the latest recommended ones.

Copy link
Contributor

Choose a reason for hiding this comment

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

b62e111#diff-38141bc38cf22f25e51d1afa26023349fcb218e27d0c46e8ada19c6c9081111cL2251-L2252

I'm not sure how 165660324 was derived in the second commit, but I believe this change to the SHARED_LIMIT_CELLS needs to be reflected? (240087 * 254 * 2 = 121964196)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we are aligned from calculation perspective, however if you check the sai api values that shared by broadcom. the value is indeed this....

"type": "ingress",
"mode": "dynamic",
"xoff": "25489408"
"xoff": "29520896"
},
"egress_lossless_pool": {
Copy link
Collaborator

Choose a reason for hiding this comment

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

should we just say this is egress_pool?

Copy link
Collaborator

Choose a reason for hiding this comment

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

i do not know if other repo (swss/sonic-utilitie) make any assumption on the name, we need to check that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, things like qos tests are currently assuming the name while grabing the configuration, changing the name will cause these tests to break at this moment...

"size": "165660324",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
25000 5m 1248 2288 53248 0 2288
40000 5m 1248 2288 66560 0 2288
50000 5m 1248 2288 90272 0 2288
100000 5m 18796 3556 255778 -2 3556
200000 5m 18796 3556 255778 -2 3556
400000 5m 18796 3556 255778 -2 3556
100000 5m 18796 3556 300990 -2 3556
200000 5m 18796 3556 300990 -2 3556
400000 5m 18796 3556 300990 -2 3556
10000 40m 1248 2288 37024 0 2288
25000 40m 1248 2288 53248 0 2288
40000 40m 1248 2288 71552 0 2288
50000 40m 1248 2288 96096 0 2288
100000 40m 18796 3556 255778 -2 3556
200000 40m 18796 3556 255778 -2 3556
400000 40m 18796 3556 255778 -2 3556
100000 40m 18796 3556 300990 -2 3556
200000 40m 18796 3556 300990 -2 3556
400000 40m 18796 3556 300990 -2 3556
10000 300m 1248 2288 46176 0 2288
25000 300m 1248 2288 79040 0 2288
40000 300m 1248 2288 108160 0 2288
50000 300m 1248 2288 141856 0 2288
100000 300m 18796 3556 255778 -2 3556
200000 300m 18796 3556 255778 -2 3556
400000 300m 18796 3556 255778 -2 3556
100000 300m 18796 3556 300990 -2 3556
200000 300m 18796 3556 300990 -2 3556
400000 300m 18796 3556 300990 -2 3556
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ bcm_device:
l3_intf_vlan_split_egress : 1
pfc_deadlock_seq_control : 1
sai_tunnel_support: 2
mmu_init_config: "\"TH5-MSFT-LAB\""
mmu_init_config: "\"TH5-MSFT-PROD\""
bcm_tunnel_term_compatible_mode: 1
l3_ecmp_member_first_lkup_mem_size: 12288
---
Expand Down Expand Up @@ -1926,8 +1926,6 @@ device:
DEVICE_CONFIG:
AUTOLOAD_BOARD_SETTINGS: 0
...
# DO NOT MODIFY THIS FILE! It was auto generated from lossy_lossless_template.yml

### Baseline
# Skipping buffer reservation. This means that don't use SDK default setings.
---
Expand Down Expand Up @@ -2125,7 +2123,7 @@ device:
TM_THD_UC_Q:
?
PORT_ID: [[1,8], [11,18], [21,29], [33,40], [43,51], [55,62], [65,73], [76,84], [87,95], [99,106], [109,117], [121,128], [131,139], [143,150], [153,161], [165,172], [175,183], [187,194], [197,205], [209,216], [219,227], [231,238], [241,249], [253,260], [263,271], [274,282], [285,293], [297,304], [307,315], [319,326], [329,337], [341,348], 351]
TM_UC_Q_ID: [[0,9]]
TM_UC_Q_ID: [[0,7]]
:
MIN_GUARANTEE_CELLS: 0
SHARED_LIMITS: 1
Expand Down Expand Up @@ -2248,7 +2246,7 @@ device:
BUFFER_POOL: [0,1]
TM_ING_SERVICE_POOL_ID: 0
:
SHARED_LIMIT_CELLS: 248023
SHARED_LIMIT_CELLS: 240087
SHARED_RESUME_OFFSET_CELLS: 74
COLOR_SPECIFIC_LIMITS: 0
?
Expand All @@ -2266,7 +2264,7 @@ device:
BUFFER_POOL: [0,1]
TM_HEADROOM_POOL_ID: 0
:
LIMIT_CELLS: 50176
LIMIT_CELLS: 58112

...
---
Expand Down Expand Up @@ -2467,7 +2465,7 @@ device:
RESUME_OFFSET_CELLS: 14
RESUME_FLOOR_CELLS: 0
HEADROOM_LIMIT_AUTO: 0
HEADROOM_LIMIT_CELLS: 1007
HEADROOM_LIMIT_CELLS: 1185
?
PORT_ID: [[176,183], [187,194], [198,205], [209,216], [220,227], [231,238], [242,249], [253,260], [264,271], [275,282], [286,293], [297,304], [308,315], [319,326], [330,337], [341,348]]
TM_PRI_GRP_ID: [3,4]
Expand All @@ -2478,7 +2476,7 @@ device:
RESUME_OFFSET_CELLS: 14
RESUME_FLOOR_CELLS: 0
HEADROOM_LIMIT_AUTO: 0
HEADROOM_LIMIT_CELLS: 1007
HEADROOM_LIMIT_CELLS: 1185
?
PORT_ID: [76, 274]
TM_PRI_GRP_ID: [3,4]
Expand Down Expand Up @@ -2524,13 +2522,13 @@ device:
BUFFER_POOL: [0,1]
TM_EGR_SERVICE_POOL_ID: 0
:
SHARED_LIMIT_CELLS: 248023
SHARED_RESUME_LIMIT_CELLS: 30993
SHARED_LIMIT_CELLS: 240087
SHARED_RESUME_LIMIT_CELLS: 30001
COLOR_SPECIFIC_LIMITS: 0
YELLOW_SHARED_LIMIT_CELLS: 23253
YELLOW_SHARED_RESUME_LIMIT_CELLS: 23243
RED_SHARED_LIMIT_CELLS: 19377
RED_SHARED_RESUME_LIMIT_CELLS: 17367
YELLOW_SHARED_LIMIT_CELLS: 22509
YELLOW_SHARED_RESUME_LIMIT_CELLS: 22499
RED_SHARED_LIMIT_CELLS: 18757
RED_SHARED_RESUME_LIMIT_CELLS: 18747
?
BUFFER_POOL: [0,1]
TM_EGR_SERVICE_POOL_ID: 1
Expand All @@ -2547,7 +2545,6 @@ device:
device:
0:
# Multicast Egress Service Pool Limits, CQEs
# Assign shared limit first in this block to bypass INCORRECT STATE check in SDKLT
TM_THD_MC_EGR_SERVICE_POOL:
?
BUFFER_POOL: [0,1]
Expand All @@ -2564,7 +2561,6 @@ device:
device:
0:
# Multicast Egress Service Pool Limits, CQEs
# Now assign resume limits.
TM_THD_MC_EGR_SERVICE_POOL:
?
BUFFER_POOL: [0,1]
Expand Down Expand Up @@ -2789,12 +2785,12 @@ device:
TM_EGR_SERVICE_POOL_ID: 0
:
COLOR_SPECIFIC_LIMITS: 0
RED_SHARED_LIMIT_CELLS: 19376
YELLOW_SHARED_LIMIT_CELLS: 23252
SHARED_LIMIT_CELLS: 248023
RED_SHARED_RESUME_LIMIT_CELLS: 19374
YELLOW_SHARED_RESUME_LIMIT_CELLS: 23250
SHARED_RESUME_LIMIT_CELLS: 31001
RED_SHARED_LIMIT_CELLS: 18756
YELLOW_SHARED_LIMIT_CELLS: 22508
SHARED_LIMIT_CELLS: 240087
RED_SHARED_RESUME_LIMIT_CELLS: 18754
YELLOW_SHARED_RESUME_LIMIT_CELLS: 22506
SHARED_RESUME_LIMIT_CELLS: 30009
?
PORT_ID: [[1,8], [11,18], [21,29], [33,40], [43,51], [55,62], [65,73], [76,84], [87,95], [99,106], [109,117], [121,128], [131,139], [143,150], [153,161], [165,172], [175,183], [187,194], [197,205], [209,216], [219,227], [231,238], [241,249], [253,260], [263,271], [274,282], [285,293], [297,304], [307,315], [319,326], [329,337], [341,348], 351]
TM_EGR_SERVICE_POOL_ID: 1
Expand Down Expand Up @@ -3111,4 +3107,4 @@ device:
:
TRAFFIC_CLASS: OBM_TC_LOSSLESS0

...
...
Loading