# See the License for the specific language governing permissions and
# 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)
+vpp_plugin_find_library(dpdk DPDK_LIB "libdpdk.a")
if (NOT DPDK_INCLUDE_DIR)
- message(WARNING "-- DPDK headers not found - dpdk_plugin disabled")
+ message(WARNING "-- DPDK headers not found - dpdk plugin disabled")
return()
endif()
if (NOT DPDK_LIB)
- dpdk_find_library(DPDK_SHLIB "libdpdk.so")
+ 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_version})
+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)
##############################################################################
# libnuma
##############################################################################
-dpdk_find_library(NUMA_LIB "numa")
+vpp_plugin_find_library(dpdk NUMA_LIB "numa")
list(APPEND DPDK_LINK_LIBRARIES ${NUMA_LIB})
-##############################################################################
-# AESNI libraries
-##############################################################################
-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")
+ vpp_plugin_find_library(dpdk MNL_LIB "mnl")
list(APPEND DPDK_LINK_LIBRARIES "${MNL_LIB}")
- if (DPDK_RTE_LIBRTE_MLX5_DLOPEN_DEPS)
+ 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)")
+ message(WARNING "unsupported DPDK configuration: DPDK Mellanox PMD requires RTE_IBVERBS_LINK_DLOPEN")
endif()
endif()
##############################################################################
# DPDK plugin
##############################################################################
+
+if (${DPDK_VERSION} VERSION_LESS "20.8.0")
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/cryptodev.c
MULTIARCH_SOURCES
buffer.c
ipsec/esp_decrypt.c
ipsec/esp_encrypt.c
- API_FILES
- api/dpdk.api
+ INSTALL_HEADERS
+ device/dpdk.h
+ ipsec/ipsec.h
+
+ LINK_FLAGS
+ "${DPDK_LINK_FLAGS}"
+
+ LINK_LIBRARIES
+ ${DPDK_LINK_LIBRARIES}
+
+ COMPONENT
+ vpp-plugin-dpdk
+)
- API_TEST_SOURCES
- api/dpdk_test.c
+else ()
+add_vpp_plugin(dpdk
+ SOURCES
+ buffer.c
+ main.c
+ thread.c
+ device/cli.c
+ device/common.c
+ device/device.c
+ device/flow.c
+ device/format.c
+ device/init.c
+ device/node.c
+ ipsec/cli.c
+ ipsec/crypto_node.c
+ ipsec/esp_decrypt.c
+ ipsec/esp_encrypt.c
+ ipsec/ipsec.c
+ cryptodev/cryptodev_dp_api.c
+
+ MULTIARCH_SOURCES
+ buffer.c
+ device/device.c
+ device/node.c
+ ipsec/crypto_node.c
+ ipsec/esp_decrypt.c
+ ipsec/esp_encrypt.c
INSTALL_HEADERS
device/dpdk.h
- api/dpdk_all_api_h.h
ipsec/ipsec.h
LINK_FLAGS
vpp-plugin-dpdk
)
+endif ()
\ No newline at end of file