Skip to content

[Dell] S5232f default buffer configuration changes #3278

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

Merged
lguohan merged 9 commits into from
Aug 8, 2019
Merged

[Dell] S5232f default buffer configuration changes #3278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5849e8b
Added > /64 ip6 route support for 1024 entries.
AshokDaparthi Jul 2, 2019
12d3002
Added t0 buffer_default file
AshokDaparthi Jul 2, 2019
3a17fb3
Seperated buffer config as seperate PR
AshokDaparthi Jul 2, 2019
0b56694
Merge remote-tracking branch 'upstream/master'
AshokDaparthi Jul 12, 2019
88098a2
Merge remote-tracking branch 'upstream/master'
AshokDaparthi Jul 22, 2019
36857a4
Corrected Wrong dport map and renamed config files
AshokDaparthi Jul 22, 2019
4ccdd77
Merge remote-tracking branch 'upstream/master' into dell-s5232f-buffe…
AshokDaparthi Aug 2, 2019
4ea6374
[dell] s5232f buffer configuration defaults
AshokDaparthi Aug 2, 2019
d2a3384
Correted the configuration file name
AshokDaparthi Aug 6, 2019
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
37 changes: 37 additions & 0 deletions device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@

{%- set default_cable = '40m' %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "28550336",
"type": "ingress",
"mode": "dynamic",
"xoff": "4194112"
},
"egress_pool": {
"size": "28550336",
"type": "egress",
"mode": "static"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0",
"dynamic_th":"3"
},
"egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_pool]",
"size":"0",
"mode": "static",
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_pool]",
"size":"0",
"mode": "dynamic",
"dynamic_th":"3"
}
},
{%- endmacro %}
30 changes: 10 additions & 20 deletions device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,16 @@

{%- set default_cable = '40m' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
{%- for port_idx in range(0,32) %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx*4)) %}{%- endif %}
{%- endfor %}
{%- endmacro %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "27678784",
"size": "28550336",
"type": "ingress",
"mode": "dynamic",
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "26045524",
"type": "egress",
"mode": "dynamic"
},
"egress_lossless_pool": {
"size": "32786432",
"egress_pool": {
"size": "28550336",
"type": "egress",
"mode": "static"
}
Expand All @@ -34,13 +22,15 @@
"dynamic_th":"3"
},
"egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518",
"static_th":"3995680"
"pool":"[BUFFER_POOL|egress_pool]",
"size":"0",
"mode": "static",
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
"size":"1518",
"pool":"[BUFFER_POOL|egress_pool]",
"size":"0",
"mode": "dynamic",
"dynamic_th":"3"
}
},
Expand Down
3 changes: 1 addition & 2 deletions device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ l3_max_ecmp_mode=1

bcm_tunnel_term_compatible_mode=1
ifp_inports_support_enable=1
mmu_init_config="MSFT-TD3-Tier1"

stable_size=0x5500000

Expand Down Expand Up @@ -542,4 +541,4 @@ dport_map_port_129=126
dport_map_port_66=127
dport_map_port_130=128


mmu_init_config="TD3-DEFAULT-LOSSLESS-P3P4"
46 changes: 46 additions & 0 deletions device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@

{%- set default_cable = '40m' %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "32744448",
"type": "ingress",
"mode": "static"
},
"egress_lossy_pool": {
"size": "32744448",
"type": "egress",
"mode": "dynamic"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0",
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
"size":"0",
"dynamic_th":"3"
}
},
{%- endmacro %}

{%- macro generate_pg_profils(port_names_active) %}
"BUFFER_PG": {
"{{ port_names_active }}|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}
},
{%- endmacro %}

{% macro generate_queue_buffers(port_names_active) %}
"BUFFER_QUEUE": {
"{{ port_names_active }}|0-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}
}
{% endmacro %}

19 changes: 6 additions & 13 deletions device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@

{%- set default_cable = '40m' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
{%- for port_idx in range(0,32) %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx*4)) %}{%- endif %}
{%- endfor %}
{%- endmacro %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "33554432",
"size": "32744448",
"type": "ingress",
"mode": "dynamic"
"mode": "static"
},
"egress_lossy_pool": {
"size": "32786432",
"size": "32744448",
"type": "egress",
"mode": "dynamic"
}
Expand All @@ -25,11 +18,11 @@
"ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0",
"dynamic_th":"3"
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
"size":"1518",
"size":"0",
"dynamic_th":"3"
}
},
Expand All @@ -45,7 +38,7 @@

