From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 20278A00C2;
Mon, 26 Sep 2022 19:07:40 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 5EA3A4114B;
Mon, 26 Sep 2022 19:07:32 +0200 (CEST)
Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com
[67.231.148.174])
by mails.dpdk.org (Postfix) with ESMTP id B3AFD40146
for <dev@dpdk.org>; Mon, 26 Sep 2022 19:07:30 +0200 (CEST)
Received: from pps.filterd (m0045849.ppops.net [127.0.0.1])
by mx0a-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28QH6Fle032060;
Mon, 26 Sep 2022 10:07:29 -0700
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;
h=from : to : cc :
subject : date : message-id : in-reply-to : references : mime-version :
content-transfer-encoding : content-type; s=pfpt0220;
bh=xvcn1JKuI8AU47b0ojlgrKGhRMRmxe343dYB9U7UCqI=;
b=VX2N7WMGxRmquUArztqSGVjO+xUdP5jKRC03sjO31bEmheUOPKT8C2tpRjAXNpxfm3Oa
+YHJd8JE2PTAuubvx0CaSPYUHzu2+eb5Wa5ndfAeQDibTvrys5RGC6RCR0tYF5MfB0WE
2Ju/Q56HJ2E9C7lKYA+3u6XQOlvG9IZruIZDdVLpB4id8BkVreUOKp5Qqqk56eBmSwcB
wuetKFrGgPof0o1UCJihJOmGj6lAhfAZxn89hOtyLWgBffUViwrAKXnFmY3n50DFXYNQ
uJLir1paBynZVLS6JcqtORj2+D2/gPtGJT7S030dnB3RR89K2CZ5q9aRgMyBQBrHayw3 Uw==
Received: from dc5-exch02.marvell.com ([199.233.59.182])
by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3jucsq0tvb-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);
Mon, 26 Sep 2022 10:07:29 -0700
Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com
(10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18;
Mon, 26 Sep 2022 10:07:28 -0700
Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com
(10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend
Transport; Mon, 26 Sep 2022 10:07:28 -0700
Received: from localhost.localdomain (unknown [10.28.36.102])
by maili.marvell.com (Postfix) with ESMTP id 696173F70DA;
Mon, 26 Sep 2022 10:07:24 -0700 (PDT)
From: Akhil Goyal <gakhil@marvell.com>
To: <dev@dpdk.org>
CC: <thomas@monjalon.net>, <david.marchand@redhat.com>,
<hemant.agrawal@nxp.com>, <vattunuru@marvell.com>,
<ferruh.yigit@xilinx.com>, <andrew.rybchenko@oktetlabs.ru>,
<konstantin.v.ananyev@yandex.ru>, <jerinj@marvell.com>,
<adwivedi@marvell.com>, <anoobj@marvell.com>,
<ndabilpuram@marvell.com>, Akhil Goyal <gakhil@marvell.com>
Subject: [PATCH v6 3/3] test/security: add inline IPsec SA hard expiry cases
Date: Mon, 26 Sep 2022 22:37:09 +0530
Message-ID: <20220926170709.367891-4-gakhil@marvell.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20220926170709.367891-1-gakhil@marvell.com>
References: <20220924135758.3402392-1-gakhil@marvell.com>
<20220926170709.367891-1-gakhil@marvell.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Proofpoint-GUID: 1etcDN7lvGYNuQG5SvYkcIthtK0hJDp-
X-Proofpoint-ORIG-GUID: 1etcDN7lvGYNuQG5SvYkcIthtK0hJDp-
X-Proofpoint-Virus-Version: vendor=baseguard
engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1
definitions=2022-09-26_09,2022-09-22_02,2022-06-22_01
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
From: Vamsi Attunuru <vattunuru@marvell.com>
Patch adds hard expiry unit tests for both packet
and byte limits.
Signed-off-by: Vamsi Attunuru <vattunuru@marvell.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>
---
app/test/test_security_inline_proto.c | 71 +++++++++++++++++++++++----
1 file changed, 61 insertions(+), 10 deletions(-)
diff --git a/app/test/test_security_inline_proto.c b/app/test/test_security_inline_proto.c
index 5747ee0990..8d0dd7765c 100644
--- a/app/test/test_security_inline_proto.c
+++ b/app/test/test_security_inline_proto.c
@@ -969,18 +969,25 @@ test_ipsec_inline_sa_exp_event_callback(uint16_t port_id,
printf("Mismatch in event specific metadata\n");
return -1;
}
- if (event_desc->subtype == RTE_ETH_EVENT_IPSEC_SA_PKT_EXPIRY) {
+ switch (event_desc->subtype) {
+ case RTE_ETH_EVENT_IPSEC_SA_PKT_EXPIRY:
vector->event = RTE_ETH_EVENT_IPSEC_SA_PKT_EXPIRY;
- return 0;
- } else if (event_desc->subtype == RTE_ETH_EVENT_IPSEC_SA_BYTE_EXPIRY) {
+ break;
+ case RTE_ETH_EVENT_IPSEC_SA_BYTE_EXPIRY:
vector->event = RTE_ETH_EVENT_IPSEC_SA_BYTE_EXPIRY;
- return 0;
- } else if (event_desc->subtype >= RTE_ETH_EVENT_IPSEC_MAX) {
+ break;
+ case RTE_ETH_EVENT_IPSEC_SA_PKT_HARD_EXPIRY:
+ vector->event = RTE_ETH_EVENT_IPSEC_SA_PKT_HARD_EXPIRY;
+ break;
+ case RTE_ETH_EVENT_IPSEC_SA_BYTE_HARD_EXPIRY:
+ vector->event = RTE_ETH_EVENT_IPSEC_SA_BYTE_HARD_EXPIRY;
+ break;
+ default:
printf("Invalid IPsec event reported\n");
return -1;
}
- return -1;
+ return 0;
}
static enum rte_eth_event_ipsec_subtype
@@ -995,8 +1002,12 @@ test_ipsec_inline_setup_expiry_vector(struct sa_expiry_vector *vector,
vector->sa_data = (void *)tdata;
if (flags->sa_expiry_pkts_soft)
event = RTE_ETH_EVENT_IPSEC_SA_PKT_EXPIRY;
- else
+ else if (flags->sa_expiry_bytes_soft)
event = RTE_ETH_EVENT_IPSEC_SA_BYTE_EXPIRY;
+ else if (flags->sa_expiry_pkts_hard)
+ event = RTE_ETH_EVENT_IPSEC_SA_PKT_HARD_EXPIRY;
+ else
+ event = RTE_ETH_EVENT_IPSEC_SA_BYTE_HARD_EXPIRY;
rte_eth_dev_callback_register(port_id, RTE_ETH_EVENT_IPSEC,
test_ipsec_inline_sa_exp_event_callback, vector);
@@ -1024,7 +1035,8 @@ test_ipsec_inline_proto_process(struct ipsec_test_data *td,
memset(rx_pkts_burst, 0, sizeof(rx_pkts_burst[0]) * nb_pkts);
- if (flags->sa_expiry_pkts_soft || flags->sa_expiry_bytes_soft) {
+ if (flags->sa_expiry_pkts_soft || flags->sa_expiry_bytes_soft ||
+ flags->sa_expiry_pkts_hard || flags->sa_expiry_bytes_hard) {
if (td->ipsec_xform.direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS)
return TEST_SUCCESS;
event = test_ipsec_inline_setup_expiry_vector(&vector, flags, td);
@@ -1112,7 +1124,9 @@ test_ipsec_inline_proto_process(struct ipsec_test_data *td,
break;
} while (j++ < 5 || nb_rx == 0);
- if (nb_rx != nb_sent) {
+ if (!flags->sa_expiry_pkts_hard &&
+ !flags->sa_expiry_bytes_hard &&
+ (nb_rx != nb_sent)) {
printf("\nUnable to RX all %d packets, received(%i)",
nb_sent, nb_rx);
while (--nb_rx >= 0)
@@ -1147,7 +1161,8 @@ test_ipsec_inline_proto_process(struct ipsec_test_data *td,
out:
if (td->ipsec_xform.direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS)
destroy_default_flow(port_id);
- if (flags->sa_expiry_pkts_soft || flags->sa_expiry_bytes_soft) {
+ if (flags->sa_expiry_pkts_soft || flags->sa_expiry_bytes_soft ||
+ flags->sa_expiry_pkts_hard || flags->sa_expiry_bytes_hard) {
if (vector.notify_event && (vector.event == event))
ret = TEST_SUCCESS;
else
@@ -1174,6 +1189,7 @@ test_ipsec_inline_proto_all(const struct ipsec_test_flags *flags)
if (flags->iv_gen || flags->sa_expiry_pkts_soft ||
flags->sa_expiry_bytes_soft ||
+ flags->sa_expiry_bytes_hard ||
flags->sa_expiry_pkts_hard)
nb_pkts = IPSEC_TEST_PACKETS_MAX;
@@ -1210,6 +1226,13 @@ test_ipsec_inline_proto_all(const struct ipsec_test_flags *flags)
td_outb.ipsec_xform.life.bytes_soft_limit =
(((td_outb.output_text.len + RTE_ETHER_HDR_LEN)
* nb_pkts) >> 3) - 1;
+ if (flags->sa_expiry_pkts_hard)
+ td_outb.ipsec_xform.life.packets_hard_limit =
+ IPSEC_TEST_PACKETS_MAX - 1;
+ if (flags->sa_expiry_bytes_hard)
+ td_outb.ipsec_xform.life.bytes_hard_limit =
+ (((td_outb.output_text.len + RTE_ETHER_HDR_LEN)
+ * nb_pkts) >> 3) - 1;
ret = test_ipsec_inline_proto_process(&td_outb, &td_inb, nb_pkts,
false, flags);
@@ -2338,6 +2361,26 @@ test_ipsec_inline_proto_sa_byte_soft_expiry(const void *data __rte_unused)
return test_ipsec_inline_proto_all(&flags);
}
+static int
+test_ipsec_inline_proto_sa_pkt_hard_expiry(const void *data __rte_unused)
+{
+ struct ipsec_test_flags flags = {
+ .sa_expiry_pkts_hard = true
+ };
+
+ return test_ipsec_inline_proto_all(&flags);
+}
+
+static int
+test_ipsec_inline_proto_sa_byte_hard_expiry(const void *data __rte_unused)
+{
+ struct ipsec_test_flags flags = {
+ .sa_expiry_bytes_hard = true
+ };
+
+ return test_ipsec_inline_proto_all(&flags);
+}
+
static int
test_ipsec_inline_proto_known_vec_fragmented(const void *test_data)
{
@@ -2748,6 +2791,14 @@ static struct unit_test_suite inline_ipsec_testsuite = {
"SA soft expiry with byte limit",
ut_setup_inline_ipsec, ut_teardown_inline_ipsec,
test_ipsec_inline_proto_sa_byte_soft_expiry),
+ TEST_CASE_NAMED_ST(
+ "SA hard expiry with packet limit",
+ ut_setup_inline_ipsec, ut_teardown_inline_ipsec,
+ test_ipsec_inline_proto_sa_pkt_hard_expiry),
+ TEST_CASE_NAMED_ST(
+ "SA hard expiry with byte limit",
+ ut_setup_inline_ipsec, ut_teardown_inline_ipsec,
+ test_ipsec_inline_proto_sa_byte_hard_expiry),
TEST_CASE_NAMED_WITH_DATA(
"Antireplay with window size 1024",
--
2.25.1