[202012][cherry-pick]Update orchagent to support new field pfcwd_sw_enable#2302
Merged
bingwang-ms merged 9 commits intosonic-net:202012from Jun 4, 2022
Merged
Conversation
Signed-off-by: bingwang <[email protected]>
Signed-off-by: bingwang <[email protected]>
Signed-off-by: bingwang <[email protected]>
Signed-off-by: bingwang <[email protected]>
Signed-off-by: bingwang <[email protected]>
neethajohn
reviewed
May 31, 2022
cfgmgr/buffermgr.cpp
Outdated
| speed = m_speedLookup[port]; | ||
| if (m_portStatusLookup.count(port) == 0) | ||
| { | ||
| // admin_statue is not available yet. This can happen when notification of `PORT_QOS_MAP` table |
Contributor
There was a problem hiding this comment.
spell check: admin_status
| } | ||
| if (fvField(i) == "admin_status") | ||
| { | ||
| admin_up = ("up" == fvValue(i)); |
Contributor
There was a problem hiding this comment.
remove the declaration in L567
orchagent/portsorch.cpp
Outdated
|
|
||
| m_portList[p.m_alias] = p; | ||
|
|
||
| SWSS_LOG_INFO("Set PFC watchdog port id=0x%" PRIx64 ", bitmast=0x%x", portId, pfcwd_bitmask); |
Contributor
Author
|
@neethajohn Thanks. All fixed. |
neethajohn
approved these changes
Jun 4, 2022
6 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
What I did
This PR is to cherry-pick #2171 after resolving conflicts.
Currently, the entry
pfc_enablein tablePORT_QOS_MAPis used to specify pfc and pfc_watchdog are enabled on which queues.To avoid PFC deadlock in Dual-ToR scrnario, we are going to introduce two extra lossless queues to carry bounced back traffic.HLD.
The extra lossless queues require another two pfc_watchdogs, and the new watchdogs will be implemented by hardware due to limited resources. The hardware pfc watchdog is not covered in this PR.
To specify on which queue to enable pfc watchdog, we need to define new table
pfcwd_sw_enable.This PR is to update orchagent to support new field
pfcwd_sw_enable.As two extra lossless PGs (2 and 6) are to be added,
buffermgrdis also updated in this PR to generate lossless profile for the new PGs.Why I did it
Update orchagent to support new field
pfcwd_sw_enable.How I verified it
Verified by UT.
Test cases in sonic-mgmt is working in progress.
Details if related