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

Jump to bottom

PG buffer profile based on port configuration #301

Merged
merged 2 commits into from
Sep 22, 2017
Merged

PG buffer profile based on port configuration #301

merged 2 commits into from
Sep 22, 2017

Conversation

andriymoroz-mlnx
Copy link
Contributor

No description provided.

@andriymoroz-mlnx andriymoroz-mlnx mentioned this pull request Aug 29, 2017
Closed
@andriymoroz-mlnx
Copy link
Contributor Author

related PR sonic-net/sonic-buildimage#926

stcheng
stcheng reviewed Sep 5, 2017
View reviewed changes
Copy link
Contributor

@stcheng stcheng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the pull request in the sonic-buildimage looks good. it is not easy to review this pull request. could you paste an output of the 2700 generated file in the pull request? I'll take a look then. thanks!

stcheng
stcheng suggested changes Sep 5, 2017
View reviewed changes
debian/swss.install
@@ -1,8 +1,7 @@
swssconfig/sample/netbouncer.json etc/swss/config.d
swssconfig/sample/00-copp.config.json etc/swss/config.d
swssconfig/sample/msn2700.32ports.buffers.json etc/swss/config.d
swssconfig/sample/msn27xx.32ports.buffers.json.j2 usr/share/sonic/templates
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm also wondering if we could still leave the file inside the /etc/swss/config.d folder. i think to have all swss related configurations (including templates) inside this folder is better than putting the files somewhere around.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably you are right...
also the source directory looks not very nice
"production" configs should be under some sonic-buildimage/platform/<vendor>/config and sonic-buildimage/platform/generic/config
I think this should be done globally for all configuration files

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i agree with your idea here. i created the sample folder but haven't imagined that it is no longer 'sample' folder. we could fix it in the long run. but right now, i'd suggest it is okay to put it into the 'sample' folder.

@andriymoroz-mlnx
Copy link
Contributor Author

buffers json file generated from the template in this review:
msn27xx-32ports-buffers-json
I've uploaded it as the "gist". It allows commenting but not per line. But at least it shows the line numbers. If you know any better way to publish/comment files - please let me know

