Add per-aging group aging interval config

Summary: Add per-aging group aging interval config so that we expose all SDK features. Reviewed By: nivinl Differential Revision: D68373543 fbshipit-source-id: 5c75359103a09c9ecc00c6fe4c987b38a772fff9
facebook · Jan 22, 2025 · ffe50d8 · ffe50d8
1 parent d832ea8
commit ffe50d8
Show file tree

Hide file tree

Showing 9 changed files with 3,662 additions and 3,618 deletions.
diff --git a/fboss/agent/ApplyThriftConfig.cpp b/fboss/agent/ApplyThriftConfig.cpp
@@ -5510,12 +5510,6 @@ ThriftConfigApplier::createMirrorOnDropReport(
       ? folly::IPAddress(getSwitchIntfIP(new_, InterfaceID(systemPortId)))
       : folly::IPAddress(getSwitchIntfIPv6(new_, InterfaceID(systemPortId)));
 
-  uint8_t dscp = *config->dscp();
-  std::optional<int32_t> agingIntervalUsecs;
-  if (config->agingIntervalUsecs().has_value()) {
-    agingIntervalUsecs = config->agingIntervalUsecs().value();
-  }
-
   return std::make_shared<MirrorOnDropReport>(
       *config->name(),
       PortID(*config->mirrorPortId()),
@@ -5525,11 +5519,11 @@ ThriftConfigApplier::createMirrorOnDropReport(
       *config->collectorPort(),
       *config->mtu(),
       *config->truncateSize(),
-      dscp,
-      agingIntervalUsecs,
+      static_cast<uint8_t>(*config->dscp()),
       getLocalMacAddress().toString(),
       utility::getFirstInterfaceMac(new_).toString(),
-      *config->modEventToConfigMap());
+      *config->modEventToConfigMap(),
+      *config->agingGroupAgingIntervalUsecs());
 }
 
 std::shared_ptr<MirrorOnDropReport>

diff --git a/fboss/agent/hw/sai/switch/npu/bcm/SaiTamManager.cpp b/fboss/agent/hw/sai/switch/npu/bcm/SaiTamManager.cpp
@@ -267,12 +267,15 @@ void SaiTamManager::addMirrorOnDropReport(
 
     // Create aging group
     auto& agingGroupStore = saiStore_->get<SaiTamEventAgingGroupTraits>();
-    sai_uint16_t agingInterval =
-        report->getAgingIntervalUsecs().value_or(kDefaultAgingIntervalUsecs);
+    auto groupType =
+        eventCfg.agingGroup().value_or(cfg::MirrorOnDropAgingGroup::GLOBAL);
+    auto agingIntervals = report->getAgingGroupAgingIntervalUsecs();
+    auto agingTimeIt = agingIntervals.find(groupType);
+    sai_uint32_t agingTime = agingTimeIt == agingIntervals.end()
+        ? kDefaultAgingIntervalUsecs
+        : agingTimeIt->second;
     auto agingGroupTraits = SaiTamEventAgingGroupTraits::CreateAttributes{
-        getMirrorOnDropAgingGroupType(eventCfg.agingGroup().value_or(
-            cfg::MirrorOnDropAgingGroup::GLOBAL)),
-        agingInterval};
+        getMirrorOnDropAgingGroupType(groupType), agingTime};
     auto agingGroup =
         agingGroupStore.setObject(agingGroupTraits, agingGroupTraits);
     agingGroups.push_back(agingGroup);

