Commit bad261b6 authored by Kamil Godzwon's avatar Kamil Godzwon Committed by Tomasz Zawadzki
Browse files

test/patch: fix rte_thash_x86_gfni patch 



Patch rte_thash_x86_gfni introduced in change
4dcb9448 turned out
to be not unified as required so patching causes errors
in upstream vs-dpdk CI jobs.

The current master dpdk version is 23.03.0-rc1 and it
contains changes from the patch so we have to check for
all versions less than (not less-equal) 23.03.0.

Signed-off-by: default avatarKamil Godzwon <kamilx.godzwon@intel.com>
Change-Id: Ie4d3a829bcd91ca07659388094bda2d61f7c1584
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16914


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

test/common/autobuild_common.sh

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ _build_native_dpdk() { 
		else

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



			if le $dpdk_ver 23.03.0; then

			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

test/common/config/pkgdep/patches/dpdk/21.11+/dpdk_rte_thash_gfni.patch

+18 −12
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
@@ -15,3 +19,5 @@ index 880739b710..7bb76ac1bb 100644 
 	int chunk_len = 0, i = 0;

 	uint8_t mtrx_msk;

 	const int prepend = 3;

--