Merge branch 'facebook:main' into arashpartow/update_exprtk_0.0.3

facebook · Nov 15, 2024 · 9082772 · 9082772
2 parents 668f2f8 + 3f8b2b5
commit 9082772
Show file tree

Hide file tree

Showing 714 changed files with 75,365 additions and 13,002 deletions.
diff --git a/.buckconfig.d/external_cells/facebook/buck2-shims-meta/external_cell.buckconfig b/.buckconfig.d/external_cells/facebook/buck2-shims-meta/external_cell.buckconfig
@@ -6,4 +6,4 @@ gh_facebook_buck2_shims_meta = git
 
 [external_cell_gh_facebook_buck2_shims_meta]
 git_origin = https://github.com/facebook/buck2-shims-meta.git
-commit_hash = b79235f6447a07f78644ab08261e3acfe4e12604
+commit_hash = 9a7f4d630a0ea37a65175f8e330839d82823a42a
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -173,6 +173,7 @@ find_package(fizz CONFIG REQUIRED)
 find_package(fmt CONFIG REQUIRED)
 find_package(wangle CONFIG REQUIRED)
 find_package(FBThrift CONFIG REQUIRED)
+find_package(range-v3 REQUIRED)
 include_directories(${FB303_INCLUDE_DIR})
 find_path(FATAL_INCLUDE_DIR NAMES fatal/portability.h)
 include_directories(${FATAL_INCLUDE_DIR})