diff --git a/fboss/agent/state/MirrorOnDropReport.cpp b/fboss/agent/state/MirrorOnDropReport.cpp
@@ -20,10 +20,10 @@ MirrorOnDropReport::MirrorOnDropReport(
     int16_t mtu,
     int16_t truncateSize,
     uint8_t dscp,
-    std::optional<int32_t> agingIntervalUsecs,
     std::string switchMac,
     std::string firstInterfaceMac,
-    std::map<int8_t, cfg::MirrorOnDropEventConfig> modEventToConfigMap)
+    std::map<int8_t, cfg::MirrorOnDropEventConfig> modEventToConfigMap,
+    std::map<cfg::MirrorOnDropAgingGroup, int32_t> agingGroupAgingIntervalUsecs)
     : ThriftStructNode<MirrorOnDropReport, state::MirrorOnDropReportFields>() {
   set<switch_state_tags::name>(name);
   set<switch_state_tags::mirrorPortId>(mirrorPortId);
@@ -34,12 +34,11 @@ MirrorOnDropReport::MirrorOnDropReport(
   set<switch_state_tags::mtu>(mtu);
   set<switch_state_tags::truncateSize>(truncateSize);
   set<switch_state_tags::dscp>(dscp);
-  if (agingIntervalUsecs.has_value()) {
-    set<switch_state_tags::agingIntervalUsecs>(agingIntervalUsecs.value());
-  }
   set<switch_state_tags::switchMac>(switchMac);
   set<switch_state_tags::firstInterfaceMac>(firstInterfaceMac);
   set<switch_state_tags::modEventToConfigMap>(modEventToConfigMap);
+  set<switch_state_tags::agingGroupAgingIntervalUsecs>(
+      agingGroupAgingIntervalUsecs);
 }
 
 std::string MirrorOnDropReport::getID() const {
@@ -83,13 +82,6 @@ uint8_t MirrorOnDropReport::getDscp() const {
   return get<switch_state_tags::dscp>()->cref();
 }
 
-std::optional<uint32_t> MirrorOnDropReport::getAgingIntervalUsecs() const {
-  if (auto agingIntervalUsecs = get<switch_state_tags::agingIntervalUsecs>()) {
-    return agingIntervalUsecs->cref();
-  }
-  return std::nullopt;
-}
-
 std::string MirrorOnDropReport::getSwitchMac() const {
   return get<switch_state_tags::switchMac>()->cref();
 }
@@ -103,6 +95,11 @@ MirrorOnDropReport::getModEventToConfigMap() const {
   return get<switch_state_tags::modEventToConfigMap>()->toThrift();
 }
 
+std::map<cfg::MirrorOnDropAgingGroup, int32_t>
+MirrorOnDropReport::getAgingGroupAgingIntervalUsecs() const {
+  return get<switch_state_tags::agingGroupAgingIntervalUsecs>()->toThrift();
+}
+
 template struct ThriftStructNode<
     MirrorOnDropReport,
     state::MirrorOnDropReportFields>;

diff --git a/fboss/agent/state/MirrorOnDropReport.h b/fboss/agent/state/MirrorOnDropReport.h
@@ -31,10 +31,11 @@ class MirrorOnDropReport : public ThriftStructNode<
       int16_t mtu,
       int16_t truncateSize,
       uint8_t dscp,
-      std::optional<int32_t> agingIntervalUsecs,
       std::string switchMac,
       std::string firstInterfaceMac,
-      std::map<int8_t, cfg::MirrorOnDropEventConfig> modEventToConfigMap);
+      std::map<int8_t, cfg::MirrorOnDropEventConfig> modEventToConfigMap,
+      std::map<cfg::MirrorOnDropAgingGroup, int32_t>
+          agingGroupAgingIntervalUsecs);
 
   std::string getID() const;
   PortID getMirrorPortId() const;
@@ -46,10 +47,11 @@ class MirrorOnDropReport : public ThriftStructNode<
   int16_t getMtu() const;
   int16_t getTruncateSize() const;
   uint8_t getDscp() const;
-  std::optional<uint32_t> getAgingIntervalUsecs() const;
   std::string getSwitchMac() const;
   std::string getFirstInterfaceMac() const;
   std::map<int8_t, cfg::MirrorOnDropEventConfig> getModEventToConfigMap() const;
+  std::map<cfg::MirrorOnDropAgingGroup, int32_t>
+  getAgingGroupAgingIntervalUsecs() const;
 
  private:
   // Inherit the constructors required for clone()

diff --git a/fboss/agent/state/tests/MirrorOnDropReportTests.cpp b/fboss/agent/state/tests/MirrorOnDropReportTests.cpp
@@ -45,7 +45,6 @@ cfg::MirrorOnDropReport makeReportCfg(const std::string& ip) {
   report.mtu() = 1500;
   report.truncateSize() = 128;
   report.dscp() = 0;
-  report.agingIntervalUsecs() = 100;
   report.modEventToConfigMap()[0] = makeEventConfig(
       std::nullopt,
       {cfg::MirrorOnDropReasonAggregation::INGRESS_PACKET_PROCESSING_DISCARDS});
@@ -57,6 +56,8 @@ cfg::MirrorOnDropReport makeReportCfg(const std::string& ip) {
           cfg::MirrorOnDropReasonAggregation::
               INGRESS_DESTINATION_CONGESTION_DISCARDS,
       });
+  report.agingGroupAgingIntervalUsecs()[cfg::MirrorOnDropAgingGroup::PORT] =
+      100;
   return report;
 }
 
