-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Reclaim buffer][202012] Reclaim unused buffers by applying zero buff…
…er 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>
- Loading branch information
Showing
65 changed files
with
9,306 additions
and
2,782 deletions.
There are no files selected for viewing
1 change: 1 addition & 0 deletions
1
device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/buffers_defaults_objects.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2 |
1 change: 1 addition & 0 deletions
1
device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers_defaults_objects.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2 |
1 change: 1 addition & 0 deletions
1
device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/buffers_defaults_objects.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2 |
229 changes: 229 additions & 0 deletions
229
device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_objects.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,229 @@ | ||
| {%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %} | ||
| "BUFFER_POOL": { | ||
| {% if dynamic_mode is not defined and port_names_inactive|length > 0 -%} | ||
| "ingress_zero_pool" : { | ||
| "mode": "static", | ||
| "type": "ingress", | ||
| "size": "0" | ||
| }, | ||
| {% endif -%} | ||
| "ingress_lossless_pool": { | ||
| {% if dynamic_mode is not defined -%} | ||
| "size": "{{ ingress_lossless_pool_size }}", | ||
| {% endif -%} | ||
| "type": "ingress", | ||
| "mode": "dynamic" | ||
| }, | ||
| "ingress_lossy_pool": { | ||
| {% if dynamic_mode is not defined -%} | ||
| "size": "{{ ingress_lossy_pool_size }}", | ||
| {% endif -%} | ||
| "type": "ingress", | ||
| "mode": "dynamic" | ||
| }, | ||
| "egress_lossless_pool": { | ||
| "size": "{{ egress_lossless_pool_size }}", | ||
| "type": "egress", | ||
| "mode": "dynamic" | ||
| }, | ||
| "egress_lossy_pool": { | ||
| {% if dynamic_mode is not defined -%} | ||
| "size": "{{ egress_lossy_pool_size }}", | ||
| {% endif -%} | ||
| "type": "egress", | ||
| "mode": "dynamic" | ||
| } | ||
| }, | ||
| "BUFFER_PROFILE": { | ||
| {% if dynamic_mode is not defined and port_names_inactive|length > 0 -%} | ||
| "ingress_lossy_pg_zero_profile" : { | ||
| "pool":"[BUFFER_POOL|ingress_zero_pool]", | ||
| "size":"0", | ||
| "static_th":"0" | ||
| }, | ||
| "ingress_lossless_zero_profile" : { | ||
| "pool":"[BUFFER_POOL|ingress_lossless_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"-8" | ||
| }, | ||
| "ingress_lossy_zero_profile" : { | ||
| "pool":"[BUFFER_POOL|ingress_lossy_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"-8" | ||
| }, | ||
| "egress_lossless_zero_profile" : { | ||
| "pool":"[BUFFER_POOL|egress_lossless_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"-8" | ||
| }, | ||
| "egress_lossy_zero_profile" : { | ||
| "pool":"[BUFFER_POOL|egress_lossy_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"-8" | ||
| }, | ||
| {% endif -%} | ||
| "ingress_lossless_profile": { | ||
| "pool":"[BUFFER_POOL|ingress_lossless_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"7" | ||
| }, | ||
| "ingress_lossy_profile": { | ||
| "pool":"[BUFFER_POOL|ingress_lossy_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"3" | ||
| }, | ||
| "egress_lossless_profile": { | ||
| "pool":"[BUFFER_POOL|egress_lossless_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"7" | ||
| }, | ||
| "egress_lossy_profile": { | ||
| "pool":"[BUFFER_POOL|egress_lossy_pool]", | ||
| "size":"9216", | ||
| "dynamic_th":"7" | ||
| }, | ||
| "q_lossy_profile": { | ||
| "pool":"[BUFFER_POOL|egress_lossy_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"3" | ||
| } | ||
| }, | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_profile_lists(port_names_active, port_names_inactive) %} | ||
| "BUFFER_PORT_INGRESS_PROFILE_LIST": { | ||
| {% for port in port_names_active.split(',') %} | ||
| "{{ port }}": { | ||
| "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]" | ||
| }{% if not loop.last %},{% endif %} | ||
|
|
||
| {% endfor %} | ||
| {% if port_names_inactive|length > 0 %} | ||
| , | ||
| {% for port in port_names_inactive.split(',') %} | ||
| "{{ port }}": { | ||
| {% if dynamic_mode is defined %} | ||
| "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]" | ||
| {% else %} | ||
| "profile_list" : "[BUFFER_PROFILE|ingress_lossless_zero_profile],[BUFFER_PROFILE|ingress_lossy_zero_profile]" | ||
| {% endif %} | ||
| }{% if not loop.last %},{% endif %} | ||
|
|
||
| {% endfor %} | ||
| {% endif %} | ||
| }, | ||
| "BUFFER_PORT_EGRESS_PROFILE_LIST": { | ||
| {% for port in port_names_active.split(',') %} | ||
| "{{ port }}": { | ||
| "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]" | ||
| }{% if not loop.last %},{% endif %} | ||
|
|
||
| {% endfor %} | ||
| {% if port_names_inactive|length > 0 %} | ||
| , | ||
| {% for port in port_names_inactive.split(',') %} | ||
| "{{ port }}": { | ||
| {% if dynamic_mode is defined %} | ||
| "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]" | ||
| {% else %} | ||
| "profile_list" : "[BUFFER_PROFILE|egress_lossless_zero_profile],[BUFFER_PROFILE|egress_lossy_zero_profile]" | ||
| {% endif %} | ||
| }{% if not loop.last %},{% endif %} | ||
|
|
||
| {% endfor %} | ||
| {% endif %} | ||
| } | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_queue_buffers(port_names_active, port_names_inactive) %} | ||
| "BUFFER_QUEUE": { | ||
| {% for port in port_names_active.split(',') %} | ||
| "{{ port }}|3-4": { | ||
| "profile" : "[BUFFER_PROFILE|egress_lossless_profile]" | ||
| }, | ||
| {% endfor %} | ||
| {% for port in port_names_active.split(',') %} | ||
| "{{ port }}|0-2": { | ||
| "profile" : "[BUFFER_PROFILE|q_lossy_profile]" | ||
| }, | ||
| {% endfor %} | ||
| {% for port in port_names_active.split(',') %} | ||
| "{{ port }}|5-6": { | ||
| "profile" : "[BUFFER_PROFILE|q_lossy_profile]" | ||
| }{% if not loop.last %},{% endif %} | ||
|
|
||
| {% endfor %} | ||
| {% if port_names_inactive|length > 0 %} | ||
| , | ||
| {% if dynamic_mode is defined %} | ||
| {% for port in port_names_inactive.split(',') %} | ||
| "{{ port }}|3-4": { | ||
| "profile" : "[BUFFER_PROFILE|egress_lossless_profile]" | ||
| }, | ||
| {% endfor %} | ||
| {% for port in port_names_inactive.split(',') %} | ||
| "{{ port }}|0-2": { | ||
| "profile" : "[BUFFER_PROFILE|q_lossy_profile]" | ||
| }, | ||
| {% endfor %} | ||
| {% for port in port_names_inactive.split(',') %} | ||
| "{{ port }}|5-6": { | ||
| "profile" : "[BUFFER_PROFILE|q_lossy_profile]" | ||
| }{% if not loop.last %},{% endif %} | ||
|
|
||
| {% endfor %} | ||
| {% else %} | ||
| {% for port in port_names_inactive.split(',') %} | ||
| "{{ port }}|3-4": { | ||
| "profile" : "[BUFFER_PROFILE|egress_lossless_zero_profile]" | ||
| }, | ||
| {% endfor %} | ||
| {% for port in port_names_inactive.split(',') %} | ||
| "{{ port }}|0-2": { | ||
| "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]" | ||
| }, | ||
| {% endfor %} | ||
| {% for port in port_names_inactive.split(',') %} | ||
| "{{ port }}|5-6": { | ||
| "profile" : "[BUFFER_PROFILE|egress_lossy_zero_profile]" | ||
| }{% if not loop.last %},{% endif %} | ||
|
|
||
| {% endfor %} | ||
| {% endif %} | ||
| {% endif %} | ||
| } | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_pg_profiles(port_names_active, port_names_inactive) %} | ||
| "BUFFER_PG": { | ||
| {% for port in port_names_active.split(',') %} | ||
| {% if dynamic_mode is defined %} | ||
| "{{ port }}|3-4": { | ||
| "profile" : "NULL" | ||
| }, | ||
| {% endif %} | ||
| "{{ port }}|0": { | ||
| "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" | ||
| }{% if not loop.last %},{% endif %} | ||
|
|
||
| {% endfor %} | ||
| {% if port_names_inactive|length > 0 %} | ||
| {%- for port in port_names_inactive.split(',') %} | ||
| {%- if loop.first -%},{%- endif -%} | ||
| {% if dynamic_mode is defined %} | ||
| "{{ port }}|3-4": { | ||
| "profile" : "NULL" | ||
| }, | ||
| {% endif %} | ||
| "{{ port }}|0": { | ||
| {% if dynamic_mode is defined %} | ||
| "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" | ||
| {% else %} | ||
| "profile" : "[BUFFER_PROFILE|ingress_lossy_pg_zero_profile]" | ||
| {% endif %} | ||
| }{% if not loop.last %},{% endif %} | ||
|
|
||
| {% endfor %} | ||
| {% endif %} | ||
| } | ||
| {%- endmacro %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.