[pfcwd]: Only register lossless tc counters in database for query (sonic-net#455)

* [pfcwd]: Only register lossless tc counters in database for query

Signed-off-by: Sihui Han <[email protected]>

* update as comments

Signed-off-by: Sihui Han <[email protected]>

* rename the variable and function name

Signed-off-by: Sihui Han <[email protected]>

* minor change

Signed-off-by: Sihui Han <[email protected]>

* update

Signed-off-by: Sihui Han <[email protected]>

Author: sihuihan88

orchagent/pfcwdorch.cpp

@@ -21,6 +21,7 @@
 #define PFC_WD_RESTORATION_TIME_MIN     100
 #define PFC_WD_POLL_TIMEOUT             5000
 #define PFC_WD_LOSSY_POLL_TIMEOUT_SEC   (5 * 60)
+#define SAI_PORT_STAT_PFC_PREFIX        "SAI_PORT_STAT_PFC_"
 
 extern sai_port_api_t *sai_port_api;
 extern sai_queue_api_t *sai_queue_api;
@@ -400,24 +401,32 @@ void PfcWdSwOrch<DropHandler, ForwardHandler>::registerInWdDb(const Port& port,
         return;
     }
 
+    set<uint8_t> losslessTc;
+    uint8_t pfcMask = attr.value.u8;
+    for (uint8_t i = 0; i < PFC_WD_TC_MAX; i++)
+    {
+        if ((pfcMask & (1 << i)) == 0)
+        {
+            continue;
+        }
+
+        losslessTc.insert(i);
+    }
+
     if (!c_portStatIds.empty())
     {
         string key = getFlexCounterTableKey(sai_serialize_object_id(port.m_port_id));
         vector<FieldValueTuple> fieldValues;
+        // Only register lossless tc counters in database.
         string str = counterIdsToStr(c_portStatIds, &sai_serialize_port_stat);
-        fieldValues.emplace_back(PORT_COUNTER_ID_LIST, str);
+        string filteredStr = filterPfcCounters(str, losslessTc);
+        fieldValues.emplace_back(PORT_COUNTER_ID_LIST, filteredStr);
 
         m_flexCounterTable->set(key, fieldValues);
     }
 
-    uint8_t pfcMask = attr.value.u8;
-    for (uint8_t i = 0; i < PFC_WD_TC_MAX; i++)
+    for (auto i : losslessTc)
     {
-        if ((pfcMask & (1 << i)) == 0)
-        {
-            continue;
-        }
-
         sai_object_id_t queueId = port.m_queue_ids[i];
         string queueIdStr = sai_serialize_object_id(queueId);
 
@@ -461,9 +470,46 @@ void PfcWdSwOrch<DropHandler, ForwardHandler>::registerInWdDb(const Port& port,
     }
 }
 
+template <typename DropHandler, typename ForwardHandler>
+string PfcWdSwOrch<DropHandler, ForwardHandler>::filterPfcCounters(string counters, set<uint8_t>& losslessTc)
+{
+    SWSS_LOG_ENTER();
+
+    istringstream is(counters);
+    string counter;
+    string filterCounters;
+
+    while (getline(is, counter, ','))
+    {
+        size_t index = 0;
+        index = counter.find(SAI_PORT_STAT_PFC_PREFIX);
+        if (index != 0)
+        {
+            filterCounters = filterCounters + counter + ",";
+        }
+        else
+        {
+            uint8_t tc = (uint8_t)atoi(counter.substr(index + sizeof(SAI_PORT_STAT_PFC_PREFIX) - 1, 1).c_str());
+            if (losslessTc.count(tc))
+            {
+                filterCounters = filterCounters + counter + ",";
+            }
+        }
+    }
+
+    if (!filterCounters.empty())
+    {
+        filterCounters.pop_back();
+    }
+
+    return filterCounters;
+}
+
 template <typename DropHandler, typename ForwardHandler>
 string PfcWdSwOrch<DropHandler, ForwardHandler>::getFlexCounterTableKey(string key)
 {
+    SWSS_LOG_ENTER();
+
     return string(PFC_WD_FLEX_COUNTER_GROUP) + ":" + key;
 }
 

orchagent/pfcwdorch.h

@@ -102,6 +102,7 @@ class PfcWdSwOrch: public PfcWdOrch<DropHandler, ForwardHandler>
     void unregisterFromWdDb(const Port& port);
     void doTask(swss::NotificationConsumer &wdNotification);
 
+    string filterPfcCounters(string counters, set<uint8_t>& losslessTc);
     string getFlexCounterTableKey(string s);
     map<sai_object_id_t, PfcWdQueueEntry> m_entryMap;