Skip to content

Commit

Permalink
[qos]: Alpha and ECN settings change for Th (#4564)
Browse files Browse the repository at this point in the history
Dynamic threshold setting changed to 0 and WRED profile green min threshold set to 250000 for Tomahawk devices

Changed the dynamic threshold settings in pg_profile_lookup.ini
Added a macro for WRED profiles in qos.json.j2 for Tomahawk devices
Necessary changes made in qos.config.j2 to use the macro if present

Signed-off-by: Neetha John <nejo@microsoft.com>
  • Loading branch information
neethajohn authored May 9, 2020
1 parent acf465b commit 286aa35
Show file tree
Hide file tree
Showing 17 changed files with 2,119 additions and 91 deletions.
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
10000 5m 1248 2288 35776 -3 2288
25000 5m 1248 2288 53248 -3 2288
40000 5m 1248 2288 66560 -3 2288
50000 5m 1248 2288 90272 -3 2288
100000 5m 1248 2288 165568 -3 2288
10000 40m 1248 2288 37024 -3 2288
25000 40m 1248 2288 53248 -3 2288
40000 40m 1248 2288 71552 -3 2288
50000 40m 1248 2288 96096 -3 2288
100000 40m 1248 2288 177632 -3 2288
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
10000 5m 1248 2288 35776 0 2288
25000 5m 1248 2288 53248 0 2288
40000 5m 1248 2288 66560 0 2288
50000 5m 1248 2288 90272 0 2288
100000 5m 1248 2288 165568 0 2288
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 1248 2288 177632 0 2288
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 1248 2288 268736 0 2288
Original file line number Diff line number Diff line change
@@ -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" : "2097152",
"green_min_threshold" : "250000",
"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' %}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
10000 5m 1248 2288 35776 -3 2288
25000 5m 1248 2288 53248 -3 2288
40000 5m 1248 2288 66560 -3 2288
50000 5m 1248 2288 79872 -3 2288
100000 5m 1248 2288 165568 -3 2288
10000 40m 1248 2288 37024 -3 2288
25000 40m 1248 2288 56160 -3 2288
40000 40m 1248 2288 71552 -3 2288
50000 40m 1248 2288 85696 -3 2288
100000 40m 1248 2288 177632 -3 2288
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
10000 5m 1248 2288 35776 0 2288
25000 5m 1248 2288 53248 0 2288
40000 5m 1248 2288 66560 0 2288
50000 5m 1248 2288 79872 0 2288
100000 5m 1248 2288 165568 0 2288
10000 40m 1248 2288 37024 0 2288
25000 40m 1248 2288 56160 0 2288
40000 40m 1248 2288 71552 0 2288
50000 40m 1248 2288 85696 0 2288
100000 40m 1248 2288 177632 0 2288
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 1248 2288 268736 0 2288
Original file line number Diff line number Diff line change
@@ -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" : "2097152",
"green_min_threshold" : "250000",
"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' %}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
10000 5m 1248 2288 35776 -3 2288
25000 5m 1248 2288 53248 -3 2288
40000 5m 1248 2288 66560 -3 2288
50000 5m 1248 2288 90272 -3 2288
100000 5m 1248 2288 165568 -3 2288
10000 40m 1248 2288 37024 -3 2288
25000 40m 1248 2288 53248 -3 2288
40000 40m 1248 2288 71552 -3 2288
50000 40m 1248 2288 96096 -3 2288
100000 40m 1248 2288 177632 -3 2288
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
10000 5m 1248 2288 35776 0 2288
25000 5m 1248 2288 53248 0 2288
40000 5m 1248 2288 66560 0 2288
50000 5m 1248 2288 90272 0 2288
100000 5m 1248 2288 165568 0 2288
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 1248 2288 177632 0 2288
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 1248 2288 268736 0 2288
Original file line number Diff line number Diff line change
@@ -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" : "2097152",
"green_min_threshold" : "250000",
"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' %}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
10000 5m 1248 2288 35776 -3 2288
25000 5m 1248 2288 53248 -3 2288
40000 5m 1248 2288 66560 -3 2288
50000 5m 1248 2288 90272 -3 2288
100000 5m 1248 2288 165568 -3 2288
10000 40m 1248 2288 37024 -3 2288
25000 40m 1248 2288 53248 -3 2288
40000 40m 1248 2288 71552 -3 2288
50000 40m 1248 2288 96096 -3 2288
100000 40m 1248 2288 177632 -3 2288
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
10000 5m 1248 2288 35776 0 2288
25000 5m 1248 2288 53248 0 2288
40000 5m 1248 2288 66560 0 2288
50000 5m 1248 2288 90272 0 2288
100000 5m 1248 2288 165568 0 2288
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 1248 2288 177632 0 2288
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 1248 2288 268736 0 2288
Original file line number Diff line number Diff line change
@@ -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" : "2097152",
"green_min_threshold" : "250000",
"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' %}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
10000 5m 1248 2288 35776 -3 2288
25000 5m 1248 2288 53248 -3 2288
40000 5m 1248 2288 66560 -3 2288
50000 5m 1248 2288 90272 -3 2288
100000 5m 1248 2288 165568 -3 2288
10000 40m 1248 2288 37024 -3 2288
25000 40m 1248 2288 53248 -3 2288
40000 40m 1248 2288 71552 -3 2288
50000 40m 1248 2288 96096 -3 2288
100000 40m 1248 2288 177632 -3 2288
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
10000 5m 1248 2288 35776 0 2288
25000 5m 1248 2288 53248 0 2288
40000 5m 1248 2288 66560 0 2288
50000 5m 1248 2288 90272 0 2288
100000 5m 1248 2288 165568 0 2288
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 1248 2288 177632 0 2288
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 1248 2288 268736 0 2288
Original file line number Diff line number Diff line change
@@ -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" : "2097152",
"green_min_threshold" : "250000",
"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' %}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
10000 5m 1248 2288 35776 -3 2288
25000 5m 1248 2288 53248 -3 2288
40000 5m 1248 2288 66560 -3 2288
50000 5m 1248 2288 79872 -3 2288
100000 5m 1248 2288 165568 -3 2288
10000 40m 1248 2288 37024 -3 2288
25000 40m 1248 2288 56160 -3 2288
40000 40m 1248 2288 71552 -3 2288
50000 40m 1248 2288 85696 -3 2288
100000 40m 1248 2288 177632 -3 2288
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
10000 5m 1248 2288 35776 0 2288
25000 5m 1248 2288 53248 0 2288
40000 5m 1248 2288 66560 0 2288
50000 5m 1248 2288 79872 0 2288
100000 5m 1248 2288 165568 0 2288
10000 40m 1248 2288 37024 0 2288
25000 40m 1248 2288 56160 0 2288
40000 40m 1248 2288 71552 0 2288
50000 40m 1248 2288 85696 0 2288
100000 40m 1248 2288 177632 0 2288
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 1248 2288 268736 0 2288
20 changes: 20 additions & 0 deletions device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json.j2
Original file line number Diff line number Diff line change
@@ -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" : "2097152",
"green_min_threshold" : "250000",
"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' %}
4 changes: 4 additions & 0 deletions files/build_templates/qos_config.j2
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@

{% endfor %}
},
{% if generate_wred_profiles is defined %}
{{- generate_wred_profiles() }}
{% else %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
Expand All @@ -210,6 +213,7 @@
"red_drop_probability" : "5"
}
},
{% endif %}
"QUEUE": {
{% for port in PORT_ACTIVE %}
"{{ port }}|3": {
Expand Down
Loading

0 comments on commit 286aa35

Please sign in to comment.