d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

autobuild: Adjusting crypto build for latest DPDK (21.11)

Browse Source 
Details of the changes here:
918fd2f146.

They mainly target the aesni_mb driver which was moved to ipsec_mb and
bump the minimal supported version of the ipsec to v1.0.

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: Ica3b4fd66684751939159511845eb6ac6f7d5205
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10003
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Michal Berger 2021-10-26 13:55:21 +02:00 committed by Tomasz Zawadzki
parent 85c77ec183
commit 089cbda8bf
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
autobuild.sh
View File

@ -81,6 +81,7 @@ function build_native_dpdk() {
dpdk_cflags="-fPIC -g -fcommon" dpdk_cflags="-fPIC -g -fcommon"
dpdk_ldflags="" dpdk_ldflags=""
dpdk_ver=$(< "$external_dpdk_base_dir/VERSION")
if [[ $compiler == *gcc* && $compiler_version -ge 5 ]]; then if [[ $compiler == *gcc* && $compiler_version -ge 5 ]]; then
dpdk_cflags+=" -Werror" dpdk_cflags+=" -Werror"
@ -98,17 +99,29 @@ function build_native_dpdk() {
DPDK_ALL_DRIVERS=($(find "$external_dpdk_base_dir/drivers" -mindepth 1 -type d | sed -n "s#^$external_dpdk_base_dir/drivers/##p")) DPDK_ALL_DRIVERS=($(find "$external_dpdk_base_dir/drivers" -mindepth 1 -type d | sed -n "s#^$external_dpdk_base_dir/drivers/##p"))
if [[ "$SPDK_TEST_CRYPTO" -eq 1 ]]; then if [[ "$SPDK_TEST_CRYPTO" -eq 1 ]]; then
git clone --branch v0.54 --depth 1 https://github.com/intel/intel-ipsec-mb.git "$external_dpdk_base_dir/intel-ipsec-mb" intel_ipsec_mb_ver=v0.54
intel_ipsec_mb_drv=crypto/aesni_mb
intel_ipsec_lib=""
if ge "$dpdk_ver" 21.11.0; then
# Minimum supported version of intel-ipsec-mb, for DPDK >= 21.11, is 1.0.
# Source of the aesni_mb driver was moved to ipsec_mb. .{h,so,a} were moved
# to ./lib.
# https://github.com/dpdk/dpdk/commit/918fd2f1466b0e3b21a033df7012a77a83665582.
intel_ipsec_mb_ver=v1.0
intel_ipsec_mb_drv=crypto/ipsec_mb
intel_ipsec_lib=lib
fi
git clone --branch "$intel_ipsec_mb_ver" --depth 1 https://github.com/intel/intel-ipsec-mb.git "$external_dpdk_base_dir/intel-ipsec-mb"
cd "$external_dpdk_base_dir/intel-ipsec-mb" cd "$external_dpdk_base_dir/intel-ipsec-mb"
$MAKE $MAKEFLAGS all SHARED=y EXTRA_CFLAGS=-fPIC $MAKE $MAKEFLAGS all SHARED=y EXTRA_CFLAGS=-fPIC
DPDK_DRIVERS+=("crypto") DPDK_DRIVERS+=("crypto")
DPDK_DRIVERS+=("crypto/aesni_mb") DPDK_DRIVERS+=("$intel_ipsec_mb_drv")
DPDK_DRIVERS+=("crypto/qat") DPDK_DRIVERS+=("crypto/qat")
DPDK_DRIVERS+=("compress/qat") DPDK_DRIVERS+=("compress/qat")
DPDK_DRIVERS+=("common/qat") DPDK_DRIVERS+=("common/qat")
dpdk_cflags+=" -I$external_dpdk_base_dir/intel-ipsec-mb" dpdk_cflags+=" -I$external_dpdk_base_dir/intel-ipsec-mb/$intel_ipsec_lib"
dpdk_ldflags+=" -L$external_dpdk_base_dir/intel-ipsec-mb" dpdk_ldflags+=" -L$external_dpdk_base_dir/intel-ipsec-mb/$intel_ipsec_lib"
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$external_dpdk_base_dir/intel-ipsec-mb export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$external_dpdk_base_dir/intel-ipsec-mb/$intel_ipsec_lib"
fi fi
if [[ "$SPDK_TEST_REDUCE" -eq 1 ]]; then if [[ "$SPDK_TEST_REDUCE" -eq 1 ]]; then
@ -125,7 +138,7 @@ function build_native_dpdk() {
DPDK_DRIVERS+=("compress/isal") DPDK_DRIVERS+=("compress/isal")
DPDK_DRIVERS+=("compress/qat") DPDK_DRIVERS+=("compress/qat")
DPDK_DRIVERS+=("common/qat") DPDK_DRIVERS+=("common/qat")
if ge "$(< "$external_dpdk_base_dir/VERSION")" 21.02.0; then if ge "$dpdk_ver" 21.02.0; then
# SPDK enables REDUCE_MLX in case supported version of DPDK is detected # SPDK enables REDUCE_MLX in case supported version of DPDK is detected
# so make sure proper libs are built. # so make sure proper libs are built.
DPDK_DRIVERS+=("bus/auxiliary") DPDK_DRIVERS+=("bus/auxiliary")

6
lib/env_dpdk/env.mk
View File

@ -78,13 +78,19 @@ DPDK_FRAMEWORK=n
ifeq ($(CONFIG_CRYPTO),y) ifeq ($(CONFIG_CRYPTO),y)
DPDK_FRAMEWORK=y DPDK_FRAMEWORK=y
DPDK_LIB_LIST += rte_reorder DPDK_LIB_LIST += rte_reorder
ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_crypto_ipsec_mb.*))
# PMD name as of DPDK 21.11
DPDK_LIB_LIST += rte_crypto_ipsec_mb
else
ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_crypto_aesni_mb.*)) ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_crypto_aesni_mb.*))
# PMD name for DPDK 21.08 and earlier
DPDK_LIB_LIST += rte_crypto_aesni_mb DPDK_LIB_LIST += rte_crypto_aesni_mb
else else
# PMD name for DPDK 20.08 and earlier # PMD name for DPDK 20.08 and earlier
DPDK_LIB_LIST += rte_pmd_aesni_mb DPDK_LIB_LIST += rte_pmd_aesni_mb
endif endif
endif endif
endif
ifeq ($(CONFIG_REDUCE),y) ifeq ($(CONFIG_REDUCE),y)
DPDK_FRAMEWORK=y DPDK_FRAMEWORK=y

