X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2FCMakeLists.txt;h=7db6b094be76df9d807055ff4315afd5e90f87c9;hb=f15a5791ba870a98a2ab7dec101bbbb9b6e266c1;hp=66407041eae4dba17f1d436d0145b9f28991c0d0;hpb=9f540ed348e3a3ef01951208211603a07fd574d6;p=vpp.git

diff --git a/src/plugins/dpdk/CMakeLists.txt b/src/plugins/dpdk/CMakeLists.txt
index 66407041eae..7db6b094be7 100644
--- a/src/plugins/dpdk/CMakeLists.txt
+++ b/src/plugins/dpdk/CMakeLists.txt
@@ -12,113 +12,153 @@
 # limitations under the License.
 
 ##############################################################################
-# Find lib and include files
+# Check if we want to use the system DPDK
 ##############################################################################
-find_path(DPDK_INCLUDE_DIR PATH_SUFFIXES dpdk NAMES rte_config.h HINTS
-	  ${DPDK_INCLUDE_DIR_HINT})
-find_library(DPDK_LIB NAMES libdpdk.a HINTS ${DPDK_LIB_DIR_HINT})
+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()
+    ##############################################################################
+    # 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")
 
-##############################################################################
-# Find DPDK Version
-##############################################################################
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dpdk_vars.c
-"
-#include <stdio.h>
-#include <rte_version.h>
-int main()
-{
-  printf(\"VERSION=%s\\n\", strchr(rte_version(), ' ') + 1);
-  printf(\"RTE_PKTMBUF_HEADROOM=%u\\n\", RTE_PKTMBUF_HEADROOM);
-#ifdef RTE_LIBRTE_PMD_AESNI_MB
-  printf(\"RTE_LIBRTE_PMD_AESNI_MB=%u\\n\", RTE_LIBRTE_PMD_AESNI_MB);
-#endif
-#ifdef RTE_LIBRTE_PMD_AESNI_GCM
-  printf(\"RTE_LIBRTE_PMD_AESNI_GCM=%u\\n\", RTE_LIBRTE_PMD_AESNI_GCM);
-#endif
-  return 0;
-}
-")
-
-try_compile(DPDK_VARS_COMPILED
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}/dpdk_vars.c
-  CMAKE_FLAGS
-  -DINCLUDE_DIRECTORIES=${DPDK_INCLUDE_DIR}
-  COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/dpdk_vars.bin
-)
+    if (NOT DPDK_INCLUDE_DIR)
+      message(WARNING "-- DPDK headers not found - dpdk plugin disabled")
+      return()
+    endif()
 
-if(DPDK_VARS_COMPILED)
-  execute_process(
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMAND ./dpdk_vars.bin
-    OUTPUT_VARIABLE DPDK_VARS
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  string(REPLACE "\n" ";" DPDK_VARS ${DPDK_VARS})
-  foreach(v ${DPDK_VARS})
-    string(REPLACE "=" ";" v ${v})
-    list(GET v 0 name)
-    list(GET v 1 value)
-    set(DPDK_${name} ${value})
-  endforeach()
-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()
 
-file(REMOVE
-  ${CMAKE_CURRENT_BINARY_DIR}/dpdk_vars.c
-  ${CMAKE_CURRENT_BINARY_DIR}/dpdk_vars.bin
-)
+    ##############################################################################
+    # 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()
 
-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})"
-  )
+    ##############################################################################
+    # 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()
 
 ##############################################################################
 # DPDK plugin
 ##############################################################################
-if(DPDK_INCLUDE_DIR AND DPDK_LIB)
-  include_directories (${DPDK_INCLUDE_DIR})
-  add_vpp_plugin(dpdk_plugin
-    buffer.c
-    main.c
-    thread.c
-    api/dpdk_api.c
-    api/dpdk_test.c
-    device/cli.c
-    device/common.c
-    device/device.c
-    device/flow.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
-    api/dpdk.api
-  )
-
-  vpp_library_set_multiarch_sources(dpdk_plugin
-    buffer.c
-    device/device.c
-    device/node.c
-  )
-
-  message(STATUS "Found DPDK ${DPDK_VERSION} in ${DPDK_INCLUDE_DIR}")
-  get_filename_component(DPDK_LIB_DIR ${DPDK_LIB} DIRECTORY)
-  set(DPDK_LINK_FLAGS "-L${DPDK_LIB_DIR} -Wl,--whole-archive,${DPDK_LIB},--no-whole-archive")
-  if(DPDK_RTE_LIBRTE_PMD_AESNI_MB OR DPDK_RTE_LIBRTE_PMD_AESNI_GCM)
-    set(DPDK_LINK_FLAGS "${DPDK_LINK_FLAGS} -Wl,--exclude-libs,libIPSec_MB.a,-l:libIPSec_MB.a")
-    message(STATUS "DPDK depends on IPSec MB library")
-  endif()
-  set(DPDK_LINK_FLAGS "${DPDK_LINK_FLAGS} -Wl,-lnuma")
-  set_target_properties(dpdk_plugin PROPERTIES LINK_FLAGS "${DPDK_LINK_FLAGS}")
-else()
-  message(WARNING "DPDK not found - dpdk_plugin disabled")
-endif()
 
+if (${DPDK_VERSION} VERSION_GREATER_EQUAL "20.8.0")
+  set(DPDK_CRYPTODEV_SOURCE cryptodev_dp_api)
+else ()
+  set(DPDK_CRYPTODEV_SOURCE cryptodev)
+endif ()
+
+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/${DPDK_CRYPTODEV_SOURCE}.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
+  ipsec/ipsec.h
+
+  LINK_FLAGS
+  "${DPDK_LINK_FLAGS}"
+
+  LINK_LIBRARIES
+  ${DPDK_LINK_LIBRARIES}
+
+  COMPONENT
+  vpp-plugin-dpdk
+)