Merge pull request #4178 from divyagayathri-hcl/sws_s1

[P4Orch] Add orchagent support for SAI_ACL_ENTRY_ATTR_FIELD_VLAN_USER_META and SAI_ACL_ENTRY_ATTR_FIELD_PORT_USER_META.

Author: StephenWangGoogle

orchagent/p4orch/acl_rule_manager.cpp

@@ -851,6 +851,7 @@ ReturnCode AclRuleManager::setMatchValue(const sai_acl_entry_attr_t attr_name,
         }
         break;
       }
+      case SAI_ACL_ENTRY_ATTR_FIELD_PORT_USER_META:
       case SAI_ACL_ENTRY_ATTR_FIELD_ETHER_TYPE:
       case SAI_ACL_ENTRY_ATTR_FIELD_L4_SRC_PORT:
       case SAI_ACL_ENTRY_ATTR_FIELD_L4_DST_PORT:
@@ -980,6 +981,7 @@ ReturnCode AclRuleManager::setMatchValue(const sai_acl_entry_attr_t attr_name,
         }
         break;
       }
+      case SAI_ACL_ENTRY_ATTR_FIELD_VLAN_USER_META:
       case SAI_ACL_ENTRY_ATTR_FIELD_TUNNEL_VNI:
       case SAI_ACL_ENTRY_ATTR_FIELD_ROUTE_DST_USER_META:
       case SAI_ACL_ENTRY_ATTR_FIELD_ACL_USER_META:

orchagent/p4orch/acl_util.cpp

