Merge branch 'master' into fix-portsorch-init-crash

Author: arista-hpandya

orchagent/Makefile.am

@@ -29,6 +29,7 @@ dist_swss_DATA = \
 		 pfc_restore.lua \
 		 pfc_restore_cisco-8000.lua \
 		 port_rates.lua \
+		 port_flr.lua \
 		 drop_monitor.lua \
 		 watermark_queue.lua \
 		 watermark_pg.lua \

orchagent/aclorch.cpp

@@ -112,7 +112,7 @@ static acl_rule_attr_lookup_t aclL3ActionLookup =
     { ACTION_DISABLE_TRIM,                     SAI_ACL_ENTRY_ATTR_ACTION_PACKET_TRIM_DISABLE }
 };
 
-static acl_rule_attr_lookup_t aclInnerActionLookup = 
+static acl_rule_attr_lookup_t aclInnerActionLookup =
 {
     { ACTION_INNER_SRC_MAC_REWRITE_ACTION,  SAI_ACL_ENTRY_ATTR_ACTION_SET_INNER_SRC_MAC},
 };
@@ -2186,8 +2186,8 @@ AclRuleInnerSrcMacRewrite::AclRuleInnerSrcMacRewrite(AclOrch *aclOrch, string ru
             memcpy(actionData.parameter.mac, inner_src_mac_addr.getMac(), sizeof(sai_mac_t));
             action_str = ACTION_INNER_SRC_MAC_REWRITE_ACTION;
             SWSS_LOG_INFO("Converting the Mac address %s to SAI acl action parameter", _attr_value.c_str());
-        }   
-         
+        }
+
         else
         {
             return false;
@@ -2216,7 +2216,7 @@ AclRuleInnerSrcMacRewrite::AclRuleInnerSrcMacRewrite(AclOrch *aclOrch, string ru
 
  void AclRuleInnerSrcMacRewrite::onUpdate(SubjectType type, void *cntx)
  {
-    //do nothing  
+    //do nothing
  }
 
 AclRuleMirror::AclRuleMirror(AclOrch *aclOrch, MirrorOrch *mirror, string rule, string table) :
@@ -2522,7 +2522,7 @@ void AclRuleUnderlaySetDscp::onUpdate(SubjectType, void *)
 {
     // Do nothing
 }
-        
+
 AclTable::AclTable(AclOrch *pAclOrch, string id) noexcept : m_pAclOrch(pAclOrch), id(id)
 {
 
@@ -4419,7 +4419,7 @@ EgressSetDscpTableStatus AclOrch::addEgrSetDscpTable(string table_id, AclTable &
         if (!isAclMetaDataSupported())
         {
             SWSS_LOG_ERROR("Platform does not support MARK_META/MARK_METAV6 tables.");
-            return EgressSetDscpTableStatus::EGRESS_SET_DSCP_TABLE_NOT_SUPPORTED; 
+            return EgressSetDscpTableStatus::EGRESS_SET_DSCP_TABLE_NOT_SUPPORTED;
         }
         AclTable egrSetDscpTable(this);
 

orchagent/dash/dashhaorch.cpp

@@ -86,6 +86,9 @@ DashHaOrch::DashHaOrch(DBConnector *db, const vector<string> &tables, DashOrch *
 
     register_ha_set_notifier();
     register_ha_scope_notifier();
+
+    // Register this DashHaOrch instance with DashOrch
+    m_dash_orch->setDashHaOrch(this);
 }
 
 bool DashHaOrch::register_ha_set_notifier()
@@ -190,6 +193,21 @@ std::string DashHaOrch::getHaScopeObjectKey(const sai_object_id_t ha_scope_oid)
     return "";
 }
 
+HaScopeEntry DashHaOrch::getHaScopeForEni(const std::string& eni)
+{
+    SWSS_LOG_ENTER();
+
+    if (m_ha_scope_entries.empty())
+    {
+        HaScopeEntry emptyEntry;
+        emptyEntry.ha_scope_id = SAI_NULL_OBJECT_ID;
+        return emptyEntry;
+    }
+
+    /* Return the first entry. This logic only applies to DPU Scope HA */
+    return m_ha_scope_entries.begin()->second;
+}
+
 bool DashHaOrch::addHaSetEntry(const std::string &key, const dash::ha_set::HaSet &entry)
 {
     SWSS_LOG_ENTER();

orchagent/dash/dashhaorch.h

@@ -98,7 +98,7 @@ class DashHaOrch : public ZmqOrch
 
     std::unique_ptr<swss::Table> dash_ha_set_result_table_;
     std::unique_ptr<swss::Table> dash_ha_scope_result_table_;
-    
+
     std::unique_ptr<swss::DBConnector> m_dpuStateDbConnector;
     std::unique_ptr<swss::Table> m_dpuStateDbHaSetTable;
     std::unique_ptr<swss::Table> m_dpuStateDbHaScopeTable;
@@ -110,6 +110,7 @@ class DashHaOrch : public ZmqOrch
     const HaSetTable& getHaSetEntries() const { return m_ha_set_entries; };
     const HaScopeTable& getHaScopeEntries() const { return m_ha_scope_entries; };
     const DashBfdSessionTable& getBfdSessionPendingCreation() const { return m_bfd_session_pending_creation; };
+    virtual HaScopeEntry getHaScopeForEni(const std::string& eni);
 };
 
 #endif // DASHHAORCH_H

orchagent/dash/dashorch.cpp

@@ -9,6 +9,7 @@
 
 #include "converter.h"
 #include "dashorch.h"
+#include "dashhaorch.h"
 #include "macaddress.h"
 #include "orch.h"
 #include "sai.h"
@@ -91,6 +92,12 @@ DashOrch::DashOrch(DBConnector *db, vector<string> &tableName, DBConnector *app_
     }
 }
 
+void DashOrch::setDashHaOrch(DashHaOrch *dash_ha_orch)
+{
+    SWSS_LOG_ENTER();
+    m_dash_ha_orch = dash_ha_orch;
+}
+
 bool DashOrch::getRouteTypeActions(dash::route_type::RoutingType routing_type, dash::route_type::RouteType& route_type)
 {
     SWSS_LOG_ENTER();
@@ -554,14 +561,14 @@ bool DashOrch::addEniObject(const string& eni, EniEntry& entry)
     }
 
     DashMeterOrch *dash_meter_orch = gDirectory.get<DashMeterOrch*>();
-    const string &v4_meter_policy  = entry.metadata.has_v4_meter_policy_id() ? 
+    const string &v4_meter_policy  = entry.metadata.has_v4_meter_policy_id() ?
                                      entry.metadata.v4_meter_policy_id() : "";
-    const string &v6_meter_policy  = entry.metadata.has_v6_meter_policy_id() ? 
+    const string &v6_meter_policy  = entry.metadata.has_v6_meter_policy_id() ?
                                      entry.metadata.v6_meter_policy_id() : "";
 
     if (!v4_meter_policy.empty())
     {
-        sai_object_id_t meter_policy_oid = dash_meter_orch->getMeterPolicyOid(v4_meter_policy);    
+        sai_object_id_t meter_policy_oid = dash_meter_orch->getMeterPolicyOid(v4_meter_policy);
         if (meter_policy_oid == SAI_NULL_OBJECT_ID)
         {
             SWSS_LOG_INFO("Retry as v4 meter_policy %s not found", v4_meter_policy.c_str());
@@ -570,7 +577,7 @@ bool DashOrch::addEniObject(const string& eni, EniEntry& entry)
     }
     if (!v6_meter_policy.empty())
     {
-        sai_object_id_t meter_policy_oid = dash_meter_orch->getMeterPolicyOid(v6_meter_policy);    
+        sai_object_id_t meter_policy_oid = dash_meter_orch->getMeterPolicyOid(v6_meter_policy);
         if (meter_policy_oid == SAI_NULL_OBJECT_ID)
         {
             SWSS_LOG_INFO("Retry as v6 meter_policy %s not found", v6_meter_policy.c_str());
@@ -639,17 +646,54 @@ bool DashOrch::addEniObject(const string& eni, EniEntry& entry)
     if (!v4_meter_policy.empty())
     {
         eni_attr.id = SAI_ENI_ATTR_V4_METER_POLICY_ID;
-        eni_attr.value.oid = dash_meter_orch->getMeterPolicyOid(v4_meter_policy);    
+        eni_attr.value.oid = dash_meter_orch->getMeterPolicyOid(v4_meter_policy);
         eni_attrs.push_back(eni_attr);
     }
 
     if (!v6_meter_policy.empty())
     {
         eni_attr.id = SAI_ENI_ATTR_V6_METER_POLICY_ID;
-        eni_attr.value.oid = dash_meter_orch->getMeterPolicyOid(v6_meter_policy);    
+        eni_attr.value.oid = dash_meter_orch->getMeterPolicyOid(v6_meter_policy);
         eni_attrs.push_back(eni_attr);
     }
 
+    // Set HA Scope ID if DashHaOrch is available and has HA scopes configured
+    if (m_dash_ha_orch != nullptr)
+    {
+        HaScopeEntry ha_scope_entry = m_dash_ha_orch->getHaScopeForEni(eni);
+        if (ha_scope_entry.ha_scope_id != SAI_NULL_OBJECT_ID)
+        {
+            eni_attr.id = SAI_ENI_ATTR_HA_SCOPE_ID;
+            eni_attr.value.oid = ha_scope_entry.ha_scope_id;
+            eni_attrs.push_back(eni_attr);
+            SWSS_LOG_INFO("Setting HA Scope ID %" PRIx64 " for ENI %s", ha_scope_entry.ha_scope_id, eni.c_str());
+
+            // Set HA flow owner based on HA role
+            eni_attr.id = SAI_ENI_ATTR_IS_HA_FLOW_OWNER;
+            if (ha_scope_entry.metadata.ha_role() == dash::types::HA_ROLE_ACTIVE || ha_scope_entry.metadata.ha_role() == dash::types::HA_ROLE_STANDALONE)
+            {
+                eni_attr.value.booldata = true;
+                SWSS_LOG_INFO("Setting HA flow owner to true (ACTIVE) for ENI %s", eni.c_str());
+            }
+            else if (ha_scope_entry.metadata.ha_role() == dash::types::HA_ROLE_STANDBY)
+            {
+                eni_attr.value.booldata = false;
+                SWSS_LOG_INFO("Setting HA flow owner to false (STANDBY) for ENI %s", eni.c_str());
+            }
+            else
+            {
+                // For other roles (DEAD, SWITCHING_TO_ACTIVE), default to false
+                eni_attr.value.booldata = false;
+                SWSS_LOG_INFO("Setting HA flow owner to false (role: %s) for ENI %s", dash::types::HaRole_Name(ha_scope_entry.metadata.ha_role()).c_str(), eni.c_str());
+            }
+            eni_attrs.push_back(eni_attr);
+        }
+        else
+        {
+            SWSS_LOG_INFO("No HA Scope ID set for ENI %s", eni.c_str());
+        }
+    }
+
     if (entry.metadata.has_eni_mode()) {
         auto it = eniModeMap.find(entry.metadata.eni_mode());
         eni_attr.id = SAI_ENI_ATTR_DASH_ENI_MODE;
@@ -838,9 +882,9 @@ bool DashOrch::removeEniObject(const string& eni)
         }
     }
 
-    const string &v4_meter_policy  = entry.metadata.has_v4_meter_policy_id() ? 
+    const string &v4_meter_policy  = entry.metadata.has_v4_meter_policy_id() ?
                                      entry.metadata.v4_meter_policy_id() : "";
-    const string &v6_meter_policy  = entry.metadata.has_v6_meter_policy_id() ? 
+    const string &v6_meter_policy  = entry.metadata.has_v6_meter_policy_id() ?
                                      entry.metadata.v6_meter_policy_id() : "";
 
     if (!v4_meter_policy.empty())
@@ -1367,7 +1411,7 @@ void DashOrch::removeEniMapEntry(sai_object_id_t oid, const string &name) {
 
 void DashOrch::addEniToFC(sai_object_id_t oid, const string &name)
 {
-    if (!m_eni_fc_status) 
+    if (!m_eni_fc_status)
     {
        return ;
     }

orchagent/dash/dashorch.h

@@ -31,6 +31,8 @@
 #define DASH_RESULT_SUCCESS 0
 #define DASH_RESULT_FAILURE 1
 
+class DashHaOrch;
+
 struct EniEntry
 {
     sai_object_id_t eni_id;
@@ -53,6 +55,7 @@ class DashOrch : public ZmqOrch
 {
 public:
     DashOrch(swss::DBConnector *db, std::vector<std::string> &tables, swss::DBConnector *app_state_db, swss::ZmqServer *zmqServer);
+    void setDashHaOrch(DashHaOrch *dash_ha_orch);
     const EniEntry *getEni(const std::string &eni) const;
     const EniTable *getEniTable() const { return &eni_entries_; };
     bool getRouteTypeActions(dash::route_type::RoutingType routing_type, dash::route_type::RouteType& route_type);
@@ -110,6 +113,7 @@ class DashOrch : public ZmqOrch
     std::shared_ptr<swss::DBConnector> m_counter_db;
     std::shared_ptr<swss::DBConnector> m_asic_db;
     swss::SelectableTimer* m_fc_update_timer = nullptr;
+    DashHaOrch* m_dash_ha_orch = nullptr;
 
     void doTask(swss::SelectableTimer&);
     void addEniMapEntry(sai_object_id_t oid, const std::string& name);

orchagent/fdborch.cpp

@@ -855,6 +855,8 @@ void FdbOrch::doTask(Consumer& consumer)
                 }
             }
 
+            // set entry port_name, which is used in mux fdb update logic
+            entry.port_name = port;
 
             FdbData fdbData;
             fdbData.bridge_port_id = SAI_NULL_OBJECT_ID;

orchagent/flexcounterorch.cpp

@@ -39,7 +39,7 @@ extern Srv6Orch *gSrv6Orch;
 extern SwitchOrch *gSwitchOrch;
 extern sai_object_id_t gSwitchId;
 
-#define FLEX_COUNTER_DELAY_SEC 60
+int gFlexCounterDelaySec;
 
 #define BUFFER_POOL_WATERMARK_KEY   "BUFFER_POOL_WATERMARK"
 #define PORT_KEY                    "PORT"
@@ -116,11 +116,12 @@ FlexCounterOrch::FlexCounterOrch(DBConnector *db, vector<string> &tableNames):
         SWSS_LOG_ERROR("System error reading create_only_config_db_buffers: %s", e.what());
     }
 
-    m_delayTimer = std::make_unique<SelectableTimer>(timespec{.tv_sec = FLEX_COUNTER_DELAY_SEC, .tv_nsec = 0});
-    if (WarmStart::isWarmStart())
+    SWSS_LOG_NOTICE("Counter delay is %d seconds", gFlexCounterDelaySec);
+    if (gFlexCounterDelaySec > 0)
     {
-        m_delayExecutor = std::make_unique<ExecutableTimer>(m_delayTimer.get(), this, "FLEX_COUNTER_DELAY");
-        Orch::addExecutor(m_delayExecutor.get());
+        m_delayTimer = new SelectableTimer(timespec{.tv_sec = static_cast<time_t>(gFlexCounterDelaySec), .tv_nsec = 0});
+        auto delayExecutor = new ExecutableTimer(m_delayTimer, this, "FLEX_COUNTER_DELAY");
+        Orch::addExecutor(delayExecutor);
         m_delayTimer->start();
     }
     else

orchagent/flexcounterorch.h

@@ -11,6 +11,18 @@ extern "C" {
 #include "sai.h"
 }
 
+// Delay in seconds before flex counter processing begins after orchagent startup.
+// 
+// This delay improves boot time by prioritizing data plane configuration over
+// counter initialization. Systems with many ports, priority groups (PGs), and
+// queues require significant time to generate counter maps, which is not
+// immediately necessary during boot.
+// Value of 0 will process flex counters immediately.
+// 
+// Configured via orchagent command line argument: -D <delay_sec>
+// 
+extern int gFlexCounterDelaySec;
+
 const std::string createAllAvailableBuffersStr = "create_all_available_buffers";
 
 class FlexCounterQueueStates
@@ -75,8 +87,7 @@ class FlexCounterOrch: public Orch
     Table m_bufferQueueConfigTable;
     Table m_bufferPgConfigTable;
     Table m_deviceMetadataConfigTable;
-    std::unique_ptr<SelectableTimer> m_delayTimer;
-    std::unique_ptr<Executor> m_delayExecutor;
+    SelectableTimer* m_delayTimer;
     std::unordered_set<std::string> m_groupsWithBulkChunkSize;
 
     bool m_createOnlyConfigDbBuffers = false;

orchagent/main.cpp

@@ -103,6 +103,7 @@ void usage()
     cout << "    -v vrf: VRF name (default empty)" << endl;
     cout << "    -I heart_beat_interval: Heart beat interval in millisecond (default 10)" << endl;
     cout << "    -R enable the ring thread feature" << endl;
+    cout << "    -D Delay in seconds before flex counter processing begins after orchagent startup (default 0)" << endl;
 }
 
 void sighup_handler(int signo)
@@ -369,7 +370,7 @@ int main(int argc, char **argv)
     int record_type = 3; // Only swss and sairedis recordings enabled by default.
     long heartBeatInterval = HEART_BEAT_INTERVAL_MSECS_DEFAULT;
 
-    while ((opt = getopt(argc, argv, "b:m:r:f:j:d:i:hsz:k:q:c:t:v:I:R")) != -1)
+    while ((opt = getopt(argc, argv, "b:m:r:f:j:d:i:hsz:k:q:c:t:v:I:R:D:")) != -1)
     {
         switch (opt)
         {
@@ -487,6 +488,7 @@ int main(int argc, char **argv)
         case 'R':
             gRingMode = true;
             break;
+        case 'D': { gFlexCounterDelaySec = swss::to_int<int>(optarg); } break;
         default: /* '?' */
             exit(EXIT_FAILURE);
         }