From patchwork Sat Jan 21 05:21:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kozyrev X-Patchwork-Id: 122436 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3755D42436; Sat, 21 Jan 2023 06:22:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 872B542DBF; Sat, 21 Jan 2023 06:22:35 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2050.outbound.protection.outlook.com [40.107.220.50]) by mails.dpdk.org (Postfix) with ESMTP id 5CC774067E for ; Sat, 21 Jan 2023 06:22:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=naftYVaIxctXsFP1YtT9sjCxuF/6sRyhBaKekZ8GSJKS+za1BRQTsh1b1V9ZDg67rUlP0OYadvI6QefHJVG8JpR75MnV/evzvDt4fl+Avb2M1YRXwnhI+O7XyWwHA6xKojtM3GamQATr/RPLal6M6Doh/POSgixcFihpFqNEmgKB2lKib7Sp37+i5p1B9wt5PW2xuoQxvpJvsiawwRDqGZp3d1z2gVG+sIrXBZ9qAucCKDZNphgQvtV78QAgsJz+KIZ4aVA34xFl192QQ5GEXbnxD5LFbOxtQ9E9VetUQpIbVZcosBZE9tbNFDUYehOeDaFYOyo4gUN9ixvZoyufsQ== 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=H7sHCVi+Av0RE7MqXqEll92rXVextRZYIXQBjX4WxCosfCrzaYt53XQZSO7tmUNhKSKpmnyxE54/iS6fabdq/19TkPjShWJKb0VP2Vdx9RxFajfna2PUGgwpF+Bzv7edI86UG41fE69GiXnw0FLJifAmmVkhIXAAr0cEJ9pV0le78MtyjxGOaPSEAFQJ490WcGwKVbtajnvuuNysfs/FL2YTMcFkyy9cKoWGaF8EfHjm9USddK0sfyeguKWyjnJyAWCmDzKX/ZPIuvkHy9F/g9f7LGq1+fOSYWfcxVfSOEmMsZHTyZNNwvmCJCVGF7lkSEyquM/aKAD25/slhcdzOg== 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=LPGQR7e2zff7QByA6sdZeUavWgRI9J42xxHHwmfhDhBxpZ5RlQIXuJPZdBli8Hi7jYsI3VTYpR1ohiC9gCwLhfPerbPXCHuzFVyERwzIwXczHS/NFqTW01dAudbvuxjIRLPOxIpXZqwhBeRHMw8jgHiC+sgx/I4nQizc/QK96ymKymcH7m2utlfTllIT81A1/BcikLt8HwYXwQqKRkDAmd1KDLkgv+rrETCBYGVbHanPXQjnrxfjBnkOWmyHsnyuRW+xJhswbxwhU8IpvI+DpYR+OzYxHBxsBCGceHBjZneKElYA0QoN/HKeYlSt0HK+s80g6NGWU+LxeEV0Hj5Ujg== Received: from BN9PR03CA0516.namprd03.prod.outlook.com (2603:10b6:408:131::11) by PH7PR12MB8013.namprd12.prod.outlook.com (2603:10b6:510:27c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.25; Sat, 21 Jan 2023 05:22:30 +0000 Received: from BN8NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:408:131:cafe::b4) by BN9PR03CA0516.outlook.office365.com (2603:10b6:408:131::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.28 via Frontend Transport; Sat, 21 Jan 2023 05:22:30 +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 BN8NAM11FT050.mail.protection.outlook.com (10.13.177.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6023.16 via Frontend Transport; Sat, 21 Jan 2023 05:22:29 +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; Fri, 20 Jan 2023 21:22:27 -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; Fri, 20 Jan 2023 21:22:25 -0800 From: Alexander Kozyrev To: CC: , , , Subject: [PATCH 3/4] app/testpmd: add template table insertion type Date: Sat, 21 Jan 2023 07:21:57 +0200 Message-ID: <20230121052158.2928238-4-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20230121052158.2928238-1-akozyrev@nvidia.com> References: <20221214022110.393410-1-akozyrev@nvidia.com> <20230121052158.2928238-1-akozyrev@nvidia.com> MIME-Version: 1.0 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: BN8NAM11FT050:EE_|PH7PR12MB8013:EE_ X-MS-Office365-Filtering-Correlation-Id: 0b4516ff-e449-45a4-a07b-08dafb6f7dfa 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: M6YH7QBsw4JP5FuOm/f+gUhN3RTU7j7E7SD13wOV2CDtmFYoC4zl+c2HqgEbe3ObR8EyhKSKhGvBW43fcGjO4I8XeTkAn0Z0LCEOuANIxL4jdEu0ac58OzRQDgT0lsUQpEjmdegXUvv8es2YHHwv/OaY8w3JN0ewzOufspy8+yDNYJFqoDoy8uqVvF8vIw6b6XnQZgSdYE6ALeOASF/vMuyeARN9V9sk5OZaCBFKaQrDVHfWZoJIWt5O90JVrAOM6A+6GWdL9xlLz/XZJ4mGklGcPluYMlQ6vf7tceGvpXh/r/7GiPXNgn4hY3ClBeSahhEnn2qeEooVxSs1ZtbjOtaLqF/aGU2bF4Opq21Xi4lKLbGeSgDS6fuCR8340HZzulWGTtnUSpLVHKBcnRbLGWPe48VHERxHBuIvV/HTeWhxjTtPQAMQfEJDPw8aaM+m6y0OIdX9HvEWTVz7gSGJSNpDjbCsRWRRmErwkZIvnCRonS37QciNTvfqJUVLctt9+ZJiOwEb+TjHn9ssP9KZ1syegL9FnLycob35l9BQEWiwzjpc3fNEPOVgaTRUb8+A5xnEXQvS217ORl1mAZxT8HClOWmhW6j4+dQj2z13+96tjah2bEBamL1UePaJ2+EsBVCeVFeFbKck08vYFoNmjgRTmQU5wZugWBkrrJ5yf2EsR1ZXQ+0oBQUZ1xGJPZxMrcGlewQ9q+MW/MUzCRsO/Q== 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:(13230022)(4636009)(39860400002)(396003)(346002)(136003)(376002)(451199015)(46966006)(36840700001)(40470700004)(107886003)(86362001)(316002)(40460700003)(36756003)(40480700001)(478600001)(6666004)(8936002)(5660300002)(70206006)(186003)(8676002)(6916009)(36860700001)(82740400003)(4326008)(41300700001)(70586007)(82310400005)(16526019)(26005)(356005)(47076005)(426003)(1076003)(7636003)(83380400001)(2616005)(336012)(2906002)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2023 05:22:29.7365 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b4516ff-e449-45a4-a07b-08dafb6f7dfa 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: BN8NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8013 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 --- 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);