From patchwork Fri Jun 7 10:33:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Iremonger, Bernard" X-Patchwork-Id: 54541 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 475C71BA56; Fri, 7 Jun 2019 12:33:29 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 416121BA46; Fri, 7 Jun 2019 12:33:27 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jun 2019 03:33:26 -0700 X-ExtLoop1: 1 Received: from sivswdev08.ir.intel.com (HELO localhost.localdomain) ([10.237.217.47]) by fmsmga005.fm.intel.com with ESMTP; 07 Jun 2019 03:33:25 -0700 From: Bernard Iremonger To: dev@dpdk.org, konstantin.ananyev@intel.com, akhil.goyal@nxp.com Cc: Bernard Iremonger , stable@dpdk.org Date: Fri, 7 Jun 2019 11:33:13 +0100 Message-Id: <1559903595-18506-2-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1558532302-15932-0-git-send-email-bernard.iremonger@intel.com> References: <1558532302-15932-0-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH v2 1/3] test/ipsec: fix log messages in tests X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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; } From patchwork Fri Jun 7 10:33:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Iremonger, Bernard" X-Patchwork-Id: 54542 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DC54D1BA90; Fri, 7 Jun 2019 12:33:31 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id D24581BA64 for ; Fri, 7 Jun 2019 12:33:29 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jun 2019 03:33:29 -0700 X-ExtLoop1: 1 Received: from sivswdev08.ir.intel.com (HELO localhost.localdomain) ([10.237.217.47]) by fmsmga005.fm.intel.com with ESMTP; 07 Jun 2019 03:33:28 -0700 From: Bernard Iremonger To: dev@dpdk.org, konstantin.ananyev@intel.com, akhil.goyal@nxp.com Cc: Bernard Iremonger Date: Fri, 7 Jun 2019 11:33:14 +0100 Message-Id: <1559903595-18506-3-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1558532302-15932-0-git-send-email-bernard.iremonger@intel.com> References: <1558532302-15932-0-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH v2 2/3] test/ipsec: add extra test configuration X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add extra test configuration for BURST_SIZE packets Signed-off-by: Bernard Iremonger --- app/test/test_ipsec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c index cce15a7..b92068e 100644 --- a/app/test/test_ipsec.c +++ b/app/test/test_ipsec.c @@ -26,7 +26,7 @@ #include "test_cryptodev.h" #define VDEV_ARGS_SIZE 100 -#define MAX_NB_SESSIONS 100 +#define MAX_NB_SESSIONS 200 #define MAX_NB_SAS 2 #define REPLAY_WIN_0 0 #define REPLAY_WIN_32 32 @@ -93,8 +93,8 @@ struct ipsec_test_cfg { }; static const struct ipsec_test_cfg test_cfg[] = { - {REPLAY_WIN_0, ESN_DISABLED, 0, DATA_64_BYTES, 1, 0}, + {REPLAY_WIN_0, ESN_DISABLED, 0, DATA_64_BYTES, BURST_SIZE, 0}, {REPLAY_WIN_0, ESN_DISABLED, 0, DATA_80_BYTES, BURST_SIZE, REORDER_PKTS}, {REPLAY_WIN_32, ESN_ENABLED, 0, DATA_100_BYTES, 1, 0}, From patchwork Fri Jun 7 10:33:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Iremonger, Bernard" X-Patchwork-Id: 54543 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9836C1BAB6; Fri, 7 Jun 2019 12:33:34 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 53D111BAA7 for ; Fri, 7 Jun 2019 12:33:33 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jun 2019 03:33:33 -0700 X-ExtLoop1: 1 Received: from sivswdev08.ir.intel.com (HELO localhost.localdomain) ([10.237.217.47]) by fmsmga005.fm.intel.com with ESMTP; 07 Jun 2019 03:33:31 -0700 From: Bernard Iremonger To: dev@dpdk.org, konstantin.ananyev@intel.com, akhil.goyal@nxp.com Cc: Bernard Iremonger Date: Fri, 7 Jun 2019 11:33:15 +0100 Message-Id: <1559903595-18506-4-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1558532302-15932-0-git-send-email-bernard.iremonger@intel.com> References: <1558532302-15932-0-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH v2 3/3] test/ipsec: improve debug in group tests X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add dump_grp_pkt() function. Dump invalid mbuf data in case of error in group tests 12 and 13. Signed-off-by: Bernard Iremonger --- 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);