ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autobuild: patch DPDK with "ipsec_mb: expect EENOTSUP in ipsec_mb_create()"

Browse Source 
Apply this patch, when building SPDK with external DPDK (versions 22.11.0+).

Change-Id: I0a09dbe6b4ee9519d51a0b4cb881844b96d94779
Signed-off-by: Krzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16702
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Kamil Godzwon <kamilx.godzwon@intel.com>
This commit is contained in:
Krzysztof Karas 2023-02-07 09:48:33 +01:00 committed by Tomasz Zawadzki
parent d8c8e3f4ee
commit c824f88347
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/common/autobuild_common.sh
View File

@ -161,6 +161,11 @@ _build_native_dpdk() {
patch -p1 < "$rootdir/test/common/config/pkgdep/patches/dpdk/20.11/dpdk_qat.patch"
else
patch -p1 < "$rootdir/test/common/config/pkgdep/patches/dpdk/21.11+/dpdk_qat.patch"
# Commit https://review.spdk.io/gerrit/c/spdk/dpdk/+/16134 is required for DPDK 22.11+
if ge $dpdk_ver 22.11.0; then
patch -p1 < "$rootdir/test/common/config/pkgdep/patches/dpdk/22.11+/dpdk_ipsec_mb.patch"
fi
fi
fi

20
test/common/config/pkgdep/patches/dpdk/22.11+/dpdk_ipsec_mb.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_private.c b/drivers/crypto/ipsec_mb/ipsec_mb_private.c
index 50b789a..9eebf9b 100644
--- a/drivers/crypto/ipsec_mb/ipsec_mb_private.c
+++ b/drivers/crypto/ipsec_mb/ipsec_mb_private.c
@@ -170,13 +170,8 @@
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
retval = ipsec_mb_mp_request_register();
- if (retval && (rte_errno == EEXIST))
- /* Safe to proceed, return 0 */
- return 0;
-
- if (retval)
- IPSEC_MB_LOG(ERR,
- "IPSec Multi-buffer register MP request failed.\n");
+ if (retval != 0 && rte_errno == ENOTSUP)
+ retval = 0;
}
return retval;
}