* [PATCH v1 1/3] crypto/ipsec_mb: add SM3 algorithm support @ 2024-09-06 12:39 Brian Dooley 2024-09-06 12:39 ` [PATCH v1 2/3] crypto/ipsec_mb: add HMAC " Brian Dooley 2024-09-06 12:39 ` [PATCH v1 3/3] crypto/ipsec_mb: add SM4 " Brian Dooley 0 siblings, 2 replies; 4+ messages in thread From: Brian Dooley @ 2024-09-06 12:39 UTC (permalink / raw) To: Kai Ji, Pablo de Lara; +Cc: dev, gakhil, Brian Dooley This patch introduces SM3 algorithm support to the AESNI_MB PMD. Signed-off-by: Brian Dooley <brian.dooley@intel.com> --- drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 5 ++++ drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h | 26 ++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c index ef4228bd38..4711b7f590 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c @@ -377,6 +377,11 @@ aesni_mb_set_session_auth_parameters(IMB_MGR *mb_mgr, sess->template_job.hash_alg = IMB_AUTH_SHA_512; auth_precompute = 0; break; +#if IMB_VERSION(1, 5, 0) <= IMB_VERSION_NUM + case RTE_CRYPTO_AUTH_SM3: + sess->template_job.hash_alg = IMB_AUTH_SM3; + break; +#endif default: IPSEC_MB_LOG(ERR, "Unsupported authentication algorithm selection"); diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h index d6af2d4ded..90d2702a01 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h @@ -732,6 +732,27 @@ static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = { }, } }, } }, + { /* SM3 */ + .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, + {.sym = { + .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH, + {.auth = { + .algo = RTE_CRYPTO_AUTH_SM3, + .block_size = 64, + .key_size = { + .min = 0, + .max = 0, + .increment = 0 + }, + .digest_size = { + .min = 32, + .max = 32, + .increment = 1 + }, + .iv_size = { 0 } + }, } + }, } + }, RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST() }; @@ -840,7 +861,10 @@ static const unsigned int auth_digest_byte_lengths[] = { [IMB_AUTH_SHA_512] = 64, [IMB_AUTH_ZUC_EIA3_BITLEN] = 4, [IMB_AUTH_SNOW3G_UIA2_BITLEN] = 4, - [IMB_AUTH_KASUMI_UIA1] = 4 + [IMB_AUTH_KASUMI_UIA1] = 4, +#if IMB_VERSION(1, 5, 0) <= IMB_VERSION_NUM + [IMB_AUTH_SM3] = 32 +#endif /**< Vector mode dependent pointer table of the multi-buffer APIs */ }; -- 2.25.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v1 2/3] crypto/ipsec_mb: add HMAC SM3 algorithm support 2024-09-06 12:39 [PATCH v1 1/3] crypto/ipsec_mb: add SM3 algorithm support Brian Dooley @ 2024-09-06 12:39 ` Brian Dooley 2024-09-06 12:39 ` [PATCH v1 3/3] crypto/ipsec_mb: add SM4 " Brian Dooley 1 sibling, 0 replies; 4+ messages in thread From: Brian Dooley @ 2024-09-06 12:39 UTC (permalink / raw) To: Kai Ji, Pablo de Lara; +Cc: dev, gakhil, Brian Dooley This patch introduces HMAC SM3 algorithm support to the AESNI_MB PMD. Signed-off-by: Brian Dooley <brian.dooley@intel.com> --- drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 3 +++ drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h | 24 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c index 4711b7f590..019867fe1c 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c @@ -381,6 +381,9 @@ aesni_mb_set_session_auth_parameters(IMB_MGR *mb_mgr, case RTE_CRYPTO_AUTH_SM3: sess->template_job.hash_alg = IMB_AUTH_SM3; break; + case RTE_CRYPTO_AUTH_SM3_HMAC: + sess->template_job.hash_alg = IMB_AUTH_HMAC_SM3; + break; #endif default: IPSEC_MB_LOG(ERR, diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h index 90d2702a01..24c2686952 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h @@ -753,6 +753,27 @@ static const struct rte_cryptodev_capabilities aesni_mb_capabilities[] = { }, } }, } }, + { /* HMAC SM3 */ + .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, + {.sym = { + .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH, + {.auth = { + .algo = RTE_CRYPTO_AUTH_SM3_HMAC, + .block_size = 64, + .key_size = { + .min = 1, + .max = 65535, + .increment = 1 + }, + .digest_size = { + .min = 32, + .max = 32, + .increment = 1 + }, + .iv_size = { 0 } + }, } + }, } + }, RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST() }; @@ -863,7 +884,8 @@ static const unsigned int auth_digest_byte_lengths[] = { [IMB_AUTH_SNOW3G_UIA2_BITLEN] = 4, [IMB_AUTH_KASUMI_UIA1] = 4, #if IMB_VERSION(1, 5, 0) <= IMB_VERSION_NUM - [IMB_AUTH_SM3] = 32 + [IMB_AUTH_SM3] = 32, + [IMB_AUTH_HMAC_SM3] = 32, #endif /**< Vector mode dependent pointer table of the multi-buffer APIs */ -- 2.25.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v1 3/3] crypto/ipsec_mb: add SM4 algorithm support 2024-09-06 12:39 [PATCH v1 1/3] crypto/ipsec_mb: add SM3 algorithm support Brian Dooley 2024-09-06 12:39 ` [PATCH v1 2/3] crypto/ipsec_mb: add HMAC " Brian Dooley @ 2024-09-06 12:39 ` Brian Dooley 2024-09-18 5:53 ` [EXTERNAL] " Akhil Goyal 1 sibling, 1 reply; 4+ messages in thread From: Brian Dooley @ 2024-09-06 12:39 UTC (permalink / raw) To: Kai Ji, Pablo de Lara; +Cc: dev, gakhil, Brian Dooley This patch introduces SM4 algorithm support to the AESNI_MB PMD. Signed-off-by: Brian Dooley <brian.dooley@intel.com> --- 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [EXTERNAL] [PATCH v1 3/3] crypto/ipsec_mb: add SM4 algorithm support 2024-09-06 12:39 ` [PATCH v1 3/3] crypto/ipsec_mb: add SM4 " Brian Dooley @ 2024-09-18 5:53 ` Akhil Goyal 0 siblings, 0 replies; 4+ messages in thread From: Akhil Goyal @ 2024-09-18 5:53 UTC (permalink / raw) To: Brian Dooley, Kai Ji, Pablo de Lara; +Cc: dev > This patch introduces SM4 algorithm support to the AESNI_MB PMD. > > Signed-off-by: Brian Dooley <brian.dooley@intel.com> > --- > drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 22 ++++++++++ > drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h | 47 +++++++++++++++++++++ > 2 files changed, 69 insertions(+) Update corresponding .ini file for the newly added algos. Also update release notes. > > 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-09-18 5:53 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2024-09-06 12:39 [PATCH v1 1/3] crypto/ipsec_mb: add SM3 algorithm support Brian Dooley 2024-09-06 12:39 ` [PATCH v1 2/3] crypto/ipsec_mb: add HMAC " Brian Dooley 2024-09-06 12:39 ` [PATCH v1 3/3] crypto/ipsec_mb: add SM4 " Brian Dooley 2024-09-18 5:53 ` [EXTERNAL] " Akhil Goyal
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).