2
rpmbuild/spdk.spec
View File

@ -68,7 +68,7 @@ make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}/usr/local/lib/dpdk mkdir -p %{buildroot}/usr/local/lib/dpdk
cp -a %{dpdk_build_path}/lib/* %{buildroot}/usr/local/lib/dpdk/ cp -a %{dpdk_build_path}/lib/* %{buildroot}/usr/local/lib/dpdk/
# Special case for SPDK_RUN_EXTERNAL_DPDK setup # Special case for SPDK_RUN_EXTERNAL_DPDK setup
[[ -e %{dpdk_path}/intel-ipsec-mb ]] && cp -a %{dpdk_path}/intel-ipsec-mb/*.so* %{buildroot}/usr/local/lib/dpdk/ [[ -e %{dpdk_path}/intel-ipsec-mb ]] && find %{dpdk_path}/intel-ipsec-mb/ -name '*.so*' -exec cp -a {} %{buildroot}/usr/local/lib/dpdk/ ';'
[[ -e %{dpdk_path}/isa-l/build/lib ]] && cp -a %{dpdk_path}/isa-l/build/lib/*.so* %{buildroot}/usr/local/lib/dpdk/ [[ -e %{dpdk_path}/isa-l/build/lib ]] && cp -a %{dpdk_path}/isa-l/build/lib/*.so* %{buildroot}/usr/local/lib/dpdk/
%endif %endif