Commit ac639eca authored by Krzysztof Karas's avatar Krzysztof Karas Committed by Tomasz Zawadzki
Browse files

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



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

Signed-off-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16702

 (master)

(cherry picked from commit c824f883)
Change-Id: I0a09dbe6b4ee9519d51a0b4cb881844b96d94779
Signed-off-by: default avatarKamil Godzwon <kamilx.godzwon@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16797


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
parent 8f30b8bb

autobuild.sh

+5 −0
Original line number Diff line number Diff line
@@ -202,6 +202,11 @@ function 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

test/common/config/pkgdep/patches/dpdk/22.11+/dpdk_ipsec_mb.patch

0 → 100644
+20 −0
Original line number Diff line number Diff line 
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;

 }