Merge branch '202412' of https://github.com/Azure/sonic-swss.msft into 202503

Author: mssonicbld

cfgmgr/buffermgrdyn.cpp

@@ -14,6 +14,8 @@
 #include "schema.h"
 #include "warm_restart.h"
 
+#include "buffer/bufferschema.h"
+
 /*
  * Some Tips
  * 1. All keys in this file are in format of APPL_DB key.
@@ -896,6 +898,10 @@ void BufferMgrDynamic::updateBufferProfileToDb(const string &name, const buffer_
         }
         fvVector.emplace_back("xoff", profile.xoff);
     }
+    if (!profile.packet_discard_action.empty())
+    {
+        fvVector.emplace_back(BUFFER_PROFILE_PACKET_DISCARD_ACTION, profile.packet_discard_action);
+    }
     fvVector.emplace_back("size", profile.size);
     fvVector.emplace_back("pool", profile.pool_name);
     fvVector.emplace_back(mode, profile.threshold);
@@ -2631,6 +2637,10 @@ task_process_status BufferMgrDynamic::handleBufferProfileTable(KeyOpFieldsValues
                     profileApp.direction = BUFFER_INGRESS;
                 }
             }
+            else if (field == BUFFER_PROFILE_PACKET_DISCARD_ACTION)
+            {
+                profileApp.packet_discard_action = value;
+            }
             SWSS_LOG_INFO("Inserting BUFFER_PROFILE table field %s value %s", field.c_str(), value.c_str());
         }
 

cfgmgr/buffermgrdyn.h

@@ -76,6 +76,8 @@ typedef struct {
     // port_pgs - stores pgs referencing this profile
     // An element will be added or removed when a PG added or removed
     port_pg_set_t port_pgs;
+    // packet trimming control
+    std::string packet_discard_action;
 } buffer_profile_t;
 
 typedef struct {

fpmsyncd/routesync.cpp

@@ -1613,6 +1613,9 @@ void RouteSync::onRouteMsg(int nlmsg_type, struct nl_object *obj, char *vrf)
     {
         sendOffloadReply(route_obj);
     }
+    auto proto_num = rtnl_route_get_protocol(route_obj);
+    auto proto_str = getProtocolString(proto_num);
+    FieldValueTuple proto("protocol", proto_str);
 
     switch (rtnl_route_get_type(route_obj))
     {
@@ -1621,6 +1624,7 @@ void RouteSync::onRouteMsg(int nlmsg_type, struct nl_object *obj, char *vrf)
             vector<FieldValueTuple> fvVector;
             FieldValueTuple fv("blackhole", "true");
             fvVector.push_back(fv);
+            fvVector.push_back(proto);
             m_routeTable.set(destipprefix, fvVector);
             return;
         }
@@ -1692,11 +1696,8 @@ void RouteSync::onRouteMsg(int nlmsg_type, struct nl_object *obj, char *vrf)
         }
     }
 
-    auto proto_num = rtnl_route_get_protocol(route_obj);
-    auto proto_str = getProtocolString(proto_num);
 
     vector<FieldValueTuple> fvVector;
-    FieldValueTuple proto("protocol", proto_str);
     FieldValueTuple gw("nexthop", gw_list);
     FieldValueTuple intf("ifname", intf_list);
 
@@ -1776,13 +1777,18 @@ void RouteSync::onLabelRouteMsg(int nlmsg_type, struct nl_object *obj)
         return;
     }
 
+    auto proto_num = rtnl_route_get_protocol(route_obj);
+    auto proto_str = getProtocolString(proto_num);
+    FieldValueTuple proto("protocol", proto_str);
+
     switch (rtnl_route_get_type(route_obj))
     {
         case RTN_BLACKHOLE:
         {
             vector<FieldValueTuple> fvVector;
             FieldValueTuple fv("blackhole", "true");
             fvVector.push_back(fv);
+            fvVector.push_back(proto);
             m_label_routeTable.set(destaddr, fvVector);
             return;
         }
@@ -2181,14 +2187,11 @@ string RouteSync::getNextHopWt(struct rtnl_route *route_obj)
         struct rtnl_nexthop *nexthop = rtnl_route_nexthop_n(route_obj, i);
         /* Get the weight of next hop */
         uint8_t weight = rtnl_route_nh_get_weight(nexthop);
-        if (weight)
-        {
-            result += to_string(weight);
-        }
-        else
+        if (weight == 0)
         {
-            return "";
+            weight = 1; // default weight is 1
         }
+        result += to_string(weight);
 
         if (i + 1 < rtnl_route_get_nnexthops(route_obj))
         {

orchagent/Makefile.am

@@ -80,6 +80,8 @@ orchagent_SOURCES = \
             saiattr.cpp \
             switch/switch_capabilities.cpp \
             switch/switch_helper.cpp \
+            switch/trimming/capabilities.cpp \
+            switch/trimming/helper.cpp \
             switchorch.cpp \
             pfcwdorch.cpp \
             pfcactionhandler.cpp \

orchagent/aclorch.cpp

@@ -102,6 +102,7 @@ static acl_rule_attr_lookup_t aclL3ActionLookup =
     { ACTION_PACKET_ACTION,                    SAI_ACL_ENTRY_ATTR_ACTION_PACKET_ACTION },
     { ACTION_REDIRECT_ACTION,                  SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT },
     { ACTION_DO_NOT_NAT_ACTION,                SAI_ACL_ENTRY_ATTR_ACTION_NO_NAT },
+    { ACTION_DISABLE_TRIM,                     SAI_ACL_ENTRY_ATTR_ACTION_PACKET_TRIM_DISABLE }
 };
 
 static acl_rule_attr_lookup_t aclMirrorStageLookup =
