support CPU crypto for AESNI MB PMD
cover support CPU crypto for AESNI MB PMD
Add support for CPU crypto API into aesni_mb PMD and extend cryptodev UT to cover this new functionality.
Konstantin Ananyev (2):
crypto/aesni_mb: support CPU crypto
test/crypto: add CPU crypto mode for AESNI MB
app/test/test_cryptodev.c | 146 +++++-- doc/guides/cryptodevs/aesni_mb.rst | 3 + doc/guides/cryptodevs/features/aesni_mb.ini | 1 + .../crypto/aesni_mb/aesni_mb_pmd_private.h | 5 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 384 ++++++++++++++++-- .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 2 + 6 files changed, 476 insertions(+), 65 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 crypto/aesni_mb: support CPU crypto
Add support for CPU crypto mode by introducing required handler.
--- doc/guides/cryptodevs/aesni_mb.rst | 3 + doc/guides/cryptodevs/features/aesni_mb.ini | 1 + .../crypto/aesni_mb/aesni_mb_pmd_private.h | 5 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 384 ++++++++++++++++-- .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 2 + 5 files changed, 361 insertions(+), 34 deletions(-)
doc/guides/cryptodevs/aesni_mb.rst +3 -0
@@ -12,6 +12,9 @@ support for utilizing Intel multi buffer library, see the white paper The AES-NI MB PMD has current only been tested on Fedora 21 64-bit with gcc. +The AES-NI GCM PMD supports synchronous mode of operation with +``rte_cryptodev_sym_cpu_crypto_process`` function call. + Features --------
doc/guides/cryptodevs/features/aesni_mb.ini +1 -0
@@ -12,6 +12,7 @@ CPU AVX2 = Y CPU AVX512 = Y CPU AESNI = Y OOP LB In LB Out = Y +CPU crypto = Y ; ; Supported crypto algorithms of the 'aesni_mb' crypto driver.
drivers/crypto/aesni_mb/aesni_mb_pmd_private.h +4 -1
@@ -275,6 +275,9 @@ aesni_mb_set_session_parameters(const MB_MGR *mb_mgr,/** device specific operations function pointer structure */ extern struct rte_cryptodev_ops *rte_aesni_mb_pmd_ops; - +extern uint32_t +aesni_mb_cpu_crypto_process_bulk (struct rte_cryptodev *dev, +struct rte_cryptodev_sym_session *sess,union rte_crypto_sym_ofs sofs, +struct rte_crypto_sym_vec *vec);#endif /* _AESNI_MB_PMD_PRIVATE_H_ */
drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +351 -33
448 lines not on this page · raw message
drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c +2 -0
@@ -805,6 +805,8 @@ struct rte_cryptodev_ops aesni_mb_pmd_ops = { .queue_pair_release = aesni_mb_pmd_qp_release, .queue_pair_count = aesni_mb_pmd_qp_count, + .sym_cpu_process = aesni_mb_cpu_crypto_process_bulk, + .sym_session_get_size = aesni_mb_pmd_sym_session_get_size, .sym_session_configure = aesni_mb_pmd_sym_session_configure, .sym_session_clear = aesni_mb_pmd_sym_session_clear
Signature · 1 line
2.17.1
PATCH 2/2 test/crypto: add CPU crypto mode for AESNI MB
In reply to Konstantin AnanyevThis patch adds ability to run unit tests in cpu crypto mode for AESNI MB cryptodev.
--- app/test/test_cryptodev.c | 146 ++++++++++++++++++++++++++++++-------- 1 file changed, 115 insertions(+), 31 deletions(-)
app/test/test_cryptodev.c +115 -31
@@ -143,7 +143,7 @@ ceil_byte_length(uint32_t num_bits) }static void -process_cpu_gmac_op (uint8_t dev_id,struct rte_crypto_op *op) +process_cpu_aead_op (uint8_t dev_id,struct rte_crypto_op *op) {int32_t n, st;void *iv;
@@ -155,8 +155,8 @@ process_cpu_gmac_op(uint8_t dev_id, struct rte_crypto_op *op) sop = op->sym; - n =rte_crypto_mbuf_to_vec (sop->m_src, sop->auth.data.offset, - sop->auth.data.length, vec,RTE_DIM (vec)); + n =rte_crypto_mbuf_to_vec (sop->m_src, sop->aead.data.offset, + sop->aead.data.length, vec,RTE_DIM (vec));if (n <0 || n != sop->m_src->nb_segs) { op->status =RTE_CRYPTO_OP_STATUS_ERROR ;
@@ -168,8 +168,8 @@ process_cpu_gmac_op(uint8_t dev_id, struct rte_crypto_op *op) symvec.sgl = &sgl; iv = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET); symvec.iv = &iv; - symvec.aad =NULL ; - symvec.digest = (void **)&sop->auth.digest.data; + symvec.aad = (void **)&sop->aead.aad.data; + symvec.digest = (void **)&sop->aead.digest.data; symvec.status = &st; symvec.num =1 ;
@@ -184,9 +184,8 @@ process_cpu_gmac_op(uint8_t dev_id, struct rte_crypto_op *op) op->status =RTE_CRYPTO_OP_STATUS_SUCCESS ; } -static void -process_cpu_aead_op (uint8_t dev_id,struct rte_crypto_op *op) +process_cpu_crypt_auth_op (uint8_t dev_id,struct rte_crypto_op *op) {int32_t n, st;void *iv;
@@ -198,8 +197,8 @@ process_cpu_aead_op(uint8_t dev_id, struct rte_crypto_op *op) sop = op->sym; - n =rte_crypto_mbuf_to_vec (sop->m_src, sop->aead.data.offset, - sop->aead.data.length, vec,RTE_DIM (vec)); + n =rte_crypto_mbuf_to_vec (sop->m_src, sop->auth.data.offset, + sop->auth.data.length, vec,RTE_DIM (vec));if (n <0 || n != sop->m_src->nb_segs) { op->status =RTE_CRYPTO_OP_STATUS_ERROR ;
@@ -212,11 +211,14 @@ process_cpu_aead_op(uint8_t dev_id, struct rte_crypto_op *op) iv = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET); symvec.iv = &iv; symvec.aad = (void **)&sop->aead.aad.data; - symvec.digest = (void **)&sop->aead.digest.data; + symvec.digest = (void **)&sop->auth.digest.data; symvec.status = &st; symvec.num =1 ; ofs.raw =0 ; + ofs.ofs.cipher.head = sop->cipher.data.offset - sop->auth.data.offset; + ofs.ofs.cipher.tail = (sop->auth.data.offset + sop->auth.data.length) - + (sop->cipher.data.offset + sop->cipher.data.length); n =rte_cryptodev_sym_cpu_crypto_process (dev_id, sop->session, ofs, &symvec);
@@ -1538,8 +1540,14 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void) sym_op->cipher.data.length =QUOTE_512_BYTES ;/* Process crypto operation */ -TEST_ASSERT_NOT_NULL (process_crypto_request (ts_params->valid_devs[0 ], - ut_params->op),"failed to process sym crypto op" ); +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else +TEST_ASSERT_NOT_NULL ( +process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op), +"failed to process sym crypto op" );TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS ,"crypto op processing failed" );
@@ -1689,8 +1697,14 @@ test_AES_CBC_HMAC_SHA512_decrypt_perform(struct rte_cryptodev_sym_session *sess, sym_op->cipher.data.length =QUOTE_512_BYTES ;/* Process crypto operation */ -TEST_ASSERT_NOT_NULL (process_crypto_request (ts_params->valid_devs[0 ], - ut_params->op),"failed to process sym crypto op" ); +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else +TEST_ASSERT_NOT_NULL ( +process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op), +"failed to process sym crypto op" );TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS ,"crypto op processing failed" );
@@ -2637,8 +2651,13 @@ test_kasumi_authentication(const struct kasumi_hash_test_data *tdata)if (retval <0 )return retval; - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], - ut_params->op); +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else + ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op); + ut_params->obuf = ut_params->op->sym->m_src;TEST_ASSERT_NOT_NULL (ut_params->op,"failed to retrieve obuf" ); ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
@@ -8715,6 +8734,9 @@ test_stats(void)struct rte_cryptodev *dev;cryptodev_stats_get_t temp_pfn; +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +return -ENOTSUP ; +/* Verify the capabilities */ struct rte_cryptodev_sym_capability_idx cap_idx; cap_idx.type =RTE_CRYPTO_SYM_XFORM_AUTH ;
@@ -8886,8 +8908,14 @@ test_MD5_HMAC_generate(const struct HMAC_MD5_vector *test_case)if (MD5_HMAC_create_op (ut_params, test_case, &plaintext))return TEST_FAILED ; -TEST_ASSERT_NOT_NULL (process_crypto_request (ts_params->valid_devs[0 ], - ut_params->op),"failed to process sym crypto op" ); +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else +TEST_ASSERT_NOT_NULL ( +process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op), +"failed to process sym crypto op" );TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS ,"crypto op processing failed" );
@@ -8938,8 +8966,14 @@ test_MD5_HMAC_verify(const struct HMAC_MD5_vector *test_case)if (MD5_HMAC_create_op (ut_params, test_case, &plaintext))return TEST_FAILED ; -TEST_ASSERT_NOT_NULL (process_crypto_request (ts_params->valid_devs[0 ], - ut_params->op),"failed to process sym crypto op" ); +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else +TEST_ASSERT_NOT_NULL ( +process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op), +"failed to process sym crypto op" );TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS ,"HMAC_MD5 crypto op processing failed" );
@@ -9852,7 +9886,8 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata) ut_params->op->sym->m_src = ut_params->ibuf;if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) -process_cpu_gmac_op (ts_params->valid_devs[0 ], ut_params->op); +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op);else TEST_ASSERT_NOT_NULL( process_crypto_request(ts_params->valid_devs[0],
@@ -9968,7 +10003,8 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata) ut_params->op->sym->m_src = ut_params->ibuf;if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) -process_cpu_gmac_op (ts_params->valid_devs[0 ], ut_params->op); +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op);else TEST_ASSERT_NOT_NULL( process_crypto_request(ts_params->valid_devs[0],
@@ -10528,10 +10564,17 @@ test_authentication_verify_fail_when_data_corruption(else tag_corruption (plaintext, reference->plaintext.len); - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) { +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], ut_params->op); - -TEST_ASSERT_NULL (ut_params->op,"authentication not failed" ); +TEST_ASSERT_NOT_EQUAL (ut_params->op->status, +RTE_CRYPTO_OP_STATUS_SUCCESS , +"authentication not failed" ); + }else { + ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op); +TEST_ASSERT_NULL (ut_params->op,"authentication not failed" ); + }return 0 ; }
@@ -10593,7 +10636,8 @@ test_authentication_verify_GMAC_fail_when_corruption(tag_corruption (plaintext, reference->aad.len);if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) { -process_cpu_gmac_op (ts_params->valid_devs[0 ], ut_params->op); +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op);TEST_ASSERT_NOT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS ,"authentication not failed" );
@@ -10666,10 +10710,17 @@ test_authenticated_decryption_fail_when_corruption(else tag_corruption (ciphertext, reference->ciphertext.len); - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) { +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], ut_params->op); - -TEST_ASSERT_NULL (ut_params->op,"authentication not failed" ); +TEST_ASSERT_NOT_EQUAL (ut_params->op->status, +RTE_CRYPTO_OP_STATUS_SUCCESS , +"authentication not failed" ); + }else { + ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op); +TEST_ASSERT_NULL (ut_params->op,"authentication not failed" ); + }return 0 ; }
@@ -10757,8 +10808,12 @@ test_authenticated_encryt_with_esn(if (retval <0 )return retval; - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], ut_params->op); +else + ut_params->op =process_crypto_request ( + ts_params->valid_devs[0 ], ut_params->op);TEST_ASSERT_NOT_NULL (ut_params->op,"no crypto operation returned" );
@@ -10873,7 +10928,11 @@ test_authenticated_decrypt_with_esn(if (retval <0 )return retval; - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else + ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], ut_params->op);TEST_ASSERT_NOT_NULL (ut_params->op,"failed crypto process" );
@@ -13377,6 +13436,29 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)return unit_test_suite_runner (&cryptodev_testsuite); } +static int +test_cryptodev_cpu_aesni_mb (void ) +{ +int32_t rc; +enum rte_security_session_action_type at; + + gbl_driver_id =rte_cryptodev_driver_id_get ( +RTE_STR (CRYPTODEV_NAME_AESNI_MB_PMD )); + +if (gbl_driver_id ==-1 ) { +RTE_LOG (ERR ,USER1 ,"AESNI MB PMD must be loaded. Check if " +"CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled " +"in config file to run this testsuite.\n" ); +return TEST_SKIPPED ; + } + + at = gbl_action_type; + gbl_action_type =RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ; + rc =unit_test_suite_runner (&cryptodev_testsuite); + gbl_action_type = at; +return rc; +} +static int test_cryptodev_openssl (void ) {
@@ -13668,6 +13750,8 @@ test_cryptodev_nitrox(void)REGISTER_TEST_COMMAND (cryptodev_qat_autotest, test_cryptodev_qat);REGISTER_TEST_COMMAND (cryptodev_aesni_mb_autotest, test_cryptodev_aesni_mb); +REGISTER_TEST_COMMAND (cryptodev_cpu_aesni_mb_autotest, + test_cryptodev_cpu_aesni_mb);REGISTER_TEST_COMMAND (cryptodev_openssl_autotest, test_cryptodev_openssl);REGISTER_TEST_COMMAND (cryptodev_aesni_gcm_autotest, test_cryptodev_aesni_gcm); REGISTER_TEST_COMMAND(cryptodev_cpu_aesni_gcm_autotest,
Signature · 1 line
2.17.1
Hi Konstantin,
It looks there are some failures in meson build.
Could you please fix them and send a v2?
Thanks,
Akhil
Quoted 26 lines
-----Original Message-----
From: Konstantin Ananyev <[email protected]>
Sent: Monday, March 16, 2020 6:51 PM
To: [email protected]
Cc: Akhil Goyal <[email protected]>; [email protected]; [email protected]; Konstantin Ananyev <[email protected]>
Subject: [PATCH 0/2] support CPU crypto for AESNI MB PMDAdd support for CPU crypto API into
aesni_mbPMD and extend cryptodev UT to cover this new functionality.Konstantin Ananyev (2):
crypto/aesni_mb: support CPU crypto
test/crypto: add CPU crypto mode for AESNI MBapp/test/test_cryptodev.c | 146 +++++-- doc/guides/cryptodevs/aesni_mb.rst | 3 + doc/guides/cryptodevs/features/aesni_mb.ini | 1 + .../crypto/aesni_mb/aesni_mb_pmd_private.h | 5 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 384 ++++++++++++++++-- .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 2 + 6 files changed, 476 insertions(+), 65 deletions(-)--
2.17.1
Hi Akhil,
Quoted 5 lines
Hi Konstantin,
It looks there are some failures in meson build.
Could you please fix them and send a v2?
Will do.
Quoted 30 lines
Thanks,
AkhilQuoted 26 lines
-----Original Message-----
From: Konstantin Ananyev <[email protected]>
Sent: Monday, March 16, 2020 6:51 PM
To: [email protected]
Cc: Akhil Goyal <[email protected]>; [email protected]; [email protected]; Konstantin Ananyev <[email protected]>
Subject: [PATCH 0/2] support CPU crypto for AESNI MB PMDAdd support for CPU crypto API into
aesni_mbPMD and extend cryptodev UT to cover this new functionality.Konstantin Ananyev (2):
crypto/aesni_mb: support CPU crypto
test/crypto: add CPU crypto mode for AESNI MBapp/test/test_cryptodev.c | 146 +++++-- doc/guides/cryptodevs/aesni_mb.rst | 3 + doc/guides/cryptodevs/features/aesni_mb.ini | 1 + .../crypto/aesni_mb/aesni_mb_pmd_private.h | 5 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 384 ++++++++++++++++-- .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 2 + 6 files changed, 476 insertions(+), 65 deletions(-)--
2.17.1
v2 cover support CPU crypto for AESNI MB PMD
In reply to Konstantin Ananyevv2 - v1
Fix gcc 4.8 compilation issue
Add support for CPU crypto API into aesni_mb PMD and extend cryptodev UT to cover this new functionality.
Konstantin Ananyev (2):
crypto/aesni_mb: support CPU crypto
test/crypto: add CPU crypto mode for AESNI MB
app/test/test_cryptodev.c | 146 +++++-- doc/guides/cryptodevs/aesni_mb.rst | 3 + doc/guides/cryptodevs/features/aesni_mb.ini | 1 + .../crypto/aesni_mb/aesni_mb_pmd_private.h | 5 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 386 ++++++++++++++++-- .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 2 + 6 files changed, 478 insertions(+), 65 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/2 crypto/aesni_mb: support CPU crypto
Add support for CPU crypto mode by introducing required handler.
--- doc/guides/cryptodevs/aesni_mb.rst | 3 + doc/guides/cryptodevs/features/aesni_mb.ini | 1 + .../crypto/aesni_mb/aesni_mb_pmd_private.h | 5 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 386 ++++++++++++++++-- .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 2 + 5 files changed, 363 insertions(+), 34 deletions(-)
doc/guides/cryptodevs/aesni_mb.rst +3 -0
@@ -12,6 +12,9 @@ support for utilizing Intel multi buffer library, see the white paper The AES-NI MB PMD has current only been tested on Fedora 21 64-bit with gcc. +The AES-NI GCM PMD supports synchronous mode of operation with +``rte_cryptodev_sym_cpu_crypto_process`` function call. + Features --------
doc/guides/cryptodevs/features/aesni_mb.ini +1 -0
@@ -12,6 +12,7 @@ CPU AVX2 = Y CPU AVX512 = Y CPU AESNI = Y OOP LB In LB Out = Y +CPU crypto = Y ; ; Supported crypto algorithms of the 'aesni_mb' crypto driver.
drivers/crypto/aesni_mb/aesni_mb_pmd_private.h +4 -1
@@ -275,6 +275,9 @@ aesni_mb_set_session_parameters(const MB_MGR *mb_mgr,/** device specific operations function pointer structure */ extern struct rte_cryptodev_ops *rte_aesni_mb_pmd_ops; - +extern uint32_t +aesni_mb_cpu_crypto_process_bulk (struct rte_cryptodev *dev, +struct rte_cryptodev_sym_session *sess,union rte_crypto_sym_ofs sofs, +struct rte_crypto_sym_vec *vec);#endif /* _AESNI_MB_PMD_PRIVATE_H_ */
drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +353 -33
450 lines not on this page · raw message
drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c +2 -0
@@ -805,6 +805,8 @@ struct rte_cryptodev_ops aesni_mb_pmd_ops = { .queue_pair_release = aesni_mb_pmd_qp_release, .queue_pair_count = aesni_mb_pmd_qp_count, + .sym_cpu_process = aesni_mb_cpu_crypto_process_bulk, + .sym_session_get_size = aesni_mb_pmd_sym_session_get_size, .sym_session_configure = aesni_mb_pmd_sym_session_configure, .sym_session_clear = aesni_mb_pmd_sym_session_clear
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v2 1/2] crypto/aesni_mb: support CPU crypto
Hi Konstantin,
Just a small comment.
Quoted 29 lines
-----Original Message-----
From: Ananyev, Konstantin <[email protected]>
Sent: Friday, April 3, 2020 4:56 PM
To: [email protected]
Cc: [email protected]; De Lara Guarch, Pablo <[email protected]>; Doherty, Declan <[email protected]>; Ananyev, Konstantin <[email protected]>
Subject: [PATCH v2 1/2]crypto/aesni_mb: support CPU cryptoAdd support for CPU crypto mode by introducing required handler.
Signed-off-by Konstantin Ananyev <[email protected]>--- doc/guides/cryptodevs/aesni_mb.rst | 3 + doc/guides/cryptodevs/features/aesni_mb.ini | 1 + .../crypto/aesni_mb/aesni_mb_pmd_private.h | 5 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 386 ++++++++++++++++-- .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 2 + 5 files changed, 363 insertions(+), 34 deletions(-)doc/guides/cryptodevs/aesni_mb.rst +0
-0@@ -12,6 +12,9 @@ support for utilizing Intel multi buffer library, see the whitepaper
Quoted 4 lines
The AES-NI MB PMD has current only been tested on Fedora 21 64-bit with gcc.
+The AES-NI GCM PMD supports synchronous mode of operation with +``rte_cryptodev_sym_cpu_crypto_process`` function call.
This should be AES-NI MB PMD. Also, this patch needs rebasing.
Apart from this, rest looks good:
Re: [dpdk-dev] [PATCH v2 1/2] crypto/aesni_mb: support CPU crypto
In reply to Konstantin AnanyevQuoted 14 lines
-----Original Message-----
From: Ananyev, Konstantin <[email protected]>
Sent: Friday, April 3, 2020 4:56 PM
To: [email protected]
Cc: [email protected]; De Lara Guarch, Pablo <[email protected]>; Doherty, Declan <[email protected]>; Ananyev, Konstantin <[email protected]>
Subject: [PATCH v2 1/2]crypto/aesni_mb: support CPU cryptoAdd support for CPU crypto mode by introducing required handler.
Quoted 7 lines
Signed-off-by Konstantin Ananyev <[email protected]>--- doc/guides/cryptodevs/aesni_mb.rst | 3 + doc/guides/cryptodevs/features/aesni_mb.ini | 1 + .../crypto/aesni_mb/aesni_mb_pmd_private.h | 5 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 386 ++++++++++++++++-- .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 2 +
One last thing. Could you update "Release Notes"?
Re: [dpdk-dev] [PATCH v2 1/2] crypto/aesni_mb: support CPU crypto
Hi Pablo,
Quoted 11 lines
Quoted 10 lines
Add support for CPU crypto mode by introducing required handler.
Signed-off-by Konstantin Ananyev <[email protected]>--- doc/guides/cryptodevs/aesni_mb.rst | 3 + doc/guides/cryptodevs/features/aesni_mb.ini | 1 + .../crypto/aesni_mb/aesni_mb_pmd_private.h | 5 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 386 ++++++++++++++++-- .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 2 +
Quoted 1 line
One last thing. Could you update "Release Notes"?
Will do.
Thanks
Konstantin
PATCH v2 2/2 test/crypto: add CPU crypto mode for AESNI MB
In reply to Konstantin AnanyevThis patch adds ability to run unit tests in cpu crypto mode for AESNI MB cryptodev.
--- app/test/test_cryptodev.c | 146 ++++++++++++++++++++++++++++++-------- 1 file changed, 115 insertions(+), 31 deletions(-)
app/test/test_cryptodev.c +115 -31
@@ -143,7 +143,7 @@ ceil_byte_length(uint32_t num_bits) }static void -process_cpu_gmac_op (uint8_t dev_id,struct rte_crypto_op *op) +process_cpu_aead_op (uint8_t dev_id,struct rte_crypto_op *op) {int32_t n, st;void *iv;
@@ -155,8 +155,8 @@ process_cpu_gmac_op(uint8_t dev_id, struct rte_crypto_op *op) sop = op->sym; - n =rte_crypto_mbuf_to_vec (sop->m_src, sop->auth.data.offset, - sop->auth.data.length, vec,RTE_DIM (vec)); + n =rte_crypto_mbuf_to_vec (sop->m_src, sop->aead.data.offset, + sop->aead.data.length, vec,RTE_DIM (vec));if (n <0 || n != sop->m_src->nb_segs) { op->status =RTE_CRYPTO_OP_STATUS_ERROR ;
@@ -168,8 +168,8 @@ process_cpu_gmac_op(uint8_t dev_id, struct rte_crypto_op *op) symvec.sgl = &sgl; iv = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET); symvec.iv = &iv; - symvec.aad =NULL ; - symvec.digest = (void **)&sop->auth.digest.data; + symvec.aad = (void **)&sop->aead.aad.data; + symvec.digest = (void **)&sop->aead.digest.data; symvec.status = &st; symvec.num =1 ;
@@ -184,9 +184,8 @@ process_cpu_gmac_op(uint8_t dev_id, struct rte_crypto_op *op) op->status =RTE_CRYPTO_OP_STATUS_SUCCESS ; } -static void -process_cpu_aead_op (uint8_t dev_id,struct rte_crypto_op *op) +process_cpu_crypt_auth_op (uint8_t dev_id,struct rte_crypto_op *op) {int32_t n, st;void *iv;
@@ -198,8 +197,8 @@ process_cpu_aead_op(uint8_t dev_id, struct rte_crypto_op *op) sop = op->sym; - n =rte_crypto_mbuf_to_vec (sop->m_src, sop->aead.data.offset, - sop->aead.data.length, vec,RTE_DIM (vec)); + n =rte_crypto_mbuf_to_vec (sop->m_src, sop->auth.data.offset, + sop->auth.data.length, vec,RTE_DIM (vec));if (n <0 || n != sop->m_src->nb_segs) { op->status =RTE_CRYPTO_OP_STATUS_ERROR ;
@@ -212,11 +211,14 @@ process_cpu_aead_op(uint8_t dev_id, struct rte_crypto_op *op) iv = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET); symvec.iv = &iv; symvec.aad = (void **)&sop->aead.aad.data; - symvec.digest = (void **)&sop->aead.digest.data; + symvec.digest = (void **)&sop->auth.digest.data; symvec.status = &st; symvec.num =1 ; ofs.raw =0 ; + ofs.ofs.cipher.head = sop->cipher.data.offset - sop->auth.data.offset; + ofs.ofs.cipher.tail = (sop->auth.data.offset + sop->auth.data.length) - + (sop->cipher.data.offset + sop->cipher.data.length); n =rte_cryptodev_sym_cpu_crypto_process (dev_id, sop->session, ofs, &symvec);
@@ -1538,8 +1540,14 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void) sym_op->cipher.data.length =QUOTE_512_BYTES ;/* Process crypto operation */ -TEST_ASSERT_NOT_NULL (process_crypto_request (ts_params->valid_devs[0 ], - ut_params->op),"failed to process sym crypto op" ); +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else +TEST_ASSERT_NOT_NULL ( +process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op), +"failed to process sym crypto op" );TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS ,"crypto op processing failed" );
@@ -1689,8 +1697,14 @@ test_AES_CBC_HMAC_SHA512_decrypt_perform(struct rte_cryptodev_sym_session *sess, sym_op->cipher.data.length =QUOTE_512_BYTES ;/* Process crypto operation */ -TEST_ASSERT_NOT_NULL (process_crypto_request (ts_params->valid_devs[0 ], - ut_params->op),"failed to process sym crypto op" ); +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else +TEST_ASSERT_NOT_NULL ( +process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op), +"failed to process sym crypto op" );TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS ,"crypto op processing failed" );
@@ -2637,8 +2651,13 @@ test_kasumi_authentication(const struct kasumi_hash_test_data *tdata)if (retval <0 )return retval; - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], - ut_params->op); +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else + ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op); + ut_params->obuf = ut_params->op->sym->m_src;TEST_ASSERT_NOT_NULL (ut_params->op,"failed to retrieve obuf" ); ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
@@ -8715,6 +8734,9 @@ test_stats(void)struct rte_cryptodev *dev;cryptodev_stats_get_t temp_pfn; +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +return -ENOTSUP ; +/* Verify the capabilities */ struct rte_cryptodev_sym_capability_idx cap_idx; cap_idx.type =RTE_CRYPTO_SYM_XFORM_AUTH ;
@@ -8886,8 +8908,14 @@ test_MD5_HMAC_generate(const struct HMAC_MD5_vector *test_case)if (MD5_HMAC_create_op (ut_params, test_case, &plaintext))return TEST_FAILED ; -TEST_ASSERT_NOT_NULL (process_crypto_request (ts_params->valid_devs[0 ], - ut_params->op),"failed to process sym crypto op" ); +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else +TEST_ASSERT_NOT_NULL ( +process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op), +"failed to process sym crypto op" );TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS ,"crypto op processing failed" );
@@ -8938,8 +8966,14 @@ test_MD5_HMAC_verify(const struct HMAC_MD5_vector *test_case)if (MD5_HMAC_create_op (ut_params, test_case, &plaintext))return TEST_FAILED ; -TEST_ASSERT_NOT_NULL (process_crypto_request (ts_params->valid_devs[0 ], - ut_params->op),"failed to process sym crypto op" ); +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else +TEST_ASSERT_NOT_NULL ( +process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op), +"failed to process sym crypto op" );TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS ,"HMAC_MD5 crypto op processing failed" );
@@ -9852,7 +9886,8 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata) ut_params->op->sym->m_src = ut_params->ibuf;if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) -process_cpu_gmac_op (ts_params->valid_devs[0 ], ut_params->op); +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op);else TEST_ASSERT_NOT_NULL( process_crypto_request(ts_params->valid_devs[0],
@@ -9968,7 +10003,8 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata) ut_params->op->sym->m_src = ut_params->ibuf;if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) -process_cpu_gmac_op (ts_params->valid_devs[0 ], ut_params->op); +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op);else TEST_ASSERT_NOT_NULL( process_crypto_request(ts_params->valid_devs[0],
@@ -10528,10 +10564,17 @@ test_authentication_verify_fail_when_data_corruption(else tag_corruption (plaintext, reference->plaintext.len); - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) { +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], ut_params->op); - -TEST_ASSERT_NULL (ut_params->op,"authentication not failed" ); +TEST_ASSERT_NOT_EQUAL (ut_params->op->status, +RTE_CRYPTO_OP_STATUS_SUCCESS , +"authentication not failed" ); + }else { + ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op); +TEST_ASSERT_NULL (ut_params->op,"authentication not failed" ); + }return 0 ; }
@@ -10593,7 +10636,8 @@ test_authentication_verify_GMAC_fail_when_corruption(tag_corruption (plaintext, reference->aad.len);if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) { -process_cpu_gmac_op (ts_params->valid_devs[0 ], ut_params->op); +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op);TEST_ASSERT_NOT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS ,"authentication not failed" );
@@ -10666,10 +10710,17 @@ test_authenticated_decryption_fail_when_corruption(else tag_corruption (ciphertext, reference->ciphertext.len); - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) { +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], ut_params->op); - -TEST_ASSERT_NULL (ut_params->op,"authentication not failed" ); +TEST_ASSERT_NOT_EQUAL (ut_params->op->status, +RTE_CRYPTO_OP_STATUS_SUCCESS , +"authentication not failed" ); + }else { + ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op); +TEST_ASSERT_NULL (ut_params->op,"authentication not failed" ); + }return 0 ; }
@@ -10757,8 +10808,12 @@ test_authenticated_encryt_with_esn(if (retval <0 )return retval; - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], ut_params->op); +else + ut_params->op =process_crypto_request ( + ts_params->valid_devs[0 ], ut_params->op);TEST_ASSERT_NOT_NULL (ut_params->op,"no crypto operation returned" );
@@ -10873,7 +10928,11 @@ test_authenticated_decrypt_with_esn(if (retval <0 )return retval; - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else + ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], ut_params->op);TEST_ASSERT_NOT_NULL (ut_params->op,"failed crypto process" );
@@ -13377,6 +13436,29 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)return unit_test_suite_runner (&cryptodev_testsuite); } +static int +test_cryptodev_cpu_aesni_mb (void ) +{ +int32_t rc; +enum rte_security_session_action_type at; + + gbl_driver_id =rte_cryptodev_driver_id_get ( +RTE_STR (CRYPTODEV_NAME_AESNI_MB_PMD )); + +if (gbl_driver_id ==-1 ) { +RTE_LOG (ERR ,USER1 ,"AESNI MB PMD must be loaded. Check if " +"CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled " +"in config file to run this testsuite.\n" ); +return TEST_SKIPPED ; + } + + at = gbl_action_type; + gbl_action_type =RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ; + rc =unit_test_suite_runner (&cryptodev_testsuite); + gbl_action_type = at; +return rc; +} +static int test_cryptodev_openssl (void ) {
@@ -13668,6 +13750,8 @@ test_cryptodev_nitrox(void)REGISTER_TEST_COMMAND (cryptodev_qat_autotest, test_cryptodev_qat);REGISTER_TEST_COMMAND (cryptodev_aesni_mb_autotest, test_cryptodev_aesni_mb); +REGISTER_TEST_COMMAND (cryptodev_cpu_aesni_mb_autotest, + test_cryptodev_cpu_aesni_mb);REGISTER_TEST_COMMAND (cryptodev_openssl_autotest, test_cryptodev_openssl);REGISTER_TEST_COMMAND (cryptodev_aesni_gcm_autotest, test_cryptodev_aesni_gcm); REGISTER_TEST_COMMAND(cryptodev_cpu_aesni_gcm_autotest,
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v2 2/2] test/crypto: add CPU crypto mode for AESNI MB
Quoted 12 lines
-----Original Message-----
From: Ananyev, Konstantin <[email protected]>
Sent: Friday, April 3, 2020 4:56 PM
To: [email protected]
Cc: [email protected]; De Lara Guarch, Pablo <[email protected]>; Doherty, Declan <[email protected]>; Ananyev, Konstantin <[email protected]>
Subject: [PATCH v2 2/2] test/crypto: add CPU crypto mode for AESNI MB
Quoted 6 lines
This patch adds ability to run unit tests in cpu crypto mode for AESNI MB cryptodev.
Signed-off-by Konstantin Ananyev <[email protected]>--- app/test/test_cryptodev.c | 146 ++++++++++++++++++++++++++++++--------
Akhil Goyal
Acked-byRe: [dpdk-dev] [PATCH v2 2/2] test/crypto: add CPU crypto mode for AESNI MB
Quoted 9 lines
Quoted 7 lines
This patch adds ability to run unit tests in cpu crypto mode for AESNI MB cryptodev.
Signed-off-by Konstantin Ananyev <[email protected]>--- app/test/test_cryptodev.c | 146 ++++++++++++++++++++++++++++++--------Acked-by Pablo de Lara <[email protected]>
Hi Pablo,
Could you please ack this patchset if no issues?
Quoted 21 lines
v2 - v1
Fix gcc 4.8 compilation issueAdd support for CPU crypto API into
aesni_mbPMD and extend cryptodev UT to cover this new functionality.Konstantin Ananyev (2):
crypto/aesni_mb: support CPU crypto
test/crypto: add CPU crypto mode for AESNI MBapp/test/test_cryptodev.c | 146 +++++-- doc/guides/cryptodevs/aesni_mb.rst | 3 + doc/guides/cryptodevs/features/aesni_mb.ini | 1 + .../crypto/aesni_mb/aesni_mb_pmd_private.h | 5 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 386 ++++++++++++++++-- .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 2 + 6 files changed, 478 insertions(+), 65 deletions(-)--
2.17.1
v3 cover support CPU crypto for AESNI MB PMD
In reply to Konstantin Ananyevv3 - v2
Address Pablo comments:
- Fix doc typo
- Update release notes
v2 - v1
Fix gcc 4.8 compilation issue
Add support for CPU crypto API into aesni_mb PMD and extend cryptodev UT to cover this new functionality.
Konstantin Ananyev (2):
crypto/aesni_mb: support CPU crypto
test/crypto: add CPU crypto mode for AESNI MB
app/test/test_cryptodev.c | 146 +++++-- doc/guides/cryptodevs/aesni_mb.rst | 3 + doc/guides/cryptodevs/features/aesni_mb.ini | 1 + doc/guides/rel_notes/release_20_05.rst | 4 + .../crypto/aesni_mb/aesni_mb_pmd_private.h | 5 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 386 ++++++++++++++++-- .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 2 + 7 files changed, 482 insertions(+), 65 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/2 crypto/aesni_mb: support CPU crypto
Add support for CPU crypto mode by introducing required handler.
--- doc/guides/cryptodevs/aesni_mb.rst | 3 + doc/guides/cryptodevs/features/aesni_mb.ini | 1 + doc/guides/rel_notes/release_20_05.rst | 4 + .../crypto/aesni_mb/aesni_mb_pmd_private.h | 5 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 386 ++++++++++++++++-- .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 2 + 6 files changed, 367 insertions(+), 34 deletions(-)
doc/guides/cryptodevs/aesni_mb.rst +3 -0
@@ -12,6 +12,9 @@ support for utilizing Intel multi buffer library, see the white paper The AES-NI MB PMD has current only been tested on Fedora 21 64-bit with gcc. +The AES-NI MB PMD supports synchronous mode of operation with +``rte_cryptodev_sym_cpu_crypto_process`` function call. + Features --------
doc/guides/cryptodevs/features/aesni_mb.ini +1 -0
@@ -12,6 +12,7 @@ CPU AVX2 = Y CPU AVX512 = Y CPU AESNI = Y OOP LB In LB Out = Y +CPU crypto = Y ; ; Supported crypto algorithms of the 'aesni_mb' crypto driver.
doc/guides/rel_notes/release_20_05.rst +4 -0
@@ -81,6 +81,10 @@ New Features by making use of the event device capabilities. The event mode currently supports only inline IPsec protocol offload. +* **Updated the aesni_mb cryptodev PMD.** + + Add support for synchronous Crypto burst API. + Removed Items -------------
drivers/crypto/aesni_mb/aesni_mb_pmd_private.h +4 -1
@@ -275,6 +275,9 @@ aesni_mb_set_session_parameters(const MB_MGR *mb_mgr,/** device specific operations function pointer structure */ extern struct rte_cryptodev_ops *rte_aesni_mb_pmd_ops; - +extern uint32_t +aesni_mb_cpu_crypto_process_bulk (struct rte_cryptodev *dev, +struct rte_cryptodev_sym_session *sess,union rte_crypto_sym_ofs sofs, +struct rte_crypto_sym_vec *vec);#endif /* _AESNI_MB_PMD_PRIVATE_H_ */
drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +353 -33
450 lines not on this page · raw message
drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c +2 -0
@@ -797,6 +797,8 @@ struct rte_cryptodev_ops aesni_mb_pmd_ops = { .queue_pair_setup = aesni_mb_pmd_qp_setup, .queue_pair_release = aesni_mb_pmd_qp_release, + .sym_cpu_process = aesni_mb_cpu_crypto_process_bulk, + .sym_session_get_size = aesni_mb_pmd_sym_session_get_size, .sym_session_configure = aesni_mb_pmd_sym_session_configure, .sym_session_clear = aesni_mb_pmd_sym_session_clear
Signature · 1 line
2.17.1
PATCH v3 2/2 test/crypto: add CPU crypto mode for AESNI MB
In reply to Konstantin AnanyevThis patch adds ability to run unit tests in cpu crypto mode for AESNI MB cryptodev.
--- app/test/test_cryptodev.c | 146 ++++++++++++++++++++++++++++++-------- 1 file changed, 115 insertions(+), 31 deletions(-)
app/test/test_cryptodev.c +115 -31
@@ -143,7 +143,7 @@ ceil_byte_length(uint32_t num_bits) }static void -process_cpu_gmac_op (uint8_t dev_id,struct rte_crypto_op *op) +process_cpu_aead_op (uint8_t dev_id,struct rte_crypto_op *op) {int32_t n, st;void *iv;
@@ -155,8 +155,8 @@ process_cpu_gmac_op(uint8_t dev_id, struct rte_crypto_op *op) sop = op->sym; - n =rte_crypto_mbuf_to_vec (sop->m_src, sop->auth.data.offset, - sop->auth.data.length, vec,RTE_DIM (vec)); + n =rte_crypto_mbuf_to_vec (sop->m_src, sop->aead.data.offset, + sop->aead.data.length, vec,RTE_DIM (vec));if (n <0 || n != sop->m_src->nb_segs) { op->status =RTE_CRYPTO_OP_STATUS_ERROR ;
@@ -168,8 +168,8 @@ process_cpu_gmac_op(uint8_t dev_id, struct rte_crypto_op *op) symvec.sgl = &sgl; iv = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET); symvec.iv = &iv; - symvec.aad =NULL ; - symvec.digest = (void **)&sop->auth.digest.data; + symvec.aad = (void **)&sop->aead.aad.data; + symvec.digest = (void **)&sop->aead.digest.data; symvec.status = &st; symvec.num =1 ;
@@ -184,9 +184,8 @@ process_cpu_gmac_op(uint8_t dev_id, struct rte_crypto_op *op) op->status =RTE_CRYPTO_OP_STATUS_SUCCESS ; } -static void -process_cpu_aead_op (uint8_t dev_id,struct rte_crypto_op *op) +process_cpu_crypt_auth_op (uint8_t dev_id,struct rte_crypto_op *op) {int32_t n, st;void *iv;
@@ -198,8 +197,8 @@ process_cpu_aead_op(uint8_t dev_id, struct rte_crypto_op *op) sop = op->sym; - n =rte_crypto_mbuf_to_vec (sop->m_src, sop->aead.data.offset, - sop->aead.data.length, vec,RTE_DIM (vec)); + n =rte_crypto_mbuf_to_vec (sop->m_src, sop->auth.data.offset, + sop->auth.data.length, vec,RTE_DIM (vec));if (n <0 || n != sop->m_src->nb_segs) { op->status =RTE_CRYPTO_OP_STATUS_ERROR ;
@@ -212,11 +211,14 @@ process_cpu_aead_op(uint8_t dev_id, struct rte_crypto_op *op) iv = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET); symvec.iv = &iv; symvec.aad = (void **)&sop->aead.aad.data; - symvec.digest = (void **)&sop->aead.digest.data; + symvec.digest = (void **)&sop->auth.digest.data; symvec.status = &st; symvec.num =1 ; ofs.raw =0 ; + ofs.ofs.cipher.head = sop->cipher.data.offset - sop->auth.data.offset; + ofs.ofs.cipher.tail = (sop->auth.data.offset + sop->auth.data.length) - + (sop->cipher.data.offset + sop->cipher.data.length); n =rte_cryptodev_sym_cpu_crypto_process (dev_id, sop->session, ofs, &symvec);
@@ -1538,8 +1540,14 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void) sym_op->cipher.data.length =QUOTE_512_BYTES ;/* Process crypto operation */ -TEST_ASSERT_NOT_NULL (process_crypto_request (ts_params->valid_devs[0 ], - ut_params->op),"failed to process sym crypto op" ); +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else +TEST_ASSERT_NOT_NULL ( +process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op), +"failed to process sym crypto op" );TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS ,"crypto op processing failed" );
@@ -1689,8 +1697,14 @@ test_AES_CBC_HMAC_SHA512_decrypt_perform(struct rte_cryptodev_sym_session *sess, sym_op->cipher.data.length =QUOTE_512_BYTES ;/* Process crypto operation */ -TEST_ASSERT_NOT_NULL (process_crypto_request (ts_params->valid_devs[0 ], - ut_params->op),"failed to process sym crypto op" ); +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else +TEST_ASSERT_NOT_NULL ( +process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op), +"failed to process sym crypto op" );TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS ,"crypto op processing failed" );
@@ -2637,8 +2651,13 @@ test_kasumi_authentication(const struct kasumi_hash_test_data *tdata)if (retval <0 )return retval; - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], - ut_params->op); +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else + ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op); + ut_params->obuf = ut_params->op->sym->m_src;TEST_ASSERT_NOT_NULL (ut_params->op,"failed to retrieve obuf" ); ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
@@ -8733,6 +8752,9 @@ test_stats(void)struct rte_cryptodev *dev;cryptodev_stats_get_t temp_pfn; +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +return -ENOTSUP ; +/* Verify the capabilities */ struct rte_cryptodev_sym_capability_idx cap_idx; cap_idx.type =RTE_CRYPTO_SYM_XFORM_AUTH ;
@@ -8904,8 +8926,14 @@ test_MD5_HMAC_generate(const struct HMAC_MD5_vector *test_case)if (MD5_HMAC_create_op (ut_params, test_case, &plaintext))return TEST_FAILED ; -TEST_ASSERT_NOT_NULL (process_crypto_request (ts_params->valid_devs[0 ], - ut_params->op),"failed to process sym crypto op" ); +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else +TEST_ASSERT_NOT_NULL ( +process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op), +"failed to process sym crypto op" );TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS ,"crypto op processing failed" );
@@ -8956,8 +8984,14 @@ test_MD5_HMAC_verify(const struct HMAC_MD5_vector *test_case)if (MD5_HMAC_create_op (ut_params, test_case, &plaintext))return TEST_FAILED ; -TEST_ASSERT_NOT_NULL (process_crypto_request (ts_params->valid_devs[0 ], - ut_params->op),"failed to process sym crypto op" ); +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else +TEST_ASSERT_NOT_NULL ( +process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op), +"failed to process sym crypto op" );TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS ,"HMAC_MD5 crypto op processing failed" );
@@ -9870,7 +9904,8 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata) ut_params->op->sym->m_src = ut_params->ibuf;if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) -process_cpu_gmac_op (ts_params->valid_devs[0 ], ut_params->op); +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op);else TEST_ASSERT_NOT_NULL( process_crypto_request(ts_params->valid_devs[0],
@@ -9986,7 +10021,8 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata) ut_params->op->sym->m_src = ut_params->ibuf;if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) -process_cpu_gmac_op (ts_params->valid_devs[0 ], ut_params->op); +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op);else TEST_ASSERT_NOT_NULL( process_crypto_request(ts_params->valid_devs[0],
@@ -10546,10 +10582,17 @@ test_authentication_verify_fail_when_data_corruption(else tag_corruption (plaintext, reference->plaintext.len); - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) { +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], ut_params->op); - -TEST_ASSERT_NULL (ut_params->op,"authentication not failed" ); +TEST_ASSERT_NOT_EQUAL (ut_params->op->status, +RTE_CRYPTO_OP_STATUS_SUCCESS , +"authentication not failed" ); + }else { + ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op); +TEST_ASSERT_NULL (ut_params->op,"authentication not failed" ); + }return 0 ; }
@@ -10611,7 +10654,8 @@ test_authentication_verify_GMAC_fail_when_corruption(tag_corruption (plaintext, reference->aad.len);if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) { -process_cpu_gmac_op (ts_params->valid_devs[0 ], ut_params->op); +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op);TEST_ASSERT_NOT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS ,"authentication not failed" );
@@ -10684,10 +10728,17 @@ test_authenticated_decryption_fail_when_corruption(else tag_corruption (ciphertext, reference->ciphertext.len); - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) { +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], ut_params->op); - -TEST_ASSERT_NULL (ut_params->op,"authentication not failed" ); +TEST_ASSERT_NOT_EQUAL (ut_params->op->status, +RTE_CRYPTO_OP_STATUS_SUCCESS , +"authentication not failed" ); + }else { + ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], + ut_params->op); +TEST_ASSERT_NULL (ut_params->op,"authentication not failed" ); + }return 0 ; }
@@ -10775,8 +10826,12 @@ test_authenticated_encryt_with_esn(if (retval <0 )return retval; - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], ut_params->op); +else + ut_params->op =process_crypto_request ( + ts_params->valid_devs[0 ], ut_params->op);TEST_ASSERT_NOT_NULL (ut_params->op,"no crypto operation returned" );
@@ -10891,7 +10946,11 @@ test_authenticated_decrypt_with_esn(if (retval <0 )return retval; - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], +if (gbl_action_type ==RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ) +process_cpu_crypt_auth_op (ts_params->valid_devs[0 ], + ut_params->op); +else + ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], ut_params->op);TEST_ASSERT_NOT_NULL (ut_params->op,"failed crypto process" );
@@ -13400,6 +13459,29 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)return unit_test_suite_runner (&cryptodev_testsuite); } +static int +test_cryptodev_cpu_aesni_mb (void ) +{ +int32_t rc; +enum rte_security_session_action_type at; + + gbl_driver_id =rte_cryptodev_driver_id_get ( +RTE_STR (CRYPTODEV_NAME_AESNI_MB_PMD )); + +if (gbl_driver_id ==-1 ) { +RTE_LOG (ERR ,USER1 ,"AESNI MB PMD must be loaded. Check if " +"CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled " +"in config file to run this testsuite.\n" ); +return TEST_SKIPPED ; + } + + at = gbl_action_type; + gbl_action_type =RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ; + rc =unit_test_suite_runner (&cryptodev_testsuite); + gbl_action_type = at; +return rc; +} +static int test_cryptodev_openssl (void ) {
@@ -13691,6 +13773,8 @@ test_cryptodev_nitrox(void)REGISTER_TEST_COMMAND (cryptodev_qat_autotest, test_cryptodev_qat);REGISTER_TEST_COMMAND (cryptodev_aesni_mb_autotest, test_cryptodev_aesni_mb); +REGISTER_TEST_COMMAND (cryptodev_cpu_aesni_mb_autotest, + test_cryptodev_cpu_aesni_mb);REGISTER_TEST_COMMAND (cryptodev_openssl_autotest, test_cryptodev_openssl);REGISTER_TEST_COMMAND (cryptodev_aesni_gcm_autotest, test_cryptodev_aesni_gcm); REGISTER_TEST_COMMAND(cryptodev_cpu_aesni_gcm_autotest,
Signature · 1 line
2.17.1
Akhil Goyal
AppliedQuoted 6 lines
v3 - v2
Address Pablo comments:
- Fix doc typo
- Update release notes
Quoted 6 lines
v2 - v1
Fix gcc 4.8 compilation issueAdd support for CPU crypto API into
aesni_mbPMD and extend cryptodev UT to cover this new functionality.
Applied to dpdk-next-crypto
Thanks.