Use shared egress ACL table for PFCWD in BRCM DNX platform #3136

ysmanman · 2024-05-07T17:02:08Z

Today PFCWD uses separate egress ACL tables, one table for each traffic class. This may result in ACL resource overflow when other features that also need egress ACL table is enabled at the same time, e.g., MACSEC. ( See sonic-net/sonic-buildimage#17839 for details).

The fix is to use shared egress ACL table for PFCWD in BRCM DNX platform.

What I did

Why I did it

How I verified it

Details if related

ysmanman · 2024-05-07T21:35:15Z

Add @kenneth-arista @arlakshm @vmittal-msft for viz.

arlakshm · 2024-05-08T17:09:10Z

Please add UT.

arlakshm · 2024-05-08T17:09:53Z

Sai changes still now complete. These are sonic changes for this functionality change. PR to be merged after the SAI changes are integrated.

arlakshm · 2024-05-08T17:10:24Z

@saksarav-nokia

vmittal-msft

Changes looks fine.

Can you please share all the test run results to verify this functionality? Manual, sonic-mgmt, ixia tests etc
Please share syslog message change due to this. current/new both.
Please test with/without mac sec enabled ports.
Also, please post results from pizzabox.
Are these swss changes complete or expecting more after applying second patch from BRCM ?
Please make sure to verify pfcwd drop counters to make sure they are still reporting drops.

Thanks
Vineet

vmittal-msft · 2024-05-17T18:43:31Z

Also, please add test cases to cover changes.

Today PFCWD uses separate egress ACL tables, one table for each traffic class. This may result in ACL resource overflow when other features that also need egress ACL table is enabled at the same time, e.g., MACSEC. ( See sonic-net/sonic-buildimage#17839 for details). The fix is to use shared egress ACL table for PFCWD in BRCM DNX platform.

…o switch. Implement the requirement in aclorch.

…WdAclHandler on DNX.

ysmanman · 2024-05-28T17:21:42Z

The test added in this PR depends on sonic-net/sonic-buildimage#19108

ysmanman · 2024-05-28T18:31:55Z

Changes looks fine.

Can you please share all the test run results to verify this functionality? Manual, sonic-mgmt, ixia tests etc

Please share syslog message change due to this. current/new both.

Please test with/without mac sec enabled ports.

Also, please post results from pizzabox.

Are these swss changes complete or expecting more after applying second patch from BRCM ?

Please make sure to verify pfcwd drop counters to make sure they are still reporting drops.

Thanks Vineet

Changes looks fine.

Can you please share all the test run results to verify this functionality? Manual, sonic-mgmt, ixia tests etc

We completed the testing with ixia, and shared egress acl worked fine without seeing any issue.

Please share syslog message change due to this. current/new both.

The change adds the following new syslog when binging eress ACL table to switch:

May 22 17:34:39.194760 cmp329-6 NOTICE swss0#orchagent: :- bindEgrAclTableToSwitch: Bind egress acl table EgressTable_PfcWdAclHandler_Drop to switch

Please test with/without mac sec enabled ports.

Yes, we tested PFCWD alone and also PFCWD + MACsec.

Also, please post results from pizzabox.

We will provide the result when the testing is done.

Are these swss changes complete or expecting more after applying second patch from BRCM ?

The swss change is complete.

Please make sure to verify pfcwd drop counters to make sure they are still reporting drops.

Yes, the drop counters worked fine.

Thanks Vineet

ysmanman · 2024-05-28T18:32:32Z

Also, please add test cases to cover changes.

Hi @vmittal-msft, test was added.

ysmanman · 2024-05-29T17:46:41Z

Hi @vmittal-msft , the test in this PR depends on sonic-net/sonic-buildimage#19108.

prsunny · 2024-06-25T17:55:03Z

@kperumalbfn , kindly review. @ysmanman , do you've plans to fix coverage?

kperumalbfn · 2024-06-25T17:44:14Z

orchagent/aclorch.cpp

+        if (platform == BRCM_PLATFORM_SUBSTRING && sub_platform == BRCM_DNX_PLATFORM_SUBSTRING &&
+            newTable.type.getName() == TABLE_TYPE_PFCWD)
+        {
+            if(!bindEgrAclTableToSwitch(newTable))


Instead of binding ACL table directly to switch, can we use ACL Table Group? If we use ACL Table, we could bind only one ACL to the switch bind point. ACL Table groups are used for port binding.

Instead of binding ACL table directly to switch, can we use ACL Table Group? If we use ACL Table, we could bind only one ACL to the switch bind point. ACL Table groups are used for port binding.

This was discussed in a previous meeting with both MSFT and BRCM. We understood the limitation, and decided to deferred this change later when we encounter the actual use case, i.e., we have multiple egress tables that need to bind to switch. @vmittal-msft

Yes. This is was discussed in BRCM meeting and decided to bind acl table instead of group since there no current use case for this. If need arise in future, we can enhance this and support.

kperumalbfn · 2024-06-25T17:48:18Z

orchagent/aclorch.cpp

@@ -5112,3 +5168,48 @@ void AclOrch::removeAllAclRuleStatus()
    }
 }

+// Bind egress ACL table (with bind type switch) to switch


SwitchOrch already has the code to bind ACLGroup to the switch.

sonic-swss/orchagent/switchorch.cpp

Line 300 in 78af15d

ReturnCode SwitchOrch::bindAclGroupToSwitch(const sai_acl_stage_t &group_stage, const referenced_object &acl_grp)

Same as above.

kperumalbfn · 2024-06-25T18:02:04Z

orchagent/aclorch.cpp

+}
+
+// Unbind egress ACL table from swtich
+bool AclOrch::unbindEgrAclTableFromSwitch(AclTable &table)