@@ -1948,6 +1949,12 @@ bool AclRulePacket::validateAddAction(string attr_name, string _attr_value)
             actionData.parameter.booldata = true;
             action_str = ACTION_DO_NOT_NAT_ACTION;
         }
+        // handle PACKET_ACTION_DISABLE_TRIM in ACTION_PACKET_ACTION
+        else if (attr_value == PACKET_ACTION_DISABLE_TRIM)
+        {
+            actionData.parameter.booldata = true;
+            action_str = ACTION_DISABLE_TRIM;
+        }
         else
         {
             return false;

orchagent/aclorch.h

@@ -61,6 +61,7 @@
 #define ACTION_PACKET_ACTION                "PACKET_ACTION"
 #define ACTION_REDIRECT_ACTION              "REDIRECT_ACTION"
 #define ACTION_DO_NOT_NAT_ACTION            "DO_NOT_NAT_ACTION"
+#define ACTION_DISABLE_TRIM                 "DISABLE_TRIM_ACTION"
 #define ACTION_MIRROR_ACTION                "MIRROR_ACTION"
 #define ACTION_MIRROR_INGRESS_ACTION        "MIRROR_INGRESS_ACTION"
 #define ACTION_MIRROR_EGRESS_ACTION         "MIRROR_EGRESS_ACTION"
@@ -74,11 +75,12 @@
 #define ACTION_META_DATA                    "META_DATA_ACTION"
 #define ACTION_DSCP                         "DSCP_ACTION"
 
-#define PACKET_ACTION_FORWARD     "FORWARD"
-#define PACKET_ACTION_DROP        "DROP"
-#define PACKET_ACTION_COPY        "COPY"
-#define PACKET_ACTION_REDIRECT    "REDIRECT"
-#define PACKET_ACTION_DO_NOT_NAT  "DO_NOT_NAT"
+#define PACKET_ACTION_FORWARD      "FORWARD"
+#define PACKET_ACTION_DROP         "DROP"
+#define PACKET_ACTION_COPY         "COPY"
+#define PACKET_ACTION_REDIRECT     "REDIRECT"
+#define PACKET_ACTION_DO_NOT_NAT   "DO_NOT_NAT"
+#define PACKET_ACTION_DISABLE_TRIM "DISABLE_TRIM"
 
 #define DTEL_FLOW_OP_NOP        "NOP"
 #define DTEL_FLOW_OP_POSTCARD   "POSTCARD"

orchagent/buffer/bufferschema.h

@@ -0,0 +1,8 @@
+#pragma once
+
+// defines ------------------------------------------------------------------------------------------------------------
+
+#define BUFFER_PROFILE_PACKET_DISCARD_ACTION_DROP "drop"
+#define BUFFER_PROFILE_PACKET_DISCARD_ACTION_TRIM "trim"
+
+#define BUFFER_PROFILE_PACKET_DISCARD_ACTION "packet_discard_action"

orchagent/bufferorch.cpp

@@ -9,6 +9,8 @@
 #include <sstream>
 #include <iostream>
 
+#include "buffer/bufferschema.h"
+
 using namespace std;
 
 extern sai_port_api_t *sai_port_api;
@@ -710,6 +712,28 @@ task_process_status BufferOrch::processBufferProfile(KeyOpFieldsValuesTuple &tup
                 attr.value.u64 = (uint64_t)stoul(value);
                 attribs.push_back(attr);
             }
+            else if (field == BUFFER_PROFILE_PACKET_DISCARD_ACTION)
+            {
+                attr.id = SAI_BUFFER_PROFILE_ATTR_PACKET_ADMISSION_FAIL_ACTION;
+
+                if (value == BUFFER_PROFILE_PACKET_DISCARD_ACTION_DROP)
+                {
+                    attr.value.s32 = SAI_BUFFER_PROFILE_PACKET_ADMISSION_FAIL_ACTION_DROP;
+                }
+                else if (value == BUFFER_PROFILE_PACKET_DISCARD_ACTION_TRIM)
+                {
+                    attr.value.s32 = SAI_BUFFER_PROFILE_PACKET_ADMISSION_FAIL_ACTION_DROP_AND_TRIM;
+                }
+                else
+                {
+                    SWSS_LOG_ERROR("Failed to parse buffer profile(%s) field(%s): invalid value(%s)",
+                        object_name.c_str(), field.c_str(), value.c_str()
+                    );
+                    return task_process_status::task_failed;
+                }
+
+                attribs.push_back(attr);
+            }
             else
             {
                 SWSS_LOG_ERROR("Unknown buffer profile field specified:%s, ignoring", field.c_str());

orchagent/flex_counter/flex_counter_manager.cpp

@@ -50,6 +50,7 @@ const unordered_map<CounterType, string> FlexCounterManager::counter_id_field_lo
     { CounterType::HOSTIF_TRAP,     FLOW_COUNTER_ID_LIST },
     { CounterType::ROUTE,           FLOW_COUNTER_ID_LIST },
     { CounterType::ENI,             ENI_COUNTER_ID_LIST },
+    { CounterType::SRV6,            SRV6_COUNTER_ID_LIST },
 };
 
 FlexManagerDirectory g_FlexManagerDirectory;

orchagent/flex_counter/flex_counter_manager.h

@@ -38,7 +38,8 @@ enum class CounterType
     TUNNEL,
     HOSTIF_TRAP,
     ROUTE,
-    ENI
+    ENI,
+    SRV6
 };
 
 extern bool gTraditionalFlexCounter;