Update orchagent to support new field pfcwd_sw_enable
#2171
Conversation
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
Signed-off-by: bingwang <bingwang@microsoft.com>
Signed-off-by: bingwang <bingwang@microsoft.com>
bingwang-ms
force-pushed
the
pfcwd_sw_enable
branch
from
239e96d to
0408e94
Compare
neethajohn
reviewed
Mar 30, 2022
Signed-off-by: bingwang <wang.bing@microsoft.com>
|
@neethajohn The last two comments are addressed. Please take a look again. Thanks |
|
@bingwang-ms , to support the additional queues, you will also need to make a change in buffermgr to not hardcode the lossless pgs - https://github.com/Azure/sonic-swss/blob/master/cfgmgr/buffermgr.h#L14 |
Signed-off-by: bingwang <bingwang@microsoft.com>
Updated. Thanks |
stephenxs
suggested changes
Apr 7, 2022
Signed-off-by: bingwang <wang.bing@microsoft.com>
bingwang-ms
changed the title
pfcwd_sw_enable and pfcwd_hw_enablepfcwd_sw_enable
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
stephenxs
reviewed
Apr 15, 2022
Signed-off-by: bingwang <bingwang@microsoft.com>
Signed-off-by: bingwang <wang.bing@microsoft.com>
neethajohn
reviewed
Apr 20, 2022
Signed-off-by: bingwang <wang.bing@microsoft.com>
neethajohn
suggested changes
Apr 21, 2022
Signed-off-by: bingwang <wang.bing@microsoft.com>
Signed-off-by: bingwang <wang.bing@microsoft.com>
stephenxs
reviewed
Apr 24, 2022
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Signed-off-by: bingwang <wang.bing@microsoft.com>
Signed-off-by: bingwang <wang.bing@microsoft.com>
bingwang-ms
force-pushed
the
pfcwd_sw_enable
branch
from
19a13a8 to
e3aa60f
Compare
Signed-off-by: bingwang <wang.bing@microsoft.com>
stephenxs
reviewed
Apr 26, 2022
Signed-off-by: bingwang <wang.bing@microsoft.com>
stephenxs
approved these changes
Apr 26, 2022
neethajohn
approved these changes
Apr 29, 2022
|
This commit could not be cleanly cherry-picked to 202012. Please submit another PR. |
bingwang-ms
added
Request for 202205 Branch
and removed
Request for 202012 Branch
Cherry Pick Conflict_202012
labels
5 tasks
5 tasks
preetham-singh
pushed a commit
to preetham-singh/sonic-swss
that referenced
this pull request
Aug 6, 2022
Signed-off-by: bingwang bingwang@microsoft.com What I did Currently, the entry pfc_enable in table PORT_QOS_MAP is 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. Table Description pfc_enable Specify on which queues to enable PFC pfcwd_sw_enable Specify on which queues to enable software PFC watchdog 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, buffermgrd is 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. sudo pytest3 --dvsname=vs tests/test_pfcwd.py::TestPfcwdFunc -v --pdb ========================================================================================= test session starts ========================================================================================= platform linux -- Python 3.6.9, pytest-7.0.1, pluggy-1.0.0 -- /usr/bin/python3 cachedir: .pytest_cache rootdir: /home/bingwang/work/sonic/sonic-buildimage-master/src/sonic-swss plugins: flaky-3.7.0 collected 2 items tests/test_pfcwd.py::TestPfcwdFunc::test_pfcwd_software_single_queue PASSED [ 50%] tests/test_pfcwd.py::TestPfcwdFunc::test_pfcwd_software_multi_queue PASSED sudo pytest test_buffer_traditional.py ===================================================================================================================== test session starts ====================================================================================================================== platform linux -- Python 3.7.5, pytest-7.1.1, pluggy-1.0.0 rootdir: /home/bingwang/work/sonic/sonic-buildimage-master/src/sonic-swss/tests collected 1 item test_buffer_traditional.py .
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Signed-off-by: bingwang bingwang@microsoft.com
What I did
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