Same as bind aclTable, please use ACL Group instead of ACLTable and switchorch already has the code.

Same as above.

vmittal-msft · 2024-06-25T18:06:41Z

@ysmanman please check comments and re-base.

ysmanman · 2024-06-25T18:11:13Z

@kperumalbfn , kindly review. @ysmanman , do you've plans to fix coverage?

Hi @prsunny , I chatted with @vmittal-msft yesterday about the code coverage issue. The missing code coverage was due to existing code not providing any code coverage for PfcWdAclHandler. So this is a test gap in current code. My PR unfortunately hit the test gap in coverage check. We need to fix the gap here. @vmittal-msft was suggesting to merge the PR first since the PR is required by 202405 and 202205 release, and then fixed coverage separately.

prsunny · 2024-06-25T21:32:03Z

@kperumalbfn , kindly review. @ysmanman , do you've plans to fix coverage?

Hi @prsunny , I chatted with @vmittal-msft yesterday about the code coverage issue. The missing code coverage was due to existing code not providing any code coverage for PfcWdAclHandler. So this is a test gap in current code. My PR unfortunately hit the test gap in coverage check. We need to fix the gap here. @vmittal-msft was suggesting to merge the PR first since the PR is required by 202405 and 202205 release, and then fixed coverage separately.

ok, we can take that separately. waiting for reviewers to sign-off

orchagent/aclorch.cpp

…witchorch.

orchagent/switchorch.cpp

… handle both ingress and egress tables

kperumalbfn

LGTM

…e in switchorch.cpp.

vmittal-msft · 2024-06-27T21:50:52Z

@ysmanman please re-base.

…#3136) * Use shared egress ACL table for PFCWD in BRCM DNX platform. Today PFCWD uses separate egress ACL tables, one table for each traffic class. This may result in ACL resource overflow when other features that also need egress ACL table is enabled at the same time, e.g., MACSEC. ( See sonic-net/sonic-buildimage#17839 for details). The fix is to use shared egress ACL table for PFCWD in BRCM DNX platform.

mssonicbld · 2024-08-02T22:14:11Z

Cherry-pick PR to 202405: #3250

