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

[Mellanox] Support DSCP remapping in dual ToR topo on T0 switch #12605

Merged
merged 19 commits into from
Feb 7, 2023
Merged

[Mellanox] Support DSCP remapping in dual ToR topo on T0 switch #12605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
38ad4fa
Calculate 4600C-C64 t0 with 48 downlinks and 16 uplinks
stephenxs May 17, 2022
0c5da22
Support t0 SKUs
stephenxs May 16, 2022
df0274d
Support DSCP remapping for t0 switch
stephenxs Nov 2, 2022
f821d52
Unit test cases for dual ToR DSCP remapping t0
stephenxs Nov 2, 2022
aae310b
Update pool size for dual ToR t0 topo
stephenxs Nov 4, 2022
035e269
Unit test for DSCP remapping buffer part
stephenxs Nov 4, 2022
d1c5c7f
Add queue 7 in SCHEDULER table
stephenxs Nov 4, 2022
01df9e6
Remove buffer test of 2700 since the template has been covered by dua…
stephenxs Nov 4, 2022
659e66f
Fix bug: remapping wasn't disabled in 4600c-t0 "remap disable" minigraph
stephenxs Nov 4, 2022
d173cac
Add AZURE_TUNNEL mappings in various tables
stephenxs Nov 7, 2022
d755106
Preserve DSCP 33 end to end as well
stephenxs Nov 10, 2022
e35a805
Map TC 8 to queue 1
stephenxs Nov 23, 2022
73e65e9
Adjust QoS template and sample output according to latest change from…
stephenxs Nov 23, 2022
cd1ab6b
Tunnel TC_TO_QUEUE map: 2/6 => 2/6 respectively
stephenxs Nov 30, 2022
71fe7eb
Expose dual_tor and dscp_remapping to swss_var
stephenxs Dec 25, 2022
825866e
Use TC 2/6 => DSCP 2/6 in TC_TO_DSCP mapping
stephenxs Dec 12, 2022
e8f1658
Map DSCP 33 to TC 8 on downlink port as well otherwise it affects ser…
stephenxs Jan 9, 2023
4062c92
Update NVIDIA license headers
stephenxs Feb 6, 2023
30cba4d
Merge branch 'sonic-net:master' into dual-tor-dscp-remapping
stephenxs Feb 7, 2023
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
23 changes: 19 additions & 4 deletions device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{#
Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES.
Copyright (c) 2021-2023 NVIDIA CORPORATION & AFFILIATES.
Apache-2.0

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -15,10 +15,17 @@
limitations under the License.
#}
{% set default_cable = '5m' %}
{% set ingress_lossless_pool_size = '7719936' %}
{% set ingress_lossless_pool_xoff = '1032192' %}
{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) -%}
{% set ingress_lossless_pool_size = '9047040' %}
{% set ingress_lossless_pool_xoff = '851968' %}
{% set egress_lossless_pool_size = '13945824' %}
{% set egress_lossy_pool_size = '7719936' %}
{% set egress_lossy_pool_size = '9047040' %}
{%- else -%}
{% set ingress_lossless_pool_size = '9595904' %}
{% set ingress_lossless_pool_xoff = '614400' %}
{% set egress_lossless_pool_size = '13945824' %}
{% set egress_lossy_pool_size = '9595904' %}
{%- endif -%}

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

