Skip to content

Commit 309df59

Browse files
authored
Revert "[aclorch] Fixed issue sonic-net#2204.Support IN_PORTS qualifer in MIRRORV6 table. (sonic-net#2668)" (sonic-net#2687)
Reverts sonic-net#2668 which cause ACL creation failure on Mellanox platform with below err msg. 2023-03-02T11:25:00.2743784Z E Mar 2 11:22:51.042274 str2-msn2700-spy-2 ERR syncd#SDK: [ACL.ERR] Failed calculating key blocks - too many keys selected. 2023-03-02T11:25:00.2744673Z E 2023-03-02T11:25:00.2745732Z E Mar 2 11:22:51.043026 str2-msn2700-spy-2 ERR swss#orchagent: :- create: create status: SAI_STATUS_FAILURE 2023-03-02T11:25:00.2746583Z E 2023-03-02T11:25:00.2747724Z E Mar 2 11:22:51.043196 str2-msn2700-spy-2 ERR swss#orchagent: :- addAclTable: Failed to create ACL table EVERFLOWV6 2023-03-02T11:25:00.2748625Z E 2023-03-02T11:25:00.2749932Z E Mar 2 11:22:51.043384 str2-msn2700-spy-2 ERR syncd#SDK: [SAI_ACL.ERR] mlnx_sai_acl.c[13937]- mlnx_create_acl_table: Failed to create flex key - Internal Error.
1 parent ebe8de7 commit 309df59

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

orchagent/aclorch.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -3217,7 +3217,7 @@ void AclOrch::initDefaultTableTypes()
32173217
* | -----------------------------------------------------------------|
32183218
* | MATCH_ETHERTYPE | √ | √ | |
32193219
* |------------------------------------------------------------------|
3220-
* | MATCH_IN_PORTS | √ | √ | |
3220+
* | MATCH_IN_PORTS | √ | √ | |
32213221
* |------------------------------------------------------------------|
32223222
*/
32233223

@@ -3278,7 +3278,6 @@ void AclOrch::initDefaultTableTypes()
32783278
.withMatch(make_shared<AclTableMatch>(SAI_ACL_TABLE_ATTR_FIELD_L4_SRC_PORT))
32793279
.withMatch(make_shared<AclTableMatch>(SAI_ACL_TABLE_ATTR_FIELD_L4_DST_PORT))
32803280
.withMatch(make_shared<AclTableMatch>(SAI_ACL_TABLE_ATTR_FIELD_TCP_FLAGS))
3281-
.withMatch(make_shared<AclTableMatch>(SAI_ACL_TABLE_ATTR_FIELD_IN_PORTS))
32823281
.withMatch(make_shared<AclTableMatch>(SAI_ACL_TABLE_ATTR_FIELD_DSCP))
32833282
.withMatch(make_shared<AclTableRangeMatch>(set<sai_acl_range_type_t>{
32843283
{SAI_ACL_RANGE_TYPE_L4_SRC_PORT_RANGE, SAI_ACL_RANGE_TYPE_L4_DST_PORT_RANGE}}))

tests/test_mirror_ipv6_separate.py

-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ def test_MirrorV6TableCreation(self, dvs, testlog):
237237
"SAI_ACL_TABLE_ATTR_FIELD_L4_DST_PORT",
238238
"SAI_ACL_TABLE_ATTR_FIELD_TCP_FLAGS",
239239
"SAI_ACL_TABLE_ATTR_FIELD_DSCP",
240-
"SAI_ACL_TABLE_ATTR_FIELD_IN_PORTS",
241240
"SAI_ACL_TABLE_ATTR_FIELD_OUTER_VLAN_ID"
242241
]
243242

0 commit comments

Comments
 (0)