From 5e288ae18d6307298dae5faac15d7b76b25da185 Mon Sep 17 00:00:00 2001
From: Max Ng <maxgg@meta.com>
Date: Wed, 27 Nov 2024 10:57:17 -0800
Subject: [PATCH] Report fb303 stats for all PFC priorities

Summary: To catch PFC related bugs, report fb303 stats for all PFC priorities 0..7, even if they are not supposedly enabled.

Differential Revision: D66481592

fbshipit-source-id: 642f83bb2962c8e46996c5821d60a69a50744acf
---
 fboss/agent/hw/bcm/BcmPort.cpp                | 22 +++++++++++++------
 .../hw/sai/switch/npu/SaiPortManager.cpp      | 13 ++++++++++-
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/fboss/agent/hw/bcm/BcmPort.cpp b/fboss/agent/hw/bcm/BcmPort.cpp
index 77fc7a2e47617..ec4e051f3813f 100644
--- a/fboss/agent/hw/bcm/BcmPort.cpp
+++ b/fboss/agent/hw/bcm/BcmPort.cpp
@@ -243,6 +243,17 @@ static const std::string getFdrStatsKey(int errorsPerCodeword) {
   return folly::to<std::string>(kErrorsPerCodeword(), ".", errorsPerCodeword);
 }
 
+static const std::vector<PfcPriority> allPfcPriorities() {
+  static std::vector<PfcPriority> priorities;
+  if (priorities.empty()) {
+    for (int i = 0; i <= cfg::switch_config_constants::PFC_PRIORITY_VALUE_MAX();
+         i++) {
+      priorities.push_back(PfcPriority(i));
+    }
+  }
+  return priorities;
+}
+
 } // namespace
 
 namespace facebook::fboss {
@@ -355,7 +366,7 @@ void BcmPort::reinitPortPfcStats(const std::shared_ptr<Port>& swPort) {
 
   XLOG(DBG3) << "Reinitializing PFC stats for " << portName;
   // Reinit per priority PFC statistics
-  for (auto priority : swPort->getPfcPriorities()) {
+  for (auto priority : allPfcPriorities()) {
     reinitPortStat(getPfcPriorityStatsKey(kInPfc(), priority), portName);
     reinitPortStat(getPfcPriorityStatsKey(kInPfcXon(), priority), portName);
     reinitPortStat(getPfcPriorityStatsKey(kOutPfc(), priority), portName);
@@ -1064,15 +1075,13 @@ void BcmPort::setupStatsIfNeeded(const std::shared_ptr<Port>& swPort) {
     // - updated (2,6 -> 2,7)
     // Clear the existing counters and reinit the new list
     if (savedPort) {
-      auto pfcPriorities = savedPort->getPfcPriorities();
-      removePortPfcStatsLocked(lockedPortStatsPtr, swPort, pfcPriorities);
+      removePortPfcStatsLocked(lockedPortStatsPtr, swPort, allPfcPriorities());
     }
     reinitPortStatsLocked(lockedPortStatsPtr, swPort);
   }
   if (savedPort && hasPfcStatusChangedToDisabled(savedPort, swPort)) {
     // Remove stats in case PFC is disabled for previously enabled priorities
-    auto pfcPriorities = savedPort->getPfcPriorities();
-    removePortPfcStatsLocked(lockedPortStatsPtr, swPort, pfcPriorities);
+    removePortPfcStatsLocked(lockedPortStatsPtr, swPort, allPfcPriorities());
   }
 
   // Set bcmPortControlStatOversize to max frame size so that we don't trigger
@@ -1469,8 +1478,7 @@ void BcmPort::updateStats() {
 
   // InDiscards will be read along with PFC if PFC is enabled
   if (settings && settings->getPfc().has_value()) {
-    auto pfcPriorities = settings->getPfcPriorities();
-    updatePortPfcStats(now, curPortStats, pfcPriorities);
+    updatePortPfcStats(now, curPortStats, allPfcPriorities());
   } else {
     updateStat(
         now,
diff --git a/fboss/agent/hw/sai/switch/npu/SaiPortManager.cpp b/fboss/agent/hw/sai/switch/npu/SaiPortManager.cpp
index c5a099dd518aa..d31874efcbc72 100644
--- a/fboss/agent/hw/sai/switch/npu/SaiPortManager.cpp
+++ b/fboss/agent/hw/sai/switch/npu/SaiPortManager.cpp
@@ -84,6 +84,17 @@ SaiPortTraits::AdapterHostKey getPortAdapterHostKeyFromAttr(
   return portKey;
 }
 
+static const std::vector<PfcPriority> allPfcPriorities() {
+  static std::vector<PfcPriority> priorities;
+  if (priorities.empty()) {
+    for (int i = 0; i <= cfg::switch_config_constants::PFC_PRIORITY_VALUE_MAX();
+         i++) {
+      priorities.push_back(PfcPriority(i));
+    }
+  }
+  return priorities;
+}
+
 } // namespace
 
 void SaiPortManager::fillInSupportedStats(PortID port) {
@@ -246,7 +257,7 @@ PortSaiId SaiPortManager::addPortImpl(const std::shared_ptr<Port>& swPort) {
     portStats_.emplace(
         swPort->getID(),
         std::make_unique<HwPortFb303Stats>(
-            swPort->getName(), queueId2Name, swPort->getPfcPriorities()));
+            swPort->getName(), queueId2Name, allPfcPriorities()));
   }
 
   bool samplingMirror = swPort->getSampleDestination().has_value() &&