Expand All @@ -30,10 +37,18 @@
{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) %}
{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_pg_profiles_with_extra_lossless_pgs_with_inactive_ports(port_names_active, port_names_extra_pgs, port_names_inactive) %}
{{ defs.generate_pg_profiles_with_extra_lossless_pgs(port_names_active, port_names_extra_pgs, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
{%- endmacro %}
17 changes: 0 additions & 17 deletions device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/qos.json.j2
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
23 changes: 19 additions & 4 deletions device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{#
Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES.
Copyright (c) 2021-2023 NVIDIA CORPORATION & AFFILIATES.
Apache-2.0

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -15,10 +15,17 @@
limitations under the License.
#}
{% set default_cable = '5m' %}
{% set ingress_lossless_pool_size = '10177536' %}
{% set ingress_lossless_pool_xoff = '688128' %}
{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) -%}
{% set ingress_lossless_pool_size = '9047040' %}
{% set ingress_lossless_pool_xoff = '851968' %}
{% set egress_lossless_pool_size = '13945824' %}
{% set egress_lossy_pool_size = '10177536' %}
{% set egress_lossy_pool_size = '9047040' %}
{%- else -%}
{% set ingress_lossless_pool_size = '9595904' %}
{% set ingress_lossless_pool_xoff = '614400' %}
{% set egress_lossless_pool_size = '13945824' %}
{% set egress_lossy_pool_size = '9595904' %}
{%- endif -%}

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

Expand All @@ -30,10 +37,18 @@
{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) %}
{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_pg_profiles_with_extra_lossless_pgs_with_inactive_ports(port_names_active, port_names_extra_pgs, port_names_inactive) %}
{{ defs.generate_pg_profiles_with_extra_lossless_pgs(port_names_active, port_names_extra_pgs, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
{%- endmacro %}
2 changes: 1 addition & 1 deletion device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../ACS-MSN2700/qos.json.j2
../../x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
23 changes: 19 additions & 4 deletions device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{#
Copyright (c) 2018-2021 NVIDIA CORPORATION & AFFILIATES.
Copyright (c) 2018-2023 NVIDIA CORPORATION & AFFILIATES.
Apache-2.0

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -15,10 +15,17 @@
limitations under the License.
#}
{% set default_cable = '5m' %}
{% set ingress_lossless_pool_size = '49905664' %}
{% set ingress_lossless_pool_xoff = '3702784' %}
{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) -%}
{% set ingress_lossless_pool_size = '50667520' %}
{% set ingress_lossless_pool_xoff = '2629632' %}
{% set egress_lossless_pool_size = '60817392' %}
{% set egress_lossy_pool_size = '49905664' %}
{% set egress_lossy_pool_size = '50667520' %}
{%- else -%}
{% set ingress_lossless_pool_size = '51511296' %}
{% set ingress_lossless_pool_xoff = '2097152' %}
{% set egress_lossless_pool_size = '60817392' %}
{% set egress_lossy_pool_size = '51511296' %}
{%- endif -%}

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

Expand All @@ -30,10 +37,18 @@
{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) %}
{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_pg_profiles_with_extra_lossless_pgs_with_inactive_ports(port_names_active, port_names_extra_pgs, port_names_inactive) %}
{{ defs.generate_pg_profiles_with_extra_lossless_pgs(port_names_active, port_names_extra_pgs, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
{%- endmacro %}
131 changes: 118 additions & 13 deletions device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{#
Copyright (c) 2020-2021 NVIDIA CORPORATION & AFFILIATES.
Copyright (c) 2020-2023 NVIDIA CORPORATION & AFFILIATES.
Apache-2.0

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -14,18 +14,20 @@
See the License for the specific language governing permissions and
limitations under the License.
#}
{% if ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter') %}

{% if (('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter') or
('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'ToRRouter') and
('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR')) %}
{% set different_dscp_to_tc_map = true %}
{%- macro generate_dscp_to_tc_map() %}
"DSCP_TO_TC_MAP": {
"AZURE": {
{%- macro generate_normal_dscp_to_tc_map(tc_mapped_from_dscp_33) -%}
{
"0" : "1",
"1" : "1",
"2" : "2",
"2" : "1",
"3" : "3",
"4" : "4",
"5" : "1",
"6" : "6",
"6" : "1",
"7" : "1",
"8" : "0",
"9" : "1",
Expand All @@ -52,7 +54,7 @@
"30": "1",
"31": "1",
"32": "1",
"33": "1",
"33": "{{tc_mapped_from_dscp_33}}",
"34": "1",
"35": "1",
"36": "1",
Expand Down Expand Up @@ -83,15 +85,17 @@
"61": "1",
"62": "1",
"63": "1"
},
"AZURE_UPLINK": {
}
{%- endmacro -%}
{%- macro generate_dscp_to_tc_map_with_addition_lossless_pgs_n_queues(tc_mapped_from_dscp_33) -%}
{
"0" : "1",
"1" : "1",
"2" : "1",
"2" : "2",
"3" : "3",
"4" : "4",
"5" : "1",
"6" : "1",
"6" : "6",
"7" : "1",
"8" : "0",
"9" : "1",
Expand All @@ -118,7 +122,7 @@
"30": "1",
"31": "1",
"32": "1",
"33": "1",
"33": "{{tc_mapped_from_dscp_33}}",
"34": "1",
"35": "1",
"36": "1",
Expand Down Expand Up @@ -150,10 +154,52 @@
"62": "1",
"63": "1"
}
{%- endmacro -%}
{%- macro generate_dscp_to_tc_map() %}
"DSCP_TO_TC_MAP": {
{% if ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter') %}
"AZURE_UPLINK":
{{ generate_normal_dscp_to_tc_map("1") }},
"AZURE":
{{ generate_dscp_to_tc_map_with_addition_lossless_pgs_n_queues("1") }}
{% endif %}
{% if ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'ToRRouter') %}
"AZURE_UPLINK":
{{ generate_dscp_to_tc_map_with_addition_lossless_pgs_n_queues("8") }},
"AZURE_TUNNEL":
{{ generate_normal_dscp_to_tc_map("8") }},
"AZURE":
{{ generate_normal_dscp_to_tc_map("8") }}
{% endif %}
},
{%- endmacro %}
{%- macro generate_tc_to_pg_map() %}
"TC_TO_PRIORITY_GROUP_MAP": {
{% if (('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'ToRRouter') and
('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR')) %}
"AZURE_TUNNEL": {
"0": "0",
"1": "0",
"2": "0",
"3": "2",
"4": "6",
"5": "0",
"6": "0",
"7": "0",
"8": "0"
},
"AZURE": {
"0": "0",
"1": "0",
"2": "2",
"3": "3",
"4": "4",
"5": "0",
"6": "6",
"7": "0",
"8": "0"
}
{% else %}
"AZURE": {
"0": "0",
"1": "0",
Expand All @@ -164,8 +210,67 @@
"6": "6",
"7": "0"
}
{% endif %}
},
{%- endmacro %}
{%- macro generate_tc_to_queue_map() %}
"TC_TO_QUEUE_MAP": {
{% if (('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'ToRRouter') and
('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR')) %}
"AZURE_TUNNEL": {
"0": "0",
"1": "1",
"2": "2",
"3": "2",
"4": "6",
"5": "5",
"6": "6",
"7": "7",
"8": "1"
},
"AZURE": {
"0": "0",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6",
"7": "7",
"8": "1"
}
stephenxs marked this conversation as resolved.
Show resolved Hide resolved
{% else %}
"AZURE": {
"0": "0",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6",
"7": "7"
}
{% endif %}
},
{%- endmacro %}
{% if (('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'ToRRouter') and
('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR')) %}
{%- macro generate_tc_to_dscp_map() %}
"TC_TO_DSCP_MAP": {
"AZURE_TUNNEL": {
"0": "8",
"1": "0",
"2": "2",
"3": "2",
"4": "6",
"5": "46",
"6": "6",
"7": "48",
"8": "33"
stephenxs marked this conversation as resolved.
Show resolved Hide resolved
}
},
{%- endmacro %}
{%- endif %}
{%- macro generate_global_dscp_to_tc_map() %}
{# This is an empty macro since the global DSCP_TO_TC map is not required #}
{%- endmacro %}
Expand Down
Loading