From patchwork Wed Aug 24 15:58:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "De Lara Guarch, Pablo" X-Patchwork-Id: 115379 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 0ABADA0543; Wed, 24 Aug 2022 17:58:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9D28840DDE; Wed, 24 Aug 2022 17:58:32 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 4C8CA4067B for ; Wed, 24 Aug 2022 17:58:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661356711; x=1692892711; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=w2OV3OXmA3LkROu2ECxTDE8+vnGJfJgUPXhvar++0U8=; b=kRJAKWprKdMF3F2aRRYSAIIMgWmS0Fo0MzlohbvUArCpKZ85yMsCabxQ CUqROxHNGw5LJ3VbbKm/IvziMiv7ATUdDbM3miBcVSfa9laQsontzrgrc jxZg81Hgy9hFN+XKbjTH5k6t7HJcMlWg+9+Om04jQe+/CRvEP8JBL23oY nOXHMfT+lvsE4sJode1fZ7qh0FZtFE3yekZk36ynzoWIxLl2O4uvOaURj JmnQVH3RIXoEbafnQqZvd71vmZcS0PIfiQz08IAtE6SwOspU/xG7NyDCx oFUqaT26W6jN043jgFb7Fh/dPn3F5uy03uh+CHV39oc6w43AEtVbolDpV g==; X-IronPort-AV: E=McAfee;i="6500,9779,10449"; a="273757112" X-IronPort-AV: E=Sophos;i="5.93,260,1654585200"; d="scan'208";a="273757112" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2022 08:58:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,260,1654585200"; d="scan'208";a="642908689" Received: from silpixa00400636.ir.intel.com ([10.237.213.19]) by orsmga001.jf.intel.com with ESMTP; 24 Aug 2022 08:58:28 -0700 From: Pablo de Lara To: roy.fan.zhang@intel.com Cc: dev@dpdk.org, Pablo de Lara Subject: [PATCH] crypto/ipsec_mb: support all tag sizes for ZUC-EIA3-256 Date: Wed, 24 Aug 2022 15:58:26 +0000 Message-Id: <20220824155826.16424-1-pablo.de.lara.guarch@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 Add support for 8-byte and 16-byte tags for ZUC-EIA3-256. Signed-off-by: Pablo de Lara --- doc/guides/cryptodevs/aesni_mb.rst | 1 - doc/guides/rel_notes/release_22_11.rst | 4 ++++ drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 22 ++++++++++++++------- drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h | 5 +++++ 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/doc/guides/cryptodevs/aesni_mb.rst b/doc/guides/cryptodevs/aesni_mb.rst index 07222ee117..00ac454b6c 100644 --- a/doc/guides/cryptodevs/aesni_mb.rst +++ b/doc/guides/cryptodevs/aesni_mb.rst @@ -77,7 +77,6 @@ Limitations protocol. * RTE_CRYPTO_CIPHER_DES_DOCSISBPI is not supported for combined Crypto-CRC DOCSIS security protocol. -* The only tag size supported for ZUC-EIA3-256 is 4 bytes. Installation diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 8c021cf050..f1f304bee2 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -55,6 +55,10 @@ New Features Also, make sure to start the actual text at the margin. ======================================================= +* **Updated the aesni_mb crypto PMD.** + + * Added support for 8-byte and 16-byte tags for ZUC-EIA3-256. + Removed Items ------------- diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c index 6d5d3ce8eb..1a3d51b764 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c @@ -192,20 +192,28 @@ aesni_mb_set_session_auth_parameters(const IMB_MGR *mb_mgr, if (xform->auth.algo == RTE_CRYPTO_AUTH_ZUC_EIA3) { if (xform->auth.key.length == 16) { sess->auth.algo = IMB_AUTH_ZUC_EIA3_BITLEN; + + if (sess->auth.req_digest_len != 4) { + IPSEC_MB_LOG(ERR, "Invalid digest size\n"); + return -EINVAL; + } } 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 (sess->auth.req_digest_len != 4 && + sess->auth.req_digest_len != 8 && + sess->auth.req_digest_len != 16) { +#else + if (sess->auth.req_digest_len != 4) { +#endif + IPSEC_MB_LOG(ERR, "Invalid digest size\n"); + return -EINVAL; + } } else { IPSEC_MB_LOG(ERR, "Invalid authentication key length\n"); return -EINVAL; } - uint16_t zuc_eia3_digest_len = - get_truncated_digest_byte_length( - IMB_AUTH_ZUC_EIA3_BITLEN); - if (sess->auth.req_digest_len != zuc_eia3_digest_len) { - IPSEC_MB_LOG(ERR, "Invalid digest size\n"); - return -EINVAL; - } sess->auth.gen_digest_len = sess->auth.req_digest_len; memcpy(sess->auth.zuc_auth_key, xform->auth.key.data, diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h index 9ef75aa51f..661a072e20 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h @@ -568,8 +568,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = { }, .digest_size = { .min = 4, +#if IMB_VERSION(1, 2, 0) > IMB_VERSION_NUM + .max = 16, + .increment = 4 +#else .max = 4, .increment = 0 +#endif }, .iv_size = { .min = 16,