Merge branch 'main' of github.com:microsoft/dpdpu into main

DPDPU/README.md

@@ -27,4 +27,12 @@
 
 # BF-2 Memory Usage
 
-- In developing DDS, log files are accumulated under `/dev/shm/`. They should be cleared periodically.
+- In developing DDS, log files are accumulated under `/dev/shm/`. They should be cleared periodically.
+
+# DDS Configuration
+
+- Host: APR entry for the DPU must be statically configured
+	- Windows: (1) `Get-NetAdapter` to find the index of the BF-2 CX-6 NIC, and (2) `New-NetNeighbor -InterfaceIndex [BF-2 CX-6 NIC index] -IPAddress '[DPU IP]' -LinkLayerAddress '000000000100' -State Permanent`
+	- Linux: run `Scripts/HostAddArpLinux.sh [DPU IP] 00:00:00:00:01:00`
+
+- DPU: the scalable function id in `Main/NetworkConfig.json` must be consistent with the created scalable function for DDS (check with `devlink dev show`)

DPDPU/Scripts/InstallSPDK.sh

@@ -1,16 +1,17 @@
 INSTALL_PATH=/opt/dds/spdk
 mkdir -p $INSTALL_PATH
 cd ../ThirdParty/spdk
-git submodule update --init
 
 # Avoid duplicated DPDK init
 cp ../../StorageEngine/DDSBackEndDPUService/Patches/spdk_dpdk_init.c lib/env_dpdk/init.c
 # Avoid SPDK reactors taking all the Arm cores
 cp ../../StorageEngine/DDSBackEndDPUService/Patches/spdk_dpdk_threads.c lib/env_dpdk/threads.c
 cp ../../StorageEngine/DDSBackEndDPUService/Patches/spdk_reactor.c lib/event/reactor.c
 
+pip3 install testresources
 pip3 install --upgrade setuptools
 ./scripts/pkgdep.sh --all
+git submodule update --init
 ./configure --prefix=$INSTALL_PATH --with-shared --with-dpdk=/opt/mellanox/dpdk/
 CFLAGS="$(pkg-config --cflags libdpdk) -DDPDK_INIT_SUPPRESSED -DSINGLE_REACTOR" make -j
 make install