app/test/ipsec: fix logic around dequeue burst
PATCH 1/1 app/test/ipsec: fix logic around dequeue burst
Call rte_crypto_dequeue_burst() in a loop with a delay to ensure that all the packets are dequeued from the crtpto device.
--- app/test/test_ipsec.c | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-)
app/test/test_ipsec.c +31 -11
@@ -9,7 +9,7 @@#include <rte_mbuf.h> #include <rte_malloc.h> #include <rte_memcpy.h> -#include <rte_pause.h> +#include <rte_cycles.h> #include <rte_bus_vdev.h> #include <rte_ip.h>
@@ -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;
@@ -758,7 +759,9 @@ crypto_ipsec(uint16_t num_pkts)struct ipsec_testsuite_params *ts_params = &testsuite_params;struct ipsec_unitest_params *ut_params = &unittest_params;uint32_t k, ng; +uint32_t pkt_cnt;struct rte_ipsec_group grp[1 ]; +int i;/* call crypto prepare */ k = rte_ipsec_pkt_crypto_prepare(&ut_params->ss[0], ut_params->ibuf,
@@ -774,9 +777,15 @@ crypto_ipsec(uint16_t num_pkts)return TEST_FAILED ; } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop, num_pkts); -if (k != num_pkts) { +for (i =0 , pkt_cnt =0 ; + i <DEQUEUE_COUNT && pkt_cnt != num_pkts; i++) { + k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + &ut_params->cop[pkt_cnt], num_pkts - pkt_cnt); + pkt_cnt += k; +rte_delay_us (1 ); + } + +if (pkt_cnt != num_pkts) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ; }
@@ -868,7 +877,7 @@ crypto_ipsec_2sa(void)struct ipsec_testsuite_params *ts_params = &testsuite_params;struct ipsec_unitest_params *ut_params = &unittest_params;struct rte_ipsec_group grp[BURST_SIZE ]; - +uint32_t pkt_cnt;uint32_t k, ng, i, r;for (i =0 ; i <BURST_SIZE ; i++) {
@@ -890,9 +899,14 @@ crypto_ipsec_2sa(void) } } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop,BURST_SIZE ); -if (k !=BURST_SIZE ) { +for (i =0 , k =0 , pkt_cnt =0 ; + i <DEQUEUE_COUNT && pkt_cnt !=BURST_SIZE ; i++) { + k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + &ut_params->cop[pkt_cnt],BURST_SIZE - pkt_cnt); + pkt_cnt += k; +rte_delay_us (1 ); + } +if (pkt_cnt !=BURST_SIZE ) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ; }
@@ -1007,6 +1021,7 @@ crypto_ipsec_2sa_4grp(void)struct ipsec_unitest_params *ut_params = &unittest_params;struct rte_ipsec_group grp[BURST_SIZE ];uint32_t k, ng, i, j; +uint32_t pkt_cnt;uint32_t rc =0 ;for (i =0 ; i <BURST_SIZE ; i++) {
@@ -1029,9 +1044,14 @@ crypto_ipsec_2sa_4grp(void) } } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop,BURST_SIZE ); -if (k !=BURST_SIZE ) { +for (i =0 , k =0 , pkt_cnt =0 ; + i <DEQUEUE_COUNT && pkt_cnt !=BURST_SIZE ; i++) { + k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + &ut_params->cop[pkt_cnt],BURST_SIZE - pkt_cnt); + pkt_cnt += k; +rte_delay_us (1 ); + } +if (pkt_cnt !=BURST_SIZE ) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ; }
Signature · 1 line
2.7.4
Quoted 9 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Bernard Iremonger
Sent: Thursday, April 11, 2019 2:08 PM
To: [email protected]; Ananyev, Konstantin <[email protected]>; [email protected]
Cc: Iremonger, Bernard <[email protected]>; [email protected]
Subject: [dpdk-dev] [PATCH] app/test/ipsec: fix logic around dequeue burst
Quoted 7 lines
Call
rte_crypto_dequeue_burst()in a loop with a delay to ensure that all the packets are dequeued from the crtpto device.Fixes 59d7353b0df0 ("test/ipsec: fix test suite setup")Signed-off-by Bernard Iremonger <[email protected]>
Hi Bernard,
/ipsec: fix logic around dequeue burst
Quoted 47 lines
Call
rte_crypto_dequeue_burst()in a loop with a delay to ensure that all the packets are dequeued from the crtpto device.Fixes 59d7353b0df0 ("test/ipsec: fix test suite setup")Signed-off-by Bernard Iremonger <[email protected]>--- app/test/test_ipsec.c | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-)app/test/test_ipsec.c +4
-1@@ -9,7 +9,7 @@#include <rte_mbuf.h> #include <rte_malloc.h> #include <rte_memcpy.h> -#include <rte_pause.h> +#include <rte_cycles.h> #include <rte_bus_vdev.h> #include <rte_ip.h> @@ -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;@@ -758,7 +759,9 @@ crypto_ipsec(uint16_t num_pkts)struct ipsec_testsuite_params *ts_params = &testsuite_params;struct ipsec_unitest_params *ut_params = &unittest_params;uint32_t k, ng; +uint32_t pkt_cnt;struct rte_ipsec_group grp[1 ]; +int i;/* call crypto prepare */ k = rte_ipsec_pkt_crypto_prepare(&ut_params->ss[0], ut_params->ibuf,@@ -774,9 +777,15 @@ crypto_ipsec(uint16_t num_pkts)return TEST_FAILED ; }
app/test/test_ipsec.c crypto_ipsec(uint16_t num_pkts) · line 786
Quoted 10 lines
app/test/test_ipsec.c +7
-3- k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop, num_pkts); -if (k != num_pkts) { +for (i =0 , pkt_cnt =0 ; + i <DEQUEUE_COUNT && pkt_cnt != num_pkts; i++) { + k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + &ut_params->cop[pkt_cnt], num_pkts - pkt_cnt); + pkt_cnt += k; +rte_delay_us (1 ); + }
Looks good to me.
My only suggestion would be to put that loop in a separate function to avoid duplications.
Apart from that:
Quoted 60 lines
app/test/test_ipsec.c +20
-8+ +if (pkt_cnt != num_pkts) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ; }@@ -868,7 +877,7 @@ crypto_ipsec_2sa(void)struct ipsec_testsuite_params *ts_params = &testsuite_params;struct ipsec_unitest_params *ut_params = &unittest_params;struct rte_ipsec_group grp[BURST_SIZE ]; - +uint32_t pkt_cnt;uint32_t k, ng, i, r;for (i =0 ; i <BURST_SIZE ; i++) {@@ -890,9 +899,14 @@ crypto_ipsec_2sa(void) } } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop,BURST_SIZE ); -if (k !=BURST_SIZE ) { +for (i =0 , k =0 , pkt_cnt =0 ; + i <DEQUEUE_COUNT && pkt_cnt !=BURST_SIZE ; i++) { + k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + &ut_params->cop[pkt_cnt],BURST_SIZE - pkt_cnt); + pkt_cnt += k; +rte_delay_us (1 ); + } +if (pkt_cnt !=BURST_SIZE ) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ; }@@ -1007,6 +1021,7 @@ crypto_ipsec_2sa_4grp(void)struct ipsec_unitest_params *ut_params = &unittest_params;struct rte_ipsec_group grp[BURST_SIZE ];uint32_t k, ng, i, j; +uint32_t pkt_cnt;uint32_t rc =0 ;for (i =0 ; i <BURST_SIZE ; i++) {@@ -1029,9 +1044,14 @@ crypto_ipsec_2sa_4grp(void) } } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop,BURST_SIZE ); -if (k !=BURST_SIZE ) { +for (i =0 , k =0 , pkt_cnt =0 ; + i <DEQUEUE_COUNT && pkt_cnt !=BURST_SIZE ; i++) { + k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + &ut_params->cop[pkt_cnt],BURST_SIZE - pkt_cnt); + pkt_cnt += k; +rte_delay_us (1 ); + } +if (pkt_cnt !=BURST_SIZE ) {RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" );return TEST_FAILED ; } --2.7.4
Hi Konstantin,
<snip>
Quoted 61 lines
Quoted 42 lines
Call
rte_crypto_dequeue_burst()in a loop with a delay to ensure that all the packets are dequeued from the crtpto device.Fixes 59d7353b0df0 ("test/ipsec: fix test suite setup")Signed-off-by Bernard Iremonger <[email protected]>--- app/test/test_ipsec.c | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-)app/test/test_ipsec.c index renamed from app/test/test_ipsec.c +0
-080a2d25..25a7df4 100644
app/test/test_ipsec.c +2
-1@@ -9,7 +9,7 @@#include <rte_mbuf.h> #include <rte_malloc.h> #include <rte_memcpy.h> -#include <rte_pause.h> +#include <rte_cycles.h> #include <rte_bus_vdev.h> #include <rte_ip.h> @@ -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; @@ -758,7 +759,9 @@
crypto_ipsec(uint16_t num_pkts)app/test/test_ipsec.c +2
-0struct ipsec_testsuite_params *ts_params = &testsuite_params;struct ipsec_unitest_params *ut_params = &unittest_params;uint32_t k, ng; +uint32_t pkt_cnt;struct rte_ipsec_group grp[1 ]; +int i;/* call crypto prepare */ k = rte_ipsec_pkt_crypto_prepare(&ut_params->ss[0], ut_params->ibuf,app/test/test_ipsec.c crypto_ipsec(uint16_t num_pkts) · line 783
Quoted 10 lines
app/test/test_ipsec.c +4
-3@@ -774,9 +777,15 @@ crypto_ipsec(uint16_t num_pkts)return TEST_FAILED ; } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop, num_pkts); -if (k != num_pkts) { +for (i =0 , pkt_cnt =0 ; + i <DEQUEUE_COUNT && pkt_cnt != num_pkts; i++) { + k = rte_cryptodev_dequeue_burst(ts_params->valid_dev, 0, + &ut_params->cop[pkt_cnt], num_pkts -
pkt_cnt);app/test/test_ipsec.c crypto_ipsec(uint16_t num_pkts) · line 786
Quoted 3 lines
app/test/test_ipsec.c +3
-0+ pkt_cnt += k; +rte_delay_us (1 ); + }Looks good to me.
My only suggestion would be to put that loop in a separate function to avoid duplications.
Apart from that:
Quoted 1 line
I will put that loop in a separate function and send v2
Regards,
Bernard.
snip
PATCH v2 1/1 app/test/ipsec: fix logic around dequeue burst
In reply to Bernard IremongerAdded crypto_dequeue_burst() function to callrte_crypto_dequeue_burst() in a loop with a
delay to ensure that all the packets are
dequeued from the crtpto device.
---
Changes in v2:
Added crypto_dequeue_burst() function
app/test/test_ipsec.c | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-)
app/test/test_ipsec.c +29 -17
@@ -9,7 +9,7 @@#include <rte_mbuf.h> #include <rte_malloc.h> #include <rte_memcpy.h> -#include <rte_pause.h> +#include <rte_cycles.h> #include <rte_bus_vdev.h> #include <rte_ip.h>
@@ -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;
@@ -753,6 +754,29 @@ create_sa(enum rte_security_session_action_type action_type, }static int +crypto_dequeue_burst (uint16_t num_pkts) +{ +struct ipsec_testsuite_params *ts_params = &testsuite_params; +struct ipsec_unitest_params *ut_params = &unittest_params; +uint32_t pkt_cnt, k; +int i; + +for (i =0 , pkt_cnt =0 ; + i <DEQUEUE_COUNT && pkt_cnt != num_pkts; i++) { + k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , + &ut_params->cop[pkt_cnt], num_pkts - pkt_cnt); + pkt_cnt += k; +rte_delay_us (1 ); + } + +if (pkt_cnt != num_pkts) { +RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" ); +return TEST_FAILED ; + } +return TEST_SUCCESS ; +} + +static int crypto_ipsec (uint16_t num_pkts) {struct ipsec_testsuite_params *ts_params = &testsuite_params;
@@ -767,6 +791,7 @@ crypto_ipsec(uint16_t num_pkts)RTE_LOG (ERR ,USER1 ,"rte_ipsec_pkt_crypto_prepare fail\n" );return TEST_FAILED ; } + k =rte_cryptodev_enqueue_burst (ts_params->valid_dev,0 , ut_params->cop, num_pkts);if (k != num_pkts) {
@@ -774,12 +799,8 @@ crypto_ipsec(uint16_t num_pkts)return TEST_FAILED ; } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop, num_pkts); -if (k != num_pkts) { -RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" ); +if (crypto_dequeue_burst (num_pkts) ==TEST_FAILED )return TEST_FAILED ; - } ng = rte_ipsec_pkt_crypto_group( (const struct rte_crypto_op **)(uintptr_t)ut_params->cop,
@@ -868,7 +889,6 @@ crypto_ipsec_2sa(void)struct ipsec_testsuite_params *ts_params = &testsuite_params;struct ipsec_unitest_params *ut_params = &unittest_params;struct rte_ipsec_group grp[BURST_SIZE ]; -uint32_t k, ng, i, r;for (i =0 ; i <BURST_SIZE ; i++) {
@@ -890,12 +910,8 @@ crypto_ipsec_2sa(void) } } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop,BURST_SIZE ); -if (k !=BURST_SIZE ) { -RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" ); +if (crypto_dequeue_burst (BURST_SIZE ) ==TEST_FAILED )return TEST_FAILED ; - } ng = rte_ipsec_pkt_crypto_group( (const struct rte_crypto_op **)(uintptr_t)ut_params->cop,
@@ -1029,12 +1045,8 @@ crypto_ipsec_2sa_4grp(void) } } - k =rte_cryptodev_dequeue_burst (ts_params->valid_dev,0 , - ut_params->cop,BURST_SIZE ); -if (k !=BURST_SIZE ) { -RTE_LOG (ERR ,USER1 ,"rte_cryptodev_dequeue_burst fail\n" ); +if (crypto_dequeue_burst (BURST_SIZE ) ==TEST_FAILED )return TEST_FAILED ; - } ng = rte_ipsec_pkt_crypto_group( (const struct rte_crypto_op **)(uintptr_t)ut_params->cop,
Signature · 1 line
2.7.4