@@ -910,6 +910,7 @@ bool isDiffMatchFieldValue(const sai_acl_entry_attr_t attr_name,
     case SAI_ACL_ENTRY_ATTR_FIELD_OUT_PORT: {
         return value.aclfield.data.oid != old_value.aclfield.data.oid;
     }
+    case SAI_ACL_ENTRY_ATTR_FIELD_VLAN_USER_META:
     case SAI_ACL_ENTRY_ATTR_FIELD_ACL_IP_TYPE:
     case SAI_ACL_ENTRY_ATTR_FIELD_TUNNEL_VNI:
     case SAI_ACL_ENTRY_ATTR_FIELD_ROUTE_DST_USER_META:
@@ -941,6 +942,7 @@ bool isDiffMatchFieldValue(const sai_acl_entry_attr_t attr_name,
         return value.aclfield.data.u8 != old_value.aclfield.data.u8 ||
                value.aclfield.mask.u8 != old_value.aclfield.mask.u8;
     }
+    case SAI_ACL_ENTRY_ATTR_FIELD_PORT_USER_META:
     case SAI_ACL_ENTRY_ATTR_FIELD_ETHER_TYPE:
     case SAI_ACL_ENTRY_ATTR_FIELD_L4_SRC_PORT:
     case SAI_ACL_ENTRY_ATTR_FIELD_L4_DST_PORT:

orchagent/p4orch/acl_util.h

@@ -323,6 +323,8 @@ using P4AclRuleTables = std::map<std::string, std::map<std::string, P4AclRule>>;
 #define P4_MATCH_ACL_USER_META "SAI_ACL_TABLE_ATTR_FIELD_ACL_USER_META"
 #define P4_MATCH_VRF_ID "SAI_ACL_TABLE_ATTR_FIELD_VRF_ID"
 #define P4_MATCH_IPMC_TABLE_HIT "SAI_ACL_TABLE_ATTR_FIELD_IPMC_NPU_META_DST_HIT"
+#define P4_MATCH_VLAN_USER_META "SAI_ACL_TABLE_ATTR_FIELD_VLAN_USER_META"
+#define P4_MATCH_PORT_USER_META "SAI_ACL_TABLE_ATTR_FIELD_PORT_USER_META"
 
 #define P4_ACTION_PACKET_ACTION "SAI_ACL_ENTRY_ATTR_ACTION_PACKET_ACTION"
 #define P4_ACTION_REDIRECT "SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT"
@@ -495,6 +497,8 @@ static const acl_table_attr_lookup_t aclMatchTableAttrLookup = {
     {P4_MATCH_ACL_USER_META, SAI_ACL_TABLE_ATTR_FIELD_ACL_USER_META},
     {P4_MATCH_VRF_ID, SAI_ACL_TABLE_ATTR_FIELD_VRF_ID},
     {P4_MATCH_IPMC_TABLE_HIT, SAI_ACL_TABLE_ATTR_FIELD_IPMC_NPU_META_DST_HIT},
+    {P4_MATCH_VLAN_USER_META, SAI_ACL_TABLE_ATTR_FIELD_VLAN_USER_META},
+    {P4_MATCH_PORT_USER_META, SAI_ACL_TABLE_ATTR_FIELD_PORT_USER_META},
 };
 
 static const acl_table_attr_format_lookup_t aclMatchTableAttrFormatLookup = {
@@ -547,6 +551,8 @@ static const acl_table_attr_format_lookup_t aclMatchTableAttrFormatLookup = {
     {SAI_ACL_TABLE_ATTR_FIELD_ACL_USER_META, Format::HEX_STRING},
     {SAI_ACL_TABLE_ATTR_FIELD_VRF_ID, Format::STRING},
     {SAI_ACL_TABLE_ATTR_FIELD_IPMC_NPU_META_DST_HIT, Format::HEX_STRING},
+    {SAI_ACL_TABLE_ATTR_FIELD_VLAN_USER_META, Format::HEX_STRING},
+    {SAI_ACL_TABLE_ATTR_FIELD_PORT_USER_META, Format::HEX_STRING},
 };
 
 static const acl_table_attr_lookup_t aclCompositeMatchTableAttrLookup = {
@@ -606,6 +612,8 @@ static const acl_rule_attr_lookup_t aclMatchEntryAttrLookup = {
     {P4_MATCH_ACL_USER_META, SAI_ACL_ENTRY_ATTR_FIELD_ACL_USER_META},
     {P4_MATCH_VRF_ID, SAI_ACL_ENTRY_ATTR_FIELD_VRF_ID},
     {P4_MATCH_IPMC_TABLE_HIT, SAI_ACL_ENTRY_ATTR_FIELD_IPMC_NPU_META_DST_HIT},
+    {P4_MATCH_VLAN_USER_META, SAI_ACL_ENTRY_ATTR_FIELD_VLAN_USER_META},
+    {P4_MATCH_PORT_USER_META, SAI_ACL_ENTRY_ATTR_FIELD_PORT_USER_META},
 };
 
 static const acl_rule_attr_lookup_t aclCompositeMatchEntryAttrLookup = {

orchagent/p4orch/tests/acl_manager_test.cpp

@@ -659,6 +659,10 @@ P4AclTableDefinitionAppDbEntry getDefaultAclTableDefAppDbEntry()
         P4_FORMAT_HEX_STRING, 32);
     app_db_entry.match_field_lookup["udf2"] =
         BuildMatchFieldJsonStrKindUdf("SAI_UDF_BASE_L3", 56, P4_FORMAT_HEX_STRING, 16);
+    app_db_entry.match_field_lookup["vlan_user_meta"] =
+        BuildMatchFieldJsonStrKindSaiField(P4_MATCH_VLAN_USER_META);
+    app_db_entry.match_field_lookup["port_user_meta"] =
+      BuildMatchFieldJsonStrKindSaiField(P4_MATCH_PORT_USER_META);
 
     // Action field mapping, from P4 action to SAI action
     app_db_entry.action_field_lookup["set_packet_action"].push_back(
@@ -2838,6 +2842,8 @@ TEST_F(AclManagerTest, AclRuleWithValidMatchFields)
     app_db_entry.match_fvs["inner_vlan_cfi"] = "200";
     app_db_entry.match_fvs["vrf_id"] = gVrfName;
     app_db_entry.match_fvs["ipmc_table_hit"] = "0x1";
+    app_db_entry.match_fvs["vlan_user_meta"] = "0x100 & 0x1F0";
+    app_db_entry.match_fvs["port_user_meta"] = "0x0044";
 
     const auto &acl_rule_key = KeyGenerator::generateAclRuleKey(app_db_entry.match_fvs, "100");
 
@@ -3047,6 +3053,18 @@ TEST_F(AclManagerTest, AclRuleWithValidMatchFields)
     EXPECT_EQ(true,
               acl_rule->match_fvs[SAI_ACL_ENTRY_ATTR_FIELD_IPMC_NPU_META_DST_HIT]
                   .aclfield.data.booldata);
+    EXPECT_EQ(0x100,
+            acl_rule->match_fvs[SAI_ACL_ENTRY_ATTR_FIELD_VLAN_USER_META]
+                .aclfield.data.u32);
+    EXPECT_EQ(0x1F0,
+            acl_rule->match_fvs[SAI_ACL_ENTRY_ATTR_FIELD_VLAN_USER_META]
+                .aclfield.mask.u32);
+    EXPECT_EQ(0x0044,
+            acl_rule->match_fvs[SAI_ACL_ENTRY_ATTR_FIELD_PORT_USER_META]
+                .aclfield.data.u16);
+    EXPECT_EQ(0xFFFF,
+            acl_rule->match_fvs[SAI_ACL_ENTRY_ATTR_FIELD_PORT_USER_META]
+                .aclfield.mask.u16);
 
     // Check action field value
     EXPECT_EQ(SAI_PACKET_ACTION_TRAP,