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

[202012] Adjust 7260 buffer sizes to accomodate extra lossless queues #11050

Merged
merged 7 commits into from
Jun 7, 2022
+81 −16
Merged

[202012] Adjust 7260 buffer sizes to accomodate extra lossless queues #11050

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5ec9e41
Adjust 7260 buffer sizes for extra lossless queues
neethajohn Jun 2, 2022
0d38a1f
Test cases for buffer rendering
neethajohn Jun 2, 2022
f21ad31
Update pool sizes with adjustments needed for extra queues when pcbb …
neethajohn Jun 2, 2022
7330b5e
Fix template rendering issues
neethajohn Jun 3, 2022
091d56d
Add machine.conf file
neethajohn Jun 3, 2022
4697a95
Adjust the T1 pool sizes
neethajohn Jun 3, 2022
338dfe4
Adjust the expected pool sizes and fix alignment
neethajohn Jun 3, 2022
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
Next Next commit
Adjust 7260 buffer sizes for extra lossless queues 
Signed-off-by: Neetha John <nejo@microsoft.com>
@neethajohn
neethajohn committed Jun 6, 2022

Verified

This commit was signed with the committer’s verified signature.
williamdes William Desportes
GPG key ID: 90A0EF1B8251A889
Verified
Learn about vigilant mode
commit 5ec9e41f3eec1018e89a58d0aa0d1346aaf08d9b
6 changes: 4 additions & 2 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2
View file
Original file line number Diff line number Diff line change
@@ -7,16 +7,18 @@
{%- endfor %}
{%- endmacro %}

{% import 'buffers_pool_sizes_t0.j2' as defs with context %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "33329088",
"size": "{{ defs.ingress_lossless_pool_size }}",
"type": "ingress",
"mode": "dynamic",
"xoff": "7827456"
},
"egress_lossy_pool": {
"size": "26663272",
"size": "{{ defs.egress_lossy_pool_size }}",
"type": "egress",
"mode": "dynamic"
},
6 changes: 4 additions & 2 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2
View file
Original file line number Diff line number Diff line change
@@ -7,19 +7,21 @@
{%- endfor %}
{%- endmacro %}

{% import 'buffers_pool_sizes_t1.j2' as defs with context %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
{# SS Tab2 Row 71 #}
"size": "33582016",
"size": "{{ defs.ingress_lossless_pool_size }}",
"type": "ingress",
"mode": "dynamic",
{# SS Tab2 Row 68 #}
"xoff": "8965632"
},
"egress_lossy_pool": {
{# SS Tab2 Row 60 #}
"size": "26866112",
"size": "{{ defs.egress_lossy_pool_size }}",
"type": "egress",
"mode": "dynamic"
},
8 changes: 8 additions & 0 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{% set ingress_lossless_pool_size = '33329088' %}
{% set egress_lossy_pool_size = '26663272' %}

{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) and
((DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('subtype' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['subtype'] == 'DualToR')) %}
{%- set ingress_lossless_pool_size = '33169344' %}
{%- set egress_lossy_pool_size = '26535808' %}
{%- endif %}
8 changes: 8 additions & 0 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_pool_sizes_t1.j2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{%- set ingress_lossless_pool_size = '33582016' %}
{%- set egress_lossy_pool_size = '26866112' %}

{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) and
((DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('type' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['type'] == 'LeafRouter')) %}
{%- set ingress_lossless_pool_size = '33182656' %}
{%- set egress_lossy_pool_size = '26546624' %}
{%- endif %}
6 changes: 4 additions & 2 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
View file
Original file line number Diff line number Diff line change
@@ -15,16 +15,18 @@
{%- endfor %}
{%- endmacro %}

{% import 'buffers_pool_sizes_t0.j2' as defs with context %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "33329088",
"size": "{{ defs.ingress_lossless_pool_size }}",
"type": "ingress",
"mode": "dynamic",
"xoff": "7827456"
},
"egress_lossy_pool": {
"size": "26663272",
"size": "{{ defs.egress_lossy_pool_size }}",
"type": "egress",
"mode": "dynamic"
},
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_pool_sizes_t0.j2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../Arista-7260CX3-C64/buffers_pool_sizes_t0.j2
6 changes: 4 additions & 2 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
View file
Original file line number Diff line number Diff line change
@@ -7,16 +7,18 @@
{%- endfor %}
{%- endmacro %}

{% import 'buffers_pool_sizes_t0.j2' as defs with context %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "33329088",
"size": "{{ defs.ingress_lossless_pool_size }}",
"type": "ingress",
"mode": "dynamic",
"xoff": "7827456"
},
"egress_lossy_pool": {
"size": "26663272",
"size": "{{ defs.egress_lossy_pool_size }}",
"type": "egress",
"mode": "dynamic"
},
6 changes: 4 additions & 2 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2
View file
Original file line number Diff line number Diff line change
@@ -7,16 +7,18 @@
{%- endfor %}
{%- endmacro %}

{% import 'buffers_pool_sizes_t0.j2' as defs with context %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "33329088",
"size": "{{ defs.ingress_lossless_pool_size }}",
"type": "ingress",
"mode": "dynamic",
"xoff": "7827456"
},
"egress_lossy_pool": {
"size": "26663272",
"size": "{{ defs.egress_lossy_pool_size }}",
"type": "egress",
"mode": "dynamic"
},
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_pool_sizes_t0.j2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../Arista-7260CX3-C64/buffers_pool_sizes_t0.j2