# limitations under the License.
##############################################################################
-# macros
-##############################################################################
-macro(dpdk_find_library var name)
- find_library(${var} NAMES ${name} ${ARGN})
-if (NOT ${var})
- message(WARNING "-- ${name} library not found - dpdk_plugin disabled")
- return()
-endif()
- message(STATUS "DPDK plugin needs ${name} library - found at ${${var}}")
-endmacro()
-
-##############################################################################
-# Find lib and include files
-##############################################################################
-find_path(DPDK_INCLUDE_DIR PATH_SUFFIXES dpdk NAMES rte_config.h)
-find_library(DPDK_LIB NAMES libdpdk.a)
-
-if (NOT DPDK_INCLUDE_DIR)
- message(WARNING "-- DPDK headers not found - dpdk_plugin disabled")
- return()
-endif()
-
-if (NOT DPDK_LIB)
- dpdk_find_library(DPDK_SHLIB "libdpdk.so")
- set(DPDK_IS_SHARED_LIB 1)
- message(WARNING "-- linking dpdk plugin against DPDK shared libs")
-endif()
-
-##############################################################################
-# Parse DPDK config and version header files
-##############################################################################
-
-file(STRINGS ${DPDK_INCLUDE_DIR}/rte_config.h rte_config)
-file(STRINGS ${DPDK_INCLUDE_DIR}/rte_version.h rte_version)
-
-foreach(l ${rte_config} ${rte_version})
- if (l MATCHES "^#define[\t ]*RTE_")
- STRING(REGEX REPLACE "^#define[\t ]*([A-Z1-9_]+)[\t ]*(.+)" "\\1;\\2" v "${l}")
- list(GET v 0 name)
- list(GET v 1 value)
- set(DPDK_${name} ${value})
- endif()
-endforeach()
-
-set(DPDK_VERSION
- "${DPDK_RTE_VER_YEAR}.${DPDK_RTE_VER_MONTH}.${DPDK_RTE_VER_MINOR}")
-
-##############################################################################
-# verify headroom size
-##############################################################################
-if(NOT ${DPDK_RTE_PKTMBUF_HEADROOM} EQUAL ${PRE_DATA_SIZE})
- message(
- FATAL_ERROR
- "DPDK RTE_PKTMBUF_HEADROOM (${DPDK_RTE_PKTMBUF_HEADROOM}) "
- "must be equal to PRE_DATA_SIZE (${PRE_DATA_SIZE})"
- )
-endif()
-
-##############################################################################
-# static or dynamic linking
-##############################################################################
-unset(DPDK_LINK_LIBRARIES)
-unset(DPDK_LINK_FLAGS)
-message(STATUS "Found DPDK ${DPDK_VERSION} in ${DPDK_INCLUDE_DIR}")
-include_directories (${DPDK_INCLUDE_DIR})
-
-if(DPDK_IS_SHARED_LIB)
- get_filename_component(DPDK_LIB_DIR ${DPDK_SHLIB} DIRECTORY)
- string_append(DPDK_LINK_FLAGS "-L${DPDK_LIB_DIR}")
- list(APPEND DPDK_LINK_LIBRARIES ${DPDK_SHLIB})
+# Check if we want to use the system DPDK
+##############################################################################
+option(VPP_USE_SYSTEM_DPDK "Use the system installation of DPDK." OFF)
+if(VPP_USE_SYSTEM_DPDK)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(DPDK REQUIRED libdpdk)
+ message(WARNING "-- linking dpdk plugin against system libdpdk, version ${DPDK_VERSION}")
+ set(DPDK_LINK_FLAGS ${DPDK_LDFLAGS})
else()
- get_filename_component(DPDK_LIB_DIR ${DPDK_LIB} DIRECTORY)
- string_append(DPDK_LINK_FLAGS "-L${DPDK_LIB_DIR}")
- string_append(DPDK_LINK_FLAGS "-Wl,--whole-archive,${DPDK_LIB},--no-whole-archive")
+ ##############################################################################
+ # Find lib and include files
+ ##############################################################################
+ find_path(DPDK_INCLUDE_DIR PATH_SUFFIXES dpdk NAMES rte_config.h)
+ vpp_plugin_find_library(dpdk DPDK_LIB "libdpdk.a")
+
+ if (NOT DPDK_INCLUDE_DIR)
+ message(WARNING "-- DPDK headers not found - dpdk plugin disabled")
+ return()
+ endif()
+
+ if (NOT DPDK_LIB)
+ vpp_plugin_find_library(dpdk DPDK_SHLIB "libdpdk.so")
+ set(DPDK_IS_SHARED_LIB 1)
+ message(WARNING "-- linking dpdk plugin against DPDK shared libs")
+ endif()
+
+ ##############################################################################
+ # Parse DPDK config and version header files
+ ##############################################################################
+ file(STRINGS ${DPDK_INCLUDE_DIR}/rte_config.h rte_config)
+ file(STRINGS ${DPDK_INCLUDE_DIR}/rte_version.h rte_version)
+ file(STRINGS ${DPDK_INCLUDE_DIR}/rte_build_config.h rte_build_config)
+
+ foreach(l ${rte_config} ${rte_build_config} ${rte_version}})
+ if (l MATCHES "^#define[\t ]*RTE_")
+ STRING(REGEX REPLACE "^#define[\t ]*([A-Z1-9_]+)[\t ]*(.+)" "\\1;\\2" v "${l}")
+ list(GET v 0 name)
+ list(GET v 1 value)
+ set(DPDK_${name} ${value})
+ endif()
+ endforeach()
+
+ set(DPDK_VERSION
+ "${DPDK_RTE_VER_YEAR}.${DPDK_RTE_VER_MONTH}.${DPDK_RTE_VER_MINOR}")
+
+ ##############################################################################
+ # verify headroom size
+ ##############################################################################
+ if(NOT ${DPDK_RTE_PKTMBUF_HEADROOM} EQUAL ${PRE_DATA_SIZE})
+ message(
+ FATAL_ERROR
+ "DPDK RTE_PKTMBUF_HEADROOM (${DPDK_RTE_PKTMBUF_HEADROOM}) "
+ "must be equal to PRE_DATA_SIZE (${PRE_DATA_SIZE})"
+ )
+ endif()
+
+ ##############################################################################
+ # static or dynamic linking
+ ##############################################################################
+ unset(DPDK_LINK_LIBRARIES)
+ unset(DPDK_LINK_FLAGS)
+ message(STATUS "Found DPDK ${DPDK_VERSION} in ${DPDK_INCLUDE_DIR}")
+ include_directories (${DPDK_INCLUDE_DIR})
+
+ if(DPDK_IS_SHARED_LIB)
+ get_filename_component(DPDK_LIB_DIR ${DPDK_SHLIB} DIRECTORY)
+ string_append(DPDK_LINK_FLAGS "-L${DPDK_LIB_DIR}")
+ list(APPEND DPDK_LINK_LIBRARIES ${DPDK_SHLIB})
+ else()
+ get_filename_component(DPDK_LIB_DIR ${DPDK_LIB} DIRECTORY)
+ string_append(DPDK_LINK_FLAGS "-L${DPDK_LIB_DIR}")
+ string_append(DPDK_LINK_FLAGS "-Wl,--whole-archive,${DPDK_LIB},--no-whole-archive")
+ endif()
+
+ ##############################################################################
+ # libnuma
+ ##############################################################################
+ vpp_plugin_find_library(dpdk NUMA_LIB "numa")
+ list(APPEND DPDK_LINK_LIBRARIES ${NUMA_LIB})
+
+ ##############################################################################
+ # Mellanox libraries
+ ##############################################################################
+ if(DPDK_RTE_LIBRTE_MLX4_PMD OR DPDK_RTE_LIBRTE_MLX5_PMD)
+ if (DPDK_RTE_IBVERBS_LINK_DLOPEN)
+ message(STATUS "DPDK depends on libmnl (Mellanox PMD requirement)")
+ vpp_plugin_find_library(dpdk MNL_LIB "mnl")
+ list(APPEND DPDK_LINK_LIBRARIES "${MNL_LIB}")
+ else()
+ message(WARNING "EXPERIMENTAL: DPDK plugin without dlopen mode")
+ vpp_plugin_find_library(dpdk IBVERBS_LIB "libibverbs.a")
+ vpp_plugin_find_library(dpdk MLX5_LIB "libmlx5.a")
+ vpp_plugin_find_library(dpdk MLX4_LIB "libmlx4.a")
+ vpp_plugin_find_library(dpdk CCAN_LIB "libccan.a")
+ vpp_plugin_find_library(dpdk RDMA_UTIL_LIB "rdma_util")
+ string_append(DPDK_LINK_FLAGS "-Wl,--whole-archive,${IBVERBS_LIB},${MLX5_LIB},${MLX4_LIB},${CCAN_LIB},${RDMA_UTIL_LIB},--no-whole-archive")
+ endif()
+ endif()
endif()
##############################################################################
-# libnuma
-##############################################################################
-dpdk_find_library(NUMA_LIB "numa")
-list(APPEND DPDK_LINK_LIBRARIES ${NUMA_LIB})
-
-##############################################################################
-# AESNI libraries
+# DPDK plugin
##############################################################################
-if(DPDK_RTE_LIBRTE_PMD_AESNI_MB OR DPDK_RTE_LIBRTE_PMD_AESNI_GCM)
- if(DPDK_IS_SHARED_LIB)
- dpdk_find_library(IPSECMB_LIB "libIPSec_MB.so")
- list(APPEND DPDK_LINK_LIBRARIES "${IPSECMB_LIB}")
- else()
- dpdk_find_library(IPSECMB_LIB "libIPSec_MB.a")
- get_filename_component(IPSECMB_LIB_DIR ${IPSECMB_LIB} DIRECTORY)
- string_append(DPDK_LINK_FLAGS "-L${IPSECMB_LIB_DIR}")
- string_append(DPDK_LINK_FLAGS "-Wl,--exclude-libs,libIPSec_MB.a,-l:libIPSec_MB.a")
- endif()
-endif()
-##############################################################################
-# Mellanox libraries
-##############################################################################
-if(DPDK_RTE_LIBRTE_MLX4_PMD OR DPDK_RTE_LIBRTE_MLX5_PMD)
- dpdk_find_library(MNL_LIB "mnl")
- list(APPEND DPDK_LINK_LIBRARIES "${MNL_LIB}")
- if (DPDK_RTE_IBVERBS_LINK_DLOPEN)
- message(STATUS "DPDK depends on libmnl (Mellanox PMD requirement)")
- else()
- dpdk_find_library(IBVERBS_LIB "ibverbs")
- list(APPEND DPDK_LINK_LIBRARIES "${IBVERBS_LIB}")
- dpdk_find_library(MLX5_LIB "mlx5")
- list(APPEND DPDK_LINK_LIBRARIES "${MLX5_LIB}")
- message(STATUS "DPDK depends on libmnl, libibverbs, libmlx5 (Mellanox PMD requirement)")
- endif()
-endif()
+if (${DPDK_VERSION} VERSION_GREATER_EQUAL "20.8.0")
+ set(DPDK_CRYPTODEV_SOURCE cryptodev_dp_api)
+else ()
+ set(DPDK_CRYPTODEV_SOURCE cryptodev)
+endif ()
-##############################################################################
-# DPDK plugin
-##############################################################################
add_vpp_plugin(dpdk
SOURCES
buffer.c
main.c
thread.c
-# api/dpdk_api.c
-# api/dpdk_test.c
device/cli.c
device/common.c
device/device.c
device/format.c
device/init.c
device/node.c
-# hqos/hqos.c
ipsec/cli.c
ipsec/crypto_node.c
ipsec/esp_decrypt.c
ipsec/esp_encrypt.c
ipsec/ipsec.c
+ cryptodev/${DPDK_CRYPTODEV_SOURCE}.c
MULTIARCH_SOURCES
buffer.c
ipsec/esp_decrypt.c
ipsec/esp_encrypt.c
-# API_FILES
-# api/dpdk.api
-
-# API_TEST_SOURCES
-# api/dpdk_test.c
-
INSTALL_HEADERS
device/dpdk.h
-# api/dpdk_all_api_h.h
ipsec/ipsec.h
LINK_FLAGS
COMPONENT
vpp-plugin-dpdk
)
-
Code Review / vpp.git / blobdiff