From patchwork Tue Jan 31 17:20:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Power, Ciara" X-Patchwork-Id: 122760 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D3CC441B91; Tue, 31 Jan 2023 18:20:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AAEE54067B; Tue, 31 Jan 2023 18:20:46 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 6F78D40041 for ; Tue, 31 Jan 2023 18:20:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675185644; x=1706721644; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=dlXvM+CNtV+TlvHhcoIj+2MFgCfo3U1KzQ77sBmjWRo=; b=n93mbjMmF+ehhTfNf0svJJv7EHPt95qeMAxcl5pIaQCB9P7kB7DbVk4k gNI9rJ+AiuWF61ocgYcX1w+v8ZlO6wi4z5osEIL1cwOALBE+TRIwzuUGW HOT1eLnWYCNe5hIWlTDPr10WuqYthRw3VKIeaWNROiF3YZcMCmMZ6gc+p tpVL6h/NjtywuAskF5DaEggljJHdI0jNf8Fi7n309t6Z2pWVh7sIHLlu/ 0i+RkVCAm6FQDAprf/CsCIN4RG/Jq4Tx1lsZ7PU8PPWJ/LnvjrmiMsLRQ Mzh/AVco7o0Tb2gDi29IXljF0fEwxbikJ84goFowaW8MjSdq+t6SXPY0m w==; X-IronPort-AV: E=McAfee;i="6500,9779,10607"; a="311519959" X-IronPort-AV: E=Sophos;i="5.97,261,1669104000"; d="scan'208";a="311519959" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jan 2023 09:20:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10607"; a="807207133" X-IronPort-AV: E=Sophos;i="5.97,261,1669104000"; d="scan'208";a="807207133" Received: from silpixa00400355.ir.intel.com (HELO silpixa00400355.ger.corp.intel.com) ([10.237.222.80]) by fmsmga001.fm.intel.com with ESMTP; 31 Jan 2023 09:20:35 -0800 From: Ciara Power To: Kai Ji , Pablo de Lara Cc: dev@dpdk.org, Ciara Power Subject: [PATCH] crypto/ipsec_mb: fix zuc256 maximum tag length Date: Tue, 31 Jan 2023 17:20:27 +0000 Message-Id: <20230131172027.524502-1-ciara.power@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The AESNI_MB PMD supports 8 and 16 byte tag lengths for ZUC256 when intel-ipsec-mb version is 1.3 or newer. The conditional check to enable these tag lengths had the incorrect operator, which enabled 8 and 16 byte tag lengths for versions below 1.2, which is not supported. Fixes: 7babda4316f9 ("crypto/ipsec_mb: support all tag sizes for ZUC-EIA3-256") Cc: pablo.de.lara.guarch@intel.com Signed-off-by: Ciara Power Reviewed-by: Brian Dooley --- drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 2 +- drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c index 147a38932d..ac20d01937 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c @@ -199,7 +199,7 @@ aesni_mb_set_session_auth_parameters(const IMB_MGR *mb_mgr, } } else if (xform->auth.key.length == 32) { sess->auth.algo = IMB_AUTH_ZUC256_EIA3_BITLEN; -#if IMB_VERSION(1, 2, 0) > IMB_VERSION_NUM +#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM if (sess->auth.req_digest_len != 4 && sess->auth.req_digest_len != 8 && sess->auth.req_digest_len != 16) { diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h index 55fafbbbec..8a7c74f621 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h @@ -566,7 +566,7 @@ static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = { }, .digest_size = { .min = 4, -#if IMB_VERSION(1, 2, 0) > IMB_VERSION_NUM +#if IMB_VERSION(1, 2, 0) < IMB_VERSION_NUM .max = 16, .increment = 4 #else