Merge remote-tracking branch 'origin-1/main' into patch-4

Author: marian-pritsak

.github/workflows/dash-md-spellcheck.yml

@@ -16,4 +16,4 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Spellcheck
-      uses: rojopolis/spellcheck-github-actions@0.26.0
+      uses: rojopolis/spellcheck-github-actions@0.35.0

.wordlist.txt

@@ -6,6 +6,7 @@ Accton
 ACK
 Ack
 ack
+ack'ed
 acl
 ACL
 ACLs
@@ -37,6 +38,7 @@ AspNet
 assignees
 asyncE
 atlassian
+attr
 ATTR
 auditability
 autogenerate
@@ -304,6 +306,7 @@ IxLoad
 ixload
 IxNetwork
 IxNetworkWeb
+Jiang
 Jinja
 jitter
 journaled
@@ -372,6 +375,7 @@ NonSynStateful
 NorthBound
 Novus
 NPL
+NPU
 NPUS
 NSG
 NSGs
@@ -421,6 +425,7 @@ performant
 pingmesh
 PIR
 pluggable
+PLS
 PLVision's
 PKTS
 pmon
@@ -471,11 +476,13 @@ README
 READMEs
 README's
 reconvergence
+RECV
 RedirectRuleResimulatedUf
 redis
 renderer
 repo
 repos
+REQ
 resimulated
 resimulation
 responder
@@ -528,12 +535,14 @@ sharding
 SInce
 SKU
 SKUs
+SLA
 SLB
 SMAC
 SmartAppliances
 SmartNIC
 SmartNic
 SmartNICs
+SmartSwitch
 SmartSwitches
 snappi
 SNAT

dash-pipeline/Makefile

@@ -92,7 +92,7 @@ sai-submodule:
 # P4 Source code compile TARGETS
 ######################################
 
-P4_SRC=$(wildcard bmv2/*.p4)
+P4_SRC=$(wildcard bmv2/**/*.p4)
 P4_MAIN=bmv2/dash_pipeline.p4
 P4_OUTDIR=bmv2/dash_pipeline.bmv2
 P4_ARTIFACTS=$(P4_OUTDIR)/dash_pipeline.json $(P4_OUTDIR)/dash_pipeline_p4rt.txt

dash-pipeline/SAI/SAI

