* [dpdk-dev] [PATCH v2 1/3] test/ipsec: fix log messages in tests
[not found] <1558532302-15932-0-git-send-email-bernard.iremonger@intel.com>
2019-06-07 10:33 ` [dpdk-dev] [PATCH v2 0/3] test/ipsec: fixes and improvements Bernard Iremonger
@ 2019-06-07 10:33 ` Bernard Iremonger
2019-06-07 10:33 ` [dpdk-dev] [PATCH v2 2/3] test/ipsec: add extra test configuration Bernard Iremonger
2019-06-07 10:33 ` [dpdk-dev] [PATCH v2 3/3] test/ipsec: improve debug in group tests Bernard Iremonger
3 siblings, 0 replies; 6+ messages in thread
From: Bernard Iremonger @ 2019-06-07 10:33 UTC (permalink / raw)
To: dev, konstantin.ananyev, akhil.goyal; +Cc: Bernard Iremonger, stable
Error log messages after the create_sa() function calls
were using the wrong function name.
The function name is replaced with create_sa.
Fixes: 05fe65eb66b2 ("test/ipsec: introduce functional test")
Cc: stable@dpdk.org
Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
app/test/test_ipsec.c | 44 +++++++++++++++-----------------------------
1 file changed, 15 insertions(+), 29 deletions(-)
diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c
index 3993ff4..cce15a7 100644
--- a/app/test/test_ipsec.c
+++ b/app/test/test_ipsec.c
@@ -1200,8 +1200,7 @@ test_ipsec_crypto_inb_burst_null_null(int i)
rc = create_sa(RTE_SECURITY_ACTION_TYPE_NONE,
test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
if (rc != 0) {
- RTE_LOG(ERR, USER1, "rte_ipsec_sa_init failed, cfg %d\n",
- i);
+ RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
return TEST_FAILED;
}
@@ -1303,8 +1302,7 @@ test_ipsec_crypto_outb_burst_null_null(int i)
rc = create_sa(RTE_SECURITY_ACTION_TYPE_NONE,
test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
if (rc != 0) {
- RTE_LOG(ERR, USER1, "rte_ipsec_sa_init failed, cfg %d\n",
- i);
+ RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
return TEST_FAILED;
}
@@ -1413,8 +1411,7 @@ test_ipsec_inline_crypto_inb_burst_null_null(int i)
rc = create_sa(RTE_SECURITY_ACTION_TYPE_INLINE_CRYPTO,
test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
if (rc != 0) {
- RTE_LOG(ERR, USER1, "rte_ipsec_sa_init failed, cfg %d\n",
- i);
+ RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
return TEST_FAILED;
}
@@ -1492,8 +1489,7 @@ test_ipsec_inline_proto_inb_burst_null_null(int i)
rc = create_sa(RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL,
test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
if (rc != 0) {
- RTE_LOG(ERR, USER1, "rte_ipsec_sa_init failed, cfg %d\n",
- i);
+ RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
return TEST_FAILED;
}
@@ -1601,8 +1597,7 @@ test_ipsec_inline_crypto_outb_burst_null_null(int i)
rc = create_sa(RTE_SECURITY_ACTION_TYPE_INLINE_CRYPTO,
test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
if (rc != 0) {
- RTE_LOG(ERR, USER1, "rte_ipsec_sa_init failed, cfg %d\n",
- i);
+ RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
return TEST_FAILED;
}
@@ -1680,8 +1675,7 @@ test_ipsec_inline_proto_outb_burst_null_null(int i)
rc = create_sa(RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL,
test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
if (rc != 0) {
- RTE_LOG(ERR, USER1, "rte_ipsec_sa_init failed, cfg %d\n",
- i);
+ RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
return TEST_FAILED;
}
@@ -1757,8 +1751,7 @@ test_ipsec_lksd_proto_inb_burst_null_null(int i)
rc = create_sa(RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
if (rc != 0) {
- RTE_LOG(ERR, USER1, "rte_ipsec_sa_init failed, cfg %d\n",
- i);
+ RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
return TEST_FAILED;
}
@@ -1871,8 +1864,7 @@ test_ipsec_replay_inb_inside_null_null(int i)
rc = create_sa(RTE_SECURITY_ACTION_TYPE_NONE,
test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
if (rc != 0) {
- RTE_LOG(ERR, USER1, "rte_ipsec_sa_init failed, cfg %d\n",
- i);
+ RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
return TEST_FAILED;
}
@@ -1965,8 +1957,7 @@ test_ipsec_replay_inb_outside_null_null(int i)
rc = create_sa(RTE_SECURITY_ACTION_TYPE_NONE,
test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
if (rc != 0) {
- RTE_LOG(ERR, USER1, "rte_ipsec_sa_init failed, cfg %d\n",
- i);
+ RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
return TEST_FAILED;
}
@@ -2066,7 +2057,7 @@ test_ipsec_replay_inb_repeat_null_null(int i)
rc = create_sa(RTE_SECURITY_ACTION_TYPE_NONE,
test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
if (rc != 0) {
- RTE_LOG(ERR, USER1, "rte_ipsec_sa_init failed, cfg %d\n", i);
+ RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
return TEST_FAILED;
}
@@ -2167,8 +2158,7 @@ test_ipsec_replay_inb_inside_burst_null_null(int i)
rc = create_sa(RTE_SECURITY_ACTION_TYPE_NONE,
test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
if (rc != 0) {
- RTE_LOG(ERR, USER1, "rte_ipsec_sa_init failed, cfg %d\n",
- i);
+ RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i);
return TEST_FAILED;
}
@@ -2301,8 +2291,7 @@ test_ipsec_crypto_inb_burst_2sa_null_null(int i)
rc = create_sa(RTE_SECURITY_ACTION_TYPE_NONE,
test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
if (rc != 0) {
- RTE_LOG(ERR, USER1, "rte_ipsec_sa_init failed, cfg %d\n",
- i);
+ RTE_LOG(ERR, USER1, "create_sa 0 failed, cfg %d\n", i);
return TEST_FAILED;
}
@@ -2311,8 +2300,7 @@ test_ipsec_crypto_inb_burst_2sa_null_null(int i)
rc = create_sa(RTE_SECURITY_ACTION_TYPE_NONE,
test_cfg[i].replay_win_sz, test_cfg[i].flags, 1);
if (rc != 0) {
- RTE_LOG(ERR, USER1, "rte_ipsec_sa_init failed, cfg %d\n",
- i);
+ RTE_LOG(ERR, USER1, "create_sa 1 failed, cfg %d\n", i);
destroy_sa(0);
return TEST_FAILED;
}
@@ -2389,8 +2377,7 @@ test_ipsec_crypto_inb_burst_2sa_4grp_null_null(int i)
rc = create_sa(RTE_SECURITY_ACTION_TYPE_NONE,
test_cfg[i].replay_win_sz, test_cfg[i].flags, 0);
if (rc != 0) {
- RTE_LOG(ERR, USER1, "rte_ipsec_sa_init failed, cfg %d\n",
- i);
+ RTE_LOG(ERR, USER1, "create_sa 0 failed, cfg %d\n", i);
return TEST_FAILED;
}
@@ -2399,8 +2386,7 @@ test_ipsec_crypto_inb_burst_2sa_4grp_null_null(int i)
rc = create_sa(RTE_SECURITY_ACTION_TYPE_NONE,
test_cfg[i].replay_win_sz, test_cfg[i].flags, 1);
if (rc != 0) {
- RTE_LOG(ERR, USER1, "rte_ipsec_sa_init failed, cfg %d\n",
- i);
+ RTE_LOG(ERR, USER1, "create_sa 1 failed, cfg %d\n", i);
destroy_sa(0);
return TEST_FAILED;
}
--
2.7.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-dev] [PATCH v2 3/3] test/ipsec: improve debug in group tests
[not found] <1558532302-15932-0-git-send-email-bernard.iremonger@intel.com>
` (2 preceding siblings ...)
2019-06-07 10:33 ` [dpdk-dev] [PATCH v2 2/3] test/ipsec: add extra test configuration Bernard Iremonger
@ 2019-06-07 10:33 ` Bernard Iremonger
3 siblings, 0 replies; 6+ messages in thread
From: Bernard Iremonger @ 2019-06-07 10:33 UTC (permalink / raw)
To: dev, konstantin.ananyev, akhil.goyal; +Cc: Bernard Iremonger
Add dump_grp_pkt() function.
Dump invalid mbuf data in case of error in group tests 12 and 13.
Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
app/test/test_ipsec.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c
index b92068e..5389a59 100644
--- a/app/test/test_ipsec.c
+++ b/app/test/test_ipsec.c
@@ -880,6 +880,19 @@ lksd_proto_ipsec(uint16_t num_pkts)
return TEST_SUCCESS;
}
+static void
+dump_grp_pkt(uint32_t i, struct rte_ipsec_group *grp, uint32_t k)
+{
+ RTE_LOG(ERR, USER1,
+ "After rte_ipsec_pkt_process grp[%d].cnt=%d k=%d fail\n",
+ i, grp[i].cnt, k);
+ RTE_LOG(ERR, USER1,
+ "After rte_ipsec_pkt_process grp[%d].m=%p grp[%d].m[%d]=%p\n",
+ i, grp[i].m, i, k, grp[i].m[k]);
+
+ rte_pktmbuf_dump(stdout, grp[i].m[k], grp[i].m[k]->data_len);
+}
+
static int
crypto_ipsec_2sa(void)
{
@@ -915,7 +928,7 @@ crypto_ipsec_2sa(void)
ut_params->obuf, grp, BURST_SIZE);
if (ng != BURST_SIZE) {
RTE_LOG(ERR, USER1, "rte_ipsec_pkt_crypto_group fail ng=%d\n",
- ng);
+ ng);
return TEST_FAILED;
}
@@ -923,7 +936,7 @@ crypto_ipsec_2sa(void)
for (i = 0; i < ng; i++) {
k = rte_ipsec_pkt_process(grp[i].id.ptr, grp[i].m, grp[i].cnt);
if (k != grp[i].cnt) {
- RTE_LOG(ERR, USER1, "rte_ipsec_pkt_process fail\n");
+ dump_grp_pkt(i, grp, k);
return TEST_FAILED;
}
}
@@ -1058,7 +1071,7 @@ crypto_ipsec_2sa_4grp(void)
for (i = 0; i < ng; i++) {
k = rte_ipsec_pkt_process(grp[i].id.ptr, grp[i].m, grp[i].cnt);
if (k != grp[i].cnt) {
- RTE_LOG(ERR, USER1, "rte_ipsec_pkt_process fail\n");
+ dump_grp_pkt(i, grp, k);
return TEST_FAILED;
}
rc = crypto_ipsec_4grp_check_cnt(i, grp);
--
2.7.4
^ permalink raw reply [flat|nested] 6+ messages in thread