RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-01 16:03:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Add dpdk numa support

Browse Source 
Find and link the numa library for DPDK.

Fixes: https://tracker.ceph.com/issues/42275

Signed-off-by: Hu Ye <yehu5@huawei.com>
Signed-off-by: Chunsong Feng <fengchunsong@huawei.com>
This commit is contained in:
Chunsong Feng 2019-11-14 12:35:37 +08:00 committed by luo rixin
parent 64bd0e2ab4
commit 4f3606f87b
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmake/modules/BuildDPDK.cmake
View File

@ -95,8 +95,13 @@ function(do_build_dpdk dpdk_dir)
BUILD_COMMAND ${make_cmd} O=${dpdk_dir} CC=${CMAKE_C_COMPILER} EXTRA_CFLAGS=-fPIC
BUILD_IN_SOURCE 1
INSTALL_COMMAND "true")
if(NUMA_FOUND)
set(numa "y")
else()
set(numa "n")
endif()
ExternalProject_Add_Step(dpdk-ext patch-config
COMMAND ${CMAKE_MODULE_PATH}/patch-dpdk-conf.sh ${dpdk_dir} ${machine} ${arch}
COMMAND ${CMAKE_MODULE_PATH}/patch-dpdk-conf.sh ${dpdk_dir} ${machine} ${arch} ${numa}
DEPENDEES configure
DEPENDERS build)
# easier to adjust the config
@ -161,6 +166,9 @@ function(do_export_dpdk dpdk_dir)
list(APPEND DPDK_ARCHIVES "${dpdk_${c}_LIBRARY}")
endforeach()
if(NUMA_FOUND)
set(dpdk_numa " -Wl,-lnuma")
endif()
add_library(dpdk::dpdk INTERFACE IMPORTED)
add_dependencies(dpdk::dpdk
${DPDK_LIBRARIES})
@ -168,7 +176,7 @@ function(do_export_dpdk dpdk_dir)
set_target_properties(dpdk::dpdk PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${DPDK_INCLUDE_DIR}
INTERFACE_LINK_LIBRARIES
"-Wl,--whole-archive $<JOIN:${DPDK_ARCHIVES}, > -Wl,--no-whole-archive")
"-Wl,--whole-archive $<JOIN:${DPDK_ARCHIVES}, > -Wl,--no-whole-archive ${dpdk_numa}")
if(dpdk_rte_CFLAGS)
set_target_properties(dpdk::dpdk PROPERTIES
INTERFACE_COMPILE_OPTIONS "${dpdk_rte_CFLAGS}")
@ -176,6 +184,7 @@ function(do_export_dpdk dpdk_dir)
endfunction()
function(build_dpdk dpdk_dir)
find_package(NUMA QUIET)
if(NOT TARGET dpdk-ext)
do_build_dpdk(${dpdk_dir})
endif()

16
cmake/modules/FindNUMA.cmake Normal file
View File

@ -0,0 +1,16 @@
# - Find libnuma
# Find the numa library and includes
#
# NUMA_INCLUDE_DIR - where to find numa.h, etc.
# NUMA_LIBRARIES - List of libraries when using numa.
# NUMA_FOUND - True if numa found.
find_path(NUMA_INCLUDE_DIR numa.h)
find_library(NUMA_LIBRARIES numa)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(numa DEFAULT_MSG NUMA_LIBRARIES NUMA_INCLUDE_DIR)
mark_as_advanced(
NUMA_LIBRARIES
NUMA_INCLUDE_DIR)

4
cmake/modules/patch-dpdk-conf.sh
View File

@ -17,6 +17,8 @@ machine=$1
shift
arch=$1
shift
numa=$1
shift
setconf CONFIG_RTE_MACHINE "${machine}"
setconf CONFIG_RTE_ARCH "${arch}"
@ -52,4 +54,4 @@ setconf CONFIG_RTE_TEST_PMD n
setconf CONFIG_RTE_MBUF_REFCNT_ATOMIC n
# balanced allocation of hugepages
setconf CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES n
setconf CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES "${numa}"