matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update 7260 MMU and ECN settings (#11449)

Browse Source 
Signed-off-by: Neetha John <nejo@microsoft.com>

Why I did it
Improve throughput and latency for 7260 deployments

How I did it
Update the dynamic threshold to 0 and ECN settings as 2mb/10mb/5%

How to verify it
Updated unit tests to use the modified values for 7260 ecn settings.
This commit is contained in:
Neetha John 2022-07-18 17:08:20 -07:00 committed by GitHub
parent 0dfa79d3c4
commit 765741ac73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 97 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/pg_profile_lookup.ini
View File

@ -1,8 +1,8 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
50000 5m 1248 1248 56160 -3 2496
100000 5m 1248 1248 96928 -3 2496
50000 40m 1248 1248 96096 -3 2496
100000 40m 1248 1248 177632 -3 2496
50000 300m 1248 1248 141856 -3 2496
100000 300m 1248 1248 268736 -3 2496
50000 5m 1248 1248 56160 0 2496
100000 5m 1248 1248 96928 0 2496
50000 40m 1248 1248 96096 0 2496
100000 40m 1248 1248 177632 0 2496
50000 300m 1248 1248 141856 0 2496
100000 300m 1248 1248 268736 0 2496

20
device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/qos.json.j2
View File

@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",
"red_min_threshold" : "1048576",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}
{%- include 'qos_config.j2' %}

18
device/common/profiles/th2/7260/BALANCED/pg_profile_lookup.ini
View File

@ -1,11 +1,11 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
100000 5m 1248 1248 54080 -3 2496
100000 40m 1248 1248 59696 -3 2496
100000 300m 1248 1248 101088 -3 2496
50000 5m 1248 1248 54080 -3 2496
50000 40m 1248 1248 59696 -3 2496
50000 300m 1248 1248 101088 -3 2496
40000 5m 1248 1248 29536 -3 2496
40000 40m 1248 1248 31616 -3 2496
40000 300m 1248 1248 48256 -3 2496
100000 5m 1248 1248 54080 0 2496
100000 40m 1248 1248 59696 0 2496
100000 300m 1248 1248 101088 0 2496
50000 5m 1248 1248 54080 0 2496
50000 40m 1248 1248 59696 0 2496
50000 300m 1248 1248 101088 0 2496
40000 5m 1248 1248 29536 0 2496
40000 40m 1248 1248 31616 0 2496
40000 300m 1248 1248 48256 0 2496

20
device/common/profiles/th2/7260/BALANCED/qos.json.j2
View File

@ -289,4 +289,24 @@
{%- endmacro %}
{% endif %}
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",
"red_min_threshold" : "1048576",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}
{%- include 'qos_config.j2' %}

18
device/common/profiles/th2/7260/RDMA-CENTRIC/pg_profile_lookup.ini
View File

@ -1,11 +1,11 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
100000 5m 1248 1248 54080 -3 2496
100000 40m 1248 1248 59696 -3 2496
100000 300m 1248 1248 101088 -3 2496
50000 5m 1248 1248 54080 -3 2496
50000 40m 1248 1248 59696 -3 2496
50000 300m 1248 1248 101088 -3 2496
40000 5m 1248 1248 29536 -3 2496
40000 40m 1248 1248 31616 -3 2496
40000 300m 1248 1248 48256 -3 2496
100000 5m 1248 1248 54080 0 2496
100000 40m 1248 1248 59696 0 2496
100000 300m 1248 1248 101088 0 2496
50000 5m 1248 1248 54080 0 2496
50000 40m 1248 1248 59696 0 2496
50000 300m 1248 1248 101088 0 2496
40000 5m 1248 1248 29536 0 2496
40000 40m 1248 1248 31616 0 2496
40000 300m 1248 1248 48256 0 2496

20
device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
View File

@ -289,4 +289,24 @@
{%- endmacro %}
{% endif %}
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",
"red_min_threshold" : "1048576",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}
{%- include 'qos_config.j2' %}

1
src/sonic-config-engine/tests/sample_output/py2/qos-arista7260.json Symbolic link
View File

@ -0,0 +1 @@
../py3/qos-arista7260-t1-remap-disabled.json

4
src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json
View File

@ -636,8 +636,8 @@
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "2097152",
"green_min_threshold" : "1048576",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",

4
src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
View File

@ -739,8 +739,8 @@
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "2097152",
"green_min_threshold" : "1048576",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",

4
src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json
View File

@ -348,8 +348,8 @@
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "2097152",
"green_min_threshold" : "1048576",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",

4
src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
View File

@ -348,8 +348,8 @@
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "2097152",
"green_min_threshold" : "1048576",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",

1
src/sonic-config-engine/tests/sample_output/py3/qos-arista7260.json Symbolic link
View File

@ -0,0 +1 @@
qos-arista7260-t1-remap-disabled.json

3
src/sonic-config-engine/tests/test_j2files.py
View File

@ -320,6 +320,9 @@ class TestJ2Files(TestCase):
def test_qos_dell6100_render_template(self):
self._test_qos_render_template('dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100', 'sample-dell-6100-t0-minigraph.xml', 'qos-dell6100.json')
def test_qos_arista7260_render_template(self):
self._test_qos_render_template('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-D96C16', 'sample-arista-7260-t1-minigraph-remap-disabled.xml', 'qos-arista7260.json')
def _test_qos_render_template(self, vendor, platform, sku, minigraph, expected):
file_exist, dir_exist = self.create_machine_conf(platform, vendor)
dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', vendor, platform, sku)