Update orchagent to support new field `pfcwd_sw_enable` by bingwang-ms · Pull Request #2171 · sonic-net/sonic-swss

bingwang-ms · 2022-03-07T07:08:08Z

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 .                                                                                                                                                                                                                             [100%]

Test cases in sonic-mgmt is working in progress.

Details if related

Signed-off-by: bingwang <bingwang@microsoft.com>

Signed-off-by: bingwang <wang.bing@microsoft.com>

Signed-off-by: bingwang <bingwang@microsoft.com>

orchagent/port.h

orchagent/pfcwdorch.cpp

tests/test_pfcwd.py

Signed-off-by: bingwang <wang.bing@microsoft.com>

bingwang-ms · 2022-03-31T02:51:52Z

@neethajohn The last two comments are addressed. Please take a look again. Thanks

neethajohn · 2022-04-04T21:31:09Z

@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>

bingwang-ms · 2022-04-06T15:15:50Z

@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

Updated. Thanks

cfgmgr/buffermgr.h

Signed-off-by: bingwang <wang.bing@microsoft.com>

bingwang-ms · 2022-04-11T11:24:48Z

/azp run

azure-pipelines · 2022-04-11T11:24:58Z

Azure Pipelines successfully started running 1 pipeline(s).

cfgmgr/buffermgr.cpp

Signed-off-by: bingwang <bingwang@microsoft.com>

Signed-off-by: bingwang <wang.bing@microsoft.com>

cfgmgr/buffermgr.cpp

Signed-off-by: bingwang <wang.bing@microsoft.com>

cfgmgr/buffermgr.cpp

tests/test_buffer_traditional.py

Signed-off-by: bingwang <wang.bing@microsoft.com>

cfgmgr/buffermgr.cpp

bingwang-ms · 2022-04-24T01:39:22Z

/azp run

azure-pipelines · 2022-04-24T01:39:31Z

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: bingwang <wang.bing@microsoft.com>

cfgmgr/buffermgr.cpp

Signed-off-by: bingwang <wang.bing@microsoft.com>

stephenxs

LGTM

qiluo-msft · 2022-05-03T00:45:54Z

This commit could not be cleanly cherry-picked to 202012. Please submit another PR.

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 .

bingwang-ms and others added 2 commits March 7, 2022 06:53

Support new field pfcwd_sw_enable

b133c9f

Signed-off-by: bingwang <bingwang@microsoft.com>

Fix UT

87edb68

Signed-off-by: bingwang <wang.bing@microsoft.com>

bingwang-ms marked this pull request as ready for review March 7, 2022 11:26

bingwang-ms requested a review from prsunny as a code owner March 7, 2022 11:26

bingwang-ms mentioned this pull request Mar 7, 2022

Update db_migrator to support pfcwd_sw_enable sonic-net/sonic-utilities#2087

Merged

prsunny requested a review from neethajohn March 7, 2022 18:10

bingwang-ms added the Request for 202012 Branch label Mar 8, 2022

neethajohn requested a review from stephenxs March 10, 2022 18:50

Rm pfcwd_hw attributes

0408e94

Signed-off-by: bingwang <bingwang@microsoft.com>

bingwang-ms force-pushed the pfcwd_sw_enable branch from 239e96d to 0408e94 Compare March 11, 2022 04:01

neethajohn reviewed Mar 30, 2022

View reviewed changes

orchagent/port.h Outdated Show resolved Hide resolved

orchagent/pfcwdorch.cpp Show resolved Hide resolved

tests/test_pfcwd.py Outdated Show resolved Hide resolved

tests/test_pfcwd.py Outdated Show resolved Hide resolved

Query pfcwd_sw_enable for BigRed mode

06f2a76

Signed-off-by: bingwang <wang.bing@microsoft.com>

Add extra lossless PG

e740ee2

Signed-off-by: bingwang <bingwang@microsoft.com>

stephenxs requested changes Apr 7, 2022

View reviewed changes

cfgmgr/buffermgr.h Outdated Show resolved Hide resolved

Enable lossless PG only on pfc_enable queues

ad9146f

Signed-off-by: bingwang <wang.bing@microsoft.com>

bingwang-ms changed the title ~~Update orchagent to support new field pfcwd_sw_enable and pfcwd_hw_enable~~ Update orchagent to support new field pfcwd_sw_enable Apr 7, 2022

Merge branch 'master' into pfcwd_sw_enable

6457720

stephenxs reviewed Apr 15, 2022

View reviewed changes

cfgmgr/buffermgr.cpp Outdated Show resolved Hide resolved

bingwang-ms and others added 2 commits April 17, 2022 23:10

Retry if PORT_QOS_TABLE not available

446c55b

Signed-off-by: bingwang <bingwang@microsoft.com>

Update vstest

fc484c8

Signed-off-by: bingwang <wang.bing@microsoft.com>

