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

[pfcwd] Refactor pfcwd #1696

Open
wants to merge 79 commits into
base: master
Choose a base branch
from
Open

[pfcwd] Refactor pfcwd #1696

wants to merge 79 commits into from

Conversation

wendani
Copy link
Contributor

@wendani wendani commented Apr 6, 2021 •
edited
Loading

What I did

  1. Wrap config processing into the following 4 newly introduced member functions with NO change or modification to the current processing logic
  • registerPortInWdDb
  • registerQueueInWdDb
  • unregisterPortFromWdDb
  • unregisterQueueFromWdDb
  1. Change data member m_entryMap and m_brsEntryMap from map to unordered_map

Why I did it
Pave the way for #1697

How I verified it
On brcm

Details if related
This PR introduces NO change or modification to the current pfcwd orch processing logic.

Contains and therefore after #1691

wendani and others added 30 commits January 24, 2021 02:33
@wendani
Disable last tc
76add4b 
Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
Adjust log level
099582e 
Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
Introduce pfc bit mask status to track the pfc bit mask status in asic
41a9d4e 
Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
Introduce private member function bool setPortPfcStatus(const Port &p…
fb4fef4 
…, uint8_t pfc_bitmask_status) to PortsOrch

Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
getPortPfc to get pfc status and cfg bit masks
c2ba1e0 
Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
Overload setPortPfcStatus
5b1e38c 
Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
Fix compile error
908166e 
Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
Fix typo
b6e06d0 
Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
Fix typo
d7fb1bf 
Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
Set pfc bit in lossy handler destruction only if the corresponding bit
ddd480f 
in config is set

Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
Update comment
53b2043 
Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
Update code format and comment
6c96bb6 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Merge remote-tracking branch 'origin/master' into pfc_bitmask
90cd76f
@wendani
Merge remote-tracking branch 'origin/master' into pfc_bitmask
60ade5d
@wendani
Merge remote-tracking branch 'origin/master' into pfc_bitmask
eb9f10a
@wendani
Introduce registerQueueInWdDb
601b5d0 
Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
No change to original processing logic
d529118 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Update code format and add comment
114d011 
Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
No change to original processing logic
7169312 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Introduce unregisterQueueFromWdDb
70f545c 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Add SWSS_LOG_ENTER() to newly defined member functions
2d8d5c2 
Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
No change to original processing logic
93f31f3 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Remove m_portCfgMap.erase(name)
9a31710 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Update comment and add log messages
5de552a 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Remove debug symbols
ed522f0 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Change to unordered_map
e910be7 
Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
Add member function for port level db register & unregister
caaa808 
Signed-off-by: wenda.ni <wenda.ni@bytedance.com>
@wendani
Update comment
1675791 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Update code format
a4a961d 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Update comments
da33ae9 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
wendani added 25 commits March 28, 2021 07:51
@wendani
Test pfc enable bits clear
d8d8dff 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
If pfc enable bits stay unchanged, sleep 2 seconds before check; Reve…
6cf47b5 
…rt using getBitMaskStr(pfc_tcs)

Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
brd test case
f6d6e6d 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Add comment
e1bd125 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Check fc cntr db removal of both queues
ed11cac 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Rename variable
8de9ac4 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Rename variable
92a0e35 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Refactor
36d347b 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Rename variable
7fc6079 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Merge remote-tracking branch 'public/master' into pfc_bitmask
cbb2410 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Merge branch 'pfc_bitmask' into pfc_refactor
8d8c42e
@wendani
Merge remote-tracking branch 'public/master' into pfc_bitmask
6673a9c
@wendani
Merge remote-tracking branch 'public/master' into pfc_bitmask
c491f08
@wendani
Merge branch 'pfc_bitmask' into pfc_refactor
eb4d0f4
@wendani
Remove {port, queue} in-storm status when pfc wd config on port is re…
63b6ba2 
…moved

Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Remove {port, queue} in-storm status when big red switch mode is enabled
7e59764 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Update code formats
d8b5e09 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Merge branch 'pfcwd_appl' into pfc_refactor
46cdc5f 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Update code formats
116daf1 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Merge branch 'pfcwd_appl' into pfc_refactor
3201b26
@wendani
Use create_entry in place of raw hset
254d56c 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Update code formats
8248910 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Merge commit '8248910' into pfcwd_appl
e930ce4
@wendani
Clear queue deadlock counters
cedb134 
Signed-off-by: Wenda Ni <wonda.ni@gmail.com>
@wendani
Merge commit 'cedb134' into pfc_refactor
c68db83
@wendani wendani mentioned this pull request Apr 6, 2021
Open
1 task
@lgtm-com
Copy link

lgtm-com bot commented Apr 6, 2021

This pull request fixes 2 alerts when merging c68db83 into 66e1aab - view on LGTM.com

fixed alerts:

  • 2 for Unused import

@lguohan lguohan requested a review from neethajohn April 9, 2021 06:41
@lguohan lguohan added the pfcwd label Apr 24, 2021
@prsunny prsunny self-requested a review as a code owner September 2, 2022 23:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neethajohn neethajohn Awaiting requested review from neethajohn

@prsunny prsunny Awaiting requested review from prsunny prsunny is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
pfcwd
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@wendani @lguohan