test/ipsec: fix test initialisation
PATCH 1/1 test/ipsec: fix test initialisation
Fix xform initialisation.
Fix testsuite_setup.
Loop on rte_cryptodev_dequeue_burst().
Remove unused variables.
--- app/test/test_ipsec.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-)
app/test/test_ipsec.c +23 -21
@@ -42,6 +42,7 @@#define OUTBOUND_SPI 17#define BURST_SIZE 32#define REORDER_PKTS 1 +#define DEQUEUE_COUNT 100struct user_params {enum rte_crypto_sym_xform_type auth;
@@ -79,7 +80,6 @@ struct ipsec_unitest_params {struct rte_mbuf *obuf[BURST_SIZE ], *ibuf[BURST_SIZE ], *testbuf[BURST_SIZE ]; -uint8_t *digest;uint16_t pkt_index; };
@@ -111,8 +111,6 @@ static struct ipsec_testsuite_params testsuite_params = { NULL };static struct ipsec_unitest_params unittest_params;static struct user_params uparams; -static uint8_t global_key[128 ] = {0 }; -struct supported_cipher_algo {const char *keyword;enum rte_crypto_cipher_algorithm algo;
@@ -215,30 +213,26 @@ fill_crypto_xform(struct ipsec_unitest_params *ut_params,const struct supported_auth_algo *auth_algo, const struct supported_cipher_algo *cipher_algo) { - ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH; - ut_params->auth_xform.auth.algo = auth_algo->algo; - ut_params->auth_xform.auth.key.data = global_key; - ut_params->auth_xform.auth.key.length = auth_algo->key_len; - ut_params->auth_xform.auth.digest_length = auth_algo->digest_len; - ut_params->auth_xform.auth.op =RTE_CRYPTO_AUTH_OP_VERIFY ; - ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER; ut_params->cipher_xform.cipher.algo = cipher_algo->algo; - ut_params->cipher_xform.cipher.key.data = global_key; - ut_params->cipher_xform.cipher.key.length = cipher_algo->key_len; - ut_params->cipher_xform.cipher.op =RTE_CRYPTO_CIPHER_OP_DECRYPT ; - ut_params->cipher_xform.cipher.iv.offset =IV_OFFSET ; - ut_params->cipher_xform.cipher.iv.length = cipher_algo->iv_len; + ut_params->auth_xform.type =RTE_CRYPTO_SYM_XFORM_AUTH ; + ut_params->auth_xform.auth.algo = auth_algo->algo;if (ut_params->ipsec_xform.direction ==RTE_SECURITY_IPSEC_SA_DIR_INGRESS ) { - ut_params->crypto_xforms = &ut_params->auth_xform; - ut_params->auth_xform.next = &ut_params->cipher_xform; + ut_params->cipher_xform.cipher.op = +RTE_CRYPTO_CIPHER_OP_DECRYPT ; + ut_params->auth_xform.auth.op =RTE_CRYPTO_AUTH_OP_VERIFY ; ut_params->cipher_xform.next =NULL ; + ut_params->auth_xform.next = &ut_params->cipher_xform; + ut_params->crypto_xforms = &ut_params->auth_xform; }else { - ut_params->crypto_xforms = &ut_params->cipher_xform; - ut_params->cipher_xform.next = &ut_params->auth_xform; + ut_params->cipher_xform.cipher.op = +RTE_CRYPTO_CIPHER_OP_ENCRYPT ; + ut_params->auth_xform.auth.op =RTE_CRYPTO_AUTH_OP_GENERATE ; ut_params->auth_xform.next =NULL ; + ut_params->cipher_xform.next = &ut_params->auth_xform; + ut_params->crypto_xforms = &ut_params->cipher_xform; } }
@@ -287,9 +281,12 @@ testsuite_setup(void)int rc;memset (ts_params,0 ,sizeof (*ts_params)); +memset (ut_params,0 ,sizeof (*ut_params)); +memset (&uparams,0 ,sizeof (struct user_params )); uparams.auth =RTE_CRYPTO_SYM_XFORM_AUTH ; uparams.cipher =RTE_CRYPTO_SYM_XFORM_CIPHER ; + uparams.aead =RTE_CRYPTO_SYM_XFORM_NOT_SPECIFIED ;strcpy (uparams.auth_algo,"null" );strcpy (uparams.cipher_algo,"null" );
@@ -759,6 +756,7 @@ crypto_ipsec(uint16_t num_pkts)struct ipsec_unitest_params *ut_params = &unittest_params;uint32_t k, ng;struct rte_ipsec_group grp[1 ]; +int i =0 ;/* call crypto prepare */ k = rte_ipsec_pkt_crypto_prepare(&ut_params->ss[0], ut_params->ibuf,
@@ -774,8 +772,12 @@ crypto_ipsec(uint16_t num_pkts)return TEST_FAILED ; } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop, num_pkts); +while ((k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + ut_params->cop, num_pkts)) ==0 && i <DEQUEUE_COUNT ) { +rte_pause (); + i++; + } +if (k != num_pkts) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ;
Signature · 1 line
2.7.4
PATCH v2 1/1 test/ipsec: fix test initialisation
Fix xform initialisation.
Fix testsuite_setup.
Loop on rte_cryptodev_dequeue_burst() calls.
Remove unused variables.
---
Changes in v2:
Increase DEQUEUE_COUNT to 1000
Loop on other 2 rte_cryptodev_dequeue_burst() calls.
app/test/test_ipsec.c | 60 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 25 deletions(-)
app/test/test_ipsec.c +35 -25
@@ -42,6 +42,7 @@#define OUTBOUND_SPI 17#define BURST_SIZE 32#define REORDER_PKTS 1 +#define DEQUEUE_COUNT 1000struct user_params {enum rte_crypto_sym_xform_type auth;
@@ -79,7 +80,6 @@ struct ipsec_unitest_params {struct rte_mbuf *obuf[BURST_SIZE ], *ibuf[BURST_SIZE ], *testbuf[BURST_SIZE ]; -uint8_t *digest;uint16_t pkt_index; };
@@ -111,8 +111,6 @@ static struct ipsec_testsuite_params testsuite_params = { NULL };static struct ipsec_unitest_params unittest_params;static struct user_params uparams; -static uint8_t global_key[128 ] = {0 }; -struct supported_cipher_algo {const char *keyword;enum rte_crypto_cipher_algorithm algo;
@@ -215,30 +213,26 @@ fill_crypto_xform(struct ipsec_unitest_params *ut_params,const struct supported_auth_algo *auth_algo, const struct supported_cipher_algo *cipher_algo) { - ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH; - ut_params->auth_xform.auth.algo = auth_algo->algo; - ut_params->auth_xform.auth.key.data = global_key; - ut_params->auth_xform.auth.key.length = auth_algo->key_len; - ut_params->auth_xform.auth.digest_length = auth_algo->digest_len; - ut_params->auth_xform.auth.op =RTE_CRYPTO_AUTH_OP_VERIFY ; - ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER; ut_params->cipher_xform.cipher.algo = cipher_algo->algo; - ut_params->cipher_xform.cipher.key.data = global_key; - ut_params->cipher_xform.cipher.key.length = cipher_algo->key_len; - ut_params->cipher_xform.cipher.op =RTE_CRYPTO_CIPHER_OP_DECRYPT ; - ut_params->cipher_xform.cipher.iv.offset =IV_OFFSET ; - ut_params->cipher_xform.cipher.iv.length = cipher_algo->iv_len; + ut_params->auth_xform.type =RTE_CRYPTO_SYM_XFORM_AUTH ; + ut_params->auth_xform.auth.algo = auth_algo->algo;if (ut_params->ipsec_xform.direction ==RTE_SECURITY_IPSEC_SA_DIR_INGRESS ) { - ut_params->crypto_xforms = &ut_params->auth_xform; - ut_params->auth_xform.next = &ut_params->cipher_xform; + ut_params->cipher_xform.cipher.op = +RTE_CRYPTO_CIPHER_OP_DECRYPT ; + ut_params->auth_xform.auth.op =RTE_CRYPTO_AUTH_OP_VERIFY ; ut_params->cipher_xform.next =NULL ; + ut_params->auth_xform.next = &ut_params->cipher_xform; + ut_params->crypto_xforms = &ut_params->auth_xform; }else { - ut_params->crypto_xforms = &ut_params->cipher_xform; - ut_params->cipher_xform.next = &ut_params->auth_xform; + ut_params->cipher_xform.cipher.op = +RTE_CRYPTO_CIPHER_OP_ENCRYPT ; + ut_params->auth_xform.auth.op =RTE_CRYPTO_AUTH_OP_GENERATE ; ut_params->auth_xform.next =NULL ; + ut_params->cipher_xform.next = &ut_params->auth_xform; + ut_params->crypto_xforms = &ut_params->cipher_xform; } }
@@ -287,9 +281,12 @@ testsuite_setup(void)int rc;memset (ts_params,0 ,sizeof (*ts_params)); +memset (ut_params,0 ,sizeof (*ut_params)); +memset (&uparams,0 ,sizeof (struct user_params )); uparams.auth =RTE_CRYPTO_SYM_XFORM_AUTH ; uparams.cipher =RTE_CRYPTO_SYM_XFORM_CIPHER ; + uparams.aead =RTE_CRYPTO_SYM_XFORM_NOT_SPECIFIED ;strcpy (uparams.auth_algo,"null" );strcpy (uparams.cipher_algo,"null" );
@@ -759,6 +756,7 @@ crypto_ipsec(uint16_t num_pkts)struct ipsec_unitest_params *ut_params = &unittest_params;uint32_t k, ng;struct rte_ipsec_group grp[1 ]; +int i =0 ;/* call crypto prepare */ k = rte_ipsec_pkt_crypto_prepare(&ut_params->ss[0], ut_params->ibuf,
@@ -774,8 +772,12 @@ crypto_ipsec(uint16_t num_pkts)return TEST_FAILED ; } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop, num_pkts); +while ((k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + ut_params->cop, num_pkts)) ==0 && i <DEQUEUE_COUNT ) { +rte_pause (); + i++; + } +if (k != num_pkts) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ;
@@ -890,8 +892,12 @@ crypto_ipsec_2sa(void) } } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop,BURST_SIZE ); +while ((k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + ut_params->cop,BURST_SIZE )) ==0 && + i <DEQUEUE_COUNT ) { +rte_pause (); + i++; + }if (k !=BURST_SIZE ) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ;
@@ -1029,8 +1035,12 @@ crypto_ipsec_2sa_4grp(void) } } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop,BURST_SIZE ); +while ((k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + ut_params->cop,BURST_SIZE )) ==0 && + i <DEQUEUE_COUNT ) { +rte_pause (); + i++; + }if (k !=BURST_SIZE ) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ;
Signature · 1 line
2.7.4
Hi Bernard,
Quoted 145 lines · Bernard Iremonger
Fix xform initialisation.
Fixtestsuite_setup.
Loop onrte_cryptodev_dequeue_burst()calls.
Remove unused variables.Fixes 05fe65eb66b2 ("test/ipsec: introduce functional test")Fixes 59d7353b0df0 ("test/ipsec: fix test suite setup")Signed-off-by Bernard Iremonger <[email protected]>---
Changes in v2:
IncreaseDEQUEUE_COUNTto 1000
Loop on other 2rte_cryptodev_dequeue_burst()calls.app/test/test_ipsec.c | 60 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 25 deletions(-)app/test/test_ipsec.c +29
-24@@ -42,6 +42,7 @@#define OUTBOUND_SPI 17#define BURST_SIZE 32#define REORDER_PKTS 1 +#define DEQUEUE_COUNT 1000struct user_params {enum rte_crypto_sym_xform_type auth;@@ -79,7 +80,6 @@ struct ipsec_unitest_params {struct rte_mbuf *obuf[BURST_SIZE ], *ibuf[BURST_SIZE ], *testbuf[BURST_SIZE ]; -uint8_t *digest;uint16_t pkt_index; };@@ -111,8 +111,6 @@ static struct ipsec_testsuite_params testsuite_params = { NULL };static struct ipsec_unitest_params unittest_params;static struct user_params uparams; -static uint8_t global_key[128 ] = {0 }; -struct supported_cipher_algo {const char *keyword;enum rte_crypto_cipher_algorithm algo;@@ -215,30 +213,26 @@ fill_crypto_xform(struct ipsec_unitest_params *ut_params,const struct supported_auth_algo *auth_algo, const struct supported_cipher_algo *cipher_algo) { - ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH; - ut_params->auth_xform.auth.algo = auth_algo->algo; - ut_params->auth_xform.auth.key.data = global_key; - ut_params->auth_xform.auth.key.length = auth_algo->key_len; - ut_params->auth_xform.auth.digest_length = auth_algo->digest_len; - ut_params->auth_xform.auth.op =RTE_CRYPTO_AUTH_OP_VERIFY ; - ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER; ut_params->cipher_xform.cipher.algo = cipher_algo->algo; - ut_params->cipher_xform.cipher.key.data = global_key; - ut_params->cipher_xform.cipher.key.length = cipher_algo->key_len; - ut_params->cipher_xform.cipher.op =RTE_CRYPTO_CIPHER_OP_DECRYPT ; - ut_params->cipher_xform.cipher.iv.offset =IV_OFFSET ; - ut_params->cipher_xform.cipher.iv.length = cipher_algo->iv_len; + ut_params->auth_xform.type =RTE_CRYPTO_SYM_XFORM_AUTH ; + ut_params->auth_xform.auth.algo = auth_algo->algo;if (ut_params->ipsec_xform.direction ==RTE_SECURITY_IPSEC_SA_DIR_INGRESS ) { - ut_params->crypto_xforms = &ut_params->auth_xform; - ut_params->auth_xform.next = &ut_params->cipher_xform; + ut_params->cipher_xform.cipher.op = +RTE_CRYPTO_CIPHER_OP_DECRYPT ; + ut_params->auth_xform.auth.op =RTE_CRYPTO_AUTH_OP_VERIFY ; ut_params->cipher_xform.next =NULL ; + ut_params->auth_xform.next = &ut_params->cipher_xform; + ut_params->crypto_xforms = &ut_params->auth_xform; }else { - ut_params->crypto_xforms = &ut_params->cipher_xform; - ut_params->cipher_xform.next = &ut_params->auth_xform; + ut_params->cipher_xform.cipher.op = +RTE_CRYPTO_CIPHER_OP_ENCRYPT ; + ut_params->auth_xform.auth.op =RTE_CRYPTO_AUTH_OP_GENERATE ; ut_params->auth_xform.next =NULL ; + ut_params->cipher_xform.next = &ut_params->auth_xform; + ut_params->crypto_xforms = &ut_params->cipher_xform; } }@@ -287,9 +281,12 @@ testsuite_setup(void)int rc;memset (ts_params,0 ,sizeof (*ts_params)); +memset (ut_params,0 ,sizeof (*ut_params)); +memset (&uparams,0 ,sizeof (struct user_params )); uparams.auth =RTE_CRYPTO_SYM_XFORM_AUTH ; uparams.cipher =RTE_CRYPTO_SYM_XFORM_CIPHER ; + uparams.aead =RTE_CRYPTO_SYM_XFORM_NOT_SPECIFIED ;strcpy (uparams.auth_algo,"null" );strcpy (uparams.cipher_algo,"null" );@@ -759,6 +756,7 @@ crypto_ipsec(uint16_t num_pkts)struct ipsec_unitest_params *ut_params = &unittest_params;uint32_t k, ng;struct rte_ipsec_group grp[1 ]; +int i =0 ;/* call crypto prepare */ k = rte_ipsec_pkt_crypto_prepare(&ut_params->ss[0], ut_params->ibuf,@@ -774,8 +772,12 @@ crypto_ipsec(uint16_t num_pkts)return TEST_FAILED ; } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop, num_pkts); +while ((k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + ut_params->cop, num_pkts)) ==0 && i <DEQUEUE_COUNT ) { +rte_pause (); + i++; + } +if (k != num_pkts) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ;@@ -890,8 +892,12 @@ crypto_ipsec_2sa(void) } } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop,BURST_SIZE ); +while ((k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + ut_params->cop,BURST_SIZE )) ==0 && + i <DEQUEUE_COUNT ) { +rte_pause (); + i++; + }if (k !=BURST_SIZE ) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ;@@ -1029,8 +1035,12 @@ crypto_ipsec_2sa_4grp(void) } } - k = rte_cryptodev_dequeue_burst(ts_params->valid_dev, 0,
app/test/test_ipsec.c crypto_ipsec_2sa_4grp(void) · line 1046
Quoted 10 lines
app/test/test_ipsec.c +6
-1- ut_params->cop, BURST_SIZE); +while ((k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + ut_params->cop,BURST_SIZE )) ==0 && + i <DEQUEUE_COUNT ) { +rte_pause (); + i++; + }if (k !=BURST_SIZE ) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ;
The logic for dequeue is not correct here.
In case of hardware crypto PMD, there may be a case where we have lesser number of dequeues as compared to the number of enqueues in one cycle. Hardware PMDs are usually slow and may not give back packets in the same cycle. So, multiple dequeues(say a few hundred) shall be done until we get the enqueued_ops = dequeued_ops. But that would also be tricky here as we need to increment the pointer to the cop as well.
Regards,
Akhil
Hi Akhil,
<snip>
Quoted 171 lines · Bernard Iremonger
Quoted 8 lines
Fix xform initialisation.
Fixtestsuite_setup.
Loop onrte_cryptodev_dequeue_burst()calls.
Remove unused variables.Fixes 05fe65eb66b2 ("test/ipsec: introduce functional test")Fixes 59d7353b0df0 ("test/ipsec: fix test suite setup")Quoted 7 lines
Signed-off-by Bernard Iremonger <[email protected]>---
Changes in v2:
IncreaseDEQUEUE_COUNTto 1000
Loop on other 2rte_cryptodev_dequeue_burst()calls.app/test/test_ipsec.c | 60 ++++++++++++++++++++++++++++++---------------------
app/test/test_ipsec.c static struct ipsec_testsuite_params testsuite_params
Quoted 23 lines
1 file changed, 35 insertions(+), 25 deletions(-)app/test/test_ipsec.c index renamed from app/test/test_ipsec.c +0
-080a2d25..3769e56 100644
app/test/test_ipsec.c +1
-0@@ -42,6 +42,7 @@#define OUTBOUND_SPI 17#define BURST_SIZE 32#define REORDER_PKTS 1 +#define DEQUEUE_COUNT 1000struct user_params { enum rte_crypto_sym_xform_type auth; @@ -79,7 +80,6 @@ struct
ipsec_unitest_params{
structrte_mbuf*obuf[BURST_SIZE], *ibuf[BURST_SIZE],
*testbuf[BURST_SIZE];app/test/test_ipsec.c +0
-1-uint8_t *digest;uint16_t pkt_index; };@@ -111,8 +111,6 @@ static struct ipsec_testsuite_params testsuite_params= { NULL };
Quoted 14 lines
app/test/test_ipsec.c +0
-2static struct ipsec_unitest_params unittest_params;static struct user_params uparams; -static uint8_t global_key[128 ] = {0 }; -struct supported_cipher_algo {const char *keyword; enum rte_crypto_cipher_algorithm algo; @@ -215,30 +213,26 @@fill_crypto_xform(struct
ipsec_unitest_params*ut_params,
const structsupported_auth_algo*auth_algo, const structsupported_cipher_algo*cipher_algo)
{app/test/test_ipsec.c +0
-2- ut_params->auth_xform.type =RTE_CRYPTO_SYM_XFORM_AUTH ; - ut_params->auth_xform.auth.algo = auth_algo->algo;app/test/test_ipsec.c fill_crypto_xform(struct ipsec_unitest_params *ut_params,
Quoted 10 lines
app/test/test_ipsec.c +0
-8- ut_params->auth_xform.auth.key.data = global_key; - ut_params->auth_xform.auth.key.length = auth_algo->key_len; - ut_params->auth_xform.auth.digest_length = auth_algo->digest_len; - ut_params->auth_xform.auth.op =RTE_CRYPTO_AUTH_OP_VERIFY ; - ut_params->cipher_xform.type =RTE_CRYPTO_SYM_XFORM_CIPHER ; ut_params->cipher_xform.cipher.algo = cipher_algo->algo; - ut_params->cipher_xform.cipher.key.data = global_key; - ut_params->cipher_xform.cipher.key.length = cipher_algo->key_len; - ut_params->cipher_xform.cipher.op =
RTE_CRYPTO_CIPHER_OP_DECRYPT;app/test/test_ipsec.c fill_crypto_xform(struct ipsec_unitest_params *ut_params,
Quoted 12 lines
app/test/test_ipsec.c +5
-4- ut_params->cipher_xform.cipher.iv.offset =IV_OFFSET ; - ut_params->cipher_xform.cipher.iv.length = cipher_algo->iv_len; + ut_params->auth_xform.type =RTE_CRYPTO_SYM_XFORM_AUTH ; + ut_params->auth_xform.auth.algo = auth_algo->algo;if (ut_params->ipsec_xform.direction ==RTE_SECURITY_IPSEC_SA_DIR_INGRESS ) { - ut_params->crypto_xforms = &ut_params->auth_xform; - ut_params->auth_xform.next = &ut_params->cipher_xform; + ut_params->cipher_xform.cipher.op = +RTE_CRYPTO_CIPHER_OP_DECRYPT ; + ut_params->auth_xform.auth.op =
RTE_CRYPTO_AUTH_OP_VERIFY;app/test/test_ipsec.c fill_crypto_xform(struct ipsec_unitest_params *ut_params,
Quoted 9 lines
ut_params->cipher_xform.next = NULL;app/test/test_ipsec.c +5
-2+ ut_params->auth_xform.next = &ut_params->cipher_xform; + ut_params->crypto_xforms = &ut_params->auth_xform; }else { - ut_params->crypto_xforms = &ut_params->cipher_xform; - ut_params->cipher_xform.next = &ut_params->auth_xform; + ut_params->cipher_xform.cipher.op = +RTE_CRYPTO_CIPHER_OP_ENCRYPT ; + ut_params->auth_xform.auth.op =
RTE_CRYPTO_AUTH_OP_GENERATE;Quoted 31 lines
ut_params->auth_xform.next = NULL;app/test/test_ipsec.c +6
-0+ ut_params->cipher_xform.next = &ut_params->auth_xform; + ut_params->crypto_xforms = &ut_params->cipher_xform; } }@@ -287,9 +281,12 @@ testsuite_setup(void)int rc;memset (ts_params,0 ,sizeof (*ts_params)); +memset (ut_params,0 ,sizeof (*ut_params)); +memset (&uparams,0 ,sizeof (struct user_params )); uparams.auth =RTE_CRYPTO_SYM_XFORM_AUTH ; uparams.cipher =RTE_CRYPTO_SYM_XFORM_CIPHER ; + uparams.aead =RTE_CRYPTO_SYM_XFORM_NOT_SPECIFIED ;strcpy (uparams.auth_algo,"null" );strcpy (uparams.cipher_algo,"null" );@@ -759,6 +756,7 @@ crypto_ipsec(uint16_t num_pkts)struct ipsec_unitest_params *ut_params = &unittest_params;uint32_t k, ng;struct rte_ipsec_group grp[1 ]; +int i =0 ;/* call crypto prepare */ k = rte_ipsec_pkt_crypto_prepare(&ut_params->ss[0],
ut_params->ibuf, @@ -774,8 +772,12 @@crypto_ipsec(uint16_t num_pkts)
returnTEST_FAILED;
}app/test/test_ipsec.c crypto_ipsec(uint16_t num_pkts)
Quoted 4 lines
app/test/test_ipsec.c +2
-2- k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop, num_pkts); +while ((k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + ut_params->cop, num_pkts)) == 0 && i <
DEQUEUE_COUNT) {Quoted 27 lines
app/test/test_ipsec.c +10
-3+rte_pause (); + i++; + } +if (k != num_pkts) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ;@@ -890,8 +892,12 @@ crypto_ipsec_2sa(void) } } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop,BURST_SIZE ); +while ((k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + ut_params->cop,BURST_SIZE )) ==0 && + i <DEQUEUE_COUNT ) { +rte_pause (); + i++; + }if (k !=BURST_SIZE ) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ;@@ -1029,8 +1035,12 @@ crypto_ipsec_2sa_4grp(void) } } - k = rte_cryptodev_dequeue_burst(ts_params->valid_dev, 0,app/test/test_ipsec.c crypto_ipsec_2sa_4grp(void) · line 1046
Quoted 10 lines
app/test/test_ipsec.c +6
-1- ut_params->cop, BURST_SIZE); +while ((k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + ut_params->cop,BURST_SIZE )) ==0 && + i <DEQUEUE_COUNT ) { +rte_pause (); + i++; + }if (k !=BURST_SIZE ) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ;The logic for dequeue is not correct here.
In case of hardware crypto PMD, there may be a case where we have lesser number of dequeues as compared to the number of enqueues in one cycle. Hardware PMDs are usually slow and may not give back packets in the same cycle. So, multiple dequeues(say a few hundred) shall be done until we get the
enqueued_ops=dequeued_ops. But that would also be tricky here as we need to increment the pointer to the cop as well.
Quoted 2 lines
Regards,
Akhil
There are two issues in this patch, the test initialisation and the dequeue logic. I will send the fixes as separate patches.
Regards,
Bernard.
PATCH v3 1/1 app/test/ipsec: fix test initialisation
In reply to Bernard IremongerFix xform initialisation.
Fix testsuite_setup.
Remove unused variables.
---
Changes in v3:
drop changes to logic around rte_cryptodev_dequeue_burst()
app/test/test_ipsec.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-)
app/test/test_ipsec.c +15 -19
@@ -79,7 +79,6 @@ struct ipsec_unitest_params {struct rte_mbuf *obuf[BURST_SIZE ], *ibuf[BURST_SIZE ], *testbuf[BURST_SIZE ]; -uint8_t *digest;uint16_t pkt_index; };
@@ -111,8 +110,6 @@ static struct ipsec_testsuite_params testsuite_params = { NULL };static struct ipsec_unitest_params unittest_params;static struct user_params uparams; -static uint8_t global_key[128 ] = {0 }; -struct supported_cipher_algo {const char *keyword;enum rte_crypto_cipher_algorithm algo;
@@ -215,30 +212,26 @@ fill_crypto_xform(struct ipsec_unitest_params *ut_params,const struct supported_auth_algo *auth_algo, const struct supported_cipher_algo *cipher_algo) { - ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH; - ut_params->auth_xform.auth.algo = auth_algo->algo; - ut_params->auth_xform.auth.key.data = global_key; - ut_params->auth_xform.auth.key.length = auth_algo->key_len; - ut_params->auth_xform.auth.digest_length = auth_algo->digest_len; - ut_params->auth_xform.auth.op =RTE_CRYPTO_AUTH_OP_VERIFY ; - ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER; ut_params->cipher_xform.cipher.algo = cipher_algo->algo; - ut_params->cipher_xform.cipher.key.data = global_key; - ut_params->cipher_xform.cipher.key.length = cipher_algo->key_len; - ut_params->cipher_xform.cipher.op =RTE_CRYPTO_CIPHER_OP_DECRYPT ; - ut_params->cipher_xform.cipher.iv.offset =IV_OFFSET ; - ut_params->cipher_xform.cipher.iv.length = cipher_algo->iv_len; + ut_params->auth_xform.type =RTE_CRYPTO_SYM_XFORM_AUTH ; + ut_params->auth_xform.auth.algo = auth_algo->algo;if (ut_params->ipsec_xform.direction ==RTE_SECURITY_IPSEC_SA_DIR_INGRESS ) { - ut_params->crypto_xforms = &ut_params->auth_xform; - ut_params->auth_xform.next = &ut_params->cipher_xform; + ut_params->cipher_xform.cipher.op = +RTE_CRYPTO_CIPHER_OP_DECRYPT ; + ut_params->auth_xform.auth.op =RTE_CRYPTO_AUTH_OP_VERIFY ; ut_params->cipher_xform.next =NULL ; + ut_params->auth_xform.next = &ut_params->cipher_xform; + ut_params->crypto_xforms = &ut_params->auth_xform; }else { - ut_params->crypto_xforms = &ut_params->cipher_xform; - ut_params->cipher_xform.next = &ut_params->auth_xform; + ut_params->cipher_xform.cipher.op = +RTE_CRYPTO_CIPHER_OP_ENCRYPT ; + ut_params->auth_xform.auth.op =RTE_CRYPTO_AUTH_OP_GENERATE ; ut_params->auth_xform.next =NULL ; + ut_params->cipher_xform.next = &ut_params->auth_xform; + ut_params->crypto_xforms = &ut_params->cipher_xform; } }
@@ -287,9 +280,12 @@ testsuite_setup(void)int rc;memset (ts_params,0 ,sizeof (*ts_params)); +memset (ut_params,0 ,sizeof (*ut_params)); +memset (&uparams,0 ,sizeof (struct user_params )); uparams.auth =RTE_CRYPTO_SYM_XFORM_AUTH ; uparams.cipher =RTE_CRYPTO_SYM_XFORM_CIPHER ; + uparams.aead =RTE_CRYPTO_SYM_XFORM_NOT_SPECIFIED ;strcpy (uparams.auth_algo,"null" );strcpy (uparams.cipher_algo,"null" );
Signature · 1 line
2.7.4
Re: [dpdk-dev] [PATCH v3] app/test/ipsec: fix test initialisation
Quoted 10 lines
Fix xform initialisation.
Fixtestsuite_setup.
Remove unused variables.Fixes 05fe65eb66b2 ("test/ipsec: introduce functional test")Fixes 59d7353b0df0 ("test/ipsec: fix test suite setup")
Quoted 8 lines
Signed-off-by Bernard Iremonger <[email protected]>---
Changes in v3:
drop changes to logic aroundrte_cryptodev_dequeue_burst()app/test/test_ipsec.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-)
Quoted 2 lines
--
2.7.4
Akhil Goyal
AppliedRe: [dpdk-dev] [PATCH v3] app/test/ipsec: fix test initialisation
Quoted 15 lines
Quoted 15 lines
Fix xform initialisation.
Fixtestsuite_setup.
Remove unused variables.Fixes 05fe65eb66b2 ("test/ipsec: introduce functional test")Fixes 59d7353b0df0 ("test/ipsec: fix test suite setup")Signed-off-by Bernard Iremonger <[email protected]>---
Changes in v3:
drop changes to logic aroundrte_cryptodev_dequeue_burst()
Quoted 6 lines
Quoted 3 lines
app/test/test_ipsec.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-)
Applied to dpdk-next-crypto
Thanks.