Merge branch 'facebook:main' into meru_configs

Author: dzarista

build/deps/github_hashes/facebook/fb303-rev.txt

@@ -1 +1 @@
-Subproject commit 96afd687d4d32b2251fe7ebe98a005d87fc44c40
+Subproject commit 4d6086c0bfc4ffc4750857a815db98117efacdc2

build/deps/github_hashes/facebook/fbthrift-rev.txt

@@ -1 +1 @@
-Subproject commit 55c17e62970b66fe770defb77a0489e04d7d99a8
+Subproject commit efbd79410d98a2a7e98d320dcc306b8be5ceec9e

build/deps/github_hashes/facebook/folly-rev.txt

@@ -1 +1 @@
-Subproject commit 5aad7b326cf90d1b969de356e0a386ef6ab9fff1
+Subproject commit 53faba2ed3d4a7896c968f127efaae11543d10ac

build/deps/github_hashes/facebook/wangle-rev.txt

@@ -1 +1 @@
-Subproject commit c14c12402c5f3c325707bf26292b5e8f177a7a00
+Subproject commit 00169caf56fa956a5c8cf809341ae20094be941e

build/deps/github_hashes/facebookincubator/fizz-rev.txt

@@ -1 +1 @@
-Subproject commit 3a30c30ae6d01a7bfdffee9bf922721bb0f62e7c
+Subproject commit e0c841127a526324a46d19404e498cfd00cf5a05

cmake/AgentHwBenchmarks.cmake

@@ -447,7 +447,19 @@ add_library(hw_system_scale_memory_benchmark
 )
 
 target_link_libraries(hw_system_scale_memory_benchmark
+  fsdb_model
   system_scale_test_utils
   mono_agent_ensemble
   Folly::follybenchmark
 )
+
+add_library(hw_clear_interface_counters_phy_benchmark
+  fboss/agent/hw/benchmarks/HwClearInterfacePhyCountersBenchmark.cpp
+)
+
+target_link_libraries(hw_clear_interface_counters_phy_benchmark
+  config_factory
+  mono_agent_ensemble
+  mono_agent_benchmarks
+  Folly::follybenchmark
+)

cmake/AgentHwSaiHwTest.cmake