@@ -71,15 +72,19 @@ TEST_F(MirrorOnDropReportTest, CreateReportV4) {
   EXPECT_TRUE(report->getLocalSrcIp().isV4());
   EXPECT_FALSE(report->getSwitchMac().empty());
   EXPECT_FALSE(report->getFirstInterfaceMac().empty());
-  EXPECT_TRUE(report->getModEventToConfigMap().size() == 2);
-  EXPECT_TRUE(
+  EXPECT_EQ(report->getModEventToConfigMap().size(), 2);
+  EXPECT_EQ(
       report->getModEventToConfigMap()[0].agingGroup().value_or(
-          cfg::MirrorOnDropAgingGroup::GLOBAL) ==
+          cfg::MirrorOnDropAgingGroup::GLOBAL),
       cfg::MirrorOnDropAgingGroup::GLOBAL);
-  EXPECT_TRUE(
+  EXPECT_EQ(
       report->getModEventToConfigMap()[1].agingGroup().value_or(
-          cfg::MirrorOnDropAgingGroup::GLOBAL) ==
+          cfg::MirrorOnDropAgingGroup::GLOBAL),
       cfg::MirrorOnDropAgingGroup::PORT);
+  EXPECT_EQ(
+      report->getAgingGroupAgingIntervalUsecs()
+          [cfg::MirrorOnDropAgingGroup::PORT],
+      100);
 }
 
 TEST_F(MirrorOnDropReportTest, CreateReportV6) {
@@ -93,15 +98,19 @@ TEST_F(MirrorOnDropReportTest, CreateReportV6) {
   EXPECT_TRUE(report->getLocalSrcIp().isV6());
   EXPECT_FALSE(report->getSwitchMac().empty());
   EXPECT_FALSE(report->getFirstInterfaceMac().empty());
-  EXPECT_TRUE(report->getModEventToConfigMap().size() == 2);
-  EXPECT_TRUE(
+  EXPECT_EQ(report->getModEventToConfigMap().size(), 2);
+  EXPECT_EQ(
       report->getModEventToConfigMap()[0].agingGroup().value_or(
-          cfg::MirrorOnDropAgingGroup::GLOBAL) ==
+          cfg::MirrorOnDropAgingGroup::GLOBAL),
       cfg::MirrorOnDropAgingGroup::GLOBAL);
-  EXPECT_TRUE(
+  EXPECT_EQ(
       report->getModEventToConfigMap()[1].agingGroup().value_or(
-          cfg::MirrorOnDropAgingGroup::GLOBAL) ==
+          cfg::MirrorOnDropAgingGroup::GLOBAL),
       cfg::MirrorOnDropAgingGroup::PORT);
+  EXPECT_EQ(
+      report->getAgingGroupAgingIntervalUsecs()
+          [cfg::MirrorOnDropAgingGroup::PORT],
+      100);
 }
 
 } // namespace facebook::fboss
diff --git a/fboss/agent/switch_config.thrift b/fboss/agent/switch_config.thrift
@@ -425,14 +425,15 @@ struct MirrorOnDropReport {
   // Contents of the dropped packet will be truncated when mirroring.
   7: i16 truncateSize = 128;
   8: byte dscp = 0;
-  // At most one mirrored packet will be sent per port/PG/VOQ within an interval.
   9: optional i32 agingIntervalUsecs;
   10: map<
     byte,
     list<MirrorOnDropReasonAggregation>
   > eventIdToDropReasons_DEPRECATED (deprecated);
   // Configuration for each event ID.
   11: map<byte, MirrorOnDropEventConfig> modEventToConfigMap;
+  // Aging interval (how often to send packets) for each aging group in usecs.
+  12: map<MirrorOnDropAgingGroup, i32> agingGroupAgingIntervalUsecs;
 }
 
 /**

diff --git a/fboss/agent/switch_state.thrift b/fboss/agent/switch_state.thrift
@@ -337,6 +337,10 @@ struct MirrorOnDropReportFields {
     list<switch_config.MirrorOnDropReasonAggregation>
   > eventIdToDropReasons_DEPRECATED;
   14: map<byte, switch_config.MirrorOnDropEventConfig> modEventToConfigMap;
+  15: map<
+    switch_config.MirrorOnDropAgingGroup,
+    i32
+  > agingGroupAgingIntervalUsecs;
 }
 
 struct ControlPlaneFields {

diff --git a/fboss/agent/test/agent_hw_tests/AgentMirrorOnDropTests.cpp b/fboss/agent/test/agent_hw_tests/AgentMirrorOnDropTests.cpp
@@ -132,8 +132,11 @@ class AgentMirrorOnDropTest : public AgentHwTest {
     report.mtu() = 1500;
     report.truncateSize() = kTruncateSize;
     report.dscp() = 0;
-    report.agingIntervalUsecs() = 100;
     report.modEventToConfigMap() = modEventToConfigMap;
+    report.agingGroupAgingIntervalUsecs()[cfg::MirrorOnDropAgingGroup::GLOBAL] =
+        100;
+    report.agingGroupAgingIntervalUsecs()[cfg::MirrorOnDropAgingGroup::PORT] =
+        200;
     config->mirrorOnDropReports()->push_back(report);
   }