diff --git a/build-root/dpdk_mlx_default.sh b/build-root/dpdk_mlx_default.sh new file mode 100644 index 000000000000..337f59df7947 --- /dev/null +++ b/build-root/dpdk_mlx_default.sh @@ -0,0 +1 @@ +DPDK_MLX_DEFAULT=y diff --git a/build/external/Makefile b/build/external/Makefile index b036313afee6..87c79c86a414 100644 --- a/build/external/Makefile +++ b/build/external/Makefile @@ -47,10 +47,10 @@ clean: @rm -rf $(B) $(I) .PHONY: install -install: $(if $(ARCH_X86_64), ipsec-mb-install) dpdk-install rdma-core-install quicly-install libbpf-install +install: $(if $(ARCH_X86_64), ipsec-mb-install) rdma-core-install quicly-install libbpf-install .PHONY: config -config: $(if $(ARCH_X86_64), ipsec-mb-config) dpdk-config rdma-core-config quicly-build +config: $(if $(ARCH_X86_64), ipsec-mb-config) rdma-core-config quicly-build ############################################################################## # .deb packaging diff --git a/src/plugins/dpdk/CMakeLists.txt b/src/plugins/dpdk/CMakeLists.txt index a9d4f3e514cb..357c81d1fc38 100644 --- a/src/plugins/dpdk/CMakeLists.txt +++ b/src/plugins/dpdk/CMakeLists.txt @@ -14,8 +14,10 @@ ############################################################################## # Check if we want to use the system DPDK ############################################################################## -option(VPP_USE_SYSTEM_DPDK "Use the system installation of DPDK." OFF) +option(VPP_USE_SYSTEM_DPDK "Use the system installation of DPDK." ON) +set(VPP_USE_SYSTEM_DPDK "/usr/local/lib") if(VPP_USE_SYSTEM_DPDK) + message("try to find system dpdk lib") find_package(PkgConfig REQUIRED) pkg_check_modules(DPDK REQUIRED libdpdk) message(WARNING "-- linking dpdk plugin against system libdpdk, version ${DPDK_VERSION}") diff --git a/src/plugins/dpdk/device/common.c b/src/plugins/dpdk/device/common.c index b8c6eddd34b7..05416f89e767 100644 --- a/src/plugins/dpdk/device/common.c +++ b/src/plugins/dpdk/device/common.c @@ -165,7 +165,7 @@ dpdk_device_setup (dpdk_device_t * xd) { conf.rxmode.max_rx_pkt_len = dev_info.max_rx_pktlen; xd->max_supported_frame_size = dev_info.max_rx_pktlen; - mtu = xd->max_supported_frame_size - xd->driver_frame_overhead; + CLIB_UNUSED(u32 mtu) = xd->max_supported_frame_size - xd->driver_frame_overhead; } else { diff --git a/src/plugins/dpdk/device/dpdk_priv.h b/src/plugins/dpdk/device/dpdk_priv.h index 013ab41637eb..67b9a8040f3b 100644 --- a/src/plugins/dpdk/device/dpdk_priv.h +++ b/src/plugins/dpdk/device/dpdk_priv.h @@ -183,7 +183,7 @@ dpdk_update_counters (dpdk_device_t * xd, f64 now) #define RTE_ETH_RSS_ESP ETH_RSS_ESP #define RTE_ETH_RSS_L4_DST_ONLY ETH_RSS_L4_DST_ONLY #define RTE_ETH_RSS_L4_SRC_ONLY ETH_RSS_L4_SRC_ONLY -#define RTE_ETH_RSS_L3_DST_ONL ETH_RSS_L3_DST_ONL +#define RTE_ETH_RSS_L3_DST_ONLY ETH_RSS_L3_DST_ONLY #define RTE_ETH_RSS_L3_SRC_ONLY ETH_RSS_L3_SRC_ONLY #define RTE_ETH_RETA_GROUP_SIZE RTE_RETA_GROUP_SIZE #define RTE_ETH_TX_OFFLOAD_IPV4_CKSUM DEV_TX_OFFLOAD_IPV4_CKSUM diff --git a/startup.conf b/startup.conf new file mode 100644 index 000000000000..5529d39ad20d --- /dev/null +++ b/startup.conf @@ -0,0 +1,65 @@ + +unix { + interactive + #nodaemon + log /opt/vpp_copy.log + # full-coredump + cli-listen /opt/vpp_copy/cli.sock +} + +api-trace { + on +} + +memory { + main-heap-size 1G + # main-heap-page-size 1G +} + +cpu { + main-core 0 + corelist-workers 1 +} + +buffers { + #buffers-per-numa 128000 + page-size default-hugepage + #default data-size 4096 +} + +plugins { + path /opt/vpp_copy/build-root/build-vpp_debug-native/vpp/lib/aarch64-linux-gnu/vpp_plugins + plugin default { enable } + plugin oddbuf_plugin.so { enable } + plugin dpdk_plugin.so { enable } + plugin handoffdemo_plugin.so { enable } + #plugin qq_plugin.so { enable } +} + +dpdk { + no-pci + # dev 0000:02:01.0 { + # name ens33 + # } + # dev 0000:02:06.0 { + # name ens38 + # } + # dev 0000:02:07.0 { + # name ens39 + # } + # dev 0000:02:01.0 + # dev 0000:02:07.0 +} + +statseg { + size 32m + # page-size 4k + # socket-name /home/ubuntu/opt/vpp/stats.sock +} + +logging { + default-log-level debug + default-syslog-log-level debug + add-to-elog + # class dpdk/cryptodev { rate-limit 100 level debug syslog-level error } +}