* Use shared egress ACL table for PFCWD in BRCM DNX platform. Today PFCWD uses separate egress ACL tables, one table for each traffic class. This may result in ACL resource overflow when other features that also need egress ACL table is enabled at the same time, e.g., MACSEC. ( See sonic-net/sonic-buildimage#17839 for details). The fix is to use shared egress ACL table for PFCWD in BRCM DNX platform.

ysmanman requested a review from prsunny as a code owner May 7, 2024 17:02

arlakshm requested a review from vmittal-msft May 8, 2024 17:10

ysmanman force-pushed the pfcwd-shared-egress-acl branch from 19bb34b to 936088c Compare May 13, 2024 22:00

vmittal-msft self-assigned this May 15, 2024

vmittal-msft added chassis P0 labels May 15, 2024

vmittal-msft requested a review from neethajohn May 15, 2024 17:11

vmittal-msft approved these changes May 17, 2024

View reviewed changes

ysmanman added 2 commits May 28, 2024 09:45

DNX SAI requires bind ACL table with SAI_ACL_BIND_POINT_TYPE_SWITCH t…

f1535fc

…o switch. Implement the requirement in aclorch.

ysmanman force-pushed the pfcwd-shared-egress-acl branch from 603bd2d to f1535fc Compare May 28, 2024 16:45

ysmanman added 2 commits May 28, 2024 09:47

Add test for shared egress ACL table.

ef6c4c6

Allow test to override PfcDlrInitEnable. This is required to test Pfc…

45a315e

…WdAclHandler on DNX.

ysmanman mentioned this pull request May 28, 2024

Add environs to test PFCWD on DNX sonic-net/sonic-buildimage#19108

Merged

11 tasks

ysmanman and others added 2 commits May 28, 2024 11:05

Use local variable pfcDlrInit to check PfcDlrInitEnable.

8a72e3f

Merge branch 'master' into pfcwd-shared-egress-acl

ba65ef1

ysmanman and others added 2 commits May 30, 2024 17:23

Merge branch 'master' into pfcwd-shared-egress-acl

bdc9df0

Fix a bad merge conflict resolution.

b0b90dd

gechiang added the Request for 202405 Branch label Jun 6, 2024

ysmanman added a commit to ysmanman/sonic-swss that referenced this pull request Jun 7, 2024

Backport sonic-net#3136 (master) to 202205.

1ae1893

ysmanman mentioned this pull request Jun 7, 2024

Use shared egress ACL table for PFCWD in BRCM DNX platform #3186

Closed

kperumalbfn reviewed Jun 25, 2024

View reviewed changes

ysmanman and others added 2 commits June 25, 2024 12:40

Bail out if port is not found.

b1f5cf8

Merge branch 'master' into pfcwd-shared-egress-acl

0f878dc

kperumalbfn reviewed Jun 25, 2024

View reviewed changes

orchagent/aclorch.cpp Outdated Show resolved Hide resolved

ysmanman added 2 commits June 26, 2024 11:36

Move bindEgrAclTableToSwitch() and unbindEgrAclTableFromSwitch() to s…

e4b308b

…witchorch.

Revert test change that's not needed anymore.

65ca212

kperumalbfn reviewed Jun 27, 2024

View reviewed changes

orchagent/switchorch.cpp Outdated Show resolved Hide resolved

kperumalbfn reviewed Jun 27, 2024

View reviewed changes

orchagent/switchorch.cpp Outdated Show resolved Hide resolved

Extend bindEgrAclTableToSwitch() and unbindEgrAclTableFromSwitch() to…

72ebb07

… handle both ingress and egress tables

kperumalbfn reviewed Jun 27, 2024

View reviewed changes

kperumalbfn approved these changes Jun 27, 2024

View reviewed changes

acltable.h was already included in switchorch.h. So no need to includ…

feaf82a

…e in switchorch.cpp.

Merge branch 'master' into pfcwd-shared-egress-acl

b844aaa

bingwang-ms approved these changes Jun 28, 2024

View reviewed changes

prsunny merged commit b02181a into sonic-net:master Jun 28, 2024
16 of 17 checks passed

ysmanman mentioned this pull request Jun 28, 2024

[VOQ][PFC] Orchagent crashed because of SAI_STATUS_INSUFFICIENT_RESOURCES sonic-net/sonic-buildimage#17839

Closed

bingwang-ms added the Approved for 202405 Branch label Aug 2, 2024

mssonicbld mentioned this pull request Aug 2, 2024

[action] [PR:3136] Use shared egress ACL table for PFCWD in BRCM DNX platform (#3136) #3250

Merged

mssonicbld added the Created PR to 202405 Branch label Aug 2, 2024

mssonicbld added Included in 202405 Branch and removed Created PR to 202405 Branch labels Aug 3, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use shared egress ACL table for PFCWD in BRCM DNX platform #3136

Use shared egress ACL table for PFCWD in BRCM DNX platform #3136

ysmanman commented May 7, 2024

ysmanman commented May 7, 2024

arlakshm commented May 8, 2024

arlakshm commented May 8, 2024

arlakshm commented May 8, 2024

vmittal-msft left a comment

vmittal-msft commented May 17, 2024

ysmanman commented May 28, 2024

ysmanman commented May 28, 2024

ysmanman commented May 28, 2024

ysmanman commented May 29, 2024

prsunny commented Jun 25, 2024

kperumalbfn Jun 25, 2024

ysmanman Jun 25, 2024

vmittal-msft Jun 26, 2024

kperumalbfn Jun 25, 2024

vmittal-msft Jun 26, 2024

kperumalbfn Jun 25, 2024

vmittal-msft Jun 26, 2024

vmittal-msft commented Jun 25, 2024

ysmanman commented Jun 25, 2024

prsunny commented Jun 25, 2024

kperumalbfn left a comment

vmittal-msft commented Jun 27, 2024

mssonicbld commented Aug 2, 2024

Use shared egress ACL table for PFCWD in BRCM DNX platform #3136

Use shared egress ACL table for PFCWD in BRCM DNX platform #3136

Conversation

ysmanman commented May 7, 2024

ysmanman commented May 7, 2024

arlakshm commented May 8, 2024

arlakshm commented May 8, 2024

arlakshm commented May 8, 2024

vmittal-msft left a comment

Choose a reason for hiding this comment

vmittal-msft commented May 17, 2024

ysmanman commented May 28, 2024

ysmanman commented May 28, 2024

ysmanman commented May 28, 2024

ysmanman commented May 29, 2024

prsunny commented Jun 25, 2024

kperumalbfn Jun 25, 2024

Choose a reason for hiding this comment

ysmanman Jun 25, 2024

Choose a reason for hiding this comment

vmittal-msft Jun 26, 2024

Choose a reason for hiding this comment

kperumalbfn Jun 25, 2024

Choose a reason for hiding this comment

vmittal-msft Jun 26, 2024

Choose a reason for hiding this comment

kperumalbfn Jun 25, 2024

Choose a reason for hiding this comment

vmittal-msft Jun 26, 2024

Choose a reason for hiding this comment

vmittal-msft commented Jun 25, 2024

ysmanman commented Jun 25, 2024

prsunny commented Jun 25, 2024

kperumalbfn left a comment

Choose a reason for hiding this comment

vmittal-msft commented Jun 27, 2024

mssonicbld commented Aug 2, 2024