yxieca
yxieca approved these changes Sep 6, 2017
View reviewed changes
swssconfig/sample/msn27xx.32ports.buffers.json.j2
"OP": "SET"
},
{
"BUFFER_PG_TABLE:{{ ethernet_interfaces_names }}:0-1": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears that a BUFFER_PG_TABLE with BUFFER_PROFILE_TABLE:pg_lossless_profile for queue 3 and 4 is missing?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comparing the diff link 114 - 124, 2 BUFFER_PG_TABLE were removed, here only 1 got added back.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The other table which previously linked one profile to all ports and queues 3-4 is now split into many tables (one per port). These tables generated in j2 template in line 219
In the example of generated buffers config json they are in lines 115-337

@stcheng
Copy link
Contributor

stcheng commented Sep 7, 2017

thanks for hadding the output. gist is nice. Ying and I will take a look!

stcheng
stcheng approved these changes Sep 12, 2017
View reviewed changes
Copy link
Contributor

@stcheng stcheng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please do not merge immediately we might need to merge v1.0.3 into master first

@stcheng
Copy link
Contributor

stcheng commented Sep 19, 2017

Hello @andriymoroz-mlnx could you close this pull request and generate a new one against the master?

@stcheng stcheng merged commit 533ace2 into sonic-net:master Sep 22, 2017
praveen-li pushed a commit to praveen-li/sonic-swss that referenced this pull request Aug 24, 2020
Merge remote-tracking branch 'msft_github/master'
63dbfde 
* msft_github/master:
  [swssconfig]: Update Mellanox buffer profile template to work with an incomplete minigraph (sonic-net#332)
  [portsyncd]: Remove deprecated sample file port_config.ini (sonic-net#330)
  [portsyncd]: Remove unused LAG related tables (sonic-net#329)
  [tunnelorch]: Minor comment update
  [aclorch]: Fix crashing when removing ACL table that has associated ACL rules (sonic-net#322)
  [pfcwdorch]: Initial support (sonic-net#317)
  [swssconfig]: Update buffer profile template to work with CONF_DB (sonic-net#319)
  [aclorch]: Refactor doAclTableTask and doAclRuleTask (sonic-net#318)
  [swssconfig]: Add Mellanox PG buffer profiles based on port configuration (sonic-net#301)
  [switchorch]: Add SwitchOrch to deal with switch attributes changes (sonic-net#314)
  [github]: Update pull request template comments
  [github]: Add pull request template (sonic-net#313)
  Optimize orch performance by pops() (sonic-net#312)
  Refactor TableConsumable (sonic-net#291)
  [buffer]: Remove failed tasks from the m_toSync queue (sonic-net#308)
  [qos]: Remove failed tasks from the m_toSync queue (sonic-net#306)
  [aclorch]: Add match TC support for ACL rule (sonic-net#302)
  [orchagent]: Set log recording directory before enable recording (sonic-net#300)
  [orchagent]: Remove duplicate SwSS recording file set code (sonic-net#298)
  Fix port speed validation (sonic-net#288)
  [fdborch]: Fix FdbOrch code to work upon SAI v1.0 (sonic-net#284)
  [config]: Add BGPv6 COPP in 00-copp.config.json (sonic-net#281)
  [aclorch]: Fix match DSCP attribute value mask length to 0x3F
  [mirrororch]: Set the VLAN header only when the packet is mirrored to a VLAN (sonic-net#282)
  [swssconfig]: Log errors instead of throwing exception when file open fails (sonic-net#277)
  [aclorch]: Remove wrong table attribute (sonic-net#280)
  [aclorch]: Fix remove_acl_counter function to remove the counter (sonic-net#274)
  [copporch]: Add SAI_HOSTIF_TRAP_ATTR_TRAP_PRIORITY support and refactor code (sonic-net#270)
  [mirrororch]: Add SAI_MIRROR_SESSION_ATTR_VLAN_HEADER_VALID (sonic-net#269)
  [bufferorch]: Add SAI_BUFFER_PROFILE_THRESHOLD_MODE_* (sonic-net#271)
  [aclorch]: Minor logs fix
  [orchagent]: Update recording file name to swss.rec
  [Make]: Fix type conversions and add more warnings (sonic-net#267)
  [aclorch]: Fix ACL table group attribute type issue (sonic-net#268)
  [portsorch]: Update default bridge port removal logic (sonic-net#263)
  [routeorch]: Need to set drop route next hop ID to NULL (sonic-net#261)
  [portsorch]: Remove SAI_PORT_ATTR_BIND_MODE (sonic-net#262)
  [portsorch]: Create a bridge port with admin status set to UP (sonic-net#259)
  Revert "[portsorch]: Set port bind mode after adding VLAN member" (sonic-net#258)
  [orchagent]: Temporarily fix pre-allocated bridge_port_list size (sonic-net#256)
  [saihelper]: Create initSaiRedis function and put related code inside it (sonic-net#254)
  [portsorch]: Set port bind mode after adding VLAN member (sonic-net#251)
  [orchagent]: Create the switch with source MAC address (sonic-net#253)
  [copporch]: Add UDLD entry in COPP (sonic-net#252)
  [orchagent]: Support LAG/VLAN with SAI 1.0 (sonic-net#250)
  use vlan oid instead of vlan id (sonic-net#247)
  Fix getBridgePort: handle non existing bridge_port_id
  Integration for SAI v1.0.1
  Remove vlan member before removing bridge port
  Fix SAI functional calls
  Fix: store bridge ports at initialization
  Refactor vector<attr>
  Resolve review comments
  Implement bridge port in portsorch
  Fix initSystemAclTable: bind system ACL to each port
  Refactor: port owns acl table group
  Resolve code review comments
  Resolve code review comments
  Adpat SAIv1.0 headers and fix compilation errors
EdenGri pushed a commit to EdenGri/sonic-swss that referenced this pull request Feb 28, 2022
@wendani @lguohan
ecnconfig: add show and change ECN on/off status on queues (sonic-net…
987b399 
…#301)

* Add the capability of show and change ECN on/off status on queues to
ecnconfig

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Address comments: 1) usage format for ecn on/off; 2) add sample outputs;
3) avoid variable name reuse for different entities; 4) iterate over
dictionary key-value tuples using .items(); 5) replace
SonicV2Connector.set() call by ConfigDBConnector.mod_entry() for
performance improvement
oleksandrivantsiv pushed a commit to oleksandrivantsiv/sonic-swss that referenced this pull request Mar 1, 2023
@keboliu @lguohan
fix a fdb-clear bug that introduced by SAI 1.2 modification (sonic-n…
8990e25 
…et#301)

consolidated fdb flush event will carry a fdb_entry include
 a null bvid, in fdb flush case it shall not be considered as
 a invalid fdb_entry

 Changes to be committed:
	modified:   syncd/syncd_notifications.cpp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yxieca yxieca yxieca approved these changes

@stcheng stcheng stcheng approved these changes

Assignees
No one assigned
Labels
Enhancement ➕
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@andriymoroz-mlnx @stcheng @yxieca @msftclas