X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2FCMakeLists.txt;h=45605baada0cdde64f908fedab864591357027ee;hb=040950a59d53e8802ad31430d67df105939cce4c;hp=e1494492628717dc3bd87c91a6591c3e6a1d6c75;hpb=612dd6a955e44d2c0fed1801fb8de585ca695c63;p=vpp.git

diff --git a/src/plugins/dpdk/CMakeLists.txt b/src/plugins/dpdk/CMakeLists.txt
index e1494492628..45605baada0 100644
--- a/src/plugins/dpdk/CMakeLists.txt
+++ b/src/plugins/dpdk/CMakeLists.txt
@@ -14,53 +14,106 @@
 ##############################################################################
 # Find lib and include files
 ##############################################################################
-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})
+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 not found - dpdk_plugin disabled")
+  return()
+endif()
 
 ##############################################################################
 # Find DPDK Version
 ##############################################################################
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dpdk_version.c
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dpdk_vars.c
 "
 #include <stdio.h>
 #include <rte_version.h>
 int main()
 {
-  puts(strchr(rte_version(), ' ') + 1);
+  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
+#ifdef RTE_LIBRTE_MLX4_PMD
+  printf(\"RTE_LIBRTE_MLX4_PMD=%u\\n\", RTE_LIBRTE_MLX4_PMD);
+#endif
+#ifdef RTE_LIBRTE_MLX5_PMD
+  printf(\"RTE_LIBRTE_MLX5_PMD=%u\\n\", RTE_LIBRTE_MLX5_PMD);
+#ifdef RTE_LIBRTE_MLX5_DLOPEN_DEPS
+  printf(\"RTE_LIBRTE_MLX5_DLOPEN_DEPS=%u\\n\", RTE_LIBRTE_MLX5_DLOPEN_DEPS);
+#endif
+#endif
   return 0;
 }
 ")
 
-try_compile(DPDK_VERSION_COMPILED
+try_compile(DPDK_VARS_COMPILED
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}/dpdk_version.c
+  ${CMAKE_CURRENT_BINARY_DIR}/dpdk_vars.c
   CMAKE_FLAGS
   -DINCLUDE_DIRECTORIES=${DPDK_INCLUDE_DIR}
-  COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/dpdk_version.bin
+  COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/dpdk_vars.bin
 )
 
-if(DPDK_VERSION_COMPILED)
+if(DPDK_VARS_COMPILED)
   execute_process(
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMAND ./dpdk_version.bin
-    OUTPUT_VARIABLE DPDK_VERSION
+    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()
 
 file(REMOVE
-  ${CMAKE_CURRENT_BINARY_DIR}/dpdk_version.c
-  ${CMAKE_CURRENT_BINARY_DIR}/dpdk_version.bin
+  ${CMAKE_CURRENT_BINARY_DIR}/dpdk_vars.c
+  ${CMAKE_CURRENT_BINARY_DIR}/dpdk_vars.bin
 )
 
+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()
 
 ##############################################################################
 # DPDK plugin
 ##############################################################################
 if(DPDK_INCLUDE_DIR AND DPDK_LIB)
   include_directories (${DPDK_INCLUDE_DIR})
-  add_vpp_plugin(dpdk_plugin
+
+  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()
+  if(DPDK_RTE_LIBRTE_MLX4_PMD OR DPDK_RTE_LIBRTE_MLX5_PMD)
+    if (DPDK_RTE_LIBRTE_MLX5_DLOPEN_DEPS)
+      set(DPDK_LINK_FLAGS "${DPDK_LINK_FLAGS} -Wl,-lmnl")
+      message(STATUS "DPDK depends on libmnl (Mellanox PMD requirement)")
+    else()
+      set(DPDK_LINK_FLAGS "${DPDK_LINK_FLAGS} -Wl,-lmnl,-libverbs,-lmlx5")
+      message(STATUS "DPDK depends on libmnl, libibverbs, libmlx5 (Mellanox PMD requirement)")
+    endif()
+  endif()
+  set(DPDK_LINK_FLAGS "${DPDK_LINK_FLAGS} -Wl,-lnuma")
+  add_vpp_plugin(dpdk
+    SOURCES
     buffer.c
     main.c
     thread.c
@@ -79,22 +132,33 @@ if(DPDK_INCLUDE_DIR AND DPDK_LIB)
     ipsec/esp_decrypt.c
     ipsec/esp_encrypt.c
     ipsec/ipsec.c
-    api/dpdk.api
-  )
 
-  vpp_library_set_multiarch_sources(dpdk_plugin
+    MULTIARCH_SOURCES
     buffer.c
     device/device.c
     device/node.c
-  )
+    ipsec/crypto_node.c
+    ipsec/esp_decrypt.c
+    ipsec/esp_encrypt.c
 
-  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")
-  set(DPDK_LINK_FLAGS "${DPDK_LINK_FLAGS} -Wl,--exclude-libs,libIPSec_MB.a,-l:libIPSec_MB.a")
-  set(DPDK_LINK_FLAGS "${DPDK_LINK_FLAGS} -Wl,-lnuma")
-  set_target_properties(dpdk_plugin PROPERTIES LINK_FLAGS "${DPDK_LINK_FLAGS}")
-  message("-- Found DPDK ${DPDK_VERSION}: ${DPDK_INCLUDE_DIR} ${DPDK_LIB}")
+    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
+    ${DPDK_LINK_FLAGS}
+
+    COMPONENT
+    vpp-plugin-dpdk
+  )
 else()
-  message("-- DPDK not found - dpdk_plugin disabled")
+  message(WARNING "DPDK not found - dpdk disabled")
 endif()