{% macro generate_queue_buffers(port_names_active) %}
"BUFFER_QUEUE": {
"{{ port_names_active }}|0-7": {
"{{ port_names_active }}|0-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}
}
Expand Down
17 changes: 0 additions & 17 deletions device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/pg_profile_lookup.ini
View file
Open in desktop

This file was deleted.

24 changes: 8 additions & 16 deletions device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,20 @@
{{- generate_tc_to_pg_map() }}
{% else %}
"TC_TO_PRIORITY_GROUP_MAP": {
"AZURE": {
"DEFAULT": {
"0": "0",
"1": "0",
"2": "0",
"3": "0",
"4": "0",
"5": "0",
"6": "0",
"7": "0"
"7": "7"
}
},
{% endif %}
"MAP_PFC_PRIORITY_TO_QUEUE": {
"AZURE": {
"DEFAULT": {
"0": "0",
"1": "1",
"2": "2",
Expand All @@ -61,7 +61,7 @@
}
},
"TC_TO_QUEUE_MAP": {
"AZURE": {
"DEFAULT": {
"0": "0",
"1": "1",
"2": "2",
Expand All @@ -73,7 +73,7 @@
}
},
"DSCP_TO_TC_MAP": {
"AZURE": {
"DEFAULT": {
"0" : "0",
"1" : "0",
"2" : "0",
Expand Down Expand Up @@ -174,19 +174,11 @@
"weight": "50"
}
},
{% if asic_type in pfc_to_pg_map_supported_asics %}
"PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
"AZURE": {
"3": "3",
"4": "4"
}
},
{% endif %}
"PORT_QOS_MAP": {
"{{ port_names_active }}": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
"tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]"
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|DEFAULT]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|DEFAULT]",
"tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|DEFAULT]"
}
},
"QUEUE": {
Expand Down
3 changes: 1 addition & 2 deletions ...e/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ l3_max_ecmp_mode=1

bcm_tunnel_term_compatible_mode=1
ifp_inports_support_enable=1
mmu_init_config="MSFT-TD3-Tier1"

stable_size=0x5500000

Expand Down Expand Up @@ -542,4 +541,4 @@ dport_map_port_129=126
dport_map_port_66=127
dport_map_port_130=128


mmu_init_config="TD3-DEFAULT"
46 changes: 46 additions & 0 deletions device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@

{%- set default_cable = '40m' %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "32744448",
"type": "ingress",
"mode": "static"
},
"egress_lossy_pool": {
"size": "32744448",
"type": "egress",
"mode": "dynamic"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0",
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
"size":"0",
"dynamic_th":"3"
}
},
{%- endmacro %}

{%- macro generate_pg_profils(port_names_active) %}
"BUFFER_PG": {
"{{ port_names_active }}|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}
},
{%- endmacro %}

{% macro generate_queue_buffers(port_names_active) %}
"BUFFER_QUEUE": {
"{{ port_names_active }}|0-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}
}
{% endmacro %}

19 changes: 6 additions & 13 deletions device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@

{%- set default_cable = '40m' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
{%- for port_idx in range(0,32) %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx*4)) %}{%- endif %}
{%- endfor %}
{%- endmacro %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "33554432",
"size": "32744448",
"type": "ingress",
"mode": "dynamic"
"mode": "static"
},
"egress_lossy_pool": {
"size": "32786432",
"size": "32744448",
"type": "egress",
"mode": "dynamic"
}
Expand All @@ -25,11 +18,11 @@
"ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0",
"dynamic_th":"3"
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
"size":"1518",
"size":"0",
"dynamic_th":"3"
}
},
Expand All @@ -45,7 +38,7 @@

{% macro generate_queue_buffers(port_names_active) %}
"BUFFER_QUEUE": {
"{{ port_names_active }}|0-7": {
"{{ port_names_active }}|0-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}
}
Expand Down
Loading