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 4A62D4591E; Fri, 6 Sep 2024 14:39:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C5C2842F04; Fri, 6 Sep 2024 14:39:47 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by mails.dpdk.org (Postfix) with ESMTP id 9FE5042EFE for ; Fri, 6 Sep 2024 14:39:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725626387; x=1757162387; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bdPFJSDIS//OkV8YHAsGsIlL7XZ9FLfioaNR0/5Uyu0=; b=Cu4B/OoXqCXqPYi10NYIgxAcadovlqGnVRBC8hd7Vv8Uxad7lgLYdq7H ku/usCoEfdPAPxFZO5h0A4Lsh6pCKdjBl4soR8iw92Bb7rpb9RmXC1+ax j16lDLFEQo9OZkoB3X6muUr5FOdUhEU3jJ9gHxQodFwCLBk6X3D0d74gO lYVZ9ex4nP6vTd46DqAB7NfbyWL0/34bVZp7IaKsREvkNgT160dMy07bl hYyMUuPLa+iOx1HWL3XvSnNhN5vEYTTOSObHfrtdYU3BpcWoslJsutnSS rAl9O7Pzv6qiOcNBuudsp8K2Xnzr5XgtDngocH2jejD0Vs+B096y2Kbrl Q==; X-CSE-ConnectionGUID: Eseve2ldSMiXIvevzftd9A== X-CSE-MsgGUID: OctWXL1AScKib98Ry1Hg2Q== X-IronPort-AV: E=McAfee;i="6700,10204,11187"; a="49797927" X-IronPort-AV: E=Sophos;i="6.10,207,1719903600"; d="scan'208";a="49797927" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2024 05:39:46 -0700 X-CSE-ConnectionGUID: 3QRnYztuTwCCNnPbWd6NFQ== X-CSE-MsgGUID: y9EqdM/aQ0eRtfIfCEEw0w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,207,1719903600"; d="scan'208";a="65643021" Received: from silpixa00400886.ir.intel.com ([10.243.22.139]) by fmviesa007.fm.intel.com with ESMTP; 06 Sep 2024 05:39:45 -0700 From: Brian Dooley To: Kai Ji , Pablo de Lara Cc: dev@dpdk.org, gakhil@marvell.com, Brian Dooley Subject: [PATCH v1 3/3] crypto/ipsec_mb: add SM4 algorithm support Date: Fri, 6 Sep 2024 13:39:39 +0100 Message-Id: <20240906123939.2508919-3-brian.dooley@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240906123939.2508919-1-brian.dooley@intel.com> References: <20240906123939.2508919-1-brian.dooley@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 This patch introduces SM4 algorithm support to the AESNI_MB PMD. Signed-off-by: Brian Dooley --- drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 22 ++++++++++ drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h | 47 +++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c index 019867fe1c..1dbffb1337 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c @@ -451,6 +451,9 @@ aesni_mb_set_session_cipher_parameters(const IMB_MGR *mb_mgr, uint8_t is_zuc = 0; uint8_t is_snow3g = 0; uint8_t is_kasumi = 0; +#if IMB_VERSION(1, 5, 0) <= IMB_VERSION_NUM + uint8_t is_sm4 = 0; +#endif if (xform == NULL) { sess->template_job.cipher_mode = IMB_CIPHER_NULL; @@ -521,6 +524,16 @@ aesni_mb_set_session_cipher_parameters(const IMB_MGR *mb_mgr, sess->iv.offset = xform->cipher.iv.offset; sess->template_job.iv_len_in_bytes = xform->cipher.iv.length; return 0; +#if IMB_VERSION(1, 5, 0) <= IMB_VERSION_NUM + case RTE_CRYPTO_CIPHER_SM4_CBC: + sess->template_job.cipher_mode = IMB_CIPHER_SM4_CBC; + is_sm4 = 1; + break; + case RTE_CRYPTO_CIPHER_SM4_ECB: + sess->template_job.cipher_mode = IMB_CIPHER_SM4_ECB; + is_sm4 = 1; + break; +#endif default: IPSEC_MB_LOG(ERR, "Unsupported cipher mode parameter"); return -ENOTSUP; @@ -655,6 +668,15 @@ aesni_mb_set_session_cipher_parameters(const IMB_MGR *mb_mgr, &sess->cipher.pKeySched_kasumi_cipher); sess->template_job.enc_keys = &sess->cipher.pKeySched_kasumi_cipher; sess->template_job.dec_keys = &sess->cipher.pKeySched_kasumi_cipher; +#if IMB_VERSION(1, 5, 0) <= IMB_VERSION_NUM + } else if (is_sm4) { + sess->template_job.key_len_in_bytes = IMB_KEY_128_BYTES; + IMB_SM4_KEYEXP(mb_mgr, xform->cipher.key.data, + sess->cipher.expanded_sm4_keys.encode, + sess->cipher.expanded_sm4_keys.decode); + sess->template_job.enc_keys = sess->cipher.expanded_sm4_keys.encode; + sess->template_job.dec_keys = sess->cipher.expanded_sm4_keys.decode; +#endif } else { if (xform->cipher.key.length != 8) { IPSEC_MB_LOG(ERR, "Invalid cipher key length"); diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h index 24c2686952..e9d605d646 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h @@ -774,6 +774,42 @@ static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = { }, } }, } }, + { /* SM4 CBC */ + .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, + {.sym = { + .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER, + {.cipher = { + .algo = RTE_CRYPTO_CIPHER_SM4_CBC, + .block_size = 16, + .key_size = { + .min = 16, + .max = 16, + .increment = 0 + }, + .iv_size = { + .min = 16, + .max = 16, + .increment = 0 + } + }, } + }, } + }, + { /* SM4 ECB */ + .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, + {.sym = { + .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER, + {.cipher = { + .algo = RTE_CRYPTO_CIPHER_SM4_ECB, + .block_size = 16, + .key_size = { + .min = 16, + .max = 16, + .increment = 0 + }, + .iv_size = { 0 } + }, } + }, } + }, RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST() }; @@ -951,6 +987,17 @@ struct __rte_cache_aligned aesni_mb_session { /* *< SNOW3G scheduled cipher key */ kasumi_key_sched_t pKeySched_kasumi_cipher; /* *< KASUMI scheduled cipher key */ +#if IMB_VERSION(1, 5, 0) <= IMB_VERSION_NUM + struct { + alignas(16) uint32_t encode[IMB_SM4_KEY_SCHEDULE_ROUNDS]; + /* *< encode key */ + alignas(16) uint32_t decode[IMB_SM4_KEY_SCHEDULE_ROUNDS]; + /* *< decode key */ + } expanded_sm4_keys; + /* *< Expanded SM4 keys - Original 128 bit key is + * expanded into 32 round keys, each 32 bits. + */ +#endif }; } cipher; -- 2.25.1