d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
136c3fb461
numam-spdk/lib/env_dpdk/env.mk

132 lines
4.3 KiB
Makefile
Raw Normal View History

env: Make the environment library configurable. This allows users to swap out SPDK's third party libraries for an implementation based on their own framework. Change-Id: Ia0b7384ce5e31acba5ad0d7002dec9e95b759c52 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-08-10 17:28:20 +00:00
#
# BSD LICENSE
#
# Copyright (c) Intel Corporation.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Intel Corporation nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# This makefile snippet must define the following flags:
# ENV_CFLAGS
# ENV_CXXFLAGS
# ENV_LIBS
# ENV_LINKER_ARGS
build: remove DPDK_DIR This is an artifact from before SPDK had a configure script or a DPDK submodule. Make configure the only supported way for specifying the location of the DPDK installation to use with SPDK. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: I5c197c46220928bb18b97c8807755967d76ea42c Reviewed-on: https://review.gerrithub.io/424893 Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Paul Luse <paul.e.luse@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
2018-09-06 21:09:14 +00:00
DPDK_DIR = $(CONFIG_DPDK_DIR)
env: Make the environment library configurable. This allows users to swap out SPDK's third party libraries for an implementation based on their own framework. Change-Id: Ia0b7384ce5e31acba5ad0d7002dec9e95b759c52 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-08-10 17:28:20 +00:00
export DPDK_ABS_DIR = $(abspath $(DPDK_DIR))
env: Detect correct DPDK header install location Official installs of DPDK place headers in a 'dpdk' subdirectory under include, so detect that. Change-Id: If64421c84c91cae31688994484c22fce398dc622 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-11-23 20:33:16 +00:00
ifneq (, $(wildcard $(DPDK_ABS_DIR)/include/rte_config.h))
env_dpdk: use detected include file path env.mk already detects the location of the include path (which may or may not have 'dpdk' in the name depending on the DPDK version), so put that into a DPDK_INC_DIR variable and use it in the libnuma check so we find the correct rte_config.h location. Also check if rte_config.h exists before trying to pass it to grep - this prevents error messages when running 'make clean' using the dpdk submodule, because the rte_config.h file is removed before the other SPDK directories get a chance to run 'make clean'. Change-Id: I903c9f5801c04302407b2217723466cd6883fbda Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-on: https://review.gerrithub.io/378163 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: John Kariuki <John.K.Kariuki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2017-09-12 16:09:33 +00:00
DPDK_INC_DIR := $(DPDK_ABS_DIR)/include
env: Detect correct DPDK header install location Official installs of DPDK place headers in a 'dpdk' subdirectory under include, so detect that. Change-Id: If64421c84c91cae31688994484c22fce398dc622 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-11-23 20:33:16 +00:00
else
env_dpdk: use detected include file path env.mk already detects the location of the include path (which may or may not have 'dpdk' in the name depending on the DPDK version), so put that into a DPDK_INC_DIR variable and use it in the libnuma check so we find the correct rte_config.h location. Also check if rte_config.h exists before trying to pass it to grep - this prevents error messages when running 'make clean' using the dpdk submodule, because the rte_config.h file is removed before the other SPDK directories get a chance to run 'make clean'. Change-Id: I903c9f5801c04302407b2217723466cd6883fbda Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-on: https://review.gerrithub.io/378163 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: John Kariuki <John.K.Kariuki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2017-09-12 16:09:33 +00:00
DPDK_INC_DIR := $(DPDK_ABS_DIR)/include/dpdk
env: Detect correct DPDK header install location Official installs of DPDK place headers in a 'dpdk' subdirectory under include, so detect that. Change-Id: If64421c84c91cae31688994484c22fce398dc622 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-11-23 20:33:16 +00:00
endif
env_dpdk: use detected include file path env.mk already detects the location of the include path (which may or may not have 'dpdk' in the name depending on the DPDK version), so put that into a DPDK_INC_DIR variable and use it in the libnuma check so we find the correct rte_config.h location. Also check if rte_config.h exists before trying to pass it to grep - this prevents error messages when running 'make clean' using the dpdk submodule, because the rte_config.h file is removed before the other SPDK directories get a chance to run 'make clean'. Change-Id: I903c9f5801c04302407b2217723466cd6883fbda Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-on: https://review.gerrithub.io/378163 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: John Kariuki <John.K.Kariuki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2017-09-12 16:09:33 +00:00
DPDK_INC := -I$(DPDK_INC_DIR)
env_dpdk: allow linking against DPDK shared libs Detect whether the specified DPDK directory contains static or shared libraries, and use the appropriate extension when building the library list. Static libraries are still preferred. Change-Id: I78c68fd38fba1ea42dd605fb77209651f8cdca75 Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-01-26 00:23:37 +00:00
ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_eal.a))
DPDK_LIB_EXT = .a
else
DPDK_LIB_EXT = .so
endif
DPDK_LIB_LIST = rte_eal rte_mempool rte_ring
env: Make the environment library configurable. This allows users to swap out SPDK's third party libraries for an implementation based on their own framework. Change-Id: Ia0b7384ce5e31acba5ad0d7002dec9e95b759c52 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-08-10 17:28:20 +00:00
env/dpdk: additional library required for DPDK 17.05 ring based mempool Change-Id: I2ef4a330a5628c84657f516cb2e4fad609b6c6d8 Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
2017-05-03 07:09:10 +00:00
# librte_mempool_ring was new added from DPDK 17.05. Link this library used for
# ring based mempool management API.
ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_mempool_ring.*))
DPDK_LIB_LIST += rte_mempool_ring
endif
env: Make the environment library configurable. This allows users to swap out SPDK's third party libraries for an implementation based on their own framework. Change-Id: Ia0b7384ce5e31acba5ad0d7002dec9e95b759c52 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-08-10 17:28:20 +00:00
# librte_malloc was removed after DPDK 2.1. Link this library conditionally based on its
# existence to maintain backward compatibility.
ifneq ($(wildcard $(DPDK_ABS_DIR)/lib/librte_malloc.*),)
env_dpdk: allow linking against DPDK shared libs Detect whether the specified DPDK directory contains static or shared libraries, and use the appropriate extension when building the library list. Static libraries are still preferred. Change-Id: I78c68fd38fba1ea42dd605fb77209651f8cdca75 Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-01-26 00:23:37 +00:00
DPDK_LIB_LIST += rte_malloc
env: Make the environment library configurable. This allows users to swap out SPDK's third party libraries for an implementation based on their own framework. Change-Id: Ia0b7384ce5e31acba5ad0d7002dec9e95b759c52 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-08-10 17:28:20 +00:00
endif
env/dpdk: compile with rte_pci and rte_bus_pci for DPDK 17.11-rc1 DPDK 17.11-rc1 moved a part of it's eal code into two separate libraries. Change-Id: Ibcea448487a001c30abb68447e3fe2104ba9a7c3 Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com> Reviewed-on: https://review.gerrithub.io/387655 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2017-11-15 14:15:35 +00:00
# librte_pci and librte_bus_pci were added in DPDK 17.11. Link these libraries conditionally
# based on their existence to maintain backward compatibility.
ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_pci.*))
DPDK_LIB_LIST += rte_pci
endif
ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_bus_pci.*))
DPDK_LIB_LIST += rte_bus_pci
endif
bdev/compress: Add configure option and build dependencies Includes the required DPDK dependencies for SPDK block Reduce aka Compression. Change-Id: Ic1ea3cbeb9373a7700f6f0c2a3194d65d6a34a41 Signed-off-by: paul luse <paul.e.luse@intel.com> Reviewed-on: https://review.gerrithub.io/c/429523 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2018-10-15 20:46:41 +00:00
# There are some complex dependencies when using crypto, reduce or both so
# here we add the feature specific ones and set a flag to add the common
# ones after that.
DPDK_FRAMEWORK=n
bdev: Add crypto virtual bdev module Initial support for softare AESNI_MB DPDK driver only. Have tested (both aesni and QAT seprately and concurrrently) on underlying NVMe devices with bdevio and a bdevperf script that runs IOs from 512B to 128K each with Q depths from 1 to 512 in powers of 2 for 30 seconds each run. QAT can be included in the code (but not makefile) and marked as experimental until we are ready to test in CI. It works well on 2 systems but is a big PITA to get the hardware setup and configured for use with DPDK (IMHO). Change-Id: If518c3df8e74e00efa18afdf194824c5e69778fc Signed-off-by: Paul Luse <paul.e.luse@intel.com> Reviewed-on: https://review.gerrithub.io/403107 Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2018-03-07 23:44:06 +00:00
ifeq ($(CONFIG_CRYPTO),y)
bdev/compress: Add configure option and build dependencies Includes the required DPDK dependencies for SPDK block Reduce aka Compression. Change-Id: Ic1ea3cbeb9373a7700f6f0c2a3194d65d6a34a41 Signed-off-by: paul luse <paul.e.luse@intel.com> Reviewed-on: https://review.gerrithub.io/c/429523 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2018-10-15 20:46:41 +00:00
DPDK_FRAMEWORK=y
DPDK_LIB_LIST += rte_pmd_aesni_mb rte_pmd_qat rte_reorder
endif
ifeq ($(CONFIG_REDUCE),y)
DPDK_FRAMEWORK=y
DPDK_LIB_LIST += rte_pmd_isal_comp
endif
ifeq ($(DPDK_FRAMEWORK),y)
DPDK_LIB_LIST += rte_cryptodev rte_compressdev rte_bus_vdev
bdev: Add crypto virtual bdev module Initial support for softare AESNI_MB DPDK driver only. Have tested (both aesni and QAT seprately and concurrrently) on underlying NVMe devices with bdevio and a bdevperf script that runs IOs from 512B to 128K each with Q depths from 1 to 512 in powers of 2 for 30 seconds each run. QAT can be included in the code (but not makefile) and marked as experimental until we are ready to test in CI. It works well on 2 systems but is a big PITA to get the hardware setup and configured for use with DPDK (IMHO). Change-Id: If518c3df8e74e00efa18afdf194824c5e69778fc Signed-off-by: Paul Luse <paul.e.luse@intel.com> Reviewed-on: https://review.gerrithub.io/403107 Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2018-03-07 23:44:06 +00:00
endif
env/dpdk: link with rte_kvargs by default Starting with DPDK 18.08, rte_kvargs is a dependency of rte_eal. Change-Id: I0cde78f632fc313cec745d41ee519fb8b37de81b Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com> Reviewed-on: https://review.gerrithub.io/422238 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2018-08-14 07:51:17 +00:00
ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_kvargs.*))
DPDK_LIB_LIST += rte_kvargs
endif
env_dpdk: allow linking against DPDK shared libs Detect whether the specified DPDK directory contains static or shared libraries, and use the appropriate extension when building the library list. Static libraries are still preferred. Change-Id: I78c68fd38fba1ea42dd605fb77209651f8cdca75 Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-01-26 00:23:37 +00:00
DPDK_LIB = $(DPDK_LIB_LIST:%=$(DPDK_ABS_DIR)/lib/lib%$(DPDK_LIB_EXT))
env/dpdk: add support for DPDK 18.05 dynamic memory allocation This brings DPDK 18.05 support and introduces dynamic hugepage memory allocation. The following is now possible: ./spdk_tgt -s 32 rpc.py construct_malloc_bdev 128 512 or even: ./spdk_tgt -s 0 Note that if no -s param is given, DPDK will still allocate all available hugepage memory. This has been tested with DPDK 18.05-rc6. Fixes #281 Change-Id: Ic9521484c2871eb5b2a56445f1177f305b147707 Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com> Reviewed-on: https://review.gerrithub.io/410540 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-05-09 05:28:38 +00:00
# SPDK memory registration requires experimental (deprecated) rte_memory API for DPDK 18.05
ENV_CFLAGS = $(DPDK_INC) -Wno-deprecated-declarations
env: Make the environment library configurable. This allows users to swap out SPDK's third party libraries for an implementation based on their own framework. Change-Id: Ia0b7384ce5e31acba5ad0d7002dec9e95b759c52 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
2016-08-10 17:28:20 +00:00
ENV_CXXFLAGS = $(ENV_CFLAGS)
mk: add spdk_lib_list_to_shared_libs While here, change spdk_lib_list_to_files to spdk_lib_list_to_static_libs to differentiate it from the new spdk_lib_list_to_shared_libs. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: I6e5913addfbdd556fae2451d4e2b2c43feaf33ab Reviewed-on: https://review.gerrithub.io/429286 Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Lance Hartmann <lance.hartmann@oracle.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
2018-10-12 21:50:36 +00:00
ENV_DPDK_FILE = $(call spdk_lib_list_to_static_libs,env_dpdk)
build: define SPDK_LIB_LIST to simplify building dependencies and linker args Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: Ia969f9e5ed01f4b58cec2559133347d836118131
2016-11-18 16:57:53 +00:00
ENV_LIBS = $(ENV_DPDK_FILE) $(DPDK_LIB)
env_dpdk: Eliminate unneeded start group ld opt The ENV_LINKER_ARGS was employing both the linker --[start|end]-group and --[whole|no-whole]-archive options around the DPDK_LIBs. With the use of whole/no-whole, the start/end bracketing is unnecessary. Change-Id: I97a2ac22df8c6b48ba674b9b292f5eea01823901 Signed-off-by: Lance Hartmann <lance.hartmann@oracle.com> Reviewed-on: https://review.gerrithub.io/428737 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
2018-10-10 15:55:39 +00:00
ENV_LINKER_ARGS = $(ENV_DPDK_FILE) -Wl,--whole-archive $(DPDK_LIB) -Wl,--no-whole-archive
env_dpdk: move system libraries out of ENV_LIBS The $(ENV_LIBS) variable was including system library linker arguments like '-ldl', but $(ENV_LIBS) is intended to be used as a dependency for other Makefile targets, and those arguments don't belong there. Add the system library linker arguments to ENV_LINKER_ARGS instead. Change-Id: I247264d287047f1423365806042982b492eec311 Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-01-26 00:19:05 +00:00
ipsec_mb: use EXTRA_CFLAGS to point DPDK to intel-ipsec-mb submodule This allows us to remove the requirement to install intel-ipsec-mb to system directories. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: I579655a98b515cf148b7cd17823a9bb541ea6ad7 Reviewed-on: https://review.gerrithub.io/c/440785 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Seth Howell <seth.howell5141@gmail.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2019-01-13 20:28:21 +00:00
ifeq ($(CONFIG_IPSEC_MB),y)
ENV_LINKER_ARGS += -lIPSec_MB -L$(IPSEC_MB_DIR)
dpdkbuild: stop building ipsec library with make In early development of crypto we built the lirbary using dpdkbuild/Makefile but later due to a DPDK change we needed to move to a newer version of the ipsec library that is now built and installed in pkgdep.sh btu we never removed it from the makefile. This patch removes the extra building of the ipsec module. Change-Id: I367618440074d952ff13c6e2098fc3a572cc785e Signed-off-by: paul luse <paul.e.luse@intel.com> Reviewed-on: https://review.gerrithub.io/429519 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2018-10-15 20:08:44 +00:00
endif
bdev/compress: Add configure option and build dependencies Includes the required DPDK dependencies for SPDK block Reduce aka Compression. Change-Id: Ic1ea3cbeb9373a7700f6f0c2a3194d65d6a34a41 Signed-off-by: paul luse <paul.e.luse@intel.com> Reviewed-on: https://review.gerrithub.io/c/429523 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2018-10-15 20:46:41 +00:00
ifeq ($(CONFIG_REDUCE),y)
ENV_LINKER_ARGS += -lisal -L$(ISAL_DIR)/.libs
endif
env_dpdk: use detected include file path env.mk already detects the location of the include path (which may or may not have 'dpdk' in the name depending on the DPDK version), so put that into a DPDK_INC_DIR variable and use it in the libnuma check so we find the correct rte_config.h location. Also check if rte_config.h exists before trying to pass it to grep - this prevents error messages when running 'make clean' using the dpdk submodule, because the rte_config.h file is removed before the other SPDK directories get a chance to run 'make clean'. Change-Id: I903c9f5801c04302407b2217723466cd6883fbda Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-on: https://review.gerrithub.io/378163 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: John Kariuki <John.K.Kariuki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2017-09-12 16:09:33 +00:00
ifneq (,$(wildcard $(DPDK_INC_DIR)/rte_config.h))
env.mk: link libnuma if RTE_EAL_NUMA_AWARE_HUGEPAGES is set We used to check RTE_LIBRTE_VHOST_NUMA to decide whether or not libnuma should be linked, but EAL may need it as well. With our DPDK 18.02 fork we build fine just because RTE_LIBRTE_VHOST_NUMA is always set Change-Id: I2bdf03b328d3ae074437565c8b66e2b6adcbfe89 Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com> Reviewed-on: https://review.gerrithub.io/415481 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2018-06-15 12:48:32 +00:00
ifneq (,$(shell grep -e "define RTE_LIBRTE_VHOST_NUMA 1" -e "define RTE_EAL_NUMA_AWARE_HUGEPAGES 1" $(DPDK_INC_DIR)/rte_config.h))
env_dpdk: link libnuma when necessary Change-Id: I4e5f0694fc99e17dc405d7aa6b9e7215c63c0f52 Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-on: https://review.gerrithub.io/377608 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: John Kariuki <John.K.Kariuki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2017-09-07 18:13:28 +00:00
ENV_LINKER_ARGS += -lnuma
endif
env_dpdk: use detected include file path env.mk already detects the location of the include path (which may or may not have 'dpdk' in the name depending on the DPDK version), so put that into a DPDK_INC_DIR variable and use it in the libnuma check so we find the correct rte_config.h location. Also check if rte_config.h exists before trying to pass it to grep - this prevents error messages when running 'make clean' using the dpdk submodule, because the rte_config.h file is removed before the other SPDK directories get a chance to run 'make clean'. Change-Id: I903c9f5801c04302407b2217723466cd6883fbda Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-on: https://review.gerrithub.io/378163 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: John Kariuki <John.K.Kariuki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2017-09-12 16:09:33 +00:00
endif
env_dpdk: link libnuma when necessary Change-Id: I4e5f0694fc99e17dc405d7aa6b9e7215c63c0f52 Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-on: https://review.gerrithub.io/377608 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: John Kariuki <John.K.Kariuki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2017-09-07 18:13:28 +00:00
env_dpdk: move system libraries out of ENV_LIBS The $(ENV_LIBS) variable was including system library linker arguments like '-ldl', but $(ENV_LIBS) is intended to be used as a dependency for other Makefile targets, and those arguments don't belong there. Add the system library linker arguments to ENV_LINKER_ARGS instead. Change-Id: I247264d287047f1423365806042982b492eec311 Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-01-26 00:19:05 +00:00
ifeq ($(OS),Linux)
ENV_LINKER_ARGS += -ldl
endif
ifeq ($(OS),FreeBSD)
ENV_LINKER_ARGS += -lexecinfo
endif
Reference in New Issue Copy Permalink