@@ -169,6 +169,7 @@ add_library(agent_hw_test_thrift_handler
   fboss/agent/hw/sai/hw_test/HwTestTamUtilsThriftHandler.cpp
   fboss/agent/hw/sai/hw_test/HwTestCommonUtilsThriftHandler.cpp
   fboss/agent/hw/sai/hw_test/HwTestFlowletUtilsThriftHandler.cpp
+  fboss/agent/hw/sai/hw_test/HwTestPtpTcUtilsThriftHandler.cpp
 )
 
 target_link_libraries(agent_hw_test_thrift_handler

cmake/AgentPlatformsCommon.cmake

@@ -37,7 +37,6 @@ target_link_libraries(platform_mapping_utils
   wedge400_platform_mapping
   wedge400c_platform_mapping
   morgan_platform_mapping
-  cloud_ripper_platform_mapping
   meru400biu_platform_mapping
   meru400bfu_platform_mapping
   montblanc_platform_mapping

cmake/AgentPlatformsCommonCloudRipper.cmake

@@ -24,8 +24,6 @@ add_library(sai_platform
   fboss/agent/platforms/sai/SaiPlatformPort.cpp
   fboss/agent/platforms/sai/SaiPlatformInit.cpp
   fboss/agent/platforms/sai/SaiWedge400CPlatform.cpp
-  fboss/agent/platforms/sai/SaiCloudRipperPlatform.cpp
-  fboss/agent/platforms/sai/SaiCloudRipperPlatformPort.cpp
   fboss/agent/platforms/sai/SaiWedge400CPlatformPort.cpp
   fboss/agent/platforms/sai/SaiTajoPlatform.cpp
   fboss/agent/platforms/sai/SaiTajoPlatformPort.cpp
@@ -93,7 +91,6 @@ target_link_libraries(sai_platform
   morgan_platform_mapping
   wedge_led_utils
   bcm_yaml_config
-  cloud_ripper_platform_mapping
   meru400biu_platform_mapping
   meru400bia_platform_mapping
   meru400bfu_platform_mapping

cmake/AgentPlatformsSai.cmake

@@ -354,6 +354,7 @@ add_executable(fboss2
   fboss/cli/fboss2/commands/clear/interface/CmdClearInterface.h
   fboss/cli/fboss2/commands/clear/interface/prbs/CmdClearInterfacePrbs.h
   fboss/cli/fboss2/commands/clear/interface/prbs/stats/CmdClearInterfacePrbsStats.h
+  fboss/cli/fboss2/commands/clear/interface/counters/phy/CmdClearInterfaceCountersPhy.h
   fboss/cli/fboss2/CmdGlobalOptions.cpp
   fboss/cli/fboss2/CmdHandler.cpp
   fboss/cli/fboss2/CmdHandlerImpl.cpp

cmake/CliFboss2.cmake

@@ -4,11 +4,11 @@
 # cmake/FooBar.cmake
 
 
-file(GLOB_RECURSE required_configs 
+file(GLOB_RECURSE required_configs
   ${CMAKE_CURRENT_SOURCE_DIR}/fboss/platform/configs/*.json
 )
 
-set(generated_header 
+set(generated_header
   ${CMAKE_CURRENT_BINARY_DIR}/fboss/platform/config_lib/GeneratedConfig.h
 )
 
@@ -23,10 +23,10 @@ add_custom_command(
   COMMAND
     ${CMAKE_COMMAND} -E make_directory ${output_dir}
   COMMAND
-    ${CMAKE_CURRENT_BINARY_DIR}/platform_config_lib_config_generator 
-    --json_config_dir 
-    ${CMAKE_CURRENT_SOURCE_DIR}/fboss/platform/configs 
-    --install_dir 
+    ${CMAKE_CURRENT_BINARY_DIR}/platform_config_lib_config_generator
+    --json_config_dir
+    ${CMAKE_CURRENT_SOURCE_DIR}/fboss/platform/configs
+    --install_dir
     ${output_dir}
   DEPENDS
     ${required_configs}
@@ -35,6 +35,7 @@ add_custom_command(
 
 add_executable(platform_config_lib_config_generator
   fboss/platform/config_lib/ConfigGenerator.cpp
+  fboss/platform/config_lib/ConfigValidator.cpp
 )
 
 target_link_libraries(platform_config_lib_config_generator

cmake/PlatformConfigLib.cmake

@@ -392,6 +392,9 @@ class HwSwitch {
 
   virtual bool getArsExhaustionStatus() = 0;
 
+  virtual void clearInterfacePhyCounters(
+      const std::unique_ptr<std::vector<int32_t>>& ports) = 0;
+
  protected:
   void setProgrammedState(const std::shared_ptr<SwitchState>& state);
 

fboss/agent/HwSwitch.h

@@ -41,19 +41,8 @@ class RxPacket : public Packet {
   AggregatePortID getSrcAggregatePort() const {
     return srcAggregatePort_;
   }
-  /*
-   * Get the VLAN on which this packet was received.
-   */
-  VlanID getSrcVlan() const {
-    return srcVlan_.value();
-  }
   /*
    * Get the VLAN (if any) on which this packet was received.
-   *
-   * TODO(skhare)
-   * Once all the callsites for getSrcVlan() are converted to handle nullopt
-   * return, remove the old definition of getSrcVlan() and rename this function
-   * to getSrcVlan().
    */
   std::optional<VlanID> getSrcVlanIf() const {
     return srcVlan_;
@@ -106,11 +95,7 @@ class RxPacket : public Packet {
   PortID srcPort_{0};
   bool isFromAggregatePort_{false};
   AggregatePortID srcAggregatePort_{0};
-  // TODO(skhare)
-  // srcVlan_ was originally not optional, and had default value of 0.
-  // Several callsites rely on this default value being 0.
-  // Once all those callsites are fixed, default to std::nullopt.
-  std::optional<VlanID> srcVlan_{0};
+  std::optional<VlanID> srcVlan_{};
   uint32_t len_{0};
   std::optional<uint8_t> cosQueue_;
 };

fboss/agent/RxPacket.h

@@ -25,7 +25,7 @@ class SwRxPacket : public RxPacket {
     buf_ = std::move(other.buf_);
     len_ = other.len_;
     setSrcPort(other.getSrcPort());
-    setSrcVlan(other.getSrcVlan());
+    setSrcVlan(other.getSrcVlanIf());
     if (other.cosQueue()) {
       setCosQueue(*other.cosQueue());
     }

fboss/agent/SwRxPacket.h

@@ -179,6 +179,7 @@ void TunIntf::stop() {
 
 void TunIntf::start() {
   if (fd_ != -1 && !isHandlerRegistered()) {
+    XLOG(DBG2) << "Starting listening on " << name_ << ": fd " << fd_;
     changeHandlerFD(folly::NetworkSocket::fromFd(fd_));
     registerHandler(folly::EventHandler::READ | folly::EventHandler::PERSIST);
   }

fboss/agent/TunIntf.cpp

@@ -647,12 +647,15 @@ void TunManager::probe() {
 }
 
 void TunManager::doProbe(std::lock_guard<std::mutex>& /* lock */) {
+  XLOG(DBG2) << "Starting to probe() for linux interfaces...";
+
   const auto startTs = std::chrono::steady_clock::now();
   SCOPE_EXIT {
     const auto endTs = std::chrono::steady_clock::now();
     auto elapsedMs =
         std::chrono::duration_cast<std::chrono::milliseconds>(endTs - startTs);
-    XLOG(DBG2) << "Probing of linux state took " << elapsedMs.count() << "ms.";
+    XLOG(DBG2) << "Probing of linux state took " << elapsedMs.count()
+               << "ms. success=" << (probeDone_ ? "true" : "false");
   };
 
   CHECK(!probeDone_); // Callers must check for probeDone before calling

fboss/agent/TunManager.cpp

@@ -308,4 +308,8 @@ void HwBasePortFb303Stats::updateEgressGvoqWatermarkStats(
         queueName);
   }
 }
+
+void HwBasePortFb303Stats::clearStat(folly::StringPiece statKey) {
+  portCounters_.clearStat(statName(statKey, portName_));
+}
 } // namespace facebook::fboss

fboss/agent/hw/HwBasePortFb303Stats.cpp

@@ -73,6 +73,10 @@ class HwBasePortFb303Stats {
       folly::StringPiece statName,
       folly::StringPiece portName,
       PfcPriority priority);
+  /*
+   * clear port stat
+   */
+  void clearStat(folly::StringPiece statKey);
 
   /*
    * Priority group stat name

fboss/agent/hw/HwBasePortFb303Stats.h

@@ -14,6 +14,13 @@
 
 #include <folly/logging/xlog.h>
 
+namespace {
+using namespace facebook;
+stats::MonotonicCounter getDefaultCounter(folly::StringPiece statKey) {
+  return stats::MonotonicCounter(statKey.str(), fb303::SUM, fb303::RATE);
+}
+} // namespace
+
 namespace facebook::fboss {
 
 HwFb303Stats::~HwFb303Stats() {
@@ -58,8 +65,8 @@ void HwFb303Stats::reinitStat(
       return;
     }
     auto stat = getCounterIf(*oldStatName);
-    stats::MonotonicCounter newStat{
-        getMonotonicCounterName(statName), fb303::SUM, fb303::RATE};
+    stats::MonotonicCounter newStat =
+        getDefaultCounter(getMonotonicCounterName(statName));
     stat->swap(newStat);
     utility::deleteCounter(newStat.getName());
     counters_.insert(
@@ -68,8 +75,7 @@ void HwFb303Stats::reinitStat(
   } else {
     counters_.emplace(
         statName,
-        HwFb303Counter(stats::MonotonicCounter(
-            getMonotonicCounterName(statName), fb303::SUM, fb303::RATE)));
+        HwFb303Counter(getDefaultCounter(getMonotonicCounterName(statName))));
   }
 }
 
@@ -106,4 +112,15 @@ uint64_t HwFb303Stats::getCumulativeValueIf(const std::string& statName) const {
   return pcitr != counters_.end() ? pcitr->second.cumulativeValue : 0;
 }
 
+void HwFb303Stats::clearStat(const std::string& statName) {
+  auto stat = getCounterIf(statName);
+  if (!stat) {
+    return;
+  }
+
+  stats::MonotonicCounter newStat =
+      getDefaultCounter(getMonotonicCounterName(statName));
+  stat->swap(newStat);
+}
+
 } // namespace facebook::fboss

fboss/agent/hw/HwFb303Stats.cpp

@@ -50,6 +50,7 @@ class HwFb303Stats {
   void removeStat(const std::string& statName);
   const std::string getMonotonicCounterName(const std::string& statName) const;
   uint64_t getCumulativeValueIf(const std::string& statName) const;
+  void clearStat(const std::string& statName);
 
  private:
   /*

fboss/agent/hw/HwFb303Stats.h

@@ -258,6 +258,11 @@ std::string getPriorityGroupStatsKey(folly::StringPiece statKey, int pg) {
   return folly::to<std::string>(statKey, ".pg", pg);
 }
 
+MonotonicCounter getDefaultCounter(folly::StringPiece statKey) {
+  return MonotonicCounter(
+      statKey.str(), facebook::fb303::SUM, facebook::fb303::RATE);
+}
+
 } // namespace
 
 namespace facebook::fboss {
@@ -329,11 +334,9 @@ void BcmPort::reinitPortStat(
 
   if (!stat) {
     portCounters_.emplace(
-        statKey.str(),
-        MonotonicCounter(statName(statKey, portName), fb303::SUM, fb303::RATE));
+        statKey.str(), getDefaultCounter(statName(statKey, portName)));
   } else if (stat->getName() != statName(statKey, portName)) {
-    MonotonicCounter newStat{
-        statName(statKey, portName), fb303::SUM, fb303::RATE};
+    MonotonicCounter newStat = getDefaultCounter(statName(statKey, portName));
     stat->swap(newStat);
     utility::deleteCounter(newStat.getName());
   }
@@ -772,6 +775,46 @@ void BcmPort::updatePortFlowletConfig(const std::shared_ptr<Port>& port) {
   }
 }
 
+void BcmPort::clearSignalDetectAndLockStatusChangedStats() {
+  auto lastPmdStats = lastPhyInfo_.stats()->line()->pmd();
+  for (auto& [laneId, laneStat] : *lastPmdStats->lanes()) {
+    if (laneStat.signalDetectChangedCount().has_value()) {
+      laneStat.signalDetectChangedCount() = 0;
+    }
+    if (laneStat.cdrLockChangedCount().has_value()) {
+      laneStat.cdrLockChangedCount() = 0;
+    }
+  }
+}
+
+void BcmPort::clearInterfacePhyCounters() {
+  auto lockedPortStatsPtr = portStats_.wlock();
+  if (!lockedPortStatsPtr->has_value()) {
+    return;
+  }
+
+  auto now = duration_cast<seconds>(system_clock::now().time_since_epoch());
+  HwPortStats curPortStats, lastPortStats;
+  curPortStats = (*lockedPortStatsPtr)->portStats();
+
+  *curPortStats.fecCorrectableErrors() = 0;
+  *curPortStats.fecUncorrectableErrors() = 0;
+
+  auto portName = getPortName();
+  auto resetPortStat = [&](folly::StringPiece statKey,
+                           folly::StringPiece portName) {
+    auto stat = getPortCounterIf(statKey);
+    MonotonicCounter newStat = getDefaultCounter(statName(statKey, portName));
+    stat->swap(newStat);
+  };
+  resetPortStat(kFecCorrectable(), portName);
+  resetPortStat(kFecUncorrectable(), portName);
+
+  *lockedPortStatsPtr = BcmPortStats(std::move(curPortStats), now);
+
+  clearSignalDetectAndLockStatusChangedStats();
+}
+
 void BcmPort::cacheFaultStatus(phy::LinkFaultStatus faultStatus) {
   auto faultStatusPtr = cachedFaultStatus.wlock();
   *faultStatusPtr = faultStatus;

fboss/agent/hw/bcm/BcmPort.cpp

@@ -251,6 +251,9 @@ class BcmPort {
   void setPortFlowletConfig(const std::shared_ptr<Port>& port);
   void updatePortFlowletConfig(const std::shared_ptr<Port>& port);
 
+  void clearSignalDetectAndLockStatusChangedStats();
+  void clearInterfacePhyCounters();
+
  private:
   class BcmPortStats {
     // All actions or instantiations of this class need to be done in a

fboss/agent/hw/bcm/BcmPort.h

@@ -3483,6 +3483,13 @@ prbs::InterfacePrbsState BcmSwitch::getPortPrbsState(PortID portId) {
   return getBcmPortPrbsState(unit_, portTable_->getBcmPortId(portId));
 }
 
+void BcmSwitch::clearInterfacePhyCounters(
+    const std::unique_ptr<std::vector<int32_t>>& ports) {
+  for (auto portId : *ports) {
+    getPortTable()->getBcmPort(portId)->clearInterfacePhyCounters();
+  }
+}
+
 std::vector<phy::PrbsLaneStats> BcmSwitch::getPortAsicPrbsStats(PortID portId) {
   return bcmStatUpdater_->getPortAsicPrbsStats(portId);
 }

fboss/agent/hw/bcm/BcmSwitch.cpp

@@ -588,6 +588,9 @@ class BcmSwitch : public BcmSwitchIf {
       int32_t /* portId */) override;
   prbs::InterfacePrbsState getPortPrbsState(PortID portId) override;
 
+  void clearInterfacePhyCounters(
+      const std::unique_ptr<std::vector<int32_t>>& ports) override;
+
   /*
    * Friend tests. We want the abilty to test private methods
    * without comprimising encapsulation for code generally.

fboss/agent/hw/bcm/BcmSwitch.h

@@ -280,5 +280,6 @@ bcm_agent_benchmark(
         "//fboss/agent/hw/bcm/tests:bcm_qos_utils",
         "//fboss/agent/hw/benchmarks:hw_rx_slow_path_rate",
         "//fboss/agent/hw/benchmarks:hw_tx_slow_path_rate",
+        "//fboss/agent/hw/benchmarks:hw_clear_interface_phy_counters",
     ],
 )