Merge pull request facebook#41 from adamcalabrigo/fb_upstream_6_28_2023

Fb upstream 6 28 2023
arajeev-ARISTA · Jun 28, 2023 · d2b0ed7 · d2b0ed7
2 parents baecbc1 + 7c82f69
commit d2b0ed7
Show file tree

Hide file tree

Showing 397 changed files with 86,005 additions and 4,670 deletions.
diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt
@@ -1 +1 @@
-Subproject commit 80f3aefac8793930ae34f54bfd7e2e2933bdbb0f
+Subproject commit 0ff1d7478155b55926ff2dd8ae4b3e2d500e40bc
diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt
@@ -1 +1 @@
-Subproject commit 1b7cd10340f565d7fa3fd4f78d6faf14605d77b2
+Subproject commit 066724c012853a7f29f3bb8853543f3a5b5c48e9
diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt
@@ -1 +1 @@
-Subproject commit 4675e2631e3f41dc76d109bbf1a3e218b7abcde3
+Subproject commit 3a48d0c4d65fd0ed90f7dcbe8c6756fc01ba496d
diff --git a/build/fbcode_builder/manifests/benchmark b/build/fbcode_builder/manifests/benchmark
@@ -0,0 +1,13 @@
+[manifest]
+name = benchmark
+
+[download]
+url = https://github.com/google/benchmark/archive/refs/tags/v1.8.0.tar.gz
+sha256 = ea2e94c24ddf6594d15c711c06ccd4486434d9cf3eca954e2af8a20c88f9f172
+
+[build]
+builder = cmake
+subdir = benchmark-1.8.0/
+
+[cmake.defines]
+BENCHMARK_ENABLE_TESTING=OFF
diff --git a/build/fbcode_builder/manifests/libsodium b/build/fbcode_builder/manifests/libsodium
@@ -20,7 +20,7 @@ builder = autoconf
 subdir = libsodium-1.0.17
 
 [download.os=windows]
-url = https://download.libsodium.org/libsodium/releases/libsodium-1.0.17-msvc.zip
+url = https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.17-msvc.zip
 sha256 = f0f32ad8ebd76eee99bb039f843f583f2babca5288a8c26a7261db9694c11467
 
 [build.os=windows]