diff --git a/buck2 b/buck2
@@ -4,62 +4,62 @@
   "name": "buck2",
   "platforms": {
     "macos-aarch64": {
-      "size": 24865177,
+      "size": 24793637,
       "hash": "blake3",
-      "digest": "d7cb59045703f709e9fc07de4fc2452f336f0a4aea23b0fbf2630cb74e1ddfc2",
+      "digest": "bb0035bb305bf3b6bb381b2c98063ab0912f77fcb3603a891cac4c59d17b2795",
       "format": "zst",
       "path": "buck2-aarch64-apple-darwin",
       "providers": [
         {
-          "url": "https://github.com/facebook/buck2/releases/download/2024-11-01/buck2-aarch64-apple-darwin.zst"
+          "url": "https://github.com/facebook/buck2/releases/download/2024-11-15/buck2-aarch64-apple-darwin.zst"
         }
       ]
     },
     "linux-aarch64": {
-      "size": 27170753,
+      "size": 27097669,
       "hash": "blake3",
-      "digest": "b7524108a18829538ca0f205691bc0b2497fe4c69ac7364f18fb32273bdcb906",
+      "digest": "70c796a8e7470a497d6251963c1d9da1679266f4ba1fdbf44a252aeac1687d8c",
       "format": "zst",
       "path": "buck2-aarch64-unknown-linux-musl",
       "providers": [
         {
-          "url": "https://github.com/facebook/buck2/releases/download/2024-11-01/buck2-aarch64-unknown-linux-musl.zst"
+          "url": "https://github.com/facebook/buck2/releases/download/2024-11-15/buck2-aarch64-unknown-linux-musl.zst"
         }
       ]
     },
     "macos-x86_64": {
-      "size": 26626381,
+      "size": 26566564,
       "hash": "blake3",
-      "digest": "46ae3e7a99a4eb220b76f30b56a303ed4d573c91f309bbf82981682c79339201",
+      "digest": "f2d32397d72a0f3d96dd3265a525a9264ecc5aacc01c9f53ef1be7864f792c6c",
       "format": "zst",
       "path": "buck2-x86_64-apple-darwin",
       "providers": [
         {
-          "url": "https://github.com/facebook/buck2/releases/download/2024-11-01/buck2-x86_64-apple-darwin.zst"
+          "url": "https://github.com/facebook/buck2/releases/download/2024-11-15/buck2-x86_64-apple-darwin.zst"
         }
       ]
     },
     "windows-x86_64": {
-      "size": 21957913,
+      "size": 21945285,
       "hash": "blake3",
-      "digest": "48f23505b97b405d46919978fee8c2cfd97f75fe2140b197af0ad1ad962d47eb",
+      "digest": "e0ebb882535cc24439025b39a023ae2148fc9f4733ab3552dbce396f964dd549",
       "format": "zst",
       "path": "buck2-x86_64-pc-windows-msvc.exe",
       "providers": [
         {
-          "url": "https://github.com/facebook/buck2/releases/download/2024-11-01/buck2-x86_64-pc-windows-msvc.exe.zst"
+          "url": "https://github.com/facebook/buck2/releases/download/2024-11-15/buck2-x86_64-pc-windows-msvc.exe.zst"
         }
       ]
     },
     "linux-x86_64": {
-      "size": 28136456,
+      "size": 28049273,
       "hash": "blake3",
-      "digest": "9530f398d1a74394ab1770716bd942d4c1687fb00f13518bdbf8904e366d4d97",
+      "digest": "4ce1ccad2e051ac169d165905de2e3de68558a74e90756c71ab04fa78e38d23b",
       "format": "zst",
       "path": "buck2-x86_64-unknown-linux-musl",
       "providers": [
         {
-          "url": "https://github.com/facebook/buck2/releases/download/2024-11-01/buck2-x86_64-unknown-linux-musl.zst"
+          "url": "https://github.com/facebook/buck2/releases/download/2024-11-15/buck2-x86_64-unknown-linux-musl.zst"
         }
       ]
     }

diff --git a/build/deps/github_hashes/facebook/fb303-rev.txt b/build/deps/github_hashes/facebook/fb303-rev.txt
@@ -1 +1 @@
-Subproject commit d15028627fdd473945f04124f118e17142471f81
+Subproject commit 2e5951c4caf66cf919b88127cc4af4b103e5baa1
diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt
@@ -1 +1 @@
-Subproject commit 300f4d5e79e763ef74243da9a1f3b9f649d5addd
+Subproject commit 7f33f571ac8c8e43fcbaad99bf18a68774b03edc
diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt
@@ -1 +1 @@
-Subproject commit 30a4e783a7618f17a5b24048625872e363068887
+Subproject commit 49d920691a609f40e31a0ca8b2d5d23a4def5f38
diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt
@@ -1 +1 @@
-Subproject commit d54405ad3588791be7146a19fe4e914af0807c28
+Subproject commit b496c25312abe5fdde040bc445075b84f43f8d93
diff --git a/build/deps/github_hashes/facebookincubator/fizz-rev.txt b/build/deps/github_hashes/facebookincubator/fizz-rev.txt
@@ -1 +1 @@
-Subproject commit 4664d02b938a34d05918f2817f53afd2ed6b4ca9
+Subproject commit 519ca76f3fc6d108afb317e84342e29b2492c7d6
diff --git a/build/fbcode_builder/manifests/fboss b/build/fbcode_builder/manifests/fboss
@@ -40,6 +40,7 @@ exprtk
 nlohmann-json
 libgpiod
 systemd
+range-v3
 
 [shipit.pathmap]
 fbcode/fboss/github = .

diff --git a/build/fbcode_builder/manifests/range-v3 b/build/fbcode_builder/manifests/range-v3
@@ -9,3 +9,6 @@ sha256 = 376376615dbba43d3bef75aa590931431ecb49eb36d07bb726a19f680c75e20c
 [build]
 builder = cmake
 subdir = range-v3-0.11.0
+
+[cmake.defines]
+RANGE_V3_EXAMPLES=OFF
diff --git a/cmake/Agent.cmake b/cmake/Agent.cmake
@@ -97,6 +97,16 @@ target_link_libraries(switchinfo_utils
   agent_config_cpp2
 )
 
+add_library(voq_utils
+  fboss/agent/VoqUtils.cpp
+)
+
+target_link_libraries(voq_utils
+  Folly::folly
+  switch_config_cpp2
+  agent_features
+)
+
 target_link_libraries(address_utils
   network_address_cpp2
   Folly::folly
@@ -255,6 +265,7 @@ set(core_libs
   switchinfo_utils
   stats
   utils
+  voq_utils
   asic_utils
   fb303::fb303
   capture

diff --git a/cmake/AgentHw.cmake b/cmake/AgentHw.cmake
@@ -34,7 +34,6 @@ add_library(hw_port_fb303_stats
   fboss/agent/hw/HwBasePortFb303Stats.cpp
   fboss/agent/hw/HwPortFb303Stats.cpp
   fboss/agent/hw/HwSysPortFb303Stats.cpp
-  fboss/agent/hw/oss/HwBasePortFb303Stats.cpp
 )
 
 add_library(hw_cpu_fb303_stats

diff --git a/cmake/AgentHwBenchmarks.cmake b/cmake/AgentHwBenchmarks.cmake
@@ -265,6 +265,23 @@ add_library(hw_rx_slow_path_rate
   fboss/agent/hw/benchmarks/HwRxSlowPathBenchmark.cpp
 )
 
+add_library(hw_rx_slow_path_arp_rate
+  fboss/agent/hw/benchmarks/HwRxSlowPathArpBenchmark.cpp
+)
+
+target_link_libraries(hw_rx_slow_path_arp_rate
+  config_factory
+  pkt_factory
+  copp_test_utils
+  hw_asic_utils
+  hw_copp_utils
+  hw_test_acl_utils
+  mono_agent_ensemble
+  mono_agent_benchmarks
+  Folly::folly
+  Folly::follybenchmark
+)
+
 target_link_libraries(hw_rx_slow_path_rate
   config_factory
   copp_test_utils

diff --git a/cmake/AgentHwSaiApi.cmake b/cmake/AgentHwSaiApi.cmake
@@ -93,6 +93,7 @@ if (SAI_TAJO_IMPL)
     fboss/agent/hw/sai/api/tajo/BufferApi.cpp
     fboss/agent/hw/sai/api/tajo/QueueApi.cpp
     fboss/agent/hw/sai/api/tajo/MirrorApi.cpp
+    fboss/agent/hw/sai/api/tajo/SystemPortApi.cpp
   )
 
   find_path(SAI_IMPL_DIR NAMES lib/libsai_impl.a)
@@ -107,6 +108,7 @@ elseif (SAI_BRCM_IMPL)
     fboss/agent/hw/sai/api/bcm/BufferApi.cpp
     fboss/agent/hw/sai/api/bcm/QueueApi.cpp
     fboss/agent/hw/sai/api/bcm/MirrorApi.cpp
+    fboss/agent/hw/sai/api/bcm/SystemPortApi.cpp
   )
 
   find_path(SAI_IMPL_DIR NAMES lib/libsai_impl.a)
@@ -121,6 +123,7 @@ elseif (CHENAB_SAI_SDK)
     fboss/agent/hw/sai/api/oss/BufferApi.cpp
     fboss/agent/hw/sai/api/oss/QueueApi.cpp
     fboss/agent/hw/sai/api/oss/MirrorApi.cpp
+    fboss/agent/hw/sai/api/oss/SystemPortApi.cpp
   )
 
   find_path(SAI_IMPL_DIR NAMES lib/libsai_impl.a)

diff --git a/cmake/AgentHwSaiHwTest.cmake b/cmake/AgentHwSaiHwTest.cmake
@@ -174,6 +174,7 @@ target_link_libraries(agent_hw_test_thrift_handler
   agent_hw_test_ctrl_cpp2
   sai_ecmp_utils
   diag_shell
+  wedge_led_utils
 )
 
 

diff --git a/cmake/AgentHwTest.cmake b/cmake/AgentHwTest.cmake
@@ -194,7 +194,6 @@ add_fbthrift_cpp_library(
 )
 
 set(hw_switch_test_srcs
-  fboss/agent/hw/test/HwEcmpTests.cpp
   fboss/agent/hw/test/HwTestFabricUtils.cpp
   fboss/agent/hw/test/HwFlexPortTests.cpp
   fboss/agent/hw/test/HwIngressBufferTests.cpp
@@ -212,7 +211,6 @@ set(hw_switch_test_srcs
   fboss/agent/hw/test/HwVlanTests.cpp
   fboss/agent/hw/test/HwVerifyPfcConfigInHwTest.cpp
   fboss/agent/hw/test/HwAclStatTests.cpp
-  fboss/agent/hw/test/HwPortLedTests.cpp
   fboss/agent/hw/test/HwPortProfileTests.cpp
   fboss/agent/hw/test/HwPortStressTests.cpp
   fboss/agent/hw/test/HwResourceStatsTests.cpp

diff --git a/cmake/AgentTestAgentHwTests.cmake b/cmake/AgentTestAgentHwTests.cmake
@@ -10,6 +10,7 @@ add_library(agent_hw_test_src
   fboss/agent/test/agent_hw_tests/AgentDscpQueueMappingTests.cpp
   fboss/agent/test/agent_hw_tests/AgentDeepPacketInspectionTests.cpp
   fboss/agent/test/agent_hw_tests/AgentDiagShellStressTests.cpp
+  fboss/agent/test/agent_hw_tests/AgentEcmpTests.cpp
   fboss/agent/test/agent_hw_tests/AgentEmptyTests.cpp
   fboss/agent/test/agent_hw_tests/AgentEgressForwardingDiscardCounterTests.cpp
   fboss/agent/test/agent_hw_tests/AgentRouteOverDifferentAddressFamilyNhopTests.cpp
@@ -34,6 +35,7 @@ add_library(agent_hw_test_src
   fboss/agent/test/agent_hw_tests/AgentVoqSwitchInterruptsTests.cpp
   fboss/agent/test/agent_hw_tests/AgentFabricSwitchTests.cpp
   fboss/agent/test/agent_hw_tests/AgentPortBandWidthTests.cpp
+  fboss/agent/test/agent_hw_tests/AgentPortLedTests.cpp
   fboss/agent/test/agent_hw_tests/AgentPortTests.cpp
   fboss/agent/test/agent_hw_tests/AgentPrbsTests.cpp
   fboss/agent/test/agent_hw_tests/AgentAclCounterTests.cpp

diff --git a/cmake/AgentTestLinkTests.cmake b/cmake/AgentTestLinkTests.cmake
@@ -10,6 +10,7 @@ add_library(link_tests
   fboss/agent/test/link_tests/LinkSanityTests.cpp
   fboss/agent/test/link_tests/PtpTests.cpp
   fboss/agent/test/link_tests/OpticsTest.cpp
+  fboss/agent/test/link_tests/LacpSanityTests.cpp
 )
 
 target_link_libraries(link_tests
@@ -29,6 +30,7 @@ target_link_libraries(link_tests
   packet_snooper
   pkt_test_utils
   link_test_production_features_cpp2
+  trunk_utils
   ${GTEST}
   ${LIBGMOCK_LIBRARIES}
 )

diff --git a/cmake/PlatformPlatformManager.cmake b/cmake/PlatformPlatformManager.cmake
@@ -140,6 +140,7 @@ target_link_libraries(platform_manager_config_validator
   platform_manager_i2c_explorer
   platform_manager_config_cpp2
   Folly::folly
+  range-v3
 )
 
 add_executable(platform_manager
@@ -173,6 +174,7 @@ target_link_libraries(platform_manager
   ${LIBGPIOD}
   ${SYSTEMD}
   gpiod_line
+  range-v3
 )
 
 install(TARGETS platform_manager)
diff --git a/cmake/PlatformSensorService.cmake b/cmake/PlatformSensorService.cmake
@@ -37,6 +37,7 @@ target_link_libraries(sensor_service_utils
   platform_name_lib
   platform_manager_service_cpp2
   platform_manager_config_cpp2
+  platform_manager_config_validator
   ${RE2}
 )
 
@@ -54,6 +55,7 @@ add_library(sensor_service_lib
 target_link_libraries(sensor_service_lib
   log_thrift_call
   platform_config_lib
+  platform_manager_config_validator
   platform_name_lib
   platform_utils
   sensor_service_utils

diff --git a/cmake/PlatformWeutil.cmake b/cmake/PlatformWeutil.cmake
@@ -43,7 +43,6 @@ target_link_libraries(ioctl_smbus_eeprom_reader
 )
 
 target_link_libraries(weutil_lib
-  product_info
   platform_utils
   Folly::folly
   weutil_config_cpp2

diff --git a/common/stats/DynamicStats.h b/common/stats/DynamicStats.h
@@ -0,0 +1,5 @@
+// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+
+#pragma once
+
+#include <fb303/detail/QuantileStatWrappers.h>
diff --git a/fboss/agent/AgentFeatures.cpp b/fboss/agent/AgentFeatures.cpp
@@ -169,3 +169,24 @@ DEFINE_bool(
     fix_lossless_mode_per_pg,
     false,
     "Flag to disruptively update lossless mode per pg");
+
+DEFINE_int32(fboss_event_base_queue_limit, 10000, "FbossEventBase queue limit");
+
+DEFINE_bool(
+    dual_stage_rdsw_3q_2q,
+    false,
+    "Use platform mapping for dual stage RDSW with 3q and 2q model");
+
+DEFINE_bool(
+    dual_stage_edsw_3q_2q,
+    false,
+    "Use platform mapping for dual stage EDSW with 3q and 2q model");
+
+bool isDualStage3Q2QMode() {
+  return FLAGS_dual_stage_rdsw_3q_2q || FLAGS_dual_stage_edsw_3q_2q;
+}
+
+DEFINE_bool(
+    enable_hw_update_protection,
+    false,
+    "Enable Neighbor/MAC table hw update failure protection");
diff --git a/fboss/agent/AgentFeatures.h b/fboss/agent/AgentFeatures.h
@@ -67,3 +67,9 @@ DECLARE_bool(skip_buffer_reservation);
 // TODO(zecheng): Remove this once firmware support is ready
 DECLARE_bool(conditional_entropy_cpu_seed_test_only);
 DECLARE_bool(fix_lossless_mode_per_pg);
+DECLARE_int32(fboss_event_base_queue_limit);
+DECLARE_bool(dual_stage_rdsw_3q_2q);
+DECLARE_bool(dual_stage_edsw_3q_2q);
+
+bool isDualStage3Q2QMode();
+DECLARE_bool(enable_hw_update_protection);
diff --git a/fboss/agent/AgentPreStartExec.h b/fboss/agent/AgentPreStartExec.h
@@ -7,7 +7,7 @@
 namespace facebook::fboss {
 
 class AgentDirectoryUtil;
-class AgentConfig;
+struct AgentConfig;
 class AgentCommandExecutor;
 class AgentNetWhoAmI;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Subproject commit d15028627fdd473945f04124f118e17142471f81
		Subproject commit 2e5951c4caf66cf919b88127cc4af4b103e5baa1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Subproject commit 300f4d5e79e763ef74243da9a1f3b9f649d5addd
		Subproject commit 7f33f571ac8c8e43fcbaad99bf18a68774b03edc
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Subproject commit 30a4e783a7618f17a5b24048625872e363068887
		Subproject commit 49d920691a609f40e31a0ca8b2d5d23a4def5f38
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Subproject commit d54405ad3588791be7146a19fe4e914af0807c28
		Subproject commit b496c25312abe5fdde040bc445075b84f43f8d93
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Subproject commit 4664d02b938a34d05918f2817f53afd2ed6b4ca9
		Subproject commit 519ca76f3fc6d108afb317e84342e29b2492c7d6