autobuild.sh: apply crypto patch when building with mainline DPDK

Apply https://review.spdk.io/gerrit/c/spdk/dpdk/+/11139 patch
to accomadate QAT SYM and ASYM VFs when running crypto
functional tests.

This replaces DPDK v21.08 patches, as v21.08 is no longer
supported.

Change-Id: Ic11de9de1f96288f6b2ff504a1d262e41ad66063
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11204
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Karol Latecki 2022-01-21 14:23:17 +01:00 committed by Jim Harris
parent c733cd682f
commit 6f77ddee15
4 changed files with 30 additions and 44 deletions

View File

@ -160,8 +160,10 @@ function build_native_dpdk() {
if [[ $dpdk_ver == 20.11* ]]; then
patch -p1 < "$rootdir/test/common/config/pkgdep/patches/dpdk/20.11/dpdk_pci.patch"
patch -p1 < "$rootdir/test/common/config/pkgdep/patches/dpdk/20.11/dpdk_qat.patch"
elif [[ $dpdk_ver == 21.08* ]]; then
patch -p1 < "$rootdir/test/common/config/pkgdep/patches/dpdk/21.08/dpdk_qat.patch"
elif [[ $dpdk_ver == 21.11* ]]; then
patch -p1 < "$rootdir/test/common/config/pkgdep/patches/dpdk/21.11/dpdk_qat.patch"
elif [[ $dpdk_ver == 22.03* ]]; then
patch -p1 < "$rootdir/test/common/config/pkgdep/patches/dpdk/22.03/dpdk_qat.patch"
fi
fi

View File

@ -1,42 +0,0 @@
Subject: [PATCH] build/meson: disable qat_asym driver
---
drivers/common/qat/meson.build | 4 ++--
drivers/crypto/qat/meson.build | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build
index 479a46f9f09..d695f7d1668 100644
--- a/drivers/common/qat/meson.build
+++ b/drivers/common/qat/meson.build
@@ -64,10 +64,10 @@ endif
if qat_crypto
foreach f: ['qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c',
- 'qat_sym_hw_dp.c', 'qat_asym_pmd.c', 'qat_asym.c']
+ 'qat_sym_hw_dp.c']
sources += files(join_paths(qat_crypto_relpath, f))
endforeach
deps += ['security']
ext_deps += libcrypto
- cflags += ['-DBUILD_QAT_SYM', '-DBUILD_QAT_ASYM']
+ cflags += ['-DBUILD_QAT_SYM']
endif
diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build
index b3b2d172580..195a4f5fb28 100644
--- a/drivers/crypto/qat/meson.build
+++ b/drivers/crypto/qat/meson.build
@@ -13,8 +13,6 @@ qat_deps += 'security'
if dep.found()
# Add our sources files to the list
qat_sources += files(
- 'qat_asym.c',
- 'qat_asym_pmd.c',
'qat_sym.c',
'qat_sym_hw_dp.c',
'qat_sym_pmd.c',
@@ -22,5 +20,4 @@ if dep.found()
)
qat_ext_deps += dep
qat_cflags += '-DBUILD_QAT_SYM'
- qat_cflags += '-DBUILD_QAT_ASYM'
endif

View File

@ -0,0 +1,13 @@
diff --git a/config/rte_config.h b/config/rte_config.h
index cab4390..020b9da 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -59,7 +59,7 @@
#define RTE_MAX_MULTI_HOST_CTRLS 4
/* cryptodev defines */
-#define RTE_CRYPTO_MAX_DEVS 64
+#define RTE_CRYPTO_MAX_DEVS 128
#define RTE_CRYPTODEV_NAME_LEN 64
#define RTE_CRYPTO_CALLBACKS 1

View File

@ -0,0 +1,13 @@
diff --git a/config/rte_config.h b/config/rte_config.h
index cab4390..020b9da 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -59,7 +59,7 @@
#define RTE_MAX_MULTI_HOST_CTRLS 4
/* cryptodev defines */
-#define RTE_CRYPTO_MAX_DEVS 64
+#define RTE_CRYPTO_MAX_DEVS 128
#define RTE_CRYPTODEV_NAME_LEN 64
#define RTE_CRYPTO_CALLBACKS 1