diff --git a/build/fbcode_builder/manifests/zstrong b/build/fbcode_builder/manifests/zstrong
@@ -0,0 +1,33 @@
+[manifest]
+name = zstrong
+
+[git]
+repo_url = https://github.com/facebookincubator/zstrong.git
+
+[build]
+builder = cmake
+
+[dependencies]
+zstd
+
+[dependencies.test=on]
+benchmark
+fmt
+googletest
+
+[shipit.pathmap]
+fbcode/data_compression/experimental/zstrong = .
+
+[shipit.strip]
+^fbcode/data_compression/experimental/zstrong/zstrong/zs2_config\.h$
+
+[cmake.defines]
+BUILD_SHARED_LIBS=OFF
+
+[cmake.defines.test=on]
+BUILD_TESTS=ON
+BUILD_BENCHMARKS=ON
+
+[cmake.defines.test=off]
+BUILD_TESTS=OFF
+BUILD_BENCHMARKS=OFF
diff --git a/cmake/Agent.cmake b/cmake/Agent.cmake
@@ -312,6 +312,7 @@ target_link_libraries(sflow_shim_utils
 
 add_library(fsdb_helper
   fboss/agent/oss/FsdbHelper.cpp
+  fboss/fsdb/common/Utils.cpp
 )
 
 target_link_libraries(fsdb_helper

diff --git a/cmake/AgentHwSaiApi.cmake b/cmake/AgentHwSaiApi.cmake
@@ -41,6 +41,7 @@ set(SAI_API_SRC
   fboss/agent/hw/sai/api/NeighborApi.cpp
   fboss/agent/hw/sai/api/NextHopGroupApi.cpp
   fboss/agent/hw/sai/api/QosMapApi.cpp
+  fboss/agent/hw/sai/api/PortApi.cpp
   fboss/agent/hw/sai/api/RouteApi.cpp
   fboss/agent/hw/sai/api/SaiApiLock.cpp
   fboss/agent/hw/sai/api/SaiApiTable.cpp

diff --git a/cmake/AgentHwSwitchAsics.cmake b/cmake/AgentHwSwitchAsics.cmake
@@ -20,6 +20,7 @@ add_library(switch_asics
   fboss/agent/hw/switch_asics/Jericho2Asic.cpp
   fboss/agent/hw/switch_asics/Jericho3Asic.cpp
   fboss/agent/hw/switch_asics/RamonAsic.cpp
+  fboss/agent/hw/switch_asics/Ramon3Asic.cpp
   fboss/agent/hw/switch_asics/BroadcomXgsAsic.cpp
 )
 

diff --git a/cmake/AgentHwTest.cmake b/cmake/AgentHwTest.cmake
@@ -139,7 +139,6 @@ target_link_libraries(hw_switch_ensemble
   hw_link_state_toggler
   switchid_scope_resolver
   core
-  qsfp_cache
   hw_test_utils
   test_ensemble_if
 )

diff --git a/cmake/AgentPlatformsCommonMeru800bfa.cmake b/cmake/AgentPlatformsCommonMeru800bfa.cmake
@@ -0,0 +1,12 @@
+# CMake to build libraries and binaries in fboss/agent/platforms/common/meru800bia
+
+# In general, libraries and binaries in fboss/foo/bar are built by
+# cmake/FooBar.cmake
+
+add_library(meru800bfa_platform_mapping
+  fboss/agent/platforms/common/meru800bfa/Meru800bfaPlatformMapping.cpp
+)
+
+target_link_libraries(meru800bfa_platform_mapping
+  platform_mapping
+)
diff --git a/cmake/AgentPlatformsSai.cmake b/cmake/AgentPlatformsSai.cmake
@@ -40,6 +40,7 @@ add_library(sai_platform
   fboss/agent/platforms/sai/SaiMeru400biaPlatform.cpp
   fboss/agent/platforms/sai/SaiMeru400biaPlatformPort.cpp
   fboss/agent/platforms/sai/SaiMeru400bfuPlatform.cpp
+  fboss/agent/platforms/sai/SaiMeru800bfaPlatform.cpp
   fboss/agent/platforms/sai/SaiBcmMontblancPlatform.cpp
   fboss/agent/platforms/sai/SaiBcmMontblancPlatformPort.cpp
 
@@ -66,7 +67,9 @@ add_library(sai_platform
   fboss/agent/platforms/sai/oss/SaiMeru800biaPlatformPort.cpp
   fboss/agent/platforms/sai/oss/SaiMeru400biaPlatform.cpp
   fboss/agent/platforms/sai/oss/SaiMeru400bfuPlatform.cpp
+  fboss/agent/platforms/sai/oss/SaiMeru800bfaPlatform.cpp
   fboss/agent/platforms/sai/oss/SaiMeru400bfuPlatformPort.cpp
+  fboss/agent/platforms/sai/oss/SaiMeru800bfaPlatformPort.cpp
   fboss/agent/platforms/sai/oss/SaiSandiaPlatformPort.cpp
   fboss/agent/platforms/sai/oss/SaiMorgan800ccPlatformPort.cpp
 )
@@ -95,14 +98,14 @@ target_link_libraries(sai_platform
   morgan_platform_mapping
   sandia_platform_mapping
   wedge400c_ebb_lab_platform_mapping
-  qsfp_cache
   wedge_led_utils
   bcm_yaml_config
   cloud_ripper_platform_mapping
   meru400biu_platform_mapping
   meru400bia_platform_mapping
   meru400bfu_platform_mapping
   meru800bia_platform_mapping
+  meru800bfa_platform_mapping
   montblanc_platform_mapping
 )
 

diff --git a/cmake/AgentTestLinkTests.cmake b/cmake/AgentTestLinkTests.cmake
@@ -6,6 +6,7 @@
 add_library(link_tests
   fboss/agent/test/link_tests/EmptyLinkTest.cpp
   fboss/agent/test/link_tests/LinkTest.cpp
+  fboss/agent/test/link_tests/LinkTestUtils.cpp
   fboss/agent/test/link_tests/LinkSanityTests.cpp
   fboss/agent/test/link_tests/PtpTests.cpp
 )

diff --git a/cmake/LedService.cmake b/cmake/LedService.cmake
@@ -12,12 +12,24 @@ add_fbthrift_cpp_library(
 )
 
 add_library(led_core_lib
+  fboss/led_service/BspLedManager.cpp
   fboss/led_service/FsdbSwitchStateSubscriber.cpp
+  fboss/led_service/oss/DarwinLedManager.cpp
+  fboss/led_service/oss/ElbertLedManager.cpp
   fboss/led_service/oss/FsdbSwitchStateSubscriber.cpp
+  fboss/led_service/oss/FujiLedManager.cpp
+  fboss/led_service/oss/LassenLedManager.cpp
   fboss/led_service/oss/MinipackLedManager.cpp
+  fboss/led_service/oss/Wedge400BaseLedManager.cpp
+  fboss/led_service/oss/Wedge400CLedManager.cpp
+  fboss/led_service/oss/Wedge400LedManager.cpp
+  fboss/led_service/oss/YampLedManager.cpp
   fboss/led_service/LedManager.cpp
+  fboss/led_service/LedManagerInit.cpp
   fboss/led_service/LedService.cpp
   fboss/led_service/LedServiceHandler.cpp
+  fboss/led_service/MinipackBaseLedManager.cpp
+  fboss/led_service/MontblancLedManager.cpp
 )
 
 target_link_libraries(led_core_lib
@@ -27,8 +39,14 @@ target_link_libraries(led_core_lib
   led_structs_types_cpp2
   log_thrift_call
   montblanc_bsp
+  darwin_platform_mapping
+  elbert_platform_mapping
   fuji_platform_mapping
+  lassen_platform_mapping
+  minipack_platform_mapping
   montblanc_platform_mapping
+  wedge400_platform_mapping
+  yamp_platform_mapping
   product_info
   Folly::folly
   FBThrift::thriftcpp2

diff --git a/cmake/Lib.cmake b/cmake/Lib.cmake
@@ -161,3 +161,7 @@ target_link_libraries(fpga_device
   fboss_types
   Folly::folly
 )
+
+add_library(pci_access
+  fboss/lib/PciAccess.cpp
+)
diff --git a/cmake/LibFpga.cmake b/cmake/LibFpga.cmake
@@ -10,3 +10,49 @@ add_library(fpga_multi_pim_container
 target_link_libraries(fpga_multi_pim_container
   fboss_error
 )
+
+add_library(facebook_fpga
+  fboss/lib/fpga/FbDomFpga.cpp
+  fboss/lib/fpga/FbFpgaRegisters.cpp
+)
+
+target_link_libraries(facebook_fpga
+  fboss_error
+  Folly::folly
+  fpga_device
+)
+
+add_library(fb_fpga_i2c
+  fboss/lib/fpga/FbFpgaI2c.cpp
+)
+
+target_link_libraries(fb_fpga_i2c
+  facebook_fpga
+  utils
+  Folly::folly
+)
+
+add_library(wedge400_fpga
+  fboss/lib/fpga/Wedge400Fpga.cpp
+)
+
+target_link_libraries(wedge400_fpga
+  fboss_error
+  fboss_types
+  Folly::folly
+  pci_access
+  facebook_fpga
+)
+
+add_library(wedge400_i2c
+  fboss/lib/fpga/Wedge400I2CBus.cpp
+  fboss/lib/fpga/Wedge400TransceiverApi.cpp
+)
+
+target_link_libraries(wedge400_i2c
+  wedge400_fpga
+  pci_access
+  Folly::folly
+  utils
+  fb_fpga_i2c
+)
diff --git a/cmake/PlatformFanService.cmake b/cmake/PlatformFanService.cmake
@@ -34,8 +34,8 @@ target_link_libraries(fan_service_lib
   platform_utils
   fan_config_structs_types_cpp2
   Folly::folly
+  qsfp_service_client
   FBThrift::thriftcpp2
-  qsfp_cache
   fsdb_stream_client
   fsdb_pub_sub
   fsdb_flags

diff --git a/cmake/PlatformPlatformManager.cmake b/cmake/PlatformPlatformManager.cmake
@@ -0,0 +1,62 @@
+# Make to build libraries and binaries in fboss/platform/platform_manager
+
+# In general, libraries and binaries in fboss/foo/bar are built by
+# cmake/FooBar.cmake
+
+add_fbthrift_cpp_library(
+  platform_manager_snapshot_cpp2
+  fboss/platform/platform_manager/platform_manager_snapshot.thrift
+  OPTIONS
+    json
+    reflection
+)
+
+add_fbthrift_cpp_library(
+  platform_manager_presence_cpp2
+  fboss/platform/platform_manager/platform_manager_presence.thrift
+  OPTIONS
+    json
+    reflection
+)
+
+add_fbthrift_cpp_library(
+  platform_manager_config_cpp2
+  fboss/platform/platform_manager/platform_manager_config.thrift
+  OPTIONS
+    json
+    reflection
+  DEPENDS
+    platform_manager_presence_cpp2
+)
+
+add_fbthrift_cpp_library(
+  platform_manager_service_cpp2
+  fboss/platform/platform_manager/platform_manager_service.thrift
+  SERVICES
+    PlatformManagerService
+  OPTIONS
+    json
+    reflection
+  DEPENDS
+   platform_manager_snapshot_cpp2
+)
+
+add_executable(platform_manager
+  fboss/platform/platform_manager/Main.cpp
+  fboss/platform/platform_manager/PlatformExplorer.cpp
+  fboss/platform/platform_manager/PlatformI2cExplorer.cpp
+  fboss/platform/platform_manager/PlatformValidator.cpp
+  fboss/platform/platform_manager/PlatformManagerHandler.cpp
+)
+
+target_link_libraries(platform_manager
+  fb303::fb303
+  platform_config_lib
+  platform_utils
+  platform_manager_config_cpp2
+  platform_manager_presence_cpp2
+  platform_manager_service_cpp2
+  platform_manager_snapshot_cpp2
+)
+
+install(TARGETS platform_manager)
diff --git a/cmake/PlatformWeutil.cmake b/cmake/PlatformWeutil.cmake
@@ -17,6 +17,7 @@ target_link_libraries(weutil_lib
 
 add_executable(weutil
   fboss/platform/weutil/main.cpp
+  fboss/platform/weutil/Flags.cpp
 )
 
 target_link_libraries(weutil

diff --git a/cmake/QsfpServicePlatformsWedge.cmake b/cmake/QsfpServicePlatformsWedge.cmake
@@ -12,6 +12,7 @@ add_library(qsfp_platforms_wedge
   fboss/qsfp_service/platforms/wedge/Wedge40Manager.cpp
   fboss/qsfp_service/platforms/wedge/WedgeManagerInit.cpp
   fboss/qsfp_service/platforms/wedge/oss/WedgeManagerInit.cpp
+  fboss/qsfp_service/platforms/wedge/oss/Wedge400CManager.cpp
 )
 
 target_link_libraries(qsfp_platforms_wedge
@@ -22,11 +23,15 @@ target_link_libraries(qsfp_platforms_wedge
   galaxy_platform_mapping
   wedge100_platform_mapping
   wedge40_platform_mapping
+  wedge400c_platform_mapping
   meru400bfu_platform_mapping
   meru400bia_platform_mapping
   meru400biu_platform_mapping
+  meru400bia_platform_mapping
   meru800bia_platform_mapping
+  meru800bfa_platform_mapping
   montblanc_platform_mapping
   platform_base
   qsfp_config
+  wedge400_i2c
 )
diff --git a/cmake/ThriftCowVisitors.cmake b/cmake/ThriftCowVisitors.cmake
@@ -11,6 +11,7 @@ add_library(
   fboss/thrift_cow/visitors/ExtendedPathVisitor.h
   fboss/thrift_cow/visitors/PathVisitor.h
   fboss/thrift_cow/visitors/RecurseVisitor.h
+  fboss/thrift_cow/visitors/VisitorUtils.h
 )
 
 set_target_properties(thrift_cow_visitors PROPERTIES LINKER_LANGUAGE CXX)