neethajohn reviewed Apr 20, 2022

View reviewed changes

cfgmgr/buffermgr.cpp Outdated Show resolved Hide resolved

cfgmgr/buffermgr.cpp Outdated Show resolved Hide resolved

cfgmgr/buffermgr.cpp Show resolved Hide resolved

cfgmgr/buffermgr.cpp Outdated Show resolved Hide resolved

Address comments

a5d902f

Signed-off-by: bingwang <wang.bing@microsoft.com>

neethajohn requested changes Apr 21, 2022

View reviewed changes

cfgmgr/buffermgr.cpp Outdated Show resolved Hide resolved

cfgmgr/buffermgr.cpp Outdated Show resolved Hide resolved

cfgmgr/buffermgr.cpp Outdated Show resolved Hide resolved

tests/test_buffer_traditional.py Outdated Show resolved Hide resolved

bingwang-ms added 2 commits April 22, 2022 09:33

Remove pfc_enable update support

956eeff

Signed-off-by: bingwang <wang.bing@microsoft.com>

Merge remote-tracking branch 'upstream/master' into pfcwd_sw_enable

3117744

Move check for speed out of for loop

045334f

Signed-off-by: bingwang <wang.bing@microsoft.com>

stephenxs reviewed Apr 24, 2022

View reviewed changes

cfgmgr/buffermgr.cpp Outdated Show resolved Hide resolved

cfgmgr/buffermgr.cpp Show resolved Hide resolved

bingwang-ms added 2 commits April 24, 2022 02:11

Remove unused variable

05a55b6

Signed-off-by: bingwang <wang.bing@microsoft.com>

Continue loop other port if not succeed

e3aa60f

Signed-off-by: bingwang <wang.bing@microsoft.com>

bingwang-ms force-pushed the pfcwd_sw_enable branch from 19a13a8 to e3aa60f Compare April 24, 2022 03:52

Update vs test

3a89428

Signed-off-by: bingwang <wang.bing@microsoft.com>

stephenxs reviewed Apr 26, 2022

View reviewed changes

cfgmgr/buffermgr.cpp Show resolved Hide resolved

cfgmgr/buffermgr.cpp Show resolved Hide resolved

Call doSpeedUpdateTask in doPortQosTableTask

b76cc51

Signed-off-by: bingwang <wang.bing@microsoft.com>

stephenxs reviewed Apr 26, 2022

View reviewed changes

stephenxs approved these changes Apr 26, 2022

View reviewed changes

neethajohn approved these changes Apr 29, 2022

View reviewed changes

neethajohn merged commit 5329c39 into sonic-net:master Apr 29, 2022

bingwang-ms mentioned this pull request Apr 29, 2022

[202012][cherry-pick]Update orchagent to support new field pfcwd_sw_enable #2245

Merged

bingwang-ms mentioned this pull request May 10, 2022

[cherry-pick][202012] Update db_migrator to support pfcwd_sw_enable sonic-net/sonic-utilities#2160

Merged

bingwang-ms mentioned this pull request May 18, 2022

Combine PGs in buffermgrd #2281

Merged

bingwang-ms mentioned this pull request May 30, 2022

[202012][cherry-pick]Update orchagent to support new field pfcwd_sw_enable #2302

Merged

qiluo-msft added the Cherry Pick Conflict_202012 label Jun 8, 2022

bingwang-ms mentioned this pull request Jun 13, 2022

[HLD] DSCP/TC remapping for tunnel traffic sonic-net/SONiC#950

Merged

bingwang-ms added Request for 202205 Branch and removed Request for 202012 Branch Cherry Pick Conflict_202012 labels Jun 21, 2022

yxieca removed the Request for 202205 Branch label Jun 21, 2022

bingwang-ms mentioned this pull request Jul 6, 2022

Support 4 lossless queues in test_buffer_deployment sonic-net/sonic-mgmt#5921

Merged

5 tasks

bingwang-ms mentioned this pull request Jul 28, 2022

fix test_buffer_deployment case NoneType issue sonic-net/sonic-mgmt#6050

Merged

5 tasks

Conversation

bingwang-ms commented Mar 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bingwang-ms commented Mar 31, 2022

Uh oh!

neethajohn commented Apr 4, 2022

Uh oh!

bingwang-ms commented Apr 6, 2022

Uh oh!

Uh oh!

bingwang-ms commented Apr 11, 2022

Uh oh!

azure-pipelines bot commented Apr 11, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bingwang-ms commented Apr 24, 2022

Uh oh!

azure-pipelines bot commented Apr 24, 2022

Uh oh!

Uh oh!

Uh oh!

stephenxs left a comment

Choose a reason for hiding this comment

Uh oh!

qiluo-msft commented May 3, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

bingwang-ms commented Mar 7, 2022 •

edited

Loading