patch 'crypto/qat: fix build' has been queued to stable release 22.11.2

Xueming Li xuemingl at nvidia.com
Mon Feb 27 07:58:48 CET 2023


Hi,

FYI, your patch has been queued to stable release 22.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/01/23. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=a0b1faaad2070f0965d21cf83196bfb06c4a3f4a

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From a0b1faaad2070f0965d21cf83196bfb06c4a3f4a Mon Sep 17 00:00:00 2001
From: Pablo de Lara <pablo.de.lara.guarch at intel.com>
Date: Wed, 18 Jan 2023 11:05:58 +0000
Subject: [PATCH] crypto/qat: fix build
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 2a211079a92e962bbd0ec81e425a6ffc32890e67 ]

When building QAT PMD, the following issue comes up:

intel-ipsec-mb.h:333: error: "AES_BLOCK_SIZE" redefined
  333 | #define AES_BLOCK_SIZE          IMB_AES_BLOCK_SIZE
In file included from drivers/crypto/qat/qat_sym_session.c:8:
/usr/include/openssl/aes.h:26: previous definition
   26 | # define AES_BLOCK_SIZE 16

By defining NO_COMPAT_IMB_API_053, it prevents legacy macros
like AES_BLOCK_SIZE from being defined from IPSec MB library,
avoiding the redefinition.

Fixes: 3227bc7138f5 ("crypto/qat: use intel-ipsec-mb for partial hash and AES")

Reported-by: Thomas Monjalon <thomas at monjalon.net>
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
Acked-by: Kai Ji <kai.ji at intel.com>
---
 drivers/crypto/qat/qat_sym_session.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c
index dfff1f4afb..46a30d6539 100644
--- a/drivers/crypto/qat/qat_sym_session.c
+++ b/drivers/crypto/qat/qat_sym_session.c
@@ -10,6 +10,7 @@
 #include <openssl/evp.h>	/* Needed for bpi runt block processing */

 #ifdef RTE_QAT_LIBIPSECMB
+#define NO_COMPAT_IMB_API_053
 #if defined(RTE_ARCH_ARM)
 #include <ipsec-mb.h>
 #else
--
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-27 14:08:41.639405000 +0800
+++ 0021-crypto-qat-fix-build.patch	2023-02-27 14:08:40.739237000 +0800
@@ -1 +1 @@
-From 2a211079a92e962bbd0ec81e425a6ffc32890e67 Mon Sep 17 00:00:00 2001
+From a0b1faaad2070f0965d21cf83196bfb06c4a3f4a Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 2a211079a92e962bbd0ec81e425a6ffc32890e67 ]
@@ -19 +21,0 @@
-Cc: stable at dpdk.org
@@ -29 +31 @@
-index 622a3120f8..466482d225 100644
+index dfff1f4afb..46a30d6539 100644


More information about the stable mailing list