@@ -16,6 +16,8 @@ libsai-dev_$(VERSION)_amd64.deb: ../SAI/inc/*.h ../SAI/experimental/*.h
 	dpkg-deb --build --root-owner-group libsai-dev_$(VERSION)_amd64
 
 libsai_$(VERSION)_amd64.deb: ../lib/libsai.so
+	mkdir -p -m 755 libsai_$(VERSION)_amd64/etc/dash
+	install -vCD ../../bmv2/dash_pipeline.bmv2/* libsai_$(VERSION)_amd64/etc/dash/
 	mkdir -p -m 755 libsai_$(VERSION)_amd64/usr/lib/x86_64-linux-gnu/
 	find -type d |xargs chmod go-w
 	install -vCD ../lib/libsai.so libsai_$(VERSION)_amd64/usr/lib/x86_64-linux-gnu/libsai.so

dash-pipeline/SAI/debian/Makefile

@@ -484,6 +484,8 @@ def _parse_sai_table_attribute_annotation(self, p4rt_anno_list: Dict[str, Any])
                         self.skipattr = str(kv['value']['stringValue'])
                     elif kv['key'] == 'match_type':
                         self.match_type = str(kv['value']['stringValue'])
+                    elif kv['key'] == 'validonly':
+                        self.validonly = str(kv['value']['stringValue'])
                     else:
                         raise ValueError("Unknown attr annotation " + kv['key'])
 
@@ -516,6 +518,7 @@ def __init__(self):
         self.isreadonly: str = "true"
         self.counter_type: str = "bytes"
         self.attr_type: str = "stats"
+        self.no_suffix: bool = ""
         self.param_actions: List[str] = []
 
     def parse_p4rt(self, p4rt_counter: Dict[str, Any], var_ref_graph: P4VarRefGraph) -> None:
@@ -597,6 +600,8 @@ def __parse_sai_counter_annotation(self, p4rt_counter: Dict[str, Any]) -> None:
                         self.attr_type = str(kv['value']['stringValue'])
                         if self.attr_type not in ["counter_attr", "counter_id", "stats"]:
                             raise ValueError(f'Unknown counter attribute type: attr_type={self.attr_type}')
+                    elif kv['key'] == 'no_suffix':
+                        self.no_suffix = str(kv['value']['stringValue']) == "true"
                     else:
                         raise ValueError("Unknown attr annotation " + kv['key'])
 
@@ -613,10 +618,11 @@ def generate_counter_sai_attributes(self) -> 'Iterator[SAICounter]':
                 counter = copy.deepcopy(self)
 
             counter.counter_type = counter_type
+
             if counter.attr_type == "counter_attr":
-                counter.name = f"{counter.name}_{counter.counter_type}_counter"
+                counter.name = f"{counter.name}_{counter.counter_type}_counter" if not self.no_suffix else f"{counter.name}_counter"
             else:
-                counter.name = f"{counter.name}_{counter.counter_type}"
+                counter.name = f"{counter.name}_{counter.counter_type}" if not self.no_suffix else counter.name
 
             yield counter
 
@@ -695,8 +701,8 @@ def parse_p4rt(self, p4rt_table_action: Dict[str, Any], sai_enums: List[SAIEnum]
                 },
                 "params": [
                     { "id": 1, "name": "dst_vnet_id", "bitwidth": 16 },
-                    { "id": 2, "name": "meter_policy_en", "bitwidth": 1 },
-                    { "id": 3, "name": "meter_class", "bitwidth": 16 }
+                    { "id": 2, "name": "meter_class_or", "bitwidth": 32 },
+                    { "id": 3, "name": "meter_class_and", "bitwidth": 32 }
                 ]
             }
         '''

dash-pipeline/SAI/sai_api_gen.py

@@ -43,6 +43,7 @@ CXXFLAGS_COMMON+= -Wno-switch-default
 CXXFLAGS_COMMON+= -Wconversion
 CXXFLAGS_COMMON+= -Wno-psabi
 CXXFLAGS_COMMON+= -Wno-unused-label
+CXXFLAGS_COMMON+= -Wno-unused-result
 
 # Sources from OCP SAI Repo:
 SAI_DIR=../SAI/meta/

dash-pipeline/SAI/src/Makefile

@@ -7,6 +7,7 @@ extern "C" {
 
 #include <set>
 #include <map>
+#include <string>
 
 namespace dash
 {

dash-pipeline/SAI/src/objectidmanager.h

@@ -0,0 +1,22 @@
+#include "saiimpl.h"
+
+DASH_GENERIC_QUAD(BUFFER_POOL,buffer_pool);
+DASH_GENERIC_QUAD(INGRESS_PRIORITY_GROUP,ingress_priority_group);
+DASH_GENERIC_QUAD(BUFFER_PROFILE,buffer_profile);
+
+sai_buffer_api_t redis_buffer_api = {
+
+    DASH_GENERIC_QUAD_API(buffer_pool)
+
+    .get_buffer_pool_stats = 0,
+    .get_buffer_pool_stats_ext = 0,
+    .clear_buffer_pool_stats = 0,
+
+    DASH_GENERIC_QUAD_API(ingress_priority_group)
+
+    .get_ingress_priority_group_stats = 0,
+    .get_ingress_priority_group_stats_ext = 0,
+    .clear_ingress_priority_group_stats = 0,
+
+    DASH_GENERIC_QUAD_API(buffer_profile)
+};

dash-pipeline/SAI/src/sai_dash_buffer.cpp

@@ -0,0 +1,16 @@
+#include "saiimpl.h"
+
+DASH_GENERIC_QUAD(DTEL,dtel);
+DASH_GENERIC_QUAD(DTEL_QUEUE_REPORT,dtel_queue_report);
+DASH_GENERIC_QUAD(DTEL_INT_SESSION,dtel_int_session);
+DASH_GENERIC_QUAD(DTEL_REPORT_SESSION,dtel_report_session);
+DASH_GENERIC_QUAD(DTEL_EVENT,dtel_event);
+
+sai_dtel_api_t dash_sai_dtel_api = {
+
+    DASH_GENERIC_QUAD_API(dtel)
+    DASH_GENERIC_QUAD_API(dtel_queue_report)
+    DASH_GENERIC_QUAD_API(dtel_int_session)
+    DASH_GENERIC_QUAD_API(dtel_report_session)
+    DASH_GENERIC_QUAD_API(dtel_event)
+};