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 95D3842498;
Fri, 27 Jan 2023 00:28:58 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 9A98442D6B;
Fri, 27 Jan 2023 00:28:45 +0100 (CET)
Received: from NAM10-BN7-obe.outbound.protection.outlook.com
(mail-bn7nam10on2073.outbound.protection.outlook.com [40.107.92.73])
by mails.dpdk.org (Postfix) with ESMTP id 3F08542D53
for <dev@dpdk.org>; Fri, 27 Jan 2023 00:28:43 +0100 (CET)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=GEzbDPgisD5SiV5XVeMLr0gZzAaeQWTvrRIZ7xLgkIpxXOcI2Vf46qA7uxWbQaQ5XJ66EkNZjxoAUmG/2VpHhJB4BTSZ8tFjxmM6wr4AQNB0Th3bcZf6a8Kp7naTve8rNXK3iKJXmh+B/YpslkEA9kP2fjsO1CORB8cX7rbO6M/W4cs83EDqknyqFHPNj4UYPRp1hyM5NhCMEI0ClOZOb72YidntOlmGqymnNUEvTG7MZYQmDY4qlZAJDcvR2NAgmxQM4xXEs5sj5r5bsiHxWmzOhYnClYpujV6GHxn3RNWNQL+r0NOeYOalJcud8QWPqrqADw6lQIV3p2vqEHRXVg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector9901;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
bh=GelJ1nuhvqrn9p+RpgUtTZZp1RFvJ8PBtkHX1F43tyE=;
b=M9Q7MBGp8jkeUFf+4j+6i39RidM+/OVSr/20//mCAtQClFUS5XloCy6XhzLy6JcQwrAY5bksEpJyLXOlrdhkKlUKqylDjVA1f37Wbr0jSZMbV0BQuCIgw/2vST4ITNo0c6ivC+OnJKtooZUndoZfrr8UFVfBPg9F8bYRHxFTLa5TN3HoC7R/7WcmnaxDuLFRJxuBtxNBvR9dBCuaXIt/YQZm2L1YmR1/gie+MFIdtETKHkxIwHz+X4Ufda0+LcXSob+da/E43o8Upxx1vZSC5YdY2opsB7dcagxU8YbXuntHMRXhuf1wpfBFjA3oF2ikCsfAeQw0du2BqA3WXZ15Dg==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com;
dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com;
dkim=none (message not signed); arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;
s=selector2;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=GelJ1nuhvqrn9p+RpgUtTZZp1RFvJ8PBtkHX1F43tyE=;
b=VSNZu6JUonubd+8OLjBaEDyuW57se6NWr/SN7rcdLE851lXpaSIReLMCNJPSIIckeE6LYj6x/ihKrM2zAA5zRdN/FEDG4jqYifhGW8SYHcrWs8iFFWuS/3biuDLdL5kAgorqMhO8EDNF2iXdUUn9adTxV0o+a4KqkQhpohIJ5as8qCTe80wjPCo77YD4EbOf3EpfeoXupdnJHt1ROr4juD2a34u8esyyrj3fR3l8/JAOLh3UU44Zo3MuVQktH+/oE6vSpnwO/WWehjXi+yzqLDopyt50YphCYPI3oszF7IrI8uY0C/bTJZRBIu1ZvcC8qPq86QwJ/uHY+yu7cIxREg==
Received: from DM5PR07CA0070.namprd07.prod.outlook.com (2603:10b6:4:ad::35) by
SJ0PR12MB5405.namprd12.prod.outlook.com (2603:10b6:a03:3af::11) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22; Thu, 26 Jan
2023 23:28:41 +0000
Received: from DM6NAM11FT031.eop-nam11.prod.protection.outlook.com
(2603:10b6:4:ad:cafe::26) by DM5PR07CA0070.outlook.office365.com
(2603:10b6:4:ad::35) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22 via Frontend
Transport; Thu, 26 Jan 2023 23:28:41 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161)
smtp.mailfrom=nvidia.com;
dkim=none (message not signed)
header.d=none;dmarc=pass action=none header.from=nvidia.com;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
216.228.117.161 as permitted sender) receiver=protection.outlook.com;
client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C
Received: from mail.nvidia.com (216.228.117.161) by
DM6NAM11FT031.mail.protection.outlook.com (10.13.172.203) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.6043.21 via Frontend Transport; Thu, 26 Jan 2023 23:28:41 +0000
Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com
(10.129.200.67) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Thu, 26 Jan
2023 15:28:30 -0800
Received: from pegasus01.mtr.labs.mlnx (10.126.230.37) by
rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.2.986.36; Thu, 26 Jan 2023 15:28:28 -0800
From: Alexander Kozyrev <akozyrev@nvidia.com>
To: <dev@dpdk.org>
CC: <thomas@monjalon.net>, <ferruh.yigit@amd.com>,
<andrew.rybchenko@oktetlabs.ru>, <orika@nvidia.com>
Subject: [PATCH v2 3/4] app/testpmd: add template table insertion type
Date: Fri, 27 Jan 2023 01:28:01 +0200
Message-ID: <20230126232802.3960109-4-akozyrev@nvidia.com>
X-Mailer: git-send-email 2.18.2
In-Reply-To: <20230126232802.3960109-1-akozyrev@nvidia.com>
References: <20230121052158.2928238-1-akozyrev@nvidia.com>
<20230126232802.3960109-1-akozyrev@nvidia.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [10.126.230.37]
X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To
rnnvmail201.nvidia.com (10.129.68.8)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DM6NAM11FT031:EE_|SJ0PR12MB5405:EE_
X-MS-Office365-Filtering-Correlation-Id: 6cb4e443-1a61-4c5a-8ae0-08dafff50f31
X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: T6L+xEDnd+XhHBp/7H1xEZ0Yj+QNsV+Fs8r8FXnvKayhGrWN5kZ9pnAL74fvSnyyK3IcOzF01mGKKbddU32lnu2iuRuCjrB3eqR8jzGSFRYkBHfzBrt06tW9GotTTVoT6fZcg24qL4N+1lrklHrFWtvvgXyC49cywv7P1R61I2z0zGcQ2tqDWTB5t9qgzVb6pM8VkIYKJvp+By6qqc+umIvdtf6OZyXh+Onq+4ZGDiPsvpxGw6qPDkdaWiTqiZTqdzWSwEIr+RAizAntjWGEuerYFzHmY3gYEfui1KjJLJgTfhKQzxtWn7pgnCRo453iW57p4o99FSxQewxGojYTtIEmY+qmVrsyNelR0yXay+9OJ8JGCpJvV/MEhzftID54vBjW7bsXb1GYv7pyMzszdSJ/WAUFl0dGclZm7UZ6WOOQoGCFHQmOJ4EPZ73DlZyBbvXXCNqceIjHqY+0pNqj0SZMhJK/UZ4SJRzQRUFEIYqXIVWZJotKx+DbppaH2j3sX/ElpMeXep6qe900TvoIgb2hGVgFkhGG1ai9KN+bYRPSAen5yBQuG/yOiAj1elOhkjZGvMaxOkwQY+Uf99k0PHEpKL048P8q3At7WlgmYNje7sYtd7bbsI4R5WhUU+KPxkvau9Pkd/4yOO7Gcu2PiNdVgpqObXyshGglzkBCY7YJsJFjxos+oUSVjwq5xGjZyhgbn+hyBVnH8bVza8nBXw==
X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE;
SFS:(13230025)(4636009)(39860400002)(346002)(136003)(376002)(396003)(451199018)(40470700004)(46966006)(36840700001)(40460700003)(7636003)(2906002)(356005)(36860700001)(1076003)(2616005)(107886003)(186003)(26005)(16526019)(6666004)(426003)(86362001)(83380400001)(40480700001)(336012)(4326008)(6916009)(70586007)(47076005)(5660300002)(8676002)(36756003)(70206006)(41300700001)(316002)(54906003)(82740400003)(8936002)(478600001)(82310400005);
DIR:OUT; SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2023 23:28:41.1915 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 6cb4e443-1a61-4c5a-8ae0-08dafff50f31
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161];
Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT031.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5405
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
Add testpmd CLI interface for specifying a template table insertion type.
Available types are: pattern and index.
flow template_table 0 create table_id 0 insertion_type index ...
Allow specifying the rule index instead of the pattern template index:
flow queue 0 create 0 template_table 0 rule_index 5 actions_template 0 ...
Signed-off-by: Alexander Kozyrev <akozyrev@nvidia.com>
---
app/test-pmd/cmdline_flow.c | 97 ++++++++++++++++++++++++++++++++++---
app/test-pmd/config.c | 10 ++--
app/test-pmd/testpmd.h | 2 +-
3 files changed, 99 insertions(+), 10 deletions(-)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 88108498e0..f1d6813baa 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -133,12 +133,11 @@ enum index {
QUEUE_INDIRECT_ACTION,
/* Queue create arguments. */
- QUEUE_CREATE_ID,
QUEUE_CREATE_POSTPONE,
QUEUE_TEMPLATE_TABLE,
QUEUE_PATTERN_TEMPLATE,
QUEUE_ACTIONS_TEMPLATE,
- QUEUE_SPEC,
+ QUEUE_RULE_ID,
/* Queue destroy arguments. */
QUEUE_DESTROY_ID,
@@ -179,6 +178,8 @@ enum index {
TABLE_DESTROY,
TABLE_CREATE_ID,
TABLE_DESTROY_ID,
+ TABLE_INSERTION_TYPE,
+ TABLE_INSERTION_TYPE_NAME,
TABLE_GROUP,
TABLE_PRIORITY,
TABLE_INGRESS,
@@ -814,6 +815,12 @@ static const char *const meter_colors[] = {
"green", "yellow", "red", "all", NULL
};
+static const char *const table_insertion_types[] = {
+ "pattern", "index", NULL
+};
+
+#define RAW_IPSEC_CONFS_MAX_NUM 8
+
/** Maximum number of subsequent tokens and arguments on the stack. */
#define CTX_STACK_SIZE 16
@@ -1015,6 +1022,7 @@ struct buffer {
struct {
uint32_t table_id;
uint32_t pat_templ_id;
+ uint32_t rule_id;
uint32_t act_templ_id;
struct rte_flow_attr attr;
struct tunnel_ops tunnel_ops;
@@ -1154,6 +1162,7 @@ static const enum index next_table_subcmd[] = {
static const enum index next_table_attr[] = {
TABLE_CREATE_ID,
TABLE_GROUP,
+ TABLE_INSERTION_TYPE,
TABLE_PRIORITY,
TABLE_INGRESS,
TABLE_EGRESS,
@@ -1287,6 +1296,12 @@ static const enum index next_ia_destroy_attr[] = {
ZERO,
};
+static const enum index next_async_insert_subcmd[] = {
+ QUEUE_PATTERN_TEMPLATE,
+ QUEUE_RULE_ID,
+ ZERO,
+};
+
static const enum index item_param[] = {
ITEM_PARAM_IS,
ITEM_PARAM_SPEC,
@@ -2399,6 +2414,9 @@ static int parse_meter_policy_id2ptr(struct context *ctx,
static int parse_meter_color(struct context *ctx, const struct token *token,
const char *str, unsigned int len, void *buf,
unsigned int size);
+static int parse_insertion_table_type(struct context *ctx, const struct token *token,
+ const char *str, unsigned int len, void *buf,
+ unsigned int size);
static int comp_none(struct context *, const struct token *,
unsigned int, char *, unsigned int);
static int comp_boolean(struct context *, const struct token *,
@@ -2431,6 +2449,8 @@ static int comp_queue_id(struct context *, const struct token *,
unsigned int, char *, unsigned int);
static int comp_meter_color(struct context *, const struct token *,
unsigned int, char *, unsigned int);
+static int comp_insertion_table_type(struct context *, const struct token *,
+ unsigned int, char *, unsigned int);
/** Token definitions. */
static const struct token token_list[] = {
@@ -2901,6 +2921,20 @@ static const struct token token_list[] = {
args.table_destroy.table_id)),
.call = parse_table_destroy,
},
+ [TABLE_INSERTION_TYPE] = {
+ .name = "insertion_type",
+ .help = "specify insertion type",
+ .next = NEXT(next_table_attr,
+ NEXT_ENTRY(TABLE_INSERTION_TYPE_NAME)),
+ .args = ARGS(ARGS_ENTRY(struct buffer,
+ args.table.attr.insertion_type)),
+ },
+ [TABLE_INSERTION_TYPE_NAME] = {
+ .name = "insertion_type_name",
+ .help = "insertion type name",
+ .call = parse_insertion_table_type,
+ .comp = comp_insertion_table_type,
+ },
[TABLE_GROUP] = {
.name = "group",
.help = "specify a group",
@@ -3002,7 +3036,7 @@ static const struct token token_list[] = {
[QUEUE_TEMPLATE_TABLE] = {
.name = "template_table",
.help = "specify table id",
- .next = NEXT(NEXT_ENTRY(QUEUE_PATTERN_TEMPLATE),
+ .next = NEXT(next_async_insert_subcmd,
NEXT_ENTRY(COMMON_TABLE_ID)),
.args = ARGS(ARGS_ENTRY(struct buffer,
args.vc.table_id)),
@@ -3026,6 +3060,15 @@ static const struct token token_list[] = {
args.vc.act_templ_id)),
.call = parse_qo,
},
+ [QUEUE_RULE_ID] = {
+ .name = "rule_index",
+ .help = "specify flow rule index",
+ .next = NEXT(NEXT_ENTRY(QUEUE_ACTIONS_TEMPLATE),
+ NEXT_ENTRY(COMMON_UNSIGNED)),
+ .args = ARGS(ARGS_ENTRY(struct buffer,
+ args.vc.rule_id)),
+ .call = parse_qo,
+ },
[QUEUE_CREATE_POSTPONE] = {
.name = "postpone",
.help = "postpone create operation",
@@ -9069,11 +9112,13 @@ parse_qo(struct context *ctx, const struct token *token,
ctx->objdata = 0;
ctx->object = out;
ctx->objmask = NULL;
+ out->args.vc.rule_id = UINT32_MAX;
return len;
case QUEUE_TEMPLATE_TABLE:
case QUEUE_PATTERN_TEMPLATE:
case QUEUE_ACTIONS_TEMPLATE:
case QUEUE_CREATE_POSTPONE:
+ case QUEUE_RULE_ID:
return len;
case ITEM_PATTERN:
out->args.vc.pattern =
@@ -10052,6 +10097,32 @@ parse_meter_color(struct context *ctx, const struct token *token,
return len;
}
+/** Parse Insertion Table Type name */
+static int
+parse_insertion_table_type(struct context *ctx, const struct token *token,
+ const char *str, unsigned int len, void *buf,
+ unsigned int size)
+{
+ const struct arg *arg = pop_args(ctx);
+ unsigned int i;
+ char tmp[2];
+ int ret;
+
+ (void)size;
+ /* Argument is expected. */
+ if (!arg)
+ return -1;
+ for (i = 0; table_insertion_types[i]; ++i)
+ if (!strcmp_partial(table_insertion_types[i], str, len))
+ break;
+ if (!table_insertion_types[i])
+ return -1;
+ push_args(ctx, arg);
+ snprintf(tmp, sizeof(tmp), "%u", i);
+ ret = parse_int(ctx, token, tmp, strlen(tmp), buf, sizeof(i));
+ return ret > 0 ? (int)len : ret;
+}
+
/** No completion. */
static int
comp_none(struct context *ctx, const struct token *token,
@@ -10357,6 +10428,20 @@ comp_meter_color(struct context *ctx, const struct token *token,
return -1;
}
+/** Complete available Insertion Table types. */
+static int
+comp_insertion_table_type(struct context *ctx, const struct token *token,
+ unsigned int ent, char *buf, unsigned int size)
+{
+ RTE_SET_USED(ctx);
+ RTE_SET_USED(token);
+ if (!buf)
+ return RTE_DIM(table_insertion_types);
+ if (ent < RTE_DIM(table_insertion_types) - 1)
+ return rte_strscpy(buf, table_insertion_types[ent], size);
+ return -1;
+}
+
/** Internal context. */
static struct context cmd_flow_context;
@@ -10670,9 +10755,9 @@ cmd_flow_parsed(const struct buffer *in)
break;
case QUEUE_CREATE:
port_queue_flow_create(in->port, in->queue, in->postpone,
- in->args.vc.table_id, in->args.vc.pat_templ_id,
- in->args.vc.act_templ_id, in->args.vc.pattern,
- in->args.vc.actions);
+ in->args.vc.table_id, in->args.vc.rule_id,
+ in->args.vc.pat_templ_id, in->args.vc.act_templ_id,
+ in->args.vc.pattern, in->args.vc.actions);
break;
case QUEUE_DESTROY:
port_queue_flow_destroy(in->port, in->queue, in->postpone,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index acccb6b035..41484c3dde 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -2609,7 +2609,7 @@ port_flow_template_table_flush(portid_t port_id)
/** Enqueue create flow rule operation. */
int
port_queue_flow_create(portid_t port_id, queueid_t queue_id,
- bool postpone, uint32_t table_id,
+ bool postpone, uint32_t table_id, uint32_t rule_idx,
uint32_t pattern_idx, uint32_t actions_idx,
const struct rte_flow_item *pattern,
const struct rte_flow_action *actions)
@@ -2685,8 +2685,12 @@ port_queue_flow_create(portid_t port_id, queueid_t queue_id,
}
/* Poisoning to make sure PMDs update it in case of error. */
memset(&error, 0x11, sizeof(error));
- flow = rte_flow_async_create(port_id, queue_id, &op_attr, pt->table,
- pattern, pattern_idx, actions, actions_idx, job, &error);
+ if (rule_idx == UINT32_MAX)
+ flow = rte_flow_async_create(port_id, queue_id, &op_attr, pt->table,
+ pattern, pattern_idx, actions, actions_idx, job, &error);
+ else
+ flow = rte_flow_async_create_by_index(port_id, queue_id, &op_attr, pt->table,
+ rule_idx, actions, actions_idx, job, &error);
if (!flow) {
uint32_t flow_id = pf->id;
port_queue_flow_destroy(port_id, queue_id, true, 1, &flow_id);
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 7d24d25970..22d02a742c 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -930,7 +930,7 @@ int port_flow_template_table_destroy(portid_t port_id,
uint32_t n, const uint32_t *table);
int port_flow_template_table_flush(portid_t port_id);
int port_queue_flow_create(portid_t port_id, queueid_t queue_id,
- bool postpone, uint32_t table_id,
+ bool postpone, uint32_t table_id, uint32_t rule_idx,
uint32_t pattern_idx, uint32_t actions_idx,
const struct rte_flow_item *pattern,
const struct rte_flow_action *actions);
--
2.18.2