From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2670B459CB; Thu, 19 Sep 2024 02:49:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C9C31432CE; Thu, 19 Sep 2024 02:49:02 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2063.outbound.protection.outlook.com [40.107.236.63]) by mails.dpdk.org (Postfix) with ESMTP id 9F1EF432CE for ; Thu, 19 Sep 2024 02:49:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=j+TVDUuXQuG2hJj9hUBAe1mDv2HaC0D7K7DUKxo+l1SSZizTaAV20i3zDaIODJOq9InBGC9INs6c3g3BrD4lODU4v2XIK7PJ2adexoAxYQFGEqnVbCj0RSfn7u0RdeKPldVHkt0ug5szQdOrbV6VN3A1nnPaJPi1yIKvaX02bvyWHGPuwG3Cudnl56fdj1hQRewajC05Dm9yeQw/Ez64qmkM6+mT+1ylUFmwKzZfoRMnstJokY48UBp16wt5Y1Q2TobKYmTOTJiaPK5dgUwa5F0QI3uMyjR6PG1YcSglUi3NZ8gJZZdBY9NanfNmVp3M2ab8TZ6pE4X2c8F9dtaLDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=7jnygYO13hBEeyiyu/C3V5cEC+AAjhW1Q/qjS0fqkGY=; b=UBCsSrePX7AbBcN75K5FMHOEPNhhQgoy2LsZEwZ/exboJnddB2J/yoBLPVgaW+nj8NtbDysonxNXilNYO2Ohv0TqqpgqYiiEPy+5b0WxdE1fw8TsayFWQ6mAU+40JR0l8n+27q9tBuusQv93yXhRBhAXNKvBeSoDvKh0evWmzm6nlFqvULtHk7sjWuJZXILkDxTBKvJVpSau7sZnvvh69VTeWhcq4o79epweVgwZ5IJv0Fv3irBvBeCl2swzfOLYzTQ1eV2DQ16qXrxqytSwiCT7BcnU5uh4IpbiZ7BXOTv0RXZ71aBoLj7u7XYjhFgyI+9eDKvOBv2wMJUqyyEmSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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 (0) 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=7jnygYO13hBEeyiyu/C3V5cEC+AAjhW1Q/qjS0fqkGY=; b=uBQhUmdo/V38KHbrNDSE6T1zje1EVnAT9dMNhoWQ2ikVXhV7vZDb5EvwmwPIphXD799Ida8XkdlSZcy2cff5O2UyJAQ5oWqmI4/99Utwjo0RiW4tdKWJle/Q7dhTYvnDqIH1a97FW2sDiokLC45q1HR4wI146QiGG0jOeTUjjWMr6Gh1x1aNWi6GFRKG+aPC9WP6oqh38BGPtViaM6Xo1pZw3swbkxCvZf+rfbHrZVqHt5HLcUVq9lk6/tq/Ngwxr8iKulMf54EdoItOuUKipoCgB28h+lIsxlq/MCWCLbMvj1sPWK816NsdrEZRYvBnrYrZFUKUicXLKFDnhdbfDg== Received: from MN0P220CA0030.NAMP220.PROD.OUTLOOK.COM (2603:10b6:208:52e::24) by DS7PR12MB6069.namprd12.prod.outlook.com (2603:10b6:8:9f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7982.17; Thu, 19 Sep 2024 00:48:57 +0000 Received: from MN1PEPF0000ECDB.namprd02.prod.outlook.com (2603:10b6:208:52e:cafe::3a) by MN0P220CA0030.outlook.office365.com (2603:10b6:208:52e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.25 via Frontend Transport; Thu, 19 Sep 2024 00:48:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MN1PEPF0000ECDB.mail.protection.outlook.com (10.167.242.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.13 via Frontend Transport; Thu, 19 Sep 2024 00:48:56 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 18 Sep 2024 17:48:41 -0700 Received: from pegasus01.mtr.labs.mlnx (10.126.231.35) 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.1544.4; Wed, 18 Sep 2024 17:48:39 -0700 From: Alexander Kozyrev To: CC: , , , , , Subject: [PATCH 4/6] app/testpmd: add insertion by index with pattern option Date: Thu, 19 Sep 2024 03:48:11 +0300 Message-ID: <20240919004813.3158356-5-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20240919004813.3158356-1-akozyrev@nvidia.com> References: <20240919004813.3158356-1-akozyrev@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.126.231.35] 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: MN1PEPF0000ECDB:EE_|DS7PR12MB6069:EE_ X-MS-Office365-Filtering-Correlation-Id: 827c56ee-02c1-4adf-bfb3-08dcd844d7b6 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; ARA:13230040|376014|36860700013|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?j9rJ1uO5Xmre9pUOHvLDp6n687iPPN10CSlexwgzIrk5io/thboWJSuK+2T4?= =?us-ascii?Q?sEqm/uwpfjXtwzxuspKBj5SeBOCmd+RI/GyGCNyAS/VP0HtnRtI8XUITOvcA?= =?us-ascii?Q?J4i7U8QcjYUq3YlnSQIfDO95R4FxfvSYAxBhTUwYR6VrVRIUkXErztntzbaa?= =?us-ascii?Q?98PNGPmyjAeuFmuMJyadOAKgHJCy1lV6EQPYTeCRu+WIfGAueRFFHbaDEyIO?= =?us-ascii?Q?urOVHPQkrGe32trhReIQiKiNZb+0B5f8qCTJj0nbSvOfCse3XZOKS5JlcYcw?= =?us-ascii?Q?L/Bc46mApcRPRUokDmyBZbMTjPQMx3kPb52aC1un5125bLvpZhTnyf7OBc6R?= =?us-ascii?Q?raCKx1PkbgfciibtFKN0DPYl16OixjqD9Tgsoh4trrBU4SzE2bQeJEbmayxx?= =?us-ascii?Q?sg7L+VKxdGeDL2IoFggNmovUxXwmAlLGxr0X3rbchIaDFcmlJDRQEYbNKnk4?= =?us-ascii?Q?//g88OVajzuDOy+hCDpTyjauyU3PxSpvVPGYkNlrNapNQ2HDXV/DX2JRq/BY?= =?us-ascii?Q?pmKEJv/j+5aEupbGie9Nnui7Sy9CIlGkJRGD77x86pr418CgYFvD46OBve7m?= =?us-ascii?Q?dRJCnKmvSDslJiYuH/4JBxRUFVVN0RuMgArqyJOS5PbSUMW/5NIB9cXN1VYA?= =?us-ascii?Q?RcIsR50FI3uqYoU9OX+SMhZJ978205WARA4JaV/m2fygl5xbY4pzv3GkI6xE?= =?us-ascii?Q?Oktb0cRZSZBbvjVCQZKTnnU+oTIe58xmHZhCQfCS+wBi2taDAiXT9c0JVgR9?= =?us-ascii?Q?VaMXSwuoj8/G4SdfHdOIvLyAtpKEEK692jSuajQ0f5otiWBTKNFdsSarJiEg?= =?us-ascii?Q?5IYKvRwv2BIY0iTV5UByJh6u744VTUzoZuM7vxbhRYQ4RKPXwpn6pkICdFR6?= =?us-ascii?Q?p30cNU0DRcvCHXkSVIjyGCOkM8t51QF0pWIuM3dBuZGV+5+FajHLchnb4y8O?= =?us-ascii?Q?eLgfjFT9+z/GPbIgRZ9a0Yj5IgBVafIZw24gqy+Yjn4MLqTHaq73tqfBs6Mc?= =?us-ascii?Q?x0tR5bqyS6vP4kpVjJC4dUWu62h8ayQu5BoBXXlWTZpd8zxenxkjlVYA7svC?= =?us-ascii?Q?TeddSszBrwZl0O9I0kEBVC81Yhy19J1cCNA6bSnuhQzmlLYV9f9sjVNJUVwI?= =?us-ascii?Q?kH6xfMIR1sTlY7D59OvHI2CbOCeoJjPaILfIk0yA8ci5RED1yVY/soWuNGz7?= =?us-ascii?Q?AYYyYOIvmCNMBLtFlWF2GYUwbdO6dIPv8uG7RCdHiIzdCzlTyDGlsez9fVyN?= =?us-ascii?Q?UuJ6BPfbgrwkx9bJgnt87r7HmXXqkjFEn4q5UdnXOumE5x2UY6OViKnBiWoW?= =?us-ascii?Q?FMXDPs6w5coXl468l5JoYgDDvg6lWCPGJksNLiCAkqtNBVGOv8+PjtEE+XIX?= =?us-ascii?Q?xa4nFiQVg5r1RYk2oEiCiauKHQs+Jreg/WCNoF4AKtFnG5Y3/K+DnhhGV1cA?= =?us-ascii?Q?7Ehoa3bJdUDMC/2I7r6fs+7mEiR2LeIj?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(36860700013)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2024 00:48:56.6346 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 827c56ee-02c1-4adf-bfb3-08dcd844d7b6 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000ECDB.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6069 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 Allow to specify both the rule index and the pattern in the flow rule creation command line parameters. Both are needed for rte_flow_async_create_by_index_with_pattern(). flow queue 0 create 0 template_table 2 rule_index 5 pattern_template 0 actions_template 0 postpone no pattern eth / end actions count / queue index 1 / end Signed-off-by: Alexander Kozyrev --- app/test-pmd/cmdline_flow.c | 8 +++++++- app/test-pmd/config.c | 22 ++++++++++++++++------ app/test-pmd/testpmd.h | 2 +- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index a794e5eba5..855273365e 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -1585,6 +1585,12 @@ static const enum index next_async_insert_subcmd[] = { ZERO, }; +static const enum index next_async_pattern_subcmd[] = { + QUEUE_PATTERN_TEMPLATE, + QUEUE_ACTIONS_TEMPLATE, + ZERO, +}; + static const enum index item_param[] = { ITEM_PARAM_IS, ITEM_PARAM_SPEC, @@ -3788,7 +3794,7 @@ static const struct token token_list[] = { [QUEUE_RULE_ID] = { .name = "rule_index", .help = "specify flow rule index", - .next = NEXT(NEXT_ENTRY(QUEUE_ACTIONS_TEMPLATE), + .next = NEXT(next_async_pattern_subcmd, NEXT_ENTRY(COMMON_UNSIGNED)), .args = ARGS(ARGS_ENTRY(struct buffer, args.vc.rule_id)), diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 6f0beafa27..39924d8da9 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2636,8 +2636,8 @@ port_flow_template_table_create(portid_t port_id, uint32_t id, } pt->nb_pattern_templates = nb_pattern_templates; pt->nb_actions_templates = nb_actions_templates; - rte_memcpy(&pt->flow_attr, &table_attr->flow_attr, - sizeof(struct rte_flow_attr)); + rte_memcpy(&pt->attr, table_attr, + sizeof(struct rte_flow_template_table_attr)); printf("Template table #%u created\n", pt->id); return 0; } @@ -2835,7 +2835,7 @@ port_queue_flow_create(portid_t port_id, queueid_t queue_id, } job->type = QUEUE_JOB_TYPE_FLOW_CREATE; - pf = port_flow_new(&pt->flow_attr, pattern, actions, &error); + pf = port_flow_new(&pt->attr.flow_attr, pattern, actions, &error); if (!pf) { free(job); return port_flow_complain(&error); @@ -2846,12 +2846,22 @@ 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)); - if (rule_idx == UINT32_MAX) + if (pt->attr.insertion_type == RTE_FLOW_TABLE_INSERTION_TYPE_PATTERN) flow = rte_flow_async_create(port_id, queue_id, &op_attr, pt->table, pattern, pattern_idx, actions, actions_idx, job, &error); - else + else if (pt->attr.insertion_type == RTE_FLOW_TABLE_INSERTION_TYPE_INDEX) flow = rte_flow_async_create_by_index(port_id, queue_id, &op_attr, pt->table, rule_idx, actions, actions_idx, job, &error); + else if (pt->attr.insertion_type == RTE_FLOW_TABLE_INSERTION_TYPE_INDEX_WITH_PATTERN) + flow = rte_flow_async_create_by_index_with_pattern(port_id, queue_id, &op_attr, + pt->table, rule_idx, pattern, pattern_idx, actions, actions_idx, job, + &error); + else { + free(pf); + free(job); + printf("Insertion type %d is invalid\n", pt->attr.insertion_type); + return -EINVAL; + } if (!flow) { free(pf); free(job); @@ -3060,7 +3070,7 @@ port_queue_flow_update(portid_t port_id, queueid_t queue_id, } job->type = QUEUE_JOB_TYPE_FLOW_UPDATE; - uf = port_flow_new(&pt->flow_attr, pf->rule.pattern_ro, actions, &error); + uf = port_flow_new(&pt->attr.flow_attr, pf->rule.pattern_ro, actions, &error); if (!uf) { free(job); return port_flow_complain(&error); diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 9facd7f281..f9ab88d667 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -220,7 +220,7 @@ struct port_table { uint32_t id; /**< Table ID. */ uint32_t nb_pattern_templates; /**< Number of pattern templates. */ uint32_t nb_actions_templates; /**< Number of actions templates. */ - struct rte_flow_attr flow_attr; /**< Flow attributes. */ + struct rte_flow_template_table_attr attr; /**< Table attributes. */ struct rte_flow_template_table *table; /**< PMD opaque template object */ }; -- 2.18.2