Commit 7a2df103 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

test/dpdk: remove patches from DPDK 22.11.2 in build_native_dpdk() 



build_native_dpdk() is used on "vs DPDK" jobs that verify
current SPDK with specific releases of DPDK.

Following two patches were included in DPDK 22.11.2 and
no longer need to be applied in "vs DPDK" jobs:
(760cf754) hash: fix GFNI implementation build with GCC 12
(39ca0f73) crypto/ipsec_mb: relax multi-process requirement

Note: DPDK 21.11 is not supported, but this patch didn't focus
on removing those parts.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21538

 (master)

(cherry picked from commit 67642ba9)
Change-Id: I90bcfc1cd4b956e9b6d28f55670b7aa1f4de977f
Signed-off-by: default avatarMarek Chomnicki <marek.chomnicki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21592


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 1d7b1d37

test/common/autobuild_common.sh

+0 −10
Original line number Diff line number Diff line
@@ -171,16 +171,6 @@ _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"



			if lt $dpdk_ver 23.03.0; then

				# Commit https://review.spdk.io/gerrit/c/spdk/dpdk/+/16828 is required for DPDK <23.03.0

				patch -p1 < "$rootdir/test/common/config/pkgdep/patches/dpdk/21.11+/dpdk_rte_thash_gfni.patch"

			fi



			# Commit https://review.spdk.io/gerrit/c/spdk/dpdk/+/16134 is required for DPDK 22.11+

			if ge $dpdk_ver 22.11.0 && lt $dpdk_ver 23.03.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/21.11+/dpdk_rte_thash_gfni.patch

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
---

 lib/hash/rte_thash_x86_gfni.h | 6 ++++--

 1 file changed, 4 insertions(+), 2 deletions(-)



diff --git a/lib/hash/rte_thash_x86_gfni.h b/lib/hash/rte_thash_x86_gfni.h

index 880739b710..7bb76ac1bb 100644

--- a/lib/hash/rte_thash_x86_gfni.h

+++ b/lib/hash/rte_thash_x86_gfni.h

@@ -88,8 +88,10 @@ __rte_thash_gfni(const uint64_t *mtrx, const uint8_t *tuple,

 	const __m512i shift_8 = _mm512_set1_epi8(8);

 	__m512i xor_acc = _mm512_setzero_si512();

 	__m512i perm_bytes = _mm512_setzero_si512();

-	__m512i vals, matrixes, tuple_bytes, tuple_bytes_2;

-	__mmask64 load_mask, permute_mask, permute_mask_2;

+	__m512i vals, matrixes, tuple_bytes_2;

+	__m512i tuple_bytes = _mm512_setzero_si512();

+	__mmask64 load_mask, permute_mask_2;

+	__mmask64 permute_mask = 0;

 	int chunk_len = 0, i = 0;

 	uint8_t mtrx_msk;

 	const int prepend = 3;

--

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

deleted100644 → 0
+0 −20
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;

 }