crypto/aesni_mb: enable out of place processing
v2 cover crypto/aesni_mb: enable out of place processing
Add out-of-place processing, i.e. different source and destination m_bufs, plus related capability update, tests and documentation.
v2:
- Removed limitation of not support cipher-auth.
- Updated tests for more comprehensive test-cases.
- Splitted the patch.
Fan Zhang (3):
crypto/aesni_mb: enable out of place processing
test: add out of place test for AESNI-MB
doc: update documentation
doc/guides/cryptodevs/aesni_mb.rst | 1 - doc/guides/cryptodevs/features/aesni_mb.ini | 1 + doc/guides/rel_notes/release_19_05.rst | 4 + drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 98 +++++++++++++----- test/test/test_cryptodev_aes_test_vectors.h | 150 ++++++++++++++++++++++++++++ test/test/test_cryptodev_blockcipher.c | 81 +++++++++++++-- test/test/test_cryptodev_blockcipher.h | 4 + test/test/test_cryptodev_des_test_vectors.h | 24 +++-- 8 files changed, 321 insertions(+), 42 deletions(-)
Signature · 1 line
2.14.5
PATCH v2 1/3 crypto/aesni_mb: enable out of place processing
Add out-of-place processing, i.e. different source and destination m_bufs, plus related capability update, tests and documentation.
--- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 98 ++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 27 deletions(-)
drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +71 -27
@@ -739,6 +739,56 @@ get_session(struct aesni_mb_qp *qp, struct rte_crypto_op *op)return sess; } +static inline uint64_t +auth_start_offset (struct rte_crypto_op *op,struct aesni_mb_session *session, +uint32_t oop) +{ +struct rte_mbuf *m_src, *m_dst; +uint8_t *p_src, *p_dst; +uint64_t u_src, u_dst; +uint32_t cipher_end, auth_end; + +/* Only cipher then hash needs special calculation. */ +if (!oop || session->chain_order !=CIPHER_HASH ) +return op->sym->auth.data.offset; + + m_src = op->sym->m_src; + m_dst = op->sym->m_dst; + + p_src = rte_pktmbuf_mtod(m_src, uint8_t *); + p_dst = rte_pktmbuf_mtod(m_dst, uint8_t *); + u_src = (uint64_t )p_src; + u_dst = (uint64_t )p_dst + op->sym->auth.data.offset; + +/** +* Copy the content between cipher offset and auth offset for generating +* correct digest. +*/ +if (op->sym->cipher.data.offset > op->sym->auth.data.offset) +memcpy (p_dst + op->sym->auth.data.offset, + p_src + op->sym->auth.data.offset, + op->sym->cipher.data.offset - + op->sym->auth.data.offset); + +/** +* Copy the content between (cipher offset + length) and (auth offset + +* length) for generating correct digest +*/ + cipher_end = op->sym->cipher.data.offset + op->sym->cipher.data.length; + auth_end = op->sym->auth.data.offset + op->sym->auth.data.length; +if (cipher_end < auth_end) +memcpy (p_dst + cipher_end, p_src + cipher_end, + auth_end - cipher_end); + +/** +* Since intel-ipsec-mb only supports positive values, +* we need to deduct the correct offset between src and dst. +*/ + +return u_src < u_dst ? (u_dst - u_src) : + (UINT64_MAX - u_src + u_dst +1 ); +} +/** * Process a crypto operation and complete a JOB_AES_HMAC job structure for * submission to the multi buffer library for processing.
@@ -757,7 +807,7 @@ set_mb_job_params(JOB_AES_HMAC *job, struct aesni_mb_qp *qp, {struct rte_mbuf *m_src = op->sym->m_src, *m_dst;struct aesni_mb_session *session; -uint16_t m_offset =0 ; +uint32_t m_offset, oop; session =get_session (qp, op);if (session ==NULL ) {
@@ -840,31 +890,22 @@ set_mb_job_params(JOB_AES_HMAC *job, struct aesni_mb_qp *qp, } } -/* Mutable crypto operation parameters */ -if (op->sym->m_dst) { - m_src = m_dst = op->sym->m_dst; - -/* append space for output data to mbuf */ -char *odata =rte_pktmbuf_append (m_dst, -rte_pktmbuf_data_len (op->sym->m_src)); -if (odata ==NULL ) { -AESNI_MB_LOG (ERR ,"failed to allocate space in destination " -"mbuf for source data" ); - op->status =RTE_CRYPTO_OP_STATUS_ERROR ; -return -1 ; - } - - memcpy(odata, rte_pktmbuf_mtod(op->sym->m_src, void*), -rte_pktmbuf_data_len (op->sym->m_src)); - }else { +if (!op->sym->m_dst || op->sym->m_dst == op->sym->m_src) { +/* in-place operation */ m_dst = m_src; -if (job->hash_alg ==AES_CCM || (job->hash_alg ==AES_GMAC && - session->cipher.mode ==GCM )) - m_offset = op->sym->aead.data.offset; -else - m_offset = op->sym->cipher.data.offset; + oop =0 ; + }else { +/* out-of-place operation */ + m_dst = op->sym->m_dst; + oop =1 ; } +if (job->hash_alg ==AES_CCM || (job->hash_alg ==AES_GMAC && + session->cipher.mode ==GCM )) + m_offset = op->sym->aead.data.offset; +else + m_offset = op->sym->cipher.data.offset; +/* Set digest output location */ if (job->hash_alg !=NULL_HASH && session->auth.operation ==RTE_CRYPTO_AUTH_OP_VERIFY ) {
@@ -893,7 +934,7 @@ set_mb_job_params(JOB_AES_HMAC *job, struct aesni_mb_qp *qp,/* Set IV parameters */ job->iv_len_in_bytes = session->iv.length; -/* Data Parameter */ +/* Data Parameters */ job->src = rte_pktmbuf_mtod(m_src, uint8_t *); job->dst = rte_pktmbuf_mtod_offset(m_dst, uint8_t *, m_offset);
@@ -937,7 +978,8 @@ set_mb_job_params(JOB_AES_HMAC *job, struct aesni_mb_qp *qp, op->sym->cipher.data.offset; job->msg_len_to_cipher_in_bytes = op->sym->cipher.data.length; - job->hash_start_src_offset_in_bytes = op->sym->auth.data.offset; + job->hash_start_src_offset_in_bytes =auth_start_offset (op, + session, oop); job->msg_len_to_hash_in_bytes = op->sym->auth.data.length; job->iv = rte_crypto_op_ctod_offset(op, uint8_t *,
@@ -962,7 +1004,7 @@ static inline void generate_digest(JOB_AES_HMAC *job, struct rte_crypto_op *op, struct aesni_mb_session *sess) { -/* No extra copy neeed */ +/* No extra copy needed */ if (likely (sess->auth.req_digest_len == sess->auth.gen_digest_len))return ;
@@ -1217,7 +1259,9 @@ cryptodev_aesni_mb_create(const char *name, dev->feature_flags =RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING | -RTE_CRYPTODEV_FF_CPU_AESNI ; +RTE_CRYPTODEV_FF_CPU_AESNI | +RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT ; + mb_mgr =alloc_mb_mgr (0 );if (mb_mgr ==NULL )
Signature · 1 line
2.14.5
Quoted 11 lines
-----Original Message-----
From: Zhang, Roy Fan
Sent: Thursday, February 28, 2019 11:36 AM
To: [email protected]
Cc: [email protected]; Zhang, Roy Fan <[email protected]>; De Lara Guarch, Pablo <[email protected]>; Trahe, Fiona <[email protected]>; Luse, Paul E <[email protected]>
Subject: [PATCH v2 1/3]crypto/aesni_mb: enable out of place processing
Quoted 7 lines
Add out-of-place processing, i.e. different source and destination
m_bufs, plus related capability update, tests and documentation.Signed-off-by Fiona Trahe <[email protected]>Signed-off-by Paul Luse <[email protected]>Signed-off-by Fan Zhang <[email protected]>
Quoted 43 lines
-----Original Message-----
From: Zhang, Roy Fan
Sent: Thursday, February 28, 2019 11:36 AM
To: [email protected]
Cc: [email protected]; Zhang, Roy Fan <[email protected]>; De Lara Guarch, Pablo <[email protected]>; Trahe, Fiona <[email protected]>; Luse, Paul E <[email protected]>
Subject: [PATCH v2 1/3]crypto/aesni_mb: enable out of place processingAdd out-of-place processing, i.e. different source and destination
m_bufs, plus related capability update, tests and documentation.Signed-off-by Fiona Trahe <[email protected]>Signed-off-by Paul Luse <[email protected]>Signed-off-by Fan Zhang <[email protected]>--- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 98 ++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 27 deletions(-)drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +10
-0@@ -739,6 +739,56 @@ get_session(struct aesni_mb_qp *qp, struct rte_crypto_op *op)return sess; } +static inline uint64_t +auth_start_offset (struct rte_crypto_op *op,struct aesni_mb_session *session, +uint32_t oop) +{ +struct rte_mbuf *m_src, *m_dst; +uint8_t *p_src, *p_dst; +uint64_t u_src, u_dst; +uint32_t cipher_end, auth_end; + +/* Only cipher then hash needs special calculation. */
drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c get_session(struct aesni_mb_qp *qp, struct · line 763
Quoted 10 lines
drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +10
-0+if (!oop || session->chain_order !=CIPHER_HASH ) +return op->sym->auth.data.offset; + + m_src = op->sym->m_src; + m_dst = op->sym->m_dst; + + p_src = rte_pktmbuf_mtod(m_src, uint8_t *); + p_dst = rte_pktmbuf_mtod(m_dst, uint8_t *); + u_src = (uint64_t )p_src; + u_dst = (uint64_t )p_dst + op->sym->auth.data.offset;
Better to use (uintptr_t) instead of uint64_t.
...
drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c set_mb_job_params(JOB_AES_HMAC *job, struct aesni_mb_qp *qp, · line 893
Quoted 5 lines
drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +1
-4- - memcpy(odata, rte_pktmbuf_mtod(op->sym->m_src, void*), -rte_pktmbuf_data_len (op->sym->m_src)); - }else { +if (!op->sym->m_dst || op->sym->m_dst == op->sym->m_src) {
Better to add parenthesis on the second part of this "or" condition.
Apart from this:
PATCH v2 2/3 test: add out of place test for AESNI-MB
In reply to Fan ZhangThis patch updates the unit test to enable AESNI-MB PMD out-of-place tests. A special test type that swap both the source and destination buffer is added for a more comprehensive test set to take place.
--- test/test/test_cryptodev_aes_test_vectors.h | 150 ++++++++++++++++++++++++++++ test/test/test_cryptodev_blockcipher.c | 81 +++++++++++++-- test/test/test_cryptodev_blockcipher.h | 4 + test/test/test_cryptodev_des_test_vectors.h | 24 +++-- 4 files changed, 245 insertions(+), 14 deletions(-)
test/test/test_cryptodev_aes_test_vectors.h +150 -0
@@ -1160,6 +1160,67 @@ static const struct blockcipher_test_data aes_test_data_docsis_3 = { } }; +static const uint8_t +cipher_aescbc_offset_16[] = { +0x57 ,0x68 ,0x61 ,0x74 ,0x20 ,0x61 ,0x20 ,0x6C , +0x6F ,0x75 ,0x73 ,0x79 ,0x20 ,0x65 ,0x61 ,0x72 , +0x68 ,0x2A ,0x6A ,0x82 ,0xE0 ,0x73 ,0xC7 ,0x51 , +0x81 ,0xF4 ,0x47 ,0x27 ,0x1A ,0xEF ,0x76 ,0x15 , +0x1C ,0xE1 ,0x38 ,0x5F ,0xE1 ,0x81 ,0x77 ,0xC7 , +0x8B ,0xF0 ,0x69 ,0xC3 ,0x3C ,0x45 ,0x1C ,0x0A , +0xA3 ,0x93 ,0xBF ,0x60 ,0x57 ,0x88 ,0xD2 ,0xFF , +0xE1 ,0x8F ,0xC0 ,0x64 ,0x2C ,0x42 ,0xC5 ,0x22 , +0xE3 ,0x5F ,0x71 ,0x1F ,0xF7 ,0x62 ,0xA2 ,0x7E , +0x0D ,0x42 ,0xD9 ,0xE7 ,0xF3 ,0x10 ,0xB0 ,0xEE , +}; + +/** AES-128-CBC SHA1 OOP test vector for swapping src/dst */ +static const struct blockcipher_test_data aes_test_data_14 = { + .crypto_algo =RTE_CRYPTO_CIPHER_AES_CBC , + .cipher_key = { + .data = { +0xE4 ,0x23 ,0x33 ,0x8A ,0x35 ,0x64 ,0x61 ,0xE2 , +0x49 ,0x03 ,0xDD ,0xC6 ,0xB8 ,0xCA ,0x55 ,0x7A + }, + .len =16 + }, + .iv = { + .data = { +0x00 ,0x01 ,0x02 ,0x03 ,0x04 ,0x05 ,0x06 ,0x07 , +0x08 ,0x09 ,0x0A ,0x0B ,0x0C ,0x0D ,0x0E ,0x0F + }, + .len =16 + }, + .plaintext = { + .data = plaintext_aes_common, + .len =80 + }, + .cipher_offset =16 , + .auth_offset =0 , + .ciphertext = { + .data = cipher_aescbc_offset_16, + .len =80 + }, + .auth_algo =RTE_CRYPTO_AUTH_SHA1_HMAC , + .auth_key = { + .data = { +0xF8 ,0x2A ,0xC7 ,0x54 ,0xDB ,0x96 ,0x18 ,0xAA , +0xC3 ,0xA1 ,0x53 ,0xF6 ,0x1F ,0x17 ,0x60 ,0xBD , +0xDE ,0xF4 ,0xDE ,0xAD + }, + .len =20 + }, + .digest = { + .data = { +0xCC ,0x15 ,0x83 ,0xF7 ,0x23 ,0x87 ,0x96 ,0xA7 , +0x29 ,0x34 ,0x32 ,0xE4 ,0x4C ,0x06 ,0xE8 ,0xEB , +0x70 ,0x72 ,0x4B ,0xAD + }, + .len =20 , + .truncated_len =12 + } +}; +static const struct blockcipher_test_case aes_chain_test_cases[] = { { .test_descr ="AES-128-CTR HMAC-SHA1 Encryption Digest" ,
@@ -1471,8 +1532,18 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR | +BLOCKCIPHER_TEST_TARGET_PMD_MB |BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX }, + { + .test_descr ="AES-128-CBC HMAC-SHA1 Encryption Digest " + "OOP Swap MBUF", + .test_data = &aes_test_data_14, + .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_OOP | + BLOCKCIPHER_TEST_FEATURE_EXCHANGE_OOP, + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_MB + }, { .test_descr ="AES-128-CBC HMAC-SHA1 Decryption Digest " "Verify OOP",
@@ -1487,6 +1558,15 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX }, + { + .test_descr ="AES-128-CBC HMAC-SHA1 Decryption Digest " + "Verify OOP Swap MBUF", + .test_data = &aes_test_data_4, + .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_OOP | + BLOCKCIPHER_TEST_FEATURE_EXCHANGE_OOP, + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_MB + }, { .test_descr = "AES-128-CBC HMAC-SHA224 Encryption Digest", .test_data = &aes_test_data_8,
@@ -1700,6 +1780,14 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {BLOCKCIPHER_TEST_TARGET_PMD_CCP |BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO }, + { + .test_descr = "AES-256-CBC OOP Encryption Swap MBUF", + .test_data = &aes_test_data_11, + .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_OOP | + BLOCKCIPHER_TEST_FEATURE_EXCHANGE_OOP, + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_MB + }, { .test_descr = "AES-256-CBC OOP Decryption", .test_data = &aes_test_data_11,
@@ -1713,6 +1801,14 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {BLOCKCIPHER_TEST_TARGET_PMD_CCP |BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO }, + { + .test_descr = "AES-256-CBC OOP Decryption Swap MBUF", + .test_data = &aes_test_data_11, + .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_OOP | + BLOCKCIPHER_TEST_FEATURE_EXCHANGE_OOP, + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_MB + }, { .test_descr = "AES-128-CTR Encryption", .test_data = &aes_test_data_1,
@@ -1875,6 +1971,15 @@ static const struct blockcipher_test_case aes_docsis_test_cases[] = { .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT }, + { + .test_descr ="AES-DOCSIS-BPI OOP Full Block Encryption " + "Swap MBUF", + .test_data = &aes_test_data_docsis_1, + .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_OOP | + BLOCKCIPHER_TEST_FEATURE_EXCHANGE_OOP, + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_MB + }, { .test_descr = "AES-DOCSIS-BPI OOP Runt Block Encryption", .test_data = &aes_test_data_docsis_2,
@@ -1882,6 +1987,15 @@ static const struct blockcipher_test_case aes_docsis_test_cases[] = { .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT }, + { + .test_descr ="AES-DOCSIS-BPI OOP Runt Block Encryption " + "Swap MBUF", + .test_data = &aes_test_data_docsis_2, + .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_OOP | + BLOCKCIPHER_TEST_FEATURE_EXCHANGE_OOP, + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_MB + }, { .test_descr = "AES-DOCSIS-BPI OOP Uneven Block Encryption", .test_data = &aes_test_data_docsis_3,
@@ -1889,6 +2003,15 @@ static const struct blockcipher_test_case aes_docsis_test_cases[] = { .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT }, + { + .test_descr ="AES-DOCSIS-BPI OOP Uneven Block Encryption " + "Swap MBUF", + .test_data = &aes_test_data_docsis_3, + .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_OOP | + BLOCKCIPHER_TEST_FEATURE_EXCHANGE_OOP, + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_MB + }, { .test_descr = "AES-DOCSIS-BPI OOP Full Block Decryption", .test_data = &aes_test_data_docsis_1,
@@ -1896,6 +2019,15 @@ static const struct blockcipher_test_case aes_docsis_test_cases[] = { .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT }, + { + .test_descr ="AES-DOCSIS-BPI OOP Full Block Decryption " + "Swap MBUF", + .test_data = &aes_test_data_docsis_1, + .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_OOP | + BLOCKCIPHER_TEST_FEATURE_EXCHANGE_OOP, + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_MB + }, { .test_descr = "AES-DOCSIS-BPI OOP Runt Block Decryption", .test_data = &aes_test_data_docsis_2,
@@ -1903,12 +2035,30 @@ static const struct blockcipher_test_case aes_docsis_test_cases[] = { .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT }, + { + .test_descr ="AES-DOCSIS-BPI OOP Runt Block Decryption " + "Swap MBUF", + .test_data = &aes_test_data_docsis_2, + .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_OOP | + BLOCKCIPHER_TEST_FEATURE_EXCHANGE_OOP, + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_MB + }, { .test_descr = "AES-DOCSIS-BPI OOP Uneven Block Decryption", .test_data = &aes_test_data_docsis_3, .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT + }, + { + .test_descr ="AES-DOCSIS-BPI OOP Uneven Block Decryption " + "Swap MBUF", + .test_data = &aes_test_data_docsis_3, + .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_OOP | + BLOCKCIPHER_TEST_FEATURE_EXCHANGE_OOP, + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_MB } };#endif /* TEST_CRYPTODEV_AES_TEST_VECTORS_H_ */
test/test/test_cryptodev_blockcipher.c +75 -6
120 lines not on this page · raw message
test/test/test_cryptodev_blockcipher.h +4 -0
@@ -18,6 +18,7 @@#define BLOCKCIPHER_TEST_FEATURE_SESSIONLESS 0x02#define BLOCKCIPHER_TEST_FEATURE_STOPPER 0x04/* stop upon failing */ #define BLOCKCIPHER_TEST_FEATURE_SG 0x08/* Scatter Gather */ +#define BLOCKCIPHER_TEST_FEATURE_EXCHANGE_OOP 0x10/* Swap m_src/m_dst */ #define BLOCKCIPHER_TEST_TARGET_PMD_MB 0x0001/* Multi-buffer flag */ #define BLOCKCIPHER_TEST_TARGET_PMD_QAT 0x0002/* QAT flag */
@@ -98,6 +99,9 @@ struct blockcipher_test_data {unsigned int len;/* for qat */ unsigned int truncated_len;/* for mb */ } digest; + +unsigned int cipher_offset; +unsigned int auth_offset; };int
test/test/test_cryptodev_des_test_vectors.h +16 -8
@@ -1016,7 +1016,8 @@ static const struct blockcipher_test_case des_docsis_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | -BLOCKCIPHER_TEST_TARGET_PMD_QAT +BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "DES-DOCSIS-BPI OOP Runt Block Encryption",
@@ -1024,7 +1025,8 @@ static const struct blockcipher_test_case des_docsis_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | -BLOCKCIPHER_TEST_TARGET_PMD_QAT +BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "DES-DOCSIS-BPI OOP Uneven Encryption",
@@ -1032,7 +1034,8 @@ static const struct blockcipher_test_case des_docsis_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | -BLOCKCIPHER_TEST_TARGET_PMD_QAT +BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "DES-DOCSIS-BPI OOP Full Block Decryption",
@@ -1040,7 +1043,8 @@ static const struct blockcipher_test_case des_docsis_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | -BLOCKCIPHER_TEST_TARGET_PMD_QAT +BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "DES-DOCSIS-BPI OOP Runt Block Decryption",
@@ -1048,7 +1052,8 @@ static const struct blockcipher_test_case des_docsis_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | -BLOCKCIPHER_TEST_TARGET_PMD_QAT +BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "DES-DOCSIS-BPI OOP Uneven Decryption",
@@ -1056,7 +1061,8 @@ static const struct blockcipher_test_case des_docsis_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | - BLOCKCIPHER_TEST_TARGET_PMD_QAT +BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB } };
@@ -1200,7 +1206,8 @@ static const struct blockcipher_test_case triple_des_chain_test_cases[] = {BLOCKCIPHER_TEST_TARGET_PMD_QAT |BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC | -BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR +BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr ="3DES-128-CBC HMAC-SHA1 Decryption Digest"
@@ -1212,7 +1219,8 @@ static const struct blockcipher_test_case triple_des_chain_test_cases[] = {BLOCKCIPHER_TEST_TARGET_PMD_QAT |BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC | -BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR +BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr ="3DES-128-CBC HMAC-SHA1 Encryption Digest"
Signature · 1 line
2.14.5
Re: [PATCH v2 2/3] test: add out of place test for AESNI-MB
Quoted 10 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Fan Zhang
Sent: Thursday, February 28, 2019 11:36 AM
To: [email protected]
Cc: [email protected]; Zhang, Roy Fan <[email protected]>; De Lara Guarch, Pablo <[email protected]>
Subject: [dpdk-dev] [PATCH v2 2/3] test: add out of place test for AESNI-MB
Quoted 6 lines
This patch updates the unit test to enable AESNI-MB PMD out-of-place tests. A special test type that swap both the source and destination buffer is added for a more comprehensive test set to take place.
Signed-off-by Fan Zhang <[email protected]>
PATCH v2 3/3 doc: update documentation
In reply to Fan ZhangThis patch updates the documentation for the newly supported AESNI-MB PMD out-of-place operation feature.
--- doc/guides/cryptodevs/aesni_mb.rst | 1 - doc/guides/cryptodevs/features/aesni_mb.ini | 1 + doc/guides/rel_notes/release_19_05.rst | 4 ++++ 3 files changed, 5 insertions(+), 1 deletion(-)
doc/guides/cryptodevs/aesni_mb.rst +0 -1
@@ -56,7 +56,6 @@ Limitations ----------- * Chained mbufs are not supported. -* Only in-place is currently supported (destination address is the same as source address). * RTE_CRYPTO_AEAD_AES_GCM only works properly when the multi-buffer library is 0.51.0 or newer. * RTE_CRYPTO_HASH_AES_GMAC is supported by library version v0.51 or later.
doc/guides/cryptodevs/features/aesni_mb.ini +1 -0
@@ -11,6 +11,7 @@ CPU AVX = Y CPU AVX2 = Y CPU AVX512 = Y CPU AESNI = Y +OOP LB In LB Out = Y ; ; Supported crypto algorithms of the 'aesni_mb' crypto driver.
doc/guides/rel_notes/release_19_05.rst +4 -0
@@ -65,6 +65,10 @@ New Features process. * Added support for Rx packet types list in a secondary process. +* **Updated AESNI-MB PMD.** + + Updated AESNI-MB PMD for supporting out-of-place operations. + Removed Items -------------
Signature · 1 line
2.14.5
Re: [PATCH v2 3/3] doc: update documentation
Quoted 10 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Fan Zhang
Sent: Thursday, February 28, 2019 11:36 AM
To: [email protected]
Cc: [email protected]; Zhang, Roy Fan <[email protected]>; De Lara Guarch, Pablo <[email protected]>
Subject: [dpdk-dev] [PATCH v2 3/3] doc: update documentation
Quoted 4 lines
This patch updates the documentation for the newly supported AESNI-MB PMD out-of-place operation feature.
Signed-off-by Fan Zhang <[email protected]>
Re: [PATCH v2 3/3] doc: update documentation
In reply to Fan ZhangQuoted 9 lines
-----Original Message-----
From: Zhang, Roy Fan
Sent: Thursday, February 28, 2019 11:36 AM
To: [email protected]
Cc: [email protected]; Zhang, Roy Fan <[email protected]>; De Lara Guarch, Pablo <[email protected]>
Subject: [PATCH v2 3/3] doc: update documentation
I think you can merge this patch with patch 1.
Quoted 5 lines
This patch updates the documentation for the newly supported AESNI-MB PMD out-of-place operation feature.
Signed-off-by Fan Zhang <[email protected]>
...
doc/guides/rel_notes/release_19_05.rst New Features · line 70
Quoted 8 lines
+++
b/doc/guides/rel_notes/release_19_05.rstdoc/guides/rel_notes/release_19_05.rst +3
-0@@ -65,6 +65,10 @@ New Features process. * Added support for Rx packet types list in a secondary process. +* **Updated AESNI-MB PMD.** + + Updated AESNI-MB PMD for supporting out-of-place operations.
Better to simply state "Added support for out-of-place operations", to avoid redundancy.
Quoted 6 lines
doc/guides/rel_notes/release_19_05.rst +1
-1+ Removed Items ------------- --2.14.5
v3 cover crypto/aesni_mb: enable out of place processing
In reply to Fan ZhangAdd out-of-place processing, i.e. different source and destination m_bufs, plus related capability update, tests and documentation.
v3:
- Updated unit test, enable src-dst swap test for all oop tests.
- Merged patches.
- Updated documentation.
- Several code changes based on Pablo's comments.
v2:
- Removed limitation of not support cipher-auth.
- Updated tests for more comprehensive test-cases.
- Splitted the patch.
Fan Zhang (2):
crypto/aesni_mb: enable out of place processing
test: add out of place test for AESNI-MB
app/test/test_cryptodev_aes_test_vectors.h | 110 +++++++++++++++++++++++++--- app/test/test_cryptodev_blockcipher.c | 83 ++++++++++++++++++--- app/test/test_cryptodev_blockcipher.h | 3 + app/test/test_cryptodev_des_test_vectors.h | 24 ++++-- doc/guides/cryptodevs/aesni_mb.rst | 1 - doc/guides/cryptodevs/features/aesni_mb.ini | 1 + doc/guides/rel_notes/release_19_05.rst | 4 + drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 102 +++++++++++++++++++------- 8 files changed, 270 insertions(+), 58 deletions(-)
Signature · 1 line
2.14.5
PATCH v3 1/2 crypto/aesni_mb: enable out of place processing
Add out-of-place processing, i.e. different source and destination m_bufs, plus related capability update, tests and documentation.
--- doc/guides/cryptodevs/aesni_mb.rst | 1 - doc/guides/cryptodevs/features/aesni_mb.ini | 1 + doc/guides/rel_notes/release_19_05.rst | 4 ++ drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 102 ++++++++++++++++++++-------- 4 files changed, 80 insertions(+), 28 deletions(-)
doc/guides/cryptodevs/aesni_mb.rst +0 -1
@@ -56,7 +56,6 @@ Limitations ----------- * Chained mbufs are not supported. -* Only in-place is currently supported (destination address is the same as source address). * RTE_CRYPTO_AEAD_AES_GCM only works properly when the multi-buffer library is 0.51.0 or newer. * RTE_CRYPTO_HASH_AES_GMAC is supported by library version v0.51 or later.
doc/guides/cryptodevs/features/aesni_mb.ini +1 -0
@@ -11,6 +11,7 @@ CPU AVX = Y CPU AVX2 = Y CPU AVX512 = Y CPU AESNI = Y +OOP LB In LB Out = Y ; ; Supported crypto algorithms of the 'aesni_mb' crypto driver.
doc/guides/rel_notes/release_19_05.rst +4 -0
@@ -91,6 +91,10 @@ New Features * Added promiscuous mode support. +* **Updated AESNI-MB PMD.** + + Added support for out-of-place operations. + Removed Items -------------
drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +75 -27
147 lines not on this page · raw message
Signature · 1 line
2.14.5
PATCH v3 2/2 test: add out of place test for AESNI-MB
In reply to Fan ZhangThis patch updates the unit test to enable AESNI-MB PMD out-of-place tests. A special test type that swap both the source and destination buffer is added for a more comprehensive test set to take place.
--- app/test/test_cryptodev_aes_test_vectors.h | 110 ++++++++++++++++++++++++++--- app/test/test_cryptodev_blockcipher.c | 83 ++++++++++++++++++---- app/test/test_cryptodev_blockcipher.h | 3 + app/test/test_cryptodev_des_test_vectors.h | 24 ++++--- 4 files changed, 190 insertions(+), 30 deletions(-)
app/test/test_cryptodev_aes_test_vectors.h +100 -10
@@ -1160,8 +1160,78 @@ static const struct blockcipher_test_data aes_test_data_docsis_3 = { } }; +static const uint8_t +cipher_aescbc_offset_16[] = { +0x57 ,0x68 ,0x61 ,0x74 ,0x20 ,0x61 ,0x20 ,0x6C , +0x6F ,0x75 ,0x73 ,0x79 ,0x20 ,0x65 ,0x61 ,0x72 , +0x68 ,0x2A ,0x6A ,0x82 ,0xE0 ,0x73 ,0xC7 ,0x51 , +0x81 ,0xF4 ,0x47 ,0x27 ,0x1A ,0xEF ,0x76 ,0x15 , +0x1C ,0xE1 ,0x38 ,0x5F ,0xE1 ,0x81 ,0x77 ,0xC7 , +0x8B ,0xF0 ,0x69 ,0xC3 ,0x3C ,0x45 ,0x1C ,0x0A , +0xA3 ,0x93 ,0xBF ,0x60 ,0x57 ,0x88 ,0xD2 ,0xFF , +0xE1 ,0x8F ,0xC0 ,0x64 ,0x2C ,0x42 ,0xC5 ,0x22 , +0xE3 ,0x5F ,0x71 ,0x1F ,0xF7 ,0x62 ,0xA2 ,0x7E , +0x0D ,0x42 ,0xD9 ,0xE7 ,0xF3 ,0x10 ,0xB0 ,0xEE , +}; + +/** AES-128-CBC SHA1 OOP test vector for swapping src/dst */ +static const struct blockcipher_test_data aes_test_data_14 = { + .crypto_algo =RTE_CRYPTO_CIPHER_AES_CBC , + .cipher_key = { + .data = { +0xE4 ,0x23 ,0x33 ,0x8A ,0x35 ,0x64 ,0x61 ,0xE2 , +0x49 ,0x03 ,0xDD ,0xC6 ,0xB8 ,0xCA ,0x55 ,0x7A + }, + .len =16 + }, + .iv = { + .data = { +0x00 ,0x01 ,0x02 ,0x03 ,0x04 ,0x05 ,0x06 ,0x07 , +0x08 ,0x09 ,0x0A ,0x0B ,0x0C ,0x0D ,0x0E ,0x0F + }, + .len =16 + }, + .plaintext = { + .data = plaintext_aes_common, + .len =80 + }, + .cipher_offset =16 , + .auth_offset =0 , + .ciphertext = { + .data = cipher_aescbc_offset_16, + .len =80 + }, + .auth_algo =RTE_CRYPTO_AUTH_SHA1_HMAC , + .auth_key = { + .data = { +0xF8 ,0x2A ,0xC7 ,0x54 ,0xDB ,0x96 ,0x18 ,0xAA , +0xC3 ,0xA1 ,0x53 ,0xF6 ,0x1F ,0x17 ,0x60 ,0xBD , +0xDE ,0xF4 ,0xDE ,0xAD + }, + .len =20 + }, + .digest = { + .data = { +0xCC ,0x15 ,0x83 ,0xF7 ,0x23 ,0x87 ,0x96 ,0xA7 , +0x29 ,0x34 ,0x32 ,0xE4 ,0x4C ,0x06 ,0xE8 ,0xEB , +0x70 ,0x72 ,0x4B ,0xAD + }, + .len =20 , + .truncated_len =12 + } +}; +static const struct blockcipher_test_case aes_chain_test_cases[] = { { + .test_descr ="AES-128-CBC HMAC-SHA1 Decryption Digest " +"Verify OOP Offset" , + .test_data = &aes_test_data_14, + .op_mask =BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC , + .feature_mask =BLOCKCIPHER_TEST_FEATURE_OOP , + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_MB | +BLOCKCIPHER_TEST_TARGET_PMD_QAT + }, + { .test_descr ="AES-128-CTR HMAC-SHA1 Encryption Digest" , .test_data = &aes_test_data_1, .op_mask =BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN ,
@@ -1471,8 +1541,18 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR | +BLOCKCIPHER_TEST_TARGET_PMD_MB |BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX }, + { + .test_descr ="AES-128-CBC HMAC-SHA1 Encryption Digest " + "OOP Offset", + .test_data = &aes_test_data_14, + .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN, + .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_MB | +BLOCKCIPHER_TEST_TARGET_PMD_QAT + }, { .test_descr ="AES-128-CBC HMAC-SHA1 Decryption Digest " "Verify OOP",
@@ -1485,7 +1565,8 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR | -BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX +BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "AES-128-CBC HMAC-SHA224 Encryption Digest",
@@ -1698,7 +1779,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |BLOCKCIPHER_TEST_TARGET_PMD_CCP | -BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO +BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "AES-256-CBC OOP Decryption",
@@ -1711,7 +1793,8 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC |BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR |BLOCKCIPHER_TEST_TARGET_PMD_CCP | -BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO +BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "AES-128-CTR Encryption",
@@ -1873,42 +1956,49 @@ static const struct blockcipher_test_case aes_docsis_test_cases[] = { .test_data = &aes_test_data_docsis_1, .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, - .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "AES-DOCSIS-BPI OOP Runt Block Encryption", .test_data = &aes_test_data_docsis_2, .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, - .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, + { .test_descr = "AES-DOCSIS-BPI OOP Uneven Block Encryption", .test_data = &aes_test_data_docsis_3, .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, - .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "AES-DOCSIS-BPI OOP Full Block Decryption", .test_data = &aes_test_data_docsis_1, .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, - .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "AES-DOCSIS-BPI OOP Runt Block Decryption", .test_data = &aes_test_data_docsis_2, .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, - .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "AES-DOCSIS-BPI OOP Uneven Block Decryption", .test_data = &aes_test_data_docsis_3, .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, - .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT - } + .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB + }, };#endif /* TEST_CRYPTODEV_AES_TEST_VECTORS_H_ */
app/test/test_cryptodev_blockcipher.c +71 -12
124 lines not on this page · raw message
app/test/test_cryptodev_blockcipher.h +3 -0
@@ -98,6 +98,9 @@ struct blockcipher_test_data {unsigned int len;/* for qat */ unsigned int truncated_len;/* for mb */ } digest; + +unsigned int cipher_offset; +unsigned int auth_offset; };int
app/test/test_cryptodev_des_test_vectors.h +16 -8
@@ -1016,7 +1016,8 @@ static const struct blockcipher_test_case des_docsis_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | -BLOCKCIPHER_TEST_TARGET_PMD_QAT +BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "DES-DOCSIS-BPI OOP Runt Block Encryption",
@@ -1024,7 +1025,8 @@ static const struct blockcipher_test_case des_docsis_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | -BLOCKCIPHER_TEST_TARGET_PMD_QAT +BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "DES-DOCSIS-BPI OOP Uneven Encryption",
@@ -1032,7 +1034,8 @@ static const struct blockcipher_test_case des_docsis_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | -BLOCKCIPHER_TEST_TARGET_PMD_QAT +BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "DES-DOCSIS-BPI OOP Full Block Decryption",
@@ -1040,7 +1043,8 @@ static const struct blockcipher_test_case des_docsis_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | -BLOCKCIPHER_TEST_TARGET_PMD_QAT +BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "DES-DOCSIS-BPI OOP Runt Block Decryption",
@@ -1048,7 +1052,8 @@ static const struct blockcipher_test_case des_docsis_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | -BLOCKCIPHER_TEST_TARGET_PMD_QAT +BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr = "DES-DOCSIS-BPI OOP Uneven Decryption",
@@ -1056,7 +1061,8 @@ static const struct blockcipher_test_case des_docsis_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT, .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP, .pmd_mask =BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL | - BLOCKCIPHER_TEST_TARGET_PMD_QAT +BLOCKCIPHER_TEST_TARGET_PMD_QAT | +BLOCKCIPHER_TEST_TARGET_PMD_MB } };
@@ -1200,7 +1206,8 @@ static const struct blockcipher_test_case triple_des_chain_test_cases[] = {BLOCKCIPHER_TEST_TARGET_PMD_QAT |BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC | -BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR +BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr ="3DES-128-CBC HMAC-SHA1 Decryption Digest"
@@ -1212,7 +1219,8 @@ static const struct blockcipher_test_case triple_des_chain_test_cases[] = {BLOCKCIPHER_TEST_TARGET_PMD_QAT |BLOCKCIPHER_TEST_TARGET_PMD_DPAA2_SEC |BLOCKCIPHER_TEST_TARGET_PMD_DPAA_SEC | -BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR +BLOCKCIPHER_TEST_TARGET_PMD_CAAM_JR | +BLOCKCIPHER_TEST_TARGET_PMD_MB }, { .test_descr ="3DES-128-CBC HMAC-SHA1 Encryption Digest"
Signature · 1 line
2.14.5
Akhil Goyal
AppliedQuoted 23 lines · Fan Zhang
Add out-of-place processing, i.e. different source and destination
m_bufs, plus related capability update, tests and documentation.Signed-off-by Fiona Trahe <[email protected]>Signed-off-by Paul Luse <[email protected]>Signed-off-by Fan Zhang <[email protected]>v3:
- Updated unit test, enable src-dst swap test for all oop tests.
- Merged patches.
- Updated documentation.
- Several code changes based on Pablo's comments.v2:
- Removed limitation of not support cipher-auth.
- Updated tests for more comprehensive test-cases.
- Splitted the patch.Fan Zhang (2):
crypto/aesni_mb: enable out of place processing
test: add out of place test for AESNI-MB
Quoted 10 lines
app/test/test_cryptodev_aes_test_vectors.h | 110 +++++++++++++++++++++++++--- app/test/test_cryptodev_blockcipher.c | 83 ++++++++++++++++++--- app/test/test_cryptodev_blockcipher.h | 3 + app/test/test_cryptodev_des_test_vectors.h | 24 ++++-- doc/guides/cryptodevs/aesni_mb.rst | 1 - doc/guides/cryptodevs/features/aesni_mb.ini | 1 + doc/guides/rel_notes/release_19_05.rst | 4 + drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 102 +++++++++++++++++++------- 8 files changed, 270 insertions(+), 58 deletions(-)
Applied to dpdk-next-crypto
Thanks.