crypto/qat: fix build

Message ID 20230112193045.2907753-1-pablo.de.lara.guarch@intel.com (mailing list archive)
State Superseded, archived
Delegated to: akhil goyal
Headers
Series crypto/qat: fix build |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/github-robot: build success github build: passed
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/intel-Testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-abi-testing success Testing PASS

Commit Message

De Lara Guarch, Pablo Jan. 12, 2023, 7:30 p.m. UTC
  Instead of undefining AES_BLOCK_SIZE, define NO_COMPAT_IMB_API_053,
which prevents legacy macros like AES_BLOCK_SIZE from being defined
from IPSec MB library.

Fixes: 3227bc7138f5 ("crypto/qat: use intel-ipsec-mb for partial hash and AES")
Cc: stable@dpdk.org
Cc: kai.ji@intel.com

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 drivers/crypto/qat/qat_sym_session.c | 1 +
 1 file changed, 1 insertion(+)
  

Comments

Thomas Monjalon Jan. 12, 2023, 8:39 p.m. UTC | #1
12/01/2023 20:30, Pablo de Lara:
> Instead of undefining AES_BLOCK_SIZE, define NO_COMPAT_IMB_API_053,
> which prevents legacy macros like AES_BLOCK_SIZE from being defined
> from IPSec MB library.

Given we are discarding my first workaround,
your first sentence doesn't really make sense.
Please give more context, explain the conflict with OpenSSL,
and copy the error message.

Thanks

> Fixes: 3227bc7138f5 ("crypto/qat: use intel-ipsec-mb for partial hash and AES")
> Cc: stable@dpdk.org
> Cc: kai.ji@intel.com
> 
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
  
Akhil Goyal Jan. 17, 2023, 8:22 a.m. UTC | #2
> 12/01/2023 20:30, Pablo de Lara:
> > Instead of undefining AES_BLOCK_SIZE, define NO_COMPAT_IMB_API_053,
> > which prevents legacy macros like AES_BLOCK_SIZE from being defined
> > from IPSec MB library.
> 
> Given we are discarding my first workaround,
> your first sentence doesn't really make sense.
> Please give more context, explain the conflict with OpenSSL,
> and copy the error message.
> 
Hi Pablo,

Can you fix the description as suggested by Thomas?
I would like to take all the qat build fixes together.

Thanks.
  
De Lara Guarch, Pablo Jan. 18, 2023, 9:51 a.m. UTC | #3
> -----Original Message-----
> From: Akhil Goyal <gakhil@marvell.com>
> Sent: Tuesday, January 17, 2023 8:23 AM
> To: Thomas Monjalon <thomas@monjalon.net>; De Lara Guarch, Pablo
> <pablo.de.lara.guarch@intel.com>
> Cc: Ji, Kai <kai.ji@intel.com>; akhil.goyal@marvell.com; dev@dpdk.org;
> stable@dpdk.org
> Subject: RE: [EXT] Re: [PATCH] crypto/qat: fix build
> 
> > 12/01/2023 20:30, Pablo de Lara:
> > > Instead of undefining AES_BLOCK_SIZE, define
> NO_COMPAT_IMB_API_053,
> > > which prevents legacy macros like AES_BLOCK_SIZE from being defined
> > > from IPSec MB library.
> >
> > Given we are discarding my first workaround, your first sentence
> > doesn't really make sense.
> > Please give more context, explain the conflict with OpenSSL, and copy
> > the error message.
> >
> Hi Pablo,
> 
> Can you fix the description as suggested by Thomas?
> I would like to take all the qat build fixes together.

Sure, will do.

Pablo

> 
> Thanks.
  

Patch

diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c
index 978ee49dce..7f18e9875d 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