matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3a0d0303ac
sonic-buildimage/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2

39 lines
1.9 KiB
Plaintext
Raw Normal View History

Adding new SKU Mellanox-SN4600C-C4 (#7815) Add new SKU of SN4600C switch: Mellanox-SN4600c-c64 Co-authored-by: Madhan Babu <madhan@r-build-sonic06.mtr.labs.mlnx>
2021-06-17 12:04:38 -05:00
{% set default_cable = '5m' %}
[Mellanox][202012] Support Mellanox-SN4600C-C64 as T1 switch in dual-ToR scenario (#11032) Why I did it Support Mellanox-SN4600C-C64 as T1 switch in dual-ToR scenario 1. Support additional queue and PG in buffer templates, including both traditional and dynamic model 2. Support mapping DSCP 2/6 to lossless traffic in the QoS template. 3. Add macros to generate additional lossless PG in the dynamic model 4. Adjust the order in which the generic/dedicated (with additional lossless queues) macros are checked and called to generate buffer tables in common template buffers_config.j2 - Buffer tables are rendered via using macros. - Both generic and dedicated macros are defined on our platform. Currently, the generic one is called as long as it is defined, which causes the generic one always being called on our platform. To avoid it, the dedicated macrio is checked and called first and then the generic ones. 5. Support MAP_PFC_PRIORITY_TO_PRIORITY_GROUP on ports with additional lossless queues. On Mellanox-SN4600C-C64, buffer configuration for t1 is calculated as: 40 * 100G downlink ports with 4 lossless PGs/queues, 1 lossy PG, and 3 lossy queues 16 * 100G uplink ports with 2 lossless PGs/queues, 1 lossy PG, and 5 lossy queues Signed-off-by: Stephen Sun stephens@nvidia.com How to verify it Run regression test.
2022-06-21 12:04:49 -05:00
{%- 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 = '44130304' %}
{% set ingress_lossless_pool_xoff = '8790016' %}
{% set egress_lossless_pool_size = '60817392' %}
{% set egress_lossy_pool_size = '44130304' %}
{%- else -%}
[Mellanox] Adjust buffer parameters with 2km cable supported for 4600C non-generic SKUs (#9215) - Why I did it Also recalculated all parameters with the latest algorithm with per-speed peer response time taken into account - How I did it Detailed information of each SKU: C64: t0: 32 100G downlinks and 32 100G uplinks t1: 56 100G downlinks and 8 100G uplinks with 2km-cable supported D112C8: 112 50G downlinks and 8 100G uplinks. D48C40: 48 50G downlinks, 32 100G downlinks, and 8 100G uplinks D100C12S2: 4 100G downlinks, 2 10G downlinks, 100 50G downlinks, and 8 100G uplinks 2km cable is supported for C64 on t1 only - How to verify it Run regression test (QoS) Signed-off-by: Stephen Sun <stephens@nvidia.com>
2021-12-08 07:51:33 -06:00
{% set ingress_lossless_pool_size = '48332800' %}
Fix typo and missing files in SN3800 and SN4600C's buffer templates (#9537) Why I did it Fix typo and missing files in SN3800 and SN4600C's buffer templates How I did it ingress_lossless_xoff_size => ingress_lossless_pool_xoff add missing files for SN4600C-D100C12S2 How to verify it Deploy the fix and verify whether the device can be up. Signed-off-by: Stephen Sun <stephens@nvidia.com>
2021-12-20 15:31:45 -06:00
{% set ingress_lossless_pool_xoff = '5275648' %}
[Mellanox] [SKU] Fix the shared headroom for 4600C-C64 SKU (#8242) Removed ingress_lossy_pool from the BUFFER_POOL list Fx the the egress_lossless_pool_size value Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
2021-07-29 10:21:28 -05:00
{% set egress_lossless_pool_size = '60817392' %}
[Mellanox] Adjust buffer parameters with 2km cable supported for 4600C non-generic SKUs (#9215) - Why I did it Also recalculated all parameters with the latest algorithm with per-speed peer response time taken into account - How I did it Detailed information of each SKU: C64: t0: 32 100G downlinks and 32 100G uplinks t1: 56 100G downlinks and 8 100G uplinks with 2km-cable supported D112C8: 112 50G downlinks and 8 100G uplinks. D48C40: 48 50G downlinks, 32 100G downlinks, and 8 100G uplinks D100C12S2: 4 100G downlinks, 2 10G downlinks, 100 50G downlinks, and 8 100G uplinks 2km cable is supported for C64 on t1 only - How to verify it Run regression test (QoS) Signed-off-by: Stephen Sun <stephens@nvidia.com>
2021-12-08 07:51:33 -06:00
{% set egress_lossy_pool_size = '48332800' %}
[Mellanox][202012] Support Mellanox-SN4600C-C64 as T1 switch in dual-ToR scenario (#11032) Why I did it Support Mellanox-SN4600C-C64 as T1 switch in dual-ToR scenario 1. Support additional queue and PG in buffer templates, including both traditional and dynamic model 2. Support mapping DSCP 2/6 to lossless traffic in the QoS template. 3. Add macros to generate additional lossless PG in the dynamic model 4. Adjust the order in which the generic/dedicated (with additional lossless queues) macros are checked and called to generate buffer tables in common template buffers_config.j2 - Buffer tables are rendered via using macros. - Both generic and dedicated macros are defined on our platform. Currently, the generic one is called as long as it is defined, which causes the generic one always being called on our platform. To avoid it, the dedicated macrio is checked and called first and then the generic ones. 5. Support MAP_PFC_PRIORITY_TO_PRIORITY_GROUP on ports with additional lossless queues. On Mellanox-SN4600C-C64, buffer configuration for t1 is calculated as: 40 * 100G downlink ports with 4 lossless PGs/queues, 1 lossy PG, and 3 lossy queues 16 * 100G uplink ports with 2 lossless PGs/queues, 1 lossy PG, and 5 lossy queues Signed-off-by: Stephen Sun stephens@nvidia.com How to verify it Run regression test.
2022-06-21 12:04:49 -05:00
{%- endif -%}
Adding new SKU Mellanox-SN4600C-C4 (#7815) Add new SKU of SN4600C switch: Mellanox-SN4600c-c64 Co-authored-by: Madhan Babu <madhan@r-build-sonic06.mtr.labs.mlnx>
2021-06-17 12:04:38 -05:00
[Reclaim buffer][202012] Reclaim unused buffers by applying zero buffer profiles (#9063) - Why I did it Support zero buffer profiles 1. Add buffer profiles and pool definition for zero buffer profiles 2. Support applying zero profiles on INACTIVE PORTS 3. Enable dynamic buffer manager to load zero pools and profiles from a JSON file - How I did it Add buffer profiles and pool definition for zero buffer profiles If the buffer model is static: * Apply normal buffer profiles to admin-up ports * Apply zero buffer profiles to admin-down ports If the buffer model is dynamic: * Apply normal buffer profiles to all ports * buffer manager will take care when a port is shut down Update buffers_config.j2 to support INACTIVE PORTS by extending the existing macros to generate the various buffer objects, including PGs, queues, ingress/egress profile lists Originally, all the macros to generate the above buffer objects took active ports only as an argument. Now that buffer items need to be generated on inactive ports as well, an extra argument representing the inactive ports need to be added. To be backward compatible, a new series of macros are introduced to take both active and inactive ports as arguments The original version (with active ports only) will be checked first. If it is not defined, then the extended version will be called. Only vendors who support zero profiles need to change their buffer templates Enable buffer manager to load zero pools and profiles from a JSON file: The JSON file is provided on a per-platform basis It is copied from platform/<vendor> folder to /usr/share/sonic/temlates folder in compiling time and rendered when the swss container is being created. To make code clean and reduce redundant code, extract common macros from buffer_defaults_t{0,1}.j2 of all SKUs to two common files: One in Mellanox-SN2700-D48C8 for single ingress pool mode The other in ACS-MSN2700 for double ingress pool mode Those files of all other SKUs will be symbol link to the above files Update sonic-cfggen test accordingly: * Adjust example output file of JSON template for unit test * Add unit test in for Mellanox's new buffer templates. - How to verify it Regression test. Unit test in sonic-cfggen Run regression test and manually test. Signed-off-by: stephens <stephens@nvidia.com>
2021-12-09 09:34:56 -06:00
{% import 'buffers_defaults_objects.j2' as defs with context %}
Adding new SKU Mellanox-SN4600C-C4 (#7815) Add new SKU of SN4600C switch: Mellanox-SN4600c-c64 Co-authored-by: Madhan Babu <madhan@r-build-sonic06.mtr.labs.mlnx>
2021-06-17 12:04:38 -05:00
[Reclaim buffer][202012] Reclaim unused buffers by applying zero buffer profiles (#9063) - Why I did it Support zero buffer profiles 1. Add buffer profiles and pool definition for zero buffer profiles 2. Support applying zero profiles on INACTIVE PORTS 3. Enable dynamic buffer manager to load zero pools and profiles from a JSON file - How I did it Add buffer profiles and pool definition for zero buffer profiles If the buffer model is static: * Apply normal buffer profiles to admin-up ports * Apply zero buffer profiles to admin-down ports If the buffer model is dynamic: * Apply normal buffer profiles to all ports * buffer manager will take care when a port is shut down Update buffers_config.j2 to support INACTIVE PORTS by extending the existing macros to generate the various buffer objects, including PGs, queues, ingress/egress profile lists Originally, all the macros to generate the above buffer objects took active ports only as an argument. Now that buffer items need to be generated on inactive ports as well, an extra argument representing the inactive ports need to be added. To be backward compatible, a new series of macros are introduced to take both active and inactive ports as arguments The original version (with active ports only) will be checked first. If it is not defined, then the extended version will be called. Only vendors who support zero profiles need to change their buffer templates Enable buffer manager to load zero pools and profiles from a JSON file: The JSON file is provided on a per-platform basis It is copied from platform/<vendor> folder to /usr/share/sonic/temlates folder in compiling time and rendered when the swss container is being created. To make code clean and reduce redundant code, extract common macros from buffer_defaults_t{0,1}.j2 of all SKUs to two common files: One in Mellanox-SN2700-D48C8 for single ingress pool mode The other in ACS-MSN2700 for double ingress pool mode Those files of all other SKUs will be symbol link to the above files Update sonic-cfggen test accordingly: * Adjust example output file of JSON template for unit test * Add unit test in for Mellanox's new buffer templates. - How to verify it Regression test. Unit test in sonic-cfggen Run regression test and manually test. Signed-off-by: stephens <stephens@nvidia.com>
2021-12-09 09:34:56 -06:00
{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
Adding new SKU Mellanox-SN4600C-C4 (#7815) Add new SKU of SN4600C switch: Mellanox-SN4600c-c64 Co-authored-by: Madhan Babu <madhan@r-build-sonic06.mtr.labs.mlnx>
2021-06-17 12:04:38 -05:00
{%- endmacro %}
[Reclaim buffer][202012] Reclaim unused buffers by applying zero buffer profiles (#9063) - Why I did it Support zero buffer profiles 1. Add buffer profiles and pool definition for zero buffer profiles 2. Support applying zero profiles on INACTIVE PORTS 3. Enable dynamic buffer manager to load zero pools and profiles from a JSON file - How I did it Add buffer profiles and pool definition for zero buffer profiles If the buffer model is static: * Apply normal buffer profiles to admin-up ports * Apply zero buffer profiles to admin-down ports If the buffer model is dynamic: * Apply normal buffer profiles to all ports * buffer manager will take care when a port is shut down Update buffers_config.j2 to support INACTIVE PORTS by extending the existing macros to generate the various buffer objects, including PGs, queues, ingress/egress profile lists Originally, all the macros to generate the above buffer objects took active ports only as an argument. Now that buffer items need to be generated on inactive ports as well, an extra argument representing the inactive ports need to be added. To be backward compatible, a new series of macros are introduced to take both active and inactive ports as arguments The original version (with active ports only) will be checked first. If it is not defined, then the extended version will be called. Only vendors who support zero profiles need to change their buffer templates Enable buffer manager to load zero pools and profiles from a JSON file: The JSON file is provided on a per-platform basis It is copied from platform/<vendor> folder to /usr/share/sonic/temlates folder in compiling time and rendered when the swss container is being created. To make code clean and reduce redundant code, extract common macros from buffer_defaults_t{0,1}.j2 of all SKUs to two common files: One in Mellanox-SN2700-D48C8 for single ingress pool mode The other in ACS-MSN2700 for double ingress pool mode Those files of all other SKUs will be symbol link to the above files Update sonic-cfggen test accordingly: * Adjust example output file of JSON template for unit test * Add unit test in for Mellanox's new buffer templates. - How to verify it Regression test. Unit test in sonic-cfggen Run regression test and manually test. Signed-off-by: stephens <stephens@nvidia.com>
2021-12-09 09:34:56 -06:00
{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
Adding new SKU Mellanox-SN4600C-C4 (#7815) Add new SKU of SN4600C switch: Mellanox-SN4600c-c64 Co-authored-by: Madhan Babu <madhan@r-build-sonic06.mtr.labs.mlnx>
2021-06-17 12:04:38 -05:00
{%- endmacro %}
[Mellanox][202012] Support Mellanox-SN4600C-C64 as T1 switch in dual-ToR scenario (#11032) Why I did it Support Mellanox-SN4600C-C64 as T1 switch in dual-ToR scenario 1. Support additional queue and PG in buffer templates, including both traditional and dynamic model 2. Support mapping DSCP 2/6 to lossless traffic in the QoS template. 3. Add macros to generate additional lossless PG in the dynamic model 4. Adjust the order in which the generic/dedicated (with additional lossless queues) macros are checked and called to generate buffer tables in common template buffers_config.j2 - Buffer tables are rendered via using macros. - Both generic and dedicated macros are defined on our platform. Currently, the generic one is called as long as it is defined, which causes the generic one always being called on our platform. To avoid it, the dedicated macrio is checked and called first and then the generic ones. 5. Support MAP_PFC_PRIORITY_TO_PRIORITY_GROUP on ports with additional lossless queues. On Mellanox-SN4600C-C64, buffer configuration for t1 is calculated as: 40 * 100G downlink ports with 4 lossless PGs/queues, 1 lossy PG, and 3 lossy queues 16 * 100G uplink ports with 2 lossless PGs/queues, 1 lossy PG, and 5 lossy queues Signed-off-by: Stephen Sun stephens@nvidia.com How to verify it Run regression test.
2022-06-21 12:04:49 -05:00
{%- 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 %}
[Reclaim buffer][202012] Reclaim unused buffers by applying zero buffer profiles (#9063) - Why I did it Support zero buffer profiles 1. Add buffer profiles and pool definition for zero buffer profiles 2. Support applying zero profiles on INACTIVE PORTS 3. Enable dynamic buffer manager to load zero pools and profiles from a JSON file - How I did it Add buffer profiles and pool definition for zero buffer profiles If the buffer model is static: * Apply normal buffer profiles to admin-up ports * Apply zero buffer profiles to admin-down ports If the buffer model is dynamic: * Apply normal buffer profiles to all ports * buffer manager will take care when a port is shut down Update buffers_config.j2 to support INACTIVE PORTS by extending the existing macros to generate the various buffer objects, including PGs, queues, ingress/egress profile lists Originally, all the macros to generate the above buffer objects took active ports only as an argument. Now that buffer items need to be generated on inactive ports as well, an extra argument representing the inactive ports need to be added. To be backward compatible, a new series of macros are introduced to take both active and inactive ports as arguments The original version (with active ports only) will be checked first. If it is not defined, then the extended version will be called. Only vendors who support zero profiles need to change their buffer templates Enable buffer manager to load zero pools and profiles from a JSON file: The JSON file is provided on a per-platform basis It is copied from platform/<vendor> folder to /usr/share/sonic/temlates folder in compiling time and rendered when the swss container is being created. To make code clean and reduce redundant code, extract common macros from buffer_defaults_t{0,1}.j2 of all SKUs to two common files: One in Mellanox-SN2700-D48C8 for single ingress pool mode The other in ACS-MSN2700 for double ingress pool mode Those files of all other SKUs will be symbol link to the above files Update sonic-cfggen test accordingly: * Adjust example output file of JSON template for unit test * Add unit test in for Mellanox's new buffer templates. - How to verify it Regression test. Unit test in sonic-cfggen Run regression test and manually test. Signed-off-by: stephens <stephens@nvidia.com>
2021-12-09 09:34:56 -06:00
{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
Adding new SKU Mellanox-SN4600C-C4 (#7815) Add new SKU of SN4600C switch: Mellanox-SN4600c-c64 Co-authored-by: Madhan Babu <madhan@r-build-sonic06.mtr.labs.mlnx>
2021-06-17 12:04:38 -05:00
{%- endmacro %}
[Mellanox][202012] Support Mellanox-SN4600C-C64 as T1 switch in dual-ToR scenario (#11032) Why I did it Support Mellanox-SN4600C-C64 as T1 switch in dual-ToR scenario 1. Support additional queue and PG in buffer templates, including both traditional and dynamic model 2. Support mapping DSCP 2/6 to lossless traffic in the QoS template. 3. Add macros to generate additional lossless PG in the dynamic model 4. Adjust the order in which the generic/dedicated (with additional lossless queues) macros are checked and called to generate buffer tables in common template buffers_config.j2 - Buffer tables are rendered via using macros. - Both generic and dedicated macros are defined on our platform. Currently, the generic one is called as long as it is defined, which causes the generic one always being called on our platform. To avoid it, the dedicated macrio is checked and called first and then the generic ones. 5. Support MAP_PFC_PRIORITY_TO_PRIORITY_GROUP on ports with additional lossless queues. On Mellanox-SN4600C-C64, buffer configuration for t1 is calculated as: 40 * 100G downlink ports with 4 lossless PGs/queues, 1 lossy PG, and 3 lossy queues 16 * 100G uplink ports with 2 lossless PGs/queues, 1 lossy PG, and 5 lossy queues Signed-off-by: Stephen Sun stephens@nvidia.com How to verify it Run regression test.
2022-06-21 12:04:49 -05:00
{%- 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 %}
[Reclaim buffer][202012] Reclaim unused buffers by applying zero buffer profiles (#9063) - Why I did it Support zero buffer profiles 1. Add buffer profiles and pool definition for zero buffer profiles 2. Support applying zero profiles on INACTIVE PORTS 3. Enable dynamic buffer manager to load zero pools and profiles from a JSON file - How I did it Add buffer profiles and pool definition for zero buffer profiles If the buffer model is static: * Apply normal buffer profiles to admin-up ports * Apply zero buffer profiles to admin-down ports If the buffer model is dynamic: * Apply normal buffer profiles to all ports * buffer manager will take care when a port is shut down Update buffers_config.j2 to support INACTIVE PORTS by extending the existing macros to generate the various buffer objects, including PGs, queues, ingress/egress profile lists Originally, all the macros to generate the above buffer objects took active ports only as an argument. Now that buffer items need to be generated on inactive ports as well, an extra argument representing the inactive ports need to be added. To be backward compatible, a new series of macros are introduced to take both active and inactive ports as arguments The original version (with active ports only) will be checked first. If it is not defined, then the extended version will be called. Only vendors who support zero profiles need to change their buffer templates Enable buffer manager to load zero pools and profiles from a JSON file: The JSON file is provided on a per-platform basis It is copied from platform/<vendor> folder to /usr/share/sonic/temlates folder in compiling time and rendered when the swss container is being created. To make code clean and reduce redundant code, extract common macros from buffer_defaults_t{0,1}.j2 of all SKUs to two common files: One in Mellanox-SN2700-D48C8 for single ingress pool mode The other in ACS-MSN2700 for double ingress pool mode Those files of all other SKUs will be symbol link to the above files Update sonic-cfggen test accordingly: * Adjust example output file of JSON template for unit test * Add unit test in for Mellanox's new buffer templates. - How to verify it Regression test. Unit test in sonic-cfggen Run regression test and manually test. Signed-off-by: stephens <stephens@nvidia.com>
2021-12-09 09:34:56 -06:00
{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
{%- endmacro %}
Reference in New Issue Copy Permalink