From patchwork Thu Feb 22 09:04:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Kolomeiets X-Patchwork-Id: 136993 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 41A5643B73; Thu, 22 Feb 2024 10:05:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1840F402DA; Thu, 22 Feb 2024 10:05:57 +0100 (CET) Received: from egress-ip11a.ess.de.barracuda.com (egress-ip11a.ess.de.barracuda.com [18.184.203.234]) by mails.dpdk.org (Postfix) with ESMTP id A7FBF40281 for ; Thu, 22 Feb 2024 10:05:55 +0100 (CET) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02lp2232.outbound.protection.outlook.com [104.47.11.232]) by mx-outbound9-218.eu-central-1a.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 22 Feb 2024 09:05:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WZrdWwcjH6y9ur6y2eli9uzqNg6zumhScMccL4WlbL44YKbLWHbF8WIF1hGqcRA6Qg002MaEbu2C9poB4X9YBTty3bRA+uXk9Wssw7VaxSsVb1KJme+ZdPb7pegSiffD0p22yz8oNc+EpYWBDYQvw1ZqqEhJReY9wQOeifwpFBwG0jYOX7U4g+pAMvsIZPjwUorbY0nvzj9QAuGlCsbiW46z3PFGTzWfn28j5lVmontUPn0neyhnhRaUNv60MlFps4Ujnj2/WlXElO4RsxEIYk4nzWH2+jS1X6VQg6+jDiQZftvkHaUZZuc/7IMe8g79BBQ1ToAb4L2Cj0+U7llquQ== 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=3JsjqBS/XKM36eQQ/E89Hgfoyyg9mR0Ak8KNsaD81GA=; b=BxTfTjVZTst22s/smBfXtEaK8KWscotMgGOP4OS+Mk/iQ79jpZdPD5XRlWfoBFlZX/0GT8hIgbrj9JBQA/AGCeiPEvBUEqnzYCM0X6S1Ks/kR7WPpQ/HUksbtaKPcErxcKrGTFOrmWu5hiOArdqgFBJpNsd9nLxCgYlIrNSi8kypJHcZ1CQY6HhaQaxy9nJ0IhQSU+jj8oHp1gfJUiDULI9ILm8S+6TwzYkNqNJbGQt9+ngJEkFvHTNqNEQdl0Z1kXlFBTjCwAHcpJzbC51bbo5hiEgPW0AH4XmrE0PT/E8Juf3VHir5UjDbnhIVSE+JzO9ZeKc7hqUOWGU8OUS3nA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 178.72.21.4) smtp.rcpttodomain=monjalon.net smtp.mailfrom=napatech.com; dmarc=fail (p=none sp=none pct=100) action=none header.from=napatech.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=napatech.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3JsjqBS/XKM36eQQ/E89Hgfoyyg9mR0Ak8KNsaD81GA=; b=BB8U/vzCbN6uVM51LXu/grEg8QeKgJyzE9ZK140qPzZriUUAHrT4snrUtpZ3hKIdYppaPT7v7hl9ZEDJc7h6NotOy61U21ul04uHQEa5YKyOFgac35pdFCbUE0ctiAVR1HSwQ1+LiyuuDHsr756AZaQvQM5ISAXM8IVZFJS0k4k= Received: from AM0PR10CA0086.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:15::39) by PR3P190MB0970.EURP190.PROD.OUTLOOK.COM (2603:10a6:102:84::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.31; Thu, 22 Feb 2024 09:04:40 +0000 Received: from AM4PEPF00025F9A.EURPRD83.prod.outlook.com (2603:10a6:208:15:cafe::e0) by AM0PR10CA0086.outlook.office365.com (2603:10a6:208:15::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.43 via Frontend Transport; Thu, 22 Feb 2024 09:04:40 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 178.72.21.4) smtp.mailfrom=napatech.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=napatech.com; Received-SPF: Fail (protection.outlook.com: domain of napatech.com does not designate 178.72.21.4 as permitted sender) receiver=protection.outlook.com; client-ip=178.72.21.4; helo=localhost.localdomain.com; Received: from localhost.localdomain.com (178.72.21.4) by AM4PEPF00025F9A.mail.protection.outlook.com (10.167.16.9) with Microsoft SMTP Server id 15.20.7339.0 via Frontend Transport; Thu, 22 Feb 2024 09:04:39 +0000 From: Oleksandr Kolomeiets To: thomas@monjalon.net, aman.deep.singh@intel.com, yuying.zhang@intel.com, orika@nvidia.com, mko-plv@napatech.com, ckm@napatech.com Cc: dev@dpdk.org Subject: [PATCH v3] app/testpmd: support updating flow rule actions Date: Thu, 22 Feb 2024 10:04:20 +0100 Message-ID: <20240222090420.130180-1-okl-plv@napatech.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240201095907.3564286-1-okl-plv@napatech.com> References: <20240201095907.3564286-1-okl-plv@napatech.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM4PEPF00025F9A:EE_|PR3P190MB0970:EE_ X-MS-Office365-Filtering-Correlation-Id: 917d10c7-29b8-4a90-be09-08dc33854d5a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OVUknuq8DqsNS9rNJzxah/SIW2eYijHnLYwdUoqUm1HlVqxMlgErbMJKE01Vwk9VG2kVk2TzCDXpGjE2MhrcNA4Z9BI6a4BQyYMFXG7OHCIwhnwyLVTBrByMTJ+LGBakWQoyHKohbiUW57q+PqzJqUGgGE8hbrVdRiJQludpF427aWoekAqziOpOiUxGWHTSuv0WYUPW9guP4h2umS4YMQnHalJzE+Suy34N1ZldslSYniuFU0CR3IrWqI2m2RjQNFP/hn8tCLy5RNqwQ+/SAPdXMOdLJstdOopPL1gxwkBfvNhE4BIcM48A0lEzQrUyxKxvwnAOVRyaqS5yMUOLmIxL2pq8TU4umSPg9sUsa+A51tmVxd3RWYRUSSJH60nxpifGrG+oUpYHmOn/mg/IPMi6q0182urJXuSuzAwP7mqDesfHp9xSM8r5EgVBLGlcK+FlbdUSuA+El0Ym3aRrBKhq7OrnCzYpf6dhOMmVAvA5aT+RSSBsXc0e065gOmAwniQbJXwuB7NKybBk+8KW1pgVRYV2NemYI9nO9eZ5nrbqBQGNKUgbd0iIPHzJDeJg/sljQGb9+PYk5HPEh202kjC14Mu2D8evJKfFr9uapUphxwJIEqcFh21cbXcysAg7EiZUKSPNSipib7Qua4lRRu6gIZq0nPtgAQRiDWXVmYCL3VfolwnC5wvxVrCfjZWh X-Forefront-Antispam-Report: CIP:178.72.21.4; CTRY:DK; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:localhost.localdomain.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(36860700004)(46966006)(15866825006); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 6gOt/YbX1kHuJvpNVrHJ2mOTIN1fKgfbk5P55E9gT59PYLCccsAVZQeAC4NU0SHsCWq6d+CrrSKDdFzu2Qq7lX3Bu+0pdHkmW8KuoDl7W9nxWTmmkYk4iHlDamL8lFFVu94I5umaOXqza5qR/soEfA9UyzS7gFsJmKbx5DvbWqlp8DGpRiiK2F8TyA4eH+AzVy8xde7JwlrrmM7QG9P5F5J/CfqPfe/tqYoEWpYVZUpPV1L+pAoAZcv+7tzrGS0Cv1ryOvffpW6Vuixg5mSl13fXddnVXUrdCOteSp8ME/HJSaAVe8mu4N49QgvCMWGhynB0rtNU83voj2RGbAehtZ/164f+gHNaHWnAW5qUP3pjEozB1iVwpUSIo8SteJm331T4P6KWSL2MrBUyLeLYLogJi0UuJViiqnfvafJk4ECOFzS4Cw8BqkO24xQ/UeGs4fGIuHJZmvgHU/MwFMzVLIR8Ts/TnE6P6guy0fXaCqYjOvVmkT0006lY8j/q7vDqqdFmyAntFn7dHE+6yBT+oo9Lvq4WANmOhxeHN/GuoZMHX92F7Cd/27tf3MHvSBrZp0ms8x96h9jL6qKF3BhLCeQ6x/yyH2L7A9f1CHb9KsYv9esOQUT/ETdBi5cp1pKikor4dY7JLT61xr245ar43g== X-OriginatorOrg: napatech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2024 09:04:39.8883 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 917d10c7-29b8-4a90-be09-08dc33854d5a X-MS-Exchange-CrossTenant-Id: c4540d0b-728a-4233-9da5-9ea30c7ec3ed X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=c4540d0b-728a-4233-9da5-9ea30c7ec3ed; Ip=[178.72.21.4]; Helo=[localhost.localdomain.com] X-MS-Exchange-CrossTenant-AuthSource: AM4PEPF00025F9A.EURPRD83.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P190MB0970 X-BESS-ID: 1708592714-302522-12435-5349-1 X-BESS-VER: 2019.1_20240214.1700 X-BESS-Apparent-Source-IP: 104.47.11.232 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKVpbmRhZAVgZQ0NLSyDAp1SQ10d DU1NjcMDnNPCkxySzNIiXN3DQtNSVFqTYWACDp8+xBAAAA X-BESS-BRTS-Status: 1 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 "flow update" updates a flow rule specified by a rule ID with a new action list by making a call to "rte_flow_actions_update()": flow update {port_id} {rule_id} actions {action} [/ {action} [...]] / end [user_id] Creating, updating and destroying a flow rule: testpmd> flow create 0 group 1 pattern eth / end actions drop / end Flow rule #0 created testpmd> flow update 0 0 actions queue index 1 / end Flow rule #0 updated with new actions testpmd> flow destroy 0 rule 0 Flow rule #0 destroyed Signed-off-by: Oleksandr Kolomeiets Reviewed-by: Mykola Kostenok Reviewed-by: Christian Koue Muf --- v3: * Renamed "flow actions_update" command to "flow update". v2: * No changes. --- .mailmap | 3 ++ app/test-pmd/cmdline.c | 4 ++ app/test-pmd/cmdline_flow.c | 33 +++++++++++++++- app/test-pmd/config.c | 43 ++++++++++++++++++++ app/test-pmd/testpmd.h | 2 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 44 +++++++++++++++++++++ 6 files changed, 128 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 12d2875641..c1e7aa9ae1 100644 --- a/.mailmap +++ b/.mailmap @@ -236,6 +236,7 @@ Chintu Hetam Choonho Son Chris Metcalf Christian Ehrhardt +Christian Koue Muf Christian Maciocco Christophe Fontaine Christophe Grosse @@ -992,6 +993,7 @@ Mukesh Dua Murphy Yang Murthy NSSR Muthurajan Jayakumar +Mykola Kostenok Nachiketa Prachanda Nagadheeraj Rottela Naga Harish K S V @@ -1046,6 +1048,7 @@ Odi Assli Ognjen Joldzic Ola Liljedahl Oleg Polyakov +Oleksandr Kolomeiets Olga Shern Olivier Gournet Olivier Matz diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 566057caa5..f521a1fe9e 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -851,6 +851,10 @@ static void cmd_help_long_parsed(void *parsed_result, "flow destroy {port_id} rule {rule_id} [...]\n" " Destroy specific flow rules.\n\n" + "flow update {port_id} {rule_id}" + " actions {action} [/ {action} [...]] / end [user_id]\n" + " Update a flow rule with new actions.\n\n" + "flow flush {port_id}\n" " Destroy all flow rules.\n\n" diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 8e5eb41d71..d9d261ebd2 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -91,6 +91,7 @@ enum index { VALIDATE, CREATE, DESTROY, + UPDATE, FLUSH, DUMP, QUERY, @@ -260,6 +261,7 @@ enum index { VC_TUNNEL_SET, VC_TUNNEL_MATCH, VC_USER_ID, + VC_IS_USER_ID, /* Dump arguments */ DUMP_ALL, @@ -3200,6 +3202,7 @@ static const struct token token_list[] = { VALIDATE, CREATE, DESTROY, + UPDATE, FLUSH, DUMP, LIST, @@ -4065,6 +4068,17 @@ static const struct token token_list[] = { .args = ARGS(ARGS_ENTRY(struct buffer, port)), .call = parse_destroy, }, + [UPDATE] = { + .name = "update", + .help = "update a flow rule with new actions", + .next = NEXT(NEXT_ENTRY(VC_IS_USER_ID, END), + NEXT_ENTRY(ACTIONS), + NEXT_ENTRY(COMMON_RULE_ID), + NEXT_ENTRY(COMMON_PORT_ID)), + .args = ARGS(ARGS_ENTRY(struct buffer, args.vc.rule_id), + ARGS_ENTRY(struct buffer, port)), + .call = parse_vc, + }, [FLUSH] = { .name = "flush", .help = "destroy all flow rules", @@ -4311,6 +4325,11 @@ static const struct token token_list[] = { .args = ARGS(ARGS_ENTRY(struct buffer, args.vc.user_id)), .call = parse_vc, }, + [VC_IS_USER_ID] = { + .name = "user_id", + .help = "rule identifier is user-id", + .call = parse_vc, + }, /* Validate/create pattern. */ [ITEM_PATTERN] = { .name = "pattern", @@ -8450,8 +8469,13 @@ parse_vc(struct context *ctx, const struct token *token, if (!out->command) { if (ctx->curr != VALIDATE && ctx->curr != CREATE && ctx->curr != PATTERN_TEMPLATE_CREATE && - ctx->curr != ACTIONS_TEMPLATE_CREATE) + ctx->curr != ACTIONS_TEMPLATE_CREATE && + ctx->curr != UPDATE) return -1; + if (ctx->curr == UPDATE) + out->args.vc.pattern = + (void *)RTE_ALIGN_CEIL((uintptr_t)(out + 1), + sizeof(double)); if (sizeof(*out) > size) return -1; out->command = ctx->curr; @@ -8523,6 +8547,9 @@ parse_vc(struct context *ctx, const struct token *token, ctx->object = out->args.vc.actions; ctx->objmask = NULL; return len; + case VC_IS_USER_ID: + out->args.vc.user_id = true; + return len; default: if (!token->priv) return -1; @@ -13256,6 +13283,10 @@ cmd_flow_parsed(const struct buffer *in) in->args.destroy.rule, in->args.destroy.is_user_id); break; + case UPDATE: + port_flow_update(in->port, in->args.vc.rule_id, + in->args.vc.actions, in->args.vc.user_id); + break; case FLUSH: port_flow_flush(in->port); break; diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 08d7d0e2f8..cd2a436cd7 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -3829,6 +3829,49 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint64_t *rule, return ret; } +/** Update a flow rule with new actions. */ +int +port_flow_update(portid_t port_id, uint32_t rule_id, + const struct rte_flow_action *actions, bool is_user_id) +{ + struct rte_port *port; + struct port_flow **flow_list; + + if (port_id_is_invalid(port_id, ENABLED_WARN) || + port_id == (portid_t)RTE_PORT_ALL) + return -EINVAL; + port = &ports[port_id]; + flow_list = &port->flow_list; + while (*flow_list) { + struct port_flow *flow = *flow_list; + struct rte_flow_error error; + + if (rule_id != (is_user_id ? flow->user_id : flow->id)) { + flow_list = &flow->next; + continue; + } + /* + * Poisoning to make sure PMDs update it in case + * of error. + */ + memset(&error, 0x33, sizeof(error)); + if (rte_flow_actions_update(port_id, flow->flow, actions, + &error)) + return port_flow_complain(&error); + if (is_user_id) + printf("Flow rule #%"PRIu64" updated with new actions," + " user-id 0x%"PRIx64"\n", + flow->id, flow->user_id); + else + printf("Flow rule #%"PRIu64 + " updated with new actions\n", + flow->id); + return 0; + } + printf("Failed to find flow %"PRIu32"\n", rule_id); + return -EINVAL; +} + /** Remove all flow rules. */ int port_flow_flush(portid_t port_id) diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 467ef3a8ab..55df12033a 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -1043,6 +1043,8 @@ void update_age_action_context(const struct rte_flow_action *actions, int mcast_addr_pool_destroy(portid_t port_id); int port_flow_destroy(portid_t port_id, uint32_t n, const uint64_t *rule, bool is_user_id); +int port_flow_update(portid_t port_id, uint32_t rule, + const struct rte_flow_action *actions, bool is_user_id); int port_flow_flush(portid_t port_id); int port_flow_dump(portid_t port_id, bool dump_all, uint64_t rule, const char *file_name, diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 9f3949667f..1771115857 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -3057,6 +3057,11 @@ following sections. flow destroy {port_id} rule {rule_id} [...] [user_id] +- Update a flow rule with new actions:: + + flow update {port_id} {rule_id} + actions {action} [/ {action} [...]] / end [user_id] + - Destroy all flow rules:: flow flush {port_id} @@ -4275,6 +4280,45 @@ Non-existent rule IDs are ignored:: Flow rule #0 destroyed testpmd> +Updating flow rules with new actions +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +``flow update`` updates a flow rule specified by a rule ID with a new action +list by making a call to ``rte_flow_actions_update()``:: + + flow update {port_id} {rule_id} + actions {action} [/ {action} [...]] / end [user_id] + +If successful, it will show:: + + Flow rule #[...] updated with new actions + +Or if ``user_id`` flag is provided:: + + Flow rule #[...] updated with new actions, user-id [...] + +If a flow rule can not be found:: + + Failed to find flow [...] + +Otherwise it will show the usual error message of the form:: + + Caught error type [...] ([...]): [...] + +Optional ``user_id`` is a flag that signifies the rule ID is the one provided +by the user at creation. + +Action list is identical to the one described for the ``flow create``. + +Creating, updating and destroying a flow rule:: + + testpmd> flow create 0 group 1 pattern eth / end actions drop / end + Flow rule #0 created + testpmd> flow update 0 0 actions queue index 1 / end + Flow rule #0 updated with new actions + testpmd> flow destroy 0 rule 0 + Flow rule #0 destroyed + Enqueueing destruction of flow rules ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~