[pfcwd] Observe pfc enable bits change

orchagent/countercheckorch.cpp

@@ -56,7 +56,8 @@ void CounterCheckOrch::mcCounterCheck()
     {
         auto oid = i.first;
         auto mcCounters = i.second;
-        uint8_t pfcMask = 0;
+        uint8_t dummy = 0;
+        uint8_t pfcMaskCfg = 0;
 
         Port port;
         if (!gPortsOrch->getPort(oid, port))
@@ -67,15 +68,15 @@ void CounterCheckOrch::mcCounterCheck()
 
         auto newMcCounters = getQueueMcCounters(port);
 
-        if (!gPortsOrch->getPortPfc(port.m_port_id, &pfcMask))
+        if (!gPortsOrch->getPortPfc(port.m_port_id, dummy, pfcMaskCfg))
         {
             SWSS_LOG_ERROR("Failed to get PFC mask on port %s", port.m_alias.c_str());
             continue;
         }
 
         for (size_t prio = 0; prio != mcCounters.size(); prio++)
         {
-            bool isLossy = ((1 << prio) & pfcMask) == 0;
+            bool isLossy = ((1 << prio) & pfcMaskCfg) == 0;
             if (newMcCounters[prio] == numeric_limits<uint64_t>::max())
             {
                 SWSS_LOG_WARN("Could not retreive MC counters on queue %zu port %s",
@@ -104,7 +105,8 @@ void CounterCheckOrch::pfcFrameCounterCheck()
         auto oid = i.first;
         auto counters = i.second;
         auto newCounters = getPfcFrameCounters(oid);
-        uint8_t pfcMask = 0;
+        uint8_t dummy = 0;
+        uint8_t pfcMaskCfg = 0;
 
         Port port;
         if (!gPortsOrch->getPort(oid, port))
@@ -113,15 +115,15 @@ void CounterCheckOrch::pfcFrameCounterCheck()
             continue;
         }
 
-        if (!gPortsOrch->getPortPfc(port.m_port_id, &pfcMask))
+        if (!gPortsOrch->getPortPfc(port.m_port_id, dummy, pfcMaskCfg))
         {
             SWSS_LOG_ERROR("Failed to get PFC mask on port %s", port.m_alias.c_str());
             continue;
         }
 
         for (size_t prio = 0; prio != counters.size(); prio++)
         {
-            bool isLossy = ((1 << prio) & pfcMask) == 0;
+            bool isLossy = ((1 << prio) & pfcMaskCfg) == 0;
             if (newCounters[prio] == numeric_limits<uint64_t>::max())
             {
                 SWSS_LOG_WARN("Could not retreive PFC frame count on queue %zu port %s",

orchagent/observer.h

@@ -18,6 +18,7 @@ enum SubjectType
     SUBJECT_TYPE_PORT_CHANGE,
     SUBJECT_TYPE_PORT_OPER_STATE_CHANGE,
     SUBJECT_TYPE_FDB_FLUSH_CHANGE,
+    SUBJECT_TYPE_PORT_PFC_CHANGE,
 };
 
 class Observer

orchagent/orchdaemon.cpp

@@ -271,7 +271,7 @@ bool OrchDaemon::init()
     };
 
     gMacsecOrch = new MACsecOrch(m_applDb, m_stateDb, macsec_app_tables, gPortsOrch);
-  
+
     /*
      * The order of the orch list is important for state restore of warm start and
      * the queued processing in m_toSync map after gPortsOrch->allPortsReady() is set.
@@ -379,6 +379,7 @@ bool OrchDaemon::init()
         m_orchList.push_back(new PfcWdSwOrch<PfcWdZeroBufferHandler, PfcWdLossyHandler>(
                     m_configDb,
                     pfc_wd_tables,
+                    qos_orch,
                     portStatIds,
                     queueStatIds,
                     queueAttrIds,
@@ -422,6 +423,7 @@ bool OrchDaemon::init()
             m_orchList.push_back(new PfcWdSwOrch<PfcWdZeroBufferHandler, PfcWdLossyHandler>(
                         m_configDb,
                         pfc_wd_tables,
+                        qos_orch,
                         portStatIds,
                         queueStatIds,
                         queueAttrIds,
@@ -432,6 +434,7 @@ bool OrchDaemon::init()
             m_orchList.push_back(new PfcWdSwOrch<PfcWdAclHandler, PfcWdLossyHandler>(
                         m_configDb,
                         pfc_wd_tables,
+                        qos_orch,
                         portStatIds,
                         queueStatIds,
                         queueAttrIds,
@@ -474,6 +477,7 @@ bool OrchDaemon::init()
         m_orchList.push_back(new PfcWdSwOrch<PfcWdAclHandler, PfcWdLossyHandler>(
                     m_configDb,
                     pfc_wd_tables,
+                    qos_orch,
                     portStatIds,
                     queueStatIds,
                     queueAttrIds,

orchagent/pfcactionhandler.cpp

@@ -238,6 +238,7 @@ PfcWdAclHandler::PfcWdAclHandler(sai_object_id_t port, sai_object_id_t queue,
     {
         // First time of handling PFC for this queue, create ACL table, and bind
         createPfcAclTable(port, m_strIngressTable, true);
+        // Create acl rule in bound acl table
         shared_ptr<AclRulePfcwd> newRule = make_shared<AclRulePfcwd>(gAclOrch, m_strRule, m_strIngressTable, table_type);
         createPfcAclRule(newRule, queueId, m_strIngressTable, port);
     }
@@ -393,16 +394,17 @@ PfcWdLossyHandler::PfcWdLossyHandler(sai_object_id_t port, sai_object_id_t queue
 {
     SWSS_LOG_ENTER();
 
-    uint8_t pfcMask = 0;
+    uint8_t pfcMaskWdCfg = 0;
+    uint8_t dummy = 0;
 
-    if (!gPortsOrch->getPortPfc(port, &pfcMask))
+    if (!gPortsOrch->getPortPfc(port, pfcMaskWdCfg, dummy))
     {
         SWSS_LOG_ERROR("Failed to get PFC mask on port 0x%" PRIx64, port);
     }
 
-    pfcMask = static_cast<uint8_t>(pfcMask & ~(1 << queueId));
+    pfcMaskWdCfg = static_cast<uint8_t>(pfcMaskWdCfg & ~(1 << queueId));
 
-    if (!gPortsOrch->setPortPfc(port, pfcMask))
+    if (!gPortsOrch->setPortPfcStatus(port, pfcMaskWdCfg))
     {
         SWSS_LOG_ERROR("Failed to set PFC mask on port 0x%" PRIx64, port);
     }
@@ -412,16 +414,18 @@ PfcWdLossyHandler::~PfcWdLossyHandler(void)
 {
     SWSS_LOG_ENTER();
 
-    uint8_t pfcMask = 0;
+    uint8_t pfcMaskWdCfg = 0;
+    uint8_t pfcMaskUserCfg = 0;
 
-    if (!gPortsOrch->getPortPfc(getPort(), &pfcMask))
+    if (!gPortsOrch->getPortPfc(getPort(), pfcMaskWdCfg, pfcMaskUserCfg))
     {
         SWSS_LOG_ERROR("Failed to get PFC mask on port 0x%" PRIx64, getPort());
     }
 
-    pfcMask = static_cast<uint8_t>(pfcMask | (1 << getQueueId()));
+    // Set PFC enable bit to asic only if the corresponding bit in user config is set
+    pfcMaskWdCfg = static_cast<uint8_t>(pfcMaskWdCfg | ((1 << getQueueId()) & pfcMaskUserCfg));
 
-    if (!gPortsOrch->setPortPfc(getPort(), pfcMask))
+    if (!gPortsOrch->setPortPfcStatus(getPort(), pfcMaskWdCfg))
     {
         SWSS_LOG_ERROR("Failed to set PFC mask on port 0x%" PRIx64, getPort());
     }