[PATCH 20.11] drivers/crypto: modify max IPsec-mb version supported

Ciara Power ciara.power at intel.com
Tue Nov 21 18:03:50 CET 2023


The DPDK 20.11 LTS supports intel-ipsec-mb library version 0.53 - 1.3.
If building with a version newer than 1.3, compilation of the following
PMDs should not happen:
	- AESNI_MB PMD
	- AESNI_GCM PMD
	- KASUMI PMD
	- SNOW3G PMD
	- ZUC PMD

Signed-off-by: Ciara Power <ciara.power at intel.com>
---
 drivers/crypto/aesni_gcm/meson.build | 8 +++++---
 drivers/crypto/aesni_mb/meson.build  | 8 +++++---
 drivers/crypto/kasumi/meson.build    | 8 +++++---
 drivers/crypto/snow3g/meson.build    | 8 +++++---
 drivers/crypto/zuc/meson.build       | 8 +++++---
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/drivers/crypto/aesni_gcm/meson.build b/drivers/crypto/aesni_gcm/meson.build
index ea83e87740..dfd2bf5a18 100644
--- a/drivers/crypto/aesni_gcm/meson.build
+++ b/drivers/crypto/aesni_gcm/meson.build
@@ -2,6 +2,7 @@
 # Copyright(c) 2018 Intel Corporation
 
 IMB_required_ver = '0.52.0'
+IMB_max_ver = '1.3.0'
 lib = cc.find_library('IPSec_MB', required: false)
 if not lib.found()
 	build = false
@@ -13,9 +14,10 @@ else
 	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))
-		reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
-				IMB_required_ver, imb_ver)
+	if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver)
+		or imb_ver.version_compare('>' + IMB_max_ver))
+		reason = 'IPSec_MB version >= @0@ and <= @2@ is required, found version @1@'.format(
+				IMB_required_ver, imb_ver, IMB_max_ver)
 		build = false
 	endif
 endif
diff --git a/drivers/crypto/aesni_mb/meson.build b/drivers/crypto/aesni_mb/meson.build
index 419b4743f5..0a38750605 100644
--- a/drivers/crypto/aesni_mb/meson.build
+++ b/drivers/crypto/aesni_mb/meson.build
@@ -2,6 +2,7 @@
 # Copyright(c) 2018 Intel Corporation
 
 IMB_required_ver = '0.52.0'
+IMB_max_ver = '1.3.0'
 lib = cc.find_library('IPSec_MB', required: false)
 if not lib.found()
 	build = false
@@ -13,9 +14,10 @@ else
 	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))
-		reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
-				IMB_required_ver, imb_ver)
+	if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver)
+		or imb_ver.version_compare('>' + IMB_max_ver))
+		reason = 'IPSec_MB version >= @0@ and <= @2@ is required, found version @1@'.format(
+				IMB_required_ver, imb_ver, IMB_max_ver)
 		build = false
 	endif
 
diff --git a/drivers/crypto/kasumi/meson.build b/drivers/crypto/kasumi/meson.build
index 7560fb7cfa..a75acb1d9e 100644
--- a/drivers/crypto/kasumi/meson.build
+++ b/drivers/crypto/kasumi/meson.build
@@ -2,6 +2,7 @@
 # Copyright(c) 2018-2020 Intel Corporation
 
 IMB_required_ver = '0.53.0'
+IMB_max_ver = '1.3.0'
 lib = cc.find_library('IPSec_MB', required: false)
 if not lib.found()
 	build = false
@@ -11,9 +12,10 @@ else
 	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))
-		reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
-				IMB_required_ver, imb_ver)
+	if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver)
+		or imb_ver.version_compare('>' + IMB_max_ver))
+		reason = 'IPSec_MB version >= @0@ and <= @2@ is required, found version @1@'.format(
+				IMB_required_ver, imb_ver, IMB_max_ver)
 		build = false
 	endif
 
diff --git a/drivers/crypto/snow3g/meson.build b/drivers/crypto/snow3g/meson.build
index c1c5fd37f7..d2fdb3c791 100644
--- a/drivers/crypto/snow3g/meson.build
+++ b/drivers/crypto/snow3g/meson.build
@@ -2,6 +2,7 @@
 # Copyright(c) 2019-2020 Intel Corporation
 
 IMB_required_ver = '0.53.0'
+IMB_max_ver = '1.3.0'
 lib = cc.find_library('IPSec_MB', required: false)
 if not lib.found()
 	build = false
@@ -11,9 +12,10 @@ else
 	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))
-                reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
-				IMB_required_ver, imb_ver)
+	if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver)
+		or imb_ver.version_compare('>' + IMB_max_ver))
+                reason = 'IPSec_MB version >= @0@ and <= @2@ is required,
+				found version @1@'.format(IMB_required_ver, imb_ver, IMB_max_ver)
 		build = false
 	endif
 
diff --git a/drivers/crypto/zuc/meson.build b/drivers/crypto/zuc/meson.build
index c3454d799e..454310b46f 100644
--- a/drivers/crypto/zuc/meson.build
+++ b/drivers/crypto/zuc/meson.build
@@ -2,6 +2,7 @@
 # Copyright(c) 2018-2020 Intel Corporation
 
 IMB_required_ver = '0.53.0'
+IMB_max_ver = '1.3.0'
 lib = cc.find_library('IPSec_MB', required: false)
 if not lib.found()
 	build = false
@@ -11,9 +12,10 @@ else
 	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))
-		reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
-				IMB_required_ver, imb_ver)
+	if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver)
+		or imb_ver.version_compare('>' + IMB_max_ver))
+		reason = 'IPSec_MB version >= @0@ and <= @2@ is required,
+				found version @1@'.format(IMB_required_ver, imb_ver, IMB_max_ver)
 		build = false
 	endif
 
-- 
2.25.1



More information about the stable mailing list