From 9e073c5c00acc16cd794496e28045c4dcc4ac82e Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Tue, 5 Apr 2022 17:16:03 +0200 Subject: [PATCH] autobuild: group crypto patch apply for DPDK Crypto patch for increasing maximum number of crypto devs applies to all DPDK releases since 21.11. Change the conditionals so that the patch is applied to any new DPDK version. Also change the patch location to "21.11+" directory to indicate that patch is not exclusive for 21.11 version. Fixes #2491 Signed-off-by: Karol Latecki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12159 (cherry-picked from commit a6eafd95d4bc845785b52c789f03414b537559d9) Change-Id: I341f88958c6bf6c4d77909a06bf7ce91200cb70e Signed-off-by: Kamil Godzwon Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12456 Community-CI: Broadcom CI Reviewed-by: Michal Berger Reviewed-by: Paul Luse Reviewed-by: Tomasz Zawadzki Reviewed-by: Aleksey Marchuk Tested-by: SPDK CI Jenkins Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12496 Reviewed-by: Jim Harris Reviewed-by: Konrad Sztyber Reviewed-by: Pawel Piatek Reviewed-by: Karol Latecki Reviewed-by: Krzysztof Karas --- autobuild.sh | 8 +++----- .../patches/dpdk/{21.11 => 21.11+}/dpdk_qat.patch | 0 .../config/pkgdep/patches/dpdk/22.03/dpdk_qat.patch | 13 ------------- 3 files changed, 3 insertions(+), 18 deletions(-) rename test/common/config/pkgdep/patches/dpdk/{21.11 => 21.11+}/dpdk_qat.patch (100%) delete mode 100644 test/common/config/pkgdep/patches/dpdk/22.03/dpdk_qat.patch diff --git a/autobuild.sh b/autobuild.sh index bf91951f8..e947ba0aa 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -158,13 +158,11 @@ function build_native_dpdk() { cd $external_dpdk_base_dir if [ "$(uname -s)" = "Linux" ]; then - if [[ $dpdk_ver == 20.11* ]]; then + if lt $dpdk_ver 21.11.0; 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.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" + else + patch -p1 < "$rootdir/test/common/config/pkgdep/patches/dpdk/21.11+/dpdk_qat.patch" fi fi diff --git a/test/common/config/pkgdep/patches/dpdk/21.11/dpdk_qat.patch b/test/common/config/pkgdep/patches/dpdk/21.11+/dpdk_qat.patch similarity index 100% rename from test/common/config/pkgdep/patches/dpdk/21.11/dpdk_qat.patch rename to test/common/config/pkgdep/patches/dpdk/21.11+/dpdk_qat.patch diff --git a/test/common/config/pkgdep/patches/dpdk/22.03/dpdk_qat.patch b/test/common/config/pkgdep/patches/dpdk/22.03/dpdk_qat.patch deleted file mode 100644 index aa867f479..000000000 --- a/test/common/config/pkgdep/patches/dpdk/22.03/dpdk_qat.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 -