-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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] Avoid attaching lossless buffer profiles for internal ports #18978
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
37b386c
Don't apply lossless profiles on Dpc ports
vivekrnv 46749cf
Fix Buffer PG profile
vivekrnv 2ca447a
Fix updating wrong sku
vivekrnv 1a869dc
Update the original SKU
vivekrnv 3d7fdaa
Set the default topo to T1
vivekrnv ee4a443
Fix buffer profile ingress list
vivekrnv 2dfeccf
Adjust pool sizes and xoff
vivekrnv 75d02f4
Add Unit Tests for template change
vivekrnv 27230b7
Fix pool sizes and xoff
vivekrnv c6ada06
Update headers
vivekrnv 205d49b
Merge branch 'sonic-net:master' into fix_buffer_dpc
vivekrnv File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O28/buffers.json.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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| ../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2 | ||
| ../Mellanox-SN4700-O8C48/buffers.json.j2 |
1 change: 0 additions & 1 deletion
1
device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O28/buffers_defaults_objects.j2
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why this cannot be unified with ACS-MSN2700?
it is hard to maintain a separate file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same for buffers_defaults_t0/t1 j2.
hard to maintain a separate file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We already maintain a few different buffer_defaults_objects.j2 files for each scenario, like the file under 2700/D48C8 supports shared headroom and extra queues
the one under 2700/ACS-2700 does not support shared headroom.
So, we already maintain more than one file based on use case. Thus i'd prefer not coupling SmartSwitch changes with existing ones. It easy to maintain this way
buffers_defaults_t0/t1 j2. is anyway specific per SKU so it'll be different.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lguohan
The main logic of buffer templates is implemented in
buffer_defaults_objects.j2.we have had 2 different
buffer_defaults_objects.j2s. One for single ingress pool mode + shared headroom and the other for double ingress pool without shared headroom pool.We do it in this way because it will make the template very difficult to understand and maintain if we combine them into one.
Now it's a similar scenario and we have another
buffer_defaults_objects.j2for the smart switch.Putting them all together we have only 3
buffer_defaults_objects.j2s.As for the buffer_defaults_t0/t1.j2, they are very simple.
The main logic is to define the pool sizes and to invoke macros to define other buffer objects, like PGs, queues, etc.
So, it doesn't look like a challenge to maintain.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @lguohan, let me know what you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @lguohan, A gentle reminder