improve IPsec_MB dependency checks
Subsystems (2)
v2 cover improve IPsec_MB dependency checks
For both meson and make builds, the version checks for IPsec_MB library were incomplete. This fixes both and makes the checks consistent.
Bruce Richardson (3):
crypto/aesni_gcm: add dependency version check crypto/aesni_mb: cleanup of version check code crypto/aesni_gcm: add check for build dependency
drivers/crypto/aesni_gcm/Makefile | 19 ++++++++++++++++--- drivers/crypto/aesni_gcm/meson.build | 11 +++++++++++ drivers/crypto/aesni_mb/meson.build | 18 +++++++++--------- 3 files changed, 36 insertions(+), 12 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 1/3 crypto/aesni_gcm: add dependency version check
The aesni_mb driver and the aesni_gcm driver both require the same version of the IPSec_MB library, but only the former has a check of the library found by meson to see if it's the correct version. Add a similar check to the aesni_gcm library's meson.build file, so that the auto-detection of dependencies works correctly.
--- drivers/crypto/aesni_gcm/meson.build | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/crypto/aesni_gcm/meson.build +11 -0
@@ -1,11 +1,22 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +IMB_required_ver = '0.52.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found() build = false else ext_deps += lib + + # version comes with quotes, so we split based on " and take the middle + imb_ver = cc.get_define('IMB_VERSION_STR', + prefix : '#include<intel-ipsec-mb.h>').split('"')[1] + + if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver)) + message('IPSec_MB version >= @0@ is required, found version @1@'.format( + IMB_required_ver, imb_ver)) + build = false + endif endif allow_experimental_apis = true
Signature · 1 line
2.20.1
Re: [dpdk-dev] [PATCH v2 1/3] crypto/aesni_gcm: add dependency version check
Quoted 9 lines
-----Original Message-----
From: Richardson, Bruce
Sent: Tuesday, April 23, 2019 4:44 PM
To: De Lara Guarch, Pablo <[email protected]>; [email protected]
Cc: Richardson, Bruce <[email protected]>
Subject: [PATCH v2 1/3]crypto/aesni_gcm: add dependency version check
Quoted 7 lines
The
aesni_mbdriver and theaesni_gcmdriver both require the same version of theIPSec_MBlibrary, but only the former has a check of the library found by meson to see if it's the correct version. Add a similar check to theaesni_gcmlibrary's meson.build file, so that the auto-detection of dependencies works correctly.Signed-off-by Bruce Richardson <[email protected]>
Re: [dpdk-dev] [PATCH v2 1/3] crypto/aesni_gcm: add dependency version check
In reply to Bruce RichardsonQuoted 23 lines · Bruce Richardson
The
aesni_mbdriver and theaesni_gcmdriver both require the same version
of theIPSec_MBlibrary, but only the former has a check of the library
found by meson to see if it's the correct version. Add a similar check to
theaesni_gcmlibrary's meson.build file, so that the auto-detection of
dependencies works correctly.Signed-off-by: Bruce Richardson <
[email protected]Quoted 1 line
--- drivers/crypto/aesni_gcm/meson.build | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/crypto/aesni_gcm/meson.build +0
-0
drivers/crypto/aesni_gcm/meson.build line 9
Quoted 9 lines
drivers/crypto/aesni_gcm/meson.build +1
-0@@ -1,11 +1,22 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +IMB_required_ver = '0.52.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found() build = false else ext_deps += lib
Shouldn't this be moved into a new else branch after the version check?
Quoted 17 lines
drivers/crypto/aesni_gcm/meson.build +2
-0+ + # version comes with quotes, so we split based on " and takethe middle
drivers/crypto/aesni_gcm/meson.build +4
-0+ imb_ver = cc.get_define('IMB_VERSION_STR', + prefix : '#include<intel-ipsec-mb.h>').split('"')[1] + + if (imb_ver == '') or (imb_ver.version_compare('<' +
IMB_required_ver))drivers/crypto/aesni_gcm/meson.build +1
-0+ message('IPSec_MB version >= @0@ is required, foundversion @1@'.format(
drivers/crypto/aesni_gcm/meson.build +3
-0+ IMB_required_ver, imb_ver)) + build = false + endif endif allow_experimental_apis = true
Signature · 2 lines
Kind regards, Luca Boccassi
Re: [dpdk-dev] [PATCH v2 1/3] crypto/aesni_gcm: add dependency version check
Quoted 27 lines · Luca Boccassi
Quoted 26 lines · Bruce Richardson
The
aesni_mbdriver and theaesni_gcmdriver both require the same version
of theIPSec_MBlibrary, but only the former has a check of the library
found by meson to see if it's the correct version. Add a similar check to
theaesni_gcmlibrary's meson.build file, so that the auto-detection of
dependencies works correctly.Signed-off-by: Bruce Richardson <
[email protected]Quoted 1 line
--- drivers/crypto/aesni_gcm/meson.build | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/crypto/aesni_gcm/meson.build +0
-0@@ -1,11 +1,22 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation
Quoted 9 lines
drivers/crypto/aesni_gcm/meson.build line 9
Quoted 6 lines
drivers/crypto/aesni_gcm/meson.build +1
-0+IMB_required_ver = '0.52.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found() build = false else ext_deps += libShouldn't this be moved into a new else branch after the version check?
No, it's harmless where it is, since if build is set to false, the values set for sources, deps etc. are all ignored and reset for building the next driver in the list.
/Bruce
Re: [dpdk-dev] [PATCH v2 1/3] crypto/aesni_gcm: add dependency version check
Quoted 42 lines · Bruce Richardson
Quoted 30 lines · Luca Boccassi
Quoted 29 lines · Bruce Richardson
The
aesni_mbdriver and theaesni_gcmdriver both require the same
version
of theIPSec_MBlibrary, but only the former has a check of the library
found by meson to see if it's the correct version. Add a similar check to
theaesni_gcmlibrary's meson.build file, so that the auto- detection
of
dependencies works correctly.Signed-off-by: Bruce Richardson <
[email protected]--- drivers/crypto/aesni_gcm/meson.build | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/crypto/aesni_gcm/meson.build +0
-0@@ -1,11 +1,22 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel CorporationQuoted 10 lines
drivers/crypto/aesni_gcm/meson.build line 9
Quoted 6 lines
drivers/crypto/aesni_gcm/meson.build +1
-0+IMB_required_ver = '0.52.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found() build = false else ext_deps += libShouldn't this be moved into a new else branch after the version check?
Quoted 7 lines
No, it's harmless where it is, since if build is set to false, the values
set for sources, deps etc. are all ignored and reset for building the next
driver in the list./Bruce
Ah I see, thanks
Signature · 2 lines
Kind regards, Luca Boccassi
PATCH v2 2/3 crypto/aesni_mb: cleanup of version check code
In reply to Bruce RichardsonThe version check for the IPSec_MB library present in the aesni_gcm library's meson.build file is a little cleaner than that given here, so update this one so that both work identically.
While one could use the checks done in the other right now, potentially in future they may have different version dependencies, or may be compiled in different orders, so keep the code duplicated for safety, since it's only a few lines.
--- drivers/crypto/aesni_mb/meson.build | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/crypto/aesni_mb/meson.build +9 -9
@@ -1,25 +1,25 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -IPSec_MB_ver_0_52 = '0.52.0' + +IMB_required_ver = '0.52.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found() build = false else ext_deps += lib - imb_arr = cc.get_define('IMB_VERSION_STR', - prefix : '#include<intel-ipsec-mb.h>').split('"') - - imb_ver = ''.join(imb_arr) + # version comes with quotes, so we split based on " and take the middle + imb_ver = cc.get_define('IMB_VERSION_STR', + prefix : '#include<intel-ipsec-mb.h>').split('"')[1] - if (imb_ver == '') or (imb_ver.version_compare('<' + IPSec_MB_ver_0_52)) - message('IPSec_MB version >= 0.52 is required') + if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver)) + message('IPSec_MB version >= @0@ is required, found version @1@'.format( + IMB_required_ver, imb_ver)) build = false - else - sources = files('rte_aesni_mb_pmd.c', 'rte_aesni_mb_pmd_ops.c') endif endif +sources = files('rte_aesni_mb_pmd.c', 'rte_aesni_mb_pmd_ops.c') allow_experimental_apis = true deps += ['bus_vdev']
Signature · 1 line
2.20.1
PATCH v2 3/3 crypto/aesni_gcm: add check for build dependency
In reply to Bruce RichardsonThe aesni_mb driver has a check in its Makefile for the correct version of the IPsec_MB library, but this check was missed for the aesni_gcm driver. Add this check to the makefile, removing an unnecessary assignment in the process.
--- drivers/crypto/aesni_gcm/Makefile | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/crypto/aesni_gcm/Makefile +16 -3
@@ -23,11 +23,24 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_cryptodev LDLIBS += -lrte_bus_vdev +IMB_HDR = $(shell echo '\#include <intel-ipsec-mb.h>' | \ + $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ + head -n1 | cut -d'"' -f2) + +# Detect library version +IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2) +IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3) + +ifeq ($(IMB_VERSION),) +$(error "IPSec_MB version >= 0.52 is required") +endif + +ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1) +$(error "IPSec_MB version >= 0.52 is required") +endif + # library source files SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm_pmd.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm_pmd_ops.c -# export include files -SYMLINK-y-include += - include $(RTE_SDK)/mk/rte.lib.mk
Signature · 1 line
2.20.1
Re: [dpdk-dev] [PATCH v2 3/3] crypto/aesni_gcm: add check for build dependency
Quoted 9 lines
-----Original Message-----
From: Richardson, Bruce
Sent: Tuesday, April 23, 2019 4:44 PM
To: De Lara Guarch, Pablo <[email protected]>; [email protected]
Cc: Richardson, Bruce <[email protected]>
Subject: [PATCH v2 3/3]crypto/aesni_gcm: add check for build dependency
Quoted 7 lines
The
aesni_mbdriver has a check in itsMakefilefor the correct version of theIPsec_MBlibrary, but this check was missed for theaesni_gcmdriver. Add this check to the makefile, removing an unnecessary assignment in the process.Suggested-by Pablo de Lara <[email protected]>Signed-off-by Bruce Richardson <[email protected]>
Quoted 9 lines · Bruce Richardson
For both meson and make builds, the version checks for
IPsec_MBlibrary
were incomplete. This fixes both and makes the checks consistent.Bruce Richardson (3):
crypto/aesni_gcm: add dependency version checkcrypto/aesni_mb: cleanup of version check codecrypto/aesni_gcm: add check for build dependency
Quoted 5 lines
drivers/crypto/aesni_gcm/Makefile | 19 ++++++++++++++++--- drivers/crypto/aesni_gcm/meson.build | 11 +++++++++++ drivers/crypto/aesni_mb/meson.build | 18 +++++++++--------- 3 files changed, 36 insertions(+), 12 deletions(-)
Signature · 2 lines
Kind regards, Luca Boccassi