Add egress GVOQ watermark byte stats for queues

Summary: Egress GVOQ watermark bytes gives a view of the total buffer usage across the various VOQs mapping to a specific egress queue. Reviewed By: jasmeetbagga Differential Revision: D61809758 fbshipit-source-id: 40687e745f0d83d72cf3fe41c06e8ea0ef6ea2b1
facebook · Aug 29, 2024 · cf50a38 · cf50a38
1 parent 1c5a0d1
commit cf50a38
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 0 deletions.
diff --git a/cmake/AgentHwSaiApi.cmake b/cmake/AgentHwSaiApi.cmake
@@ -90,6 +90,7 @@ if (SAI_TAJO_IMPL)
     fboss/agent/hw/sai/api/tajo/SwitchApi.cpp
     fboss/agent/hw/sai/api/tajo/DebugCounterApi.cpp
     fboss/agent/hw/sai/api/tajo/BufferApi.cpp
+    fboss/agent/hw/sai/api/tajo/QueueApi.cpp
   )
 
   find_path(SAI_IMPL_DIR NAMES lib/libsai_impl.a)
@@ -102,6 +103,7 @@ elseif (SAI_BRCM_IMPL)
     fboss/agent/hw/sai/api/bcm/SwitchApi.cpp
     fboss/agent/hw/sai/api/bcm/DebugCounterApi.cpp
     fboss/agent/hw/sai/api/bcm/BufferApi.cpp
+    fboss/agent/hw/sai/api/bcm/QueueApi.cpp
   )
 
   find_path(SAI_IMPL_DIR NAMES lib/libsai_impl.a)

diff --git a/fboss/agent/hw/sai/api/QueueApi.h b/fboss/agent/hw/sai/api/QueueApi.h
@@ -132,6 +132,7 @@ struct SaiQueueTraits {
       WatermarkLevelCounterIdsToReadAndClear = {
           SAI_QUEUE_STAT_WATERMARK_LEVEL,
   };
+  static const std::vector<sai_stat_id_t>& egressGvoqWatermarkBytes();
 };
 
 SAI_ATTRIBUTE_NAME(Queue, Type)

diff --git a/fboss/agent/hw/sai/api/api.bzl b/fboss/agent/hw/sai/api/api.bzl
@@ -37,6 +37,7 @@ brcm_srcs = common_srcs + [
     "bcm/SwitchApi.cpp",
     "bcm/TamApi.cpp",
     "bcm/BufferApi.cpp",
+    "bcm/QueueApi.cpp",
 ]
 
 tajo_srcs = common_srcs + [
@@ -45,6 +46,7 @@ tajo_srcs = common_srcs + [
     "tajo/TamApi.cpp",
     "tajo/SwitchApi.cpp",
     "tajo/BufferApi.cpp",
+    "tajo/QueueApi.cpp",
 ]
 
 credo_srcs = common_srcs + [
@@ -53,6 +55,7 @@ credo_srcs = common_srcs + [
     "oss/SwitchApi.cpp",
     "oss/TamApi.cpp",
     "oss/BufferApi.cpp",
+    "oss/QueueApi.cpp",
 ]
 
 mrvl_srcs = common_srcs + [
@@ -61,6 +64,7 @@ mrvl_srcs = common_srcs + [
     "oss/SwitchApi.cpp",
     "oss/TamApi.cpp",
     "oss/BufferApi.cpp",
+    "oss/QueueApi.cpp",
 ]
 
 common_headers = [

diff --git a/fboss/agent/hw/sai/api/bcm/QueueApi.cpp b/fboss/agent/hw/sai/api/bcm/QueueApi.cpp
@@ -0,0 +1,23 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include "fboss/agent/hw/sai/api/QueueApi.h"
+
+#if defined(BRCM_SAI_SDK_DNX) && defined(BRCM_SAI_SDK_GTE_11_0)
+extern "C" {
+#include <brcm_sai_extensions.h>
+#include <sai.h>
+}
+#endif
+
+namespace facebook::fboss {
+
+const std::vector<sai_stat_id_t>& SaiQueueTraits::egressGvoqWatermarkBytes() {
+#if defined(BRCM_SAI_SDK_DNX) && defined(BRCM_SAI_SDK_GTE_11_0)
+  static const std::vector<sai_stat_id_t> stats{
+      SAI_QUEUE_STAT_EGRESS_GVOQ_THRESHOLD_WM};
+#else
+  static const std::vector<sai_stat_id_t> stats;
+#endif
+  return stats;
+}
+} // namespace facebook::fboss
diff --git a/fboss/agent/hw/sai/api/oss/QueueApi.cpp b/fboss/agent/hw/sai/api/oss/QueueApi.cpp
@@ -0,0 +1,12 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include "fboss/agent/hw/sai/api/QueueApi.h"
+
+namespace facebook::fboss {
+
+const std::vector<sai_stat_id_t>& SaiQueueTraits::egressGvoqWatermarkBytes() {
+  static const std::vector<sai_stat_id_t> stats;
+  return stats;
+}
+
+} // namespace facebook::fboss
diff --git a/fboss/agent/hw/sai/api/tajo/QueueApi.cpp b/fboss/agent/hw/sai/api/tajo/QueueApi.cpp
@@ -0,0 +1,12 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include "fboss/agent/hw/sai/api/QueueApi.h"
+
+namespace facebook::fboss {
+
+const std::vector<sai_stat_id_t>& SaiQueueTraits::egressGvoqWatermarkBytes() {
+  static const std::vector<sai_stat_id_t> stats;
+  return stats;
+}
+
+} // namespace facebook::fboss