dpdk: bump to DPDK v22.03 26/35826/3
authorDastin Wilski <dastin.wilski@gmail.com>
Wed, 30 Mar 2022 12:19:00 +0000 (14:19 +0200)
committerDamjan Marion <dmarion@me.com>
Tue, 5 Apr 2022 16:16:30 +0000 (16:16 +0000)
This patch bumps dpdk version from 21.11 to 22.03.

Type: feature
Signed-off-by: Dastin Wilski <dastin.wilski@gmail.com>
Change-Id: I152a7857378371d3fd26d7473421c2b3113cd3ee

build/external/packages/dpdk.mk
build/external/patches/dpdk_22.03/0001-crypto-qat-fix-of-cipher-offset-and-length-assignmen.patch [new file with mode: 0644]

index 7206826..e2fbf04 100644 (file)
@@ -22,9 +22,10 @@ DPDK_FAILSAFE_PMD            ?= n
 DPDK_MACHINE                 ?= default
 DPDK_MLX_IBV_LINK            ?= static
 
-dpdk_version                 ?= 21.11
+dpdk_version                 ?= 22.03
 dpdk_base_url                ?= http://fast.dpdk.org/rel
 dpdk_tarball                 := dpdk-$(dpdk_version).tar.xz
+dpdk_tarball_md5sum_22.03    := a07ca8839f98062f46e1cc359735cce8
 dpdk_tarball_md5sum_21.11    := 58660bbbe9e95abce86e47692b196555
 dpdk_tarball_md5sum_21.08    := de33433a1806280996a0ecbe66e3642f
 dpdk_tarball_md5sum_21.05    := a78bba290b11d9717d1272cc6bfaf7c3
diff --git a/build/external/patches/dpdk_22.03/0001-crypto-qat-fix-of-cipher-offset-and-length-assignmen.patch b/build/external/patches/dpdk_22.03/0001-crypto-qat-fix-of-cipher-offset-and-length-assignmen.patch
new file mode 100644 (file)
index 0000000..9841a00
--- /dev/null
@@ -0,0 +1,57 @@
+From 013a095d6b348afddceaa5ea710ef6309566dc85 Mon Sep 17 00:00:00 2001
+From: Kai Ji <kai.ji@intel.com>
+Date: Fri, 25 Mar 2022 19:22:07 +0800
+Subject: [PATCH] crypto/qat: fix of cipher offset and length assignment
+
+This patch fix the cipher offset and length values when convert
+mbuf to vector chain for QAT build op.
+
+Fixes: a815a04cea05 ("crypto/qat: support symmetric build op request")
+
+Signed-off-by: Kai Ji <kai.ji@intel.com>
+---
+ drivers/crypto/qat/dev/qat_crypto_pmd_gens.h | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h
+index 50a9c5ad5b..dc473e0624 100644
+--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h
++++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h
+@@ -395,12 +395,12 @@ qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,
+       ret = qat_cipher_is_len_in_bits(ctx, op);
+       switch (ret) {
+       case 1:
+-              cipher_len = op->sym->aead.data.length >> 3;
+-              cipher_ofs = op->sym->aead.data.offset >> 3;
++              cipher_len = op->sym->cipher.data.length >> 3;
++              cipher_ofs = op->sym->cipher.data.offset >> 3;
+               break;
+       case 0:
+-              cipher_len = op->sym->aead.data.length;
+-              cipher_ofs = op->sym->aead.data.offset;
++              cipher_len = op->sym->cipher.data.length;
++              cipher_ofs = op->sym->cipher.data.offset;
+               break;
+       default:
+               QAT_DP_LOG(ERR,
+@@ -426,7 +426,6 @@ qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,
+               return -EINVAL;
+       }
+-      min_ofs = cipher_ofs < auth_ofs ? cipher_ofs : auth_ofs;
+       max_len = RTE_MAX(cipher_ofs + cipher_len, auth_ofs + auth_len);
+       /* digest in buffer check. Needed only for wireless algos */
+@@ -463,7 +462,8 @@ qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,
+                                       ctx->digest_length);
+       }
+-      n_src = rte_crypto_mbuf_to_vec(op->sym->m_src, min_ofs, max_len,
++      /* Passing 0 as cipher & auth offsets are assigned into ofs later */
++      n_src = rte_crypto_mbuf_to_vec(op->sym->m_src, 0, max_len,
+                       in_sgl->vec, QAT_SYM_SGL_MAX_NUMBER);
+       if (unlikely(n_src < 0 || n_src > op->sym->m_src->nb_segs)) {
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+-- 
+2.25.1
+