test/crypto: fix AESNI-MB CPU tests
PATCH 1/1 test/crypto: fix AESNI-MB CPU tests
The AESNI-MB CPU test cases, which are executed via the cryptodev_cpu_aesni_mb_autotest command, aborted when it tried to run the DOCSIS security tests as these are not CPU type tests. The abort happened at the following line in process_crypto_request():
RTE_VERIFY(gbl_action_type != RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO);
The tests have been updated not to run the DOCSIS (or PDCP) security tests during cryptodev_cpu_aesni_mb_autotest, with the decision based on improved PMD security capability checks.
--- app/test/test_cryptodev.c | 47 ++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 21 deletions(-)
app/test/test_cryptodev.c +26 -21
@@ -7073,7 +7073,8 @@ test_authenticated_encryption(const struct aead_test_data *tdata)#ifdef RTE_LIBRTE_SECURITY static int -security_proto_supported (enum rte_security_session_protocol proto) +security_proto_supported (enum rte_security_session_action_type action, +enum rte_security_session_protocol proto) {struct crypto_testsuite_params *ts_params = &testsuite_params;
@@ -7093,7 +7094,8 @@ security_proto_supported(enum rte_security_session_protocol proto)while ((capability = &capabilities[i++])->action !=RTE_SECURITY_ACTION_TYPE_NONE ) { -if (capability->protocol == proto) +if (capability->action == action && + capability->protocol == proto)return 0 ; }
@@ -7125,7 +7127,7 @@ test_pdcp_proto(int i, int oop,/* Verify the capabilities */ struct rte_security_capability_idx sec_cap_idx; - sec_cap_idx.action =RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL ; + sec_cap_idx.action = ut_params->type; sec_cap_idx.protocol =RTE_SECURITY_PROTOCOL_PDCP ; sec_cap_idx.pdcp.domain = pdcp_test_params[i].domain;if (rte_security_capability_get (ctx, &sec_cap_idx) ==NULL )
@@ -7151,9 +7153,6 @@ test_pdcp_proto(int i, int oop,rte_pktmbuf_append (ut_params->obuf, output_vec_len); } -/* Set crypto type as IPSEC */ - ut_params->type =RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL ; -/* Setup Cipher Parameters */ ut_params->cipher_xform.type =RTE_CRYPTO_SYM_XFORM_CIPHER ; ut_params->cipher_xform.cipher.algo = pdcp_test_params[i].cipher_alg;
@@ -7181,7 +7180,7 @@ test_pdcp_proto(int i, int oop, }struct rte_security_session_conf sess_conf = { - .action_type =RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL , + .action_type = ut_params->type, .protocol =RTE_SECURITY_PROTOCOL_PDCP , {.pdcp = { .bearer = pdcp_test_bearer[i],
@@ -7315,7 +7314,7 @@ test_pdcp_proto_SGL(int i, int oop,/* Verify the capabilities */ struct rte_security_capability_idx sec_cap_idx; - sec_cap_idx.action =RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL ; + sec_cap_idx.action = ut_params->type; sec_cap_idx.protocol =RTE_SECURITY_PROTOCOL_PDCP ; sec_cap_idx.pdcp.domain = pdcp_test_params[i].domain;if (rte_security_capability_get (ctx, &sec_cap_idx) ==NULL )
@@ -7425,8 +7424,6 @@ test_pdcp_proto_SGL(int i, int oop, ut_params->obuf->nb_segs = segs; } - ut_params->type =RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL ; -/* Setup Cipher Parameters */ ut_params->cipher_xform.type =RTE_CRYPTO_SYM_XFORM_CIPHER ; ut_params->cipher_xform.cipher.algo = pdcp_test_params[i].cipher_alg;
@@ -7452,7 +7449,7 @@ test_pdcp_proto_SGL(int i, int oop, }struct rte_security_session_conf sess_conf = { - .action_type =RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL , + .action_type = ut_params->type, .protocol =RTE_SECURITY_PROTOCOL_PDCP , {.pdcp = { .bearer = pdcp_test_bearer[i],
@@ -7711,6 +7708,7 @@ static inttest_PDCP_PROTO_all (void) {struct crypto_testsuite_params *ts_params = &testsuite_params; +struct crypto_unittest_params *ut_params = &unittest_params;struct rte_cryptodev_info dev_info;int status;
@@ -7720,7 +7718,13 @@ test_PDCP_PROTO_all(void)if (!(feat_flags &RTE_CRYPTODEV_FF_SECURITY ))return -ENOTSUP ; -if (security_proto_supported (RTE_SECURITY_PROTOCOL_PDCP ) <0 ) +/* Set action type */ + ut_params->type = gbl_action_type ==RTE_SECURITY_ACTION_TYPE_NONE ? +RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL : + gbl_action_type; + +if (security_proto_supported (ut_params->type, +RTE_SECURITY_PROTOCOL_PDCP ) <0 )return -ENOTSUP ; status =test_PDCP_PROTO_cplane_encap_all ();
@@ -7760,7 +7764,7 @@ test_docsis_proto_uplink(int i, struct docsis_test_data *d_td)const struct rte_cryptodev_symmetric_capability *sym_cap;int j =0 ; - sec_cap_idx.action =RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL ; + sec_cap_idx.action = ut_params->type; sec_cap_idx.protocol =RTE_SECURITY_PROTOCOL_DOCSIS ; sec_cap_idx.docsis.direction =RTE_SECURITY_DOCSIS_UPLINK ;
@@ -7796,9 +7800,6 @@ test_docsis_proto_uplink(int i, struct docsis_test_data *d_td)memcpy (ciphertext, d_td->ciphertext.data, d_td->ciphertext.len); -/* Set session action type */ - ut_params->type =RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL ; -/* Setup cipher session parameters */ ut_params->cipher_xform.type =RTE_CRYPTO_SYM_XFORM_CIPHER ; ut_params->cipher_xform.cipher.algo =RTE_CRYPTO_CIPHER_AES_DOCSISBPI ;
@@ -7938,7 +7939,7 @@ test_docsis_proto_downlink(int i, struct docsis_test_data *d_td)const struct rte_cryptodev_symmetric_capability *sym_cap;int j =0 ; - sec_cap_idx.action =RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL ; + sec_cap_idx.action = ut_params->type; sec_cap_idx.protocol =RTE_SECURITY_PROTOCOL_DOCSIS ; sec_cap_idx.docsis.direction =RTE_SECURITY_DOCSIS_DOWNLINK ;
@@ -7974,9 +7975,6 @@ test_docsis_proto_downlink(int i, struct docsis_test_data *d_td)memcpy (plaintext, d_td->plaintext.data, d_td->plaintext.len); -/* Set session action type */ - ut_params->type =RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL ; -/* Setup cipher session parameters */ ut_params->cipher_xform.type =RTE_CRYPTO_SYM_XFORM_CIPHER ; ut_params->cipher_xform.cipher.algo =RTE_CRYPTO_CIPHER_AES_DOCSISBPI ;
@@ -8192,6 +8190,7 @@ static inttest_DOCSIS_PROTO_all (void) {struct crypto_testsuite_params *ts_params = &testsuite_params; +struct crypto_unittest_params *ut_params = &unittest_params;struct rte_cryptodev_info dev_info;int status;
@@ -8201,7 +8200,13 @@ test_DOCSIS_PROTO_all(void)if (!(feat_flags &RTE_CRYPTODEV_FF_SECURITY ))return -ENOTSUP ; -if (security_proto_supported (RTE_SECURITY_PROTOCOL_DOCSIS ) <0 ) +/* Set action type */ + ut_params->type = gbl_action_type ==RTE_SECURITY_ACTION_TYPE_NONE ? +RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL : + gbl_action_type; + +if (security_proto_supported (ut_params->type, +RTE_SECURITY_PROTOCOL_DOCSIS ) <0 )return -ENOTSUP ; status =test_DOCSIS_PROTO_uplink_all ();
Signature · 1 line
2.17.1
Quoted 7 lines
The AESNI-MB CPU test cases, which are executed via the
cryptodev_cpu_aesni_mb_autotestcommand, aborted when it tried to run the DOCSIS security tests as these are not CPU type tests. The abort happened at the following line inprocess_crypto_request():
RTE_VERIFY(gbl_action_type != RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO);
Quoted 7 lines
The tests have been updated not to run the DOCSIS (or PDCP) security tests during
cryptodev_cpu_aesni_mb_autotest, with the decision based on improved PMD security capability checks.Fixes ea31f2b4f547 ("test/crypto: add DOCSIS security cases")Signed-off-by David Coyle <[email protected]>
Quoted 19 lines
-----Original Message-----
From: Coyle, David <[email protected]>
Sent: Thursday, July 16, 2020 4:29 PM
To: [email protected]; Doherty, Declan <[email protected]>; De Lara Guarch, Pablo <[email protected]>; Trahe, Fiona <[email protected]>
Cc: [email protected]; Ryan, Brendan <[email protected]>; O'loingsigh, Mairtin <[email protected]>; Coyle, David <[email protected]>
Subject: [PATCH v1] test/crypto: fix AESNI-MB CPU testsThe AESNI-MB CPU test cases, which are executed via the
cryptodev_cpu_aesni_mb_autotestcommand, aborted when it tried to run the DOCSIS security tests as these are not CPU type tests. The abort happened at the following line inprocess_crypto_request():
RTE_VERIFY(gbl_action_type != RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO);
Quoted 7 lines
The tests have been updated not to run the DOCSIS (or PDCP) security tests during
cryptodev_cpu_aesni_mb_autotest, with the decision based on improved PMD security capability checks.Fixes ea31f2b4f547 ("test/crypto: add DOCSIS security cases")Signed-off-by David Coyle <[email protected]>
Akhil Goyal
AppliedQuoted 10 lines
Quoted 3 lines
The AESNI-MB CPU test cases, which are executed via the
cryptodev_cpu_aesni_mb_autotestcommand, aborted when it tried to run the DOCSIS security tests as these are not CPU type tests. The abort happened atthe
Quoted 6 lines
following line in
process_crypto_request():
RTE_VERIFY(gbl_action_type != RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO);The tests have been updated not to run the DOCSIS (or PDCP) security tests during
cryptodev_cpu_aesni_mb_autotest, with the decision based on
Quoted 8 lines
improved
Quoted 5 lines
PMD security capability checks.
Fixes ea31f2b4f547 ("test/crypto: add DOCSIS security cases")Signed-off-by David Coyle <[email protected]>Acked-by Pablo de Lara <[email protected]>
Applied to dpdk-next-crypto
Thanks.