From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 609D143391 for ; Tue, 21 Nov 2023 18:03:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 41F6642ED7; Tue, 21 Nov 2023 18:03:58 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mails.dpdk.org (Postfix) with ESMTP id E336D42E8E for ; Tue, 21 Nov 2023 18:03:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700586238; x=1732122238; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=iobxoSb3zqeNiiUxPycd4XVFyVNiR6NCEd92oEmsF2I=; b=V32LELiMl8bb0mDs9zTkIkDjQMlDWxZ2y4LPENMWg2Czf6UwJooGdioo NrJ1Qd/99ursFEODpHS48Qcj53+AKdUIRgs3D8dHrA5bSLfxFEEVxJG+d XwUpqpByuyWm8Z6JRjQ5ETRBMcEPYrLS0bxWZR+N8KFRi4qurmRfv5Adz bru3XvE1NzRn+OaJQkN2Q8uwOT/lf4InyFsz3hxr2APpNjyM8k0WITaFE +f5pQBVviEohuEfITy7yl+Oe1QzThEo0OL8IZiVgqBdlnMo1U8BIIQyfv +SGFvxc+t+r9fNr01dSSK9zrEHrwPA8rTmFtFmms4G1m0OZWPPDZoB48m Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10901"; a="10549868" X-IronPort-AV: E=Sophos;i="6.04,216,1695711600"; d="scan'208";a="10549868" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2023 09:03:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10901"; a="1013972245" X-IronPort-AV: E=Sophos;i="6.04,216,1695711600"; d="scan'208";a="1013972245" Received: from silpixa00400355.ir.intel.com (HELO silpixa00400355.ger.corp.intel.com) ([10.237.222.80]) by fmsmga006.fm.intel.com with ESMTP; 21 Nov 2023 09:03:53 -0800 From: Ciara Power To: stable@dpdk.org Cc: luca.boccassi@gmail.com, Ciara Power , Declan Doherty , Pablo de Lara Subject: [PATCH 20.11] drivers/crypto: modify max IPsec-mb version supported Date: Tue, 21 Nov 2023 17:03:50 +0000 Message-Id: <20231121170350.3952518-1-ciara.power@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 --- 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').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').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').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').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').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