Add table global_trusted_vni

Author: jimmyzhai

dash-pipeline/SAI/specs/dash_eni.yaml

@@ -660,7 +660,7 @@ sai_apis:
     attr_value_field: s32
     default: SAI_DASH_ENI_MODE_VM
     isresourcetype: false
-    flags: CREATE_AND_SET
+    flags: CREATE_ONLY
     object_name: null
     allow_null: false
     valid_only: null

dash-pipeline/SAI/specs/dash_trusted_vni.yaml

@@ -57,7 +57,7 @@ sai_apis:
   p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta
     tables:
     - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable
-      id: 38326132
+      id: 49370429
       single_match_priority: true
       stage: null
       keys:
@@ -80,5 +80,70 @@ sai_apis:
       actions:
         SAI_TRUSTED_VNI_ENTRY_ACTION_PERMIT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_TRUSTED_VNI_ENTRY_ACTION_PERMIT
-          id: 24633826
+          id: 29028174
+          attr_params: {}
+- !!python/object:utils.sai_spec.sai_api.SaiApi
+  name: global_trusted_vni_entry
+  description: global trusted VNI entry
+  is_object: false
+  enums:
+  - !!python/object:utils.sai_spec.sai_enum.SaiEnum
+    name: sai_global_trusted_vni_entry_action_t
+    description: 'Attribute data for #SAI_GLOBAL_TRUSTED_VNI_ENTRY_ATTR_ACTION'
+    members:
+    - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember
+      name: SAI_GLOBAL_TRUSTED_VNI_ENTRY_ACTION_PERMIT
+      description: ''
+      value: '0'
+  structs:
+  - !!python/object:utils.sai_spec.sai_struct.SaiStruct
+    name: sai_global_trusted_vni_entry_t
+    description: Entry for global_trusted_vni_entry
+    members:
+    - !!python/object:utils.sai_spec.sai_struct_entry.SaiStructEntry
+      name: switch_id
+      description: Switch ID
+      type: sai_object_id_t
+      objects: SAI_OBJECT_TYPE_SWITCH
+      valid_only: null
+    - !!python/object:utils.sai_spec.sai_struct_entry.SaiStructEntry
+      name: vni_range
+      description: Range matched key vni_range
+      type: sai_u32_range_t
+      objects: null
+      valid_only: null
+  attributes:
+  - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute
+    name: SAI_GLOBAL_TRUSTED_VNI_ENTRY_ATTR_ACTION
+    description: Action
+    type: sai_global_trusted_vni_entry_action_t
+    attr_value_field: null
+    default: SAI_GLOBAL_TRUSTED_VNI_ENTRY_ACTION_PERMIT
+    isresourcetype: false
+    flags: CREATE_AND_SET
+    object_name: null
+    allow_null: false
+    valid_only: null
+    is_vlan: false
+    deprecated: false
+  stats: []
+  p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta
+    tables:
+    - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable
+      id: 45800410
+      single_match_priority: true
+      stage: null
+      keys:
+      - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaKey
+        name: vni_range
+        id: 1
+        match_type: range
+        field: u32range
+        bitwidth: 24
+        ip_is_v6_field_id: 0
+        is_object_key: false
+      actions:
+        SAI_GLOBAL_TRUSTED_VNI_ENTRY_ACTION_PERMIT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
+          name: SAI_GLOBAL_TRUSTED_VNI_ENTRY_ACTION_PERMIT
+          id: 29028174
           attr_params: {}

dash-pipeline/SAI/specs/sai_spec.yaml

@@ -48,6 +48,7 @@ object_types:
 - SAI_OBJECT_TYPE_OUTBOUND_PORT_MAP
 - SAI_OBJECT_TYPE_OUTBOUND_PORT_MAP_PORT_RANGE_ENTRY
 - SAI_OBJECT_TYPE_TRUSTED_VNI_ENTRY
+- SAI_OBJECT_TYPE_GLOBAL_TRUSTED_VNI_ENTRY
 object_entries:
 - !!python/object:utils.sai_spec.sai_struct_entry.SaiStructEntry
   name: direction_lookup_entry
@@ -121,6 +122,12 @@ object_entries:
   type: sai_trusted_vni_entry_t
   objects: null
   valid_only: object_type == SAI_OBJECT_TYPE_TRUSTED_VNI_ENTRY,
+- !!python/object:utils.sai_spec.sai_struct_entry.SaiStructEntry
+  name: global_trusted_vni_entry
+  description: Object entry for DASH API global_trusted_vni_entry
+  type: sai_global_trusted_vni_entry_t
+  objects: null
+  valid_only: object_type == SAI_OBJECT_TYPE_GLOBAL_TRUSTED_VNI_ENTRY,
 enums:
 - !!python/object:utils.sai_spec.sai_enum.SaiEnum
   name: sai_dash_direction_t

dash-pipeline/bmv2/dash_pipeline.p4

@@ -69,7 +69,7 @@ control dash_eni_stage(
                          @SaiVal[type="sai_ip_address_t"] IPv4Address reverse_tunnel_sip,
                          bit<1> is_ha_flow_owner,
                          @SaiVal[type="sai_object_id_t"] bit<16> flow_table_id,
-                         @SaiVal[type="sai_dash_eni_mode_t"] dash_eni_mode_t dash_eni_mode)
+                         @SaiVal[type="sai_dash_eni_mode_t", create_only="true"] dash_eni_mode_t dash_eni_mode)
     {
         meta.eni_data.cps                                                   = cps;
         meta.eni_data.pps                                                   = pps;
@@ -137,9 +137,6 @@ control dash_eni_stage(
         if (!eni.apply().hit) {
             UPDATE_COUNTER(eni_miss_drop, 0);
         }
-        else if (meta.eni_data.eni_mode == dash_eni_mode_t.FNIC) {
-            trusted_vni_stage.apply(hdr, meta);
-        }
     }
 }
 
@@ -208,6 +205,10 @@ control dash_match_stage(
     }
 
     apply {
+        if (meta.dropped) {
+            return;
+        }
+
         acl_group.apply();
 
         if (meta.direction == dash_direction_t.OUTBOUND) {
@@ -284,6 +285,7 @@ control dash_ingress(
             (meta.flow_sync_state == dash_flow_sync_state_t.FLOW_MISS &&
              hdr.packet_meta.packet_source == dash_packet_source_t.EXTERNAL))
         {
+            trusted_vni_stage.apply(hdr, meta);
             dash_match_stage.apply(hdr, meta);
             if (meta.dropped) {
                 drop_action();

dash-pipeline/bmv2/stages/trusted_vni.p4

@@ -11,6 +11,17 @@ control trusted_vni_stage(
         meta.dropped = true;
     }
 
+    @SaiTable[single_match_priority = "true", api = "dash_trusted_vni", order=1, isobject="false"]
+    table global_trusted_vni {
+        key = {
+            meta.rx_encap.vni: range @SaiVal[name = "vni_range"];
+        }
+
+        actions = {
+            permit;
+        }
+    }
+
     @SaiTable[single_match_priority = "true", api = "dash_trusted_vni"]
     table trusted_vni {
         key = {
@@ -26,6 +37,10 @@ control trusted_vni_stage(
     }
 
     apply {
+        if (global_trusted_vni.apply().hit) {
+            return;
+        }
+
         trusted_vni.apply();
     }
 }