Add an API to fill extension queue stats from SaiQueueManager

Summary: Extension queue stats to be filled in HwPortStats for queue. Reviewed By: jasmeetbagga Differential Revision: D61809753 fbshipit-source-id: 774742dabdcbed89feb05c28c7c54a5b04171346
facebook · Aug 30, 2024 · 0667edc · 0667edc
1 parent 440502c
commit 0667edc
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 1 deletion.
diff --git a/cmake/AgentHwSaiSwitch.cmake b/cmake/AgentHwSaiSwitch.cmake
@@ -56,12 +56,14 @@ if (SAI_TAJO_IMPL)
     fboss/agent/hw/sai/switch/npu/tajo/SaiPortManager.cpp
     fboss/agent/hw/sai/switch/npu/tajo/SaiAclTableManager.cpp
     fboss/agent/hw/sai/switch/oss/SaiSwitchManager.cpp
+    fboss/agent/hw/sai/switch/oss/SaiQueueManager.cpp
   )
 elseif (SAI_BRCM_IMPL)
   list(APPEND SAI_SWITCH_SRC
     fboss/agent/hw/sai/switch/npu/bcm/SaiSwitch.cpp
     fboss/agent/hw/sai/switch/npu/bcm/SaiTamManager.cpp
     fboss/agent/hw/sai/switch/npu/bcm/SaiPortManager.cpp
+    fboss/agent/hw/sai/switch/npu/bcm/SaiQueueManager.cpp
     fboss/agent/hw/sai/switch/oss/SaiSwitchManager.cpp
     fboss/agent/hw/sai/switch/oss/SaiAclTableManager.cpp
   )
@@ -72,6 +74,7 @@ else()
     fboss/agent/hw/sai/switch/oss/SaiPortManager.cpp
     fboss/agent/hw/sai/switch/oss/SaiAclTableManager.cpp
     fboss/agent/hw/sai/switch/oss/SaiSwitchManager.cpp
+    fboss/agent/hw/sai/switch/oss/SaiQueueManager.cpp
   )
 endif()
 

diff --git a/fboss/agent/hw/sai/switch/SaiQueueManager.cpp b/fboss/agent/hw/sai/switch/SaiQueueManager.cpp
@@ -61,7 +61,11 @@ void fillHwQueueStats(
         hwPortStats.queueEcnMarkedPackets_()[queueId] = value;
         break;
       default:
-        throw FbossError("Got unexpected queue counter id: ", counterId);
+        // Raise exception if this is not handled by implementation
+        // specific extension stats
+        if (!fillQueueExtensionStats(queueId, counterId, value, hwPortStats)) {
+          throw FbossError("Got unexpected queue counter id: ", counterId);
+        }
     }
   }
 }

diff --git a/fboss/agent/hw/sai/switch/SaiQueueManager.h b/fboss/agent/hw/sai/switch/SaiQueueManager.h
@@ -49,6 +49,12 @@ struct SaiQueueHandle {
 using SaiQueueHandles =
     folly::F14FastMap<SaiQueueConfig, std::unique_ptr<SaiQueueHandle>>;
 
+bool fillQueueExtensionStats(
+    const uint8_t queueId,
+    const sai_stat_id_t& counterId,
+    const uint64_t& counterValue,
+    HwPortStats& hwPortStats);
+
 class SaiQueueManager {
  public:
   SaiQueueManager(

diff --git a/fboss/agent/hw/sai/switch/npu/bcm/SaiQueueManager.cpp b/fboss/agent/hw/sai/switch/npu/bcm/SaiQueueManager.cpp
@@ -0,0 +1,44 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include "fboss/agent/hw/sai/switch/SaiQueueManager.h"
+
+#if defined(BRCM_SAI_SDK_DNX) && defined(BRCM_SAI_SDK_GTE_11_0)
+extern "C" {
+#include <brcm_sai_extensions.h>
+}
+#endif
+
+namespace facebook::fboss {
+
+#if defined(BRCM_SAI_SDK_DNX) && defined(BRCM_SAI_SDK_GTE_11_0)
+bool fillQueueExtensionStats(
+    const uint8_t queueId,
+    const sai_stat_id_t& counterId,
+    const uint64_t& counterValue,
+    HwPortStats& hwPortStats) {
+  bool counterHandled = true;
+  switch (counterId) {
+    case SAI_QUEUE_STAT_EGRESS_GVOQ_THRESHOLD_WM:
+      // There are a few limitations w.r.t. GVOQ watermarks
+      // 1. Granularity of this counter is 8K bytes as of now
+      // 2. Max VoQ watermark that can be reported per VoQ is 16M
+      // 3. Max GVOQ watermark that can be reported per EGQ is 256M
+      hwPortStats.egressGvoqWatermarkBytes_()[queueId] = counterValue;
+      break;
+    default:
+      throw FbossError("Got unexpected queue counter id: ", counterId);
+  }
+  return counterHandled;
+}
+#else
+bool fillQueueExtensionStats(
+    const uint8_t /*queueId*/,
+    const sai_stat_id_t& /*counterId*/,
+    const uint64_t& /*counterValue*/,
+    HwPortStats& /*hwPortStats*/) {
+  // No extension stat ID for Queue
+  return false;
+}
+#endif
+
+} // namespace facebook::fboss
diff --git a/fboss/agent/hw/sai/switch/oss/SaiQueueManager.cpp b/fboss/agent/hw/sai/switch/oss/SaiQueueManager.cpp
@@ -0,0 +1,16 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include "fboss/agent/hw/sai/switch/SaiQueueManager.h"
+
+namespace facebook::fboss {
+
+bool fillQueueExtensionStats(
+    const uint8_t /*queueId*/,
+    const sai_stat_id_t& /*counterId*/,
+    const uint64_t& /*counterValue*/,
+    HwPortStats& /*hwPortStats*/) {
+  // No extension stat ID for Queue
+  return false;
+}
+
+} // namespace facebook::fboss
diff --git a/fboss/agent/hw/sai/switch/switch.bzl b/fboss/agent/hw/sai/switch/switch.bzl
@@ -52,6 +52,7 @@ _NPU_BRCM_SRCS = _NPU_COMMON_SRCS + [
     "facebook/SaiBufferManager.cpp",
     "facebook/SaiHostifManager.cpp",
     "facebook/SaiSwitchManager.cpp",
+    "npu/bcm/SaiQueueManager.cpp",
     "npu/bcm/SaiSwitch.cpp",
     "npu/bcm/SaiSwitchManager.cpp",
     "npu/bcm/SaiPortManager.cpp",
@@ -68,6 +69,7 @@ _NPU_TAJO_SRCS = _NPU_COMMON_SRCS + [
     "npu/tajo/SaiTamManager.cpp",
     "npu/tajo/SaiAclTableManager.cpp",
     "npu/tajo/SaiSwitchManager.cpp",
+    "oss/SaiQueueManager.cpp",
 ]
 
 _NPU_FAKE_SRCS = _NPU_COMMON_SRCS + [
@@ -78,6 +80,7 @@ _NPU_FAKE_SRCS = _NPU_COMMON_SRCS + [
     "oss/SaiPortManager.cpp",
     "oss/SaiAclTableManager.cpp",
     "oss/SaiSwitchManager.cpp",
+    "oss/SaiQueueManager.cpp",
 ]
 
 _PHY_COMMON_SRCS = _COMMON_SRCS + [
@@ -91,6 +94,7 @@ _PHY_COMMON_SRCS = _COMMON_SRCS + [
     "oss/SaiPortManager.cpp",
     "oss/SaiAclTableManager.cpp",
     "oss/SaiSwitchManager.cpp",
+    "oss/SaiQueueManager.cpp",
 ]
 
 _PHY_FAKE_SRCS = _PHY_COMMON_SRCS