From patchwork Fri Feb 23 04:19:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Kolomeiets X-Patchwork-Id: 137081 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 4E5D143B94; Fri, 23 Feb 2024 05:19:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D8182402ED; Fri, 23 Feb 2024 05:19:44 +0100 (CET) Received: from egress-ip11b.ess.de.barracuda.com (egress-ip11b.ess.de.barracuda.com [18.185.115.215]) by mails.dpdk.org (Postfix) with ESMTP id E7B39402ED for ; Fri, 23 Feb 2024 05:19:42 +0100 (CET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2169.outbound.protection.outlook.com [104.47.17.169]) by mx-outbound18-221.eu-central-1b.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 23 Feb 2024 04:19:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L2Fo8T2ZgLmlC4qDUjLZNK00B4HY1YWr+T6KmItjhpNswGeRJ82ZttvFi58bPa++oHtYcCm4+U9yKU2HMt/5BeU8Zft+IPR5ae+oKUb6PKIJxcdiC690TBDs7HOIFMJ/0mdjrDRFlnyScHwzSZhNGuyvunOnbVV/bZKZBIAUhUZXnSBtaVvZhdKMDLTTCZ/v4cMAYQWf4MZLPJs98Y2475zvnbmcZA4CV3734TRG4B92f5zxpaxNT/FiIlGNh7/Cd8n4/7ZUcr9n0YOfPxJmPlQ4MQsC1WFngIcTfEB6wjido2ZXsVfI15Xxgpnaul9diP+SaevfIK8WBhymfaUhwQ== 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=jjEqAeTlJCR6O0q4JyfucScLaazPjuCF2oM1zwLcTAI=; b=EvLtn44kym5EjMBHPhE+Z6aX/51Z0u0p4OuQfGQNsbLACMVglRAPugKmVFjtS3HSt0OMh11Nmfn1qa1CqUwEQJ1rzBxXRc5OGzE2Xw2PglMEOovIxwlmQmBWns1kIVEqv3siyUS6viw6u9wD/bO8RPgipX7FPTbA8AI01oxKKkn4Zc5lftQ9ighvJViuRx0Fs/SwN8dodtKmS8VnwDqdyhSaO0CLEPM2Oyw436FSyvGcJeKQBDZb4a9ab2IZolhJpGOXjii7tgLq05Nx7RfbfKgznYEC/uyyGH710zs/0nmAMpBJBYmJzR1HQBFmxdRjT0EgC2uuuRTiaan9WfqoGQ== 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=jjEqAeTlJCR6O0q4JyfucScLaazPjuCF2oM1zwLcTAI=; b=NXUICObVdG8eDqgqI2rCcpbVLhxLcVFrTl4b/17O0Okw18+l92EX5fiEzG8GV1KmxY4aCKWeda5Idaw4e+6dFeWEup4uVCNyyCLDDhe+uGi54OC9bG3bGu2ZIG9GHXc+nSrGi8ZMBWdkIlpWFKViH8ovq/YDlrMw0dPOxCq3aZY= Received: from AM0PR04CA0113.eurprd04.prod.outlook.com (2603:10a6:208:55::18) by DB9P190MB1401.EURP190.PROD.OUTLOOK.COM (2603:10a6:10:244::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.23; Fri, 23 Feb 2024 04:19:40 +0000 Received: from AMS0EPF0000019C.eurprd05.prod.outlook.com (2603:10a6:208:55:cafe::6b) by AM0PR04CA0113.outlook.office365.com (2603:10a6:208:55::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.43 via Frontend Transport; Fri, 23 Feb 2024 04:19: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 AMS0EPF0000019C.mail.protection.outlook.com (10.167.16.248) with Microsoft SMTP Server id 15.20.7292.25 via Frontend Transport; Fri, 23 Feb 2024 04:19: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 v4] app/testpmd: support updating flow rule actions Date: Fri, 23 Feb 2024 05:19:19 +0100 Message-ID: <20240223041919.131526-1-okl-plv@napatech.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240222090420.130180-1-okl-plv@napatech.com> References: <20240222090420.130180-1-okl-plv@napatech.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS0EPF0000019C:EE_|DB9P190MB1401:EE_ X-MS-Office365-Filtering-Correlation-Id: ae695655-916f-4053-c7ea-08dc3426a725 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NoWpKv6cZDb0iHLmVRM/tkg+1GwgXuVRo21tX4jPvg88ud2ng2WokRJ5gQJnR1MJ7H6IiDFtYQ/yxoXt2GAKe++WSCJEgchAuEvhA8FH2tqJ4W6jsipuWnJW8t/3QoLs1wy5lSjgLBNqW0cHU/UBPQsRh31pxGygZSh53wgaode+yX4RFP8bsmyn/Yqr2xNQx5h99FjZB8v2TQx5iIji690H1FB+z5Edw9eARPFGXFcVA8SgoJmIE6zTZpGnZi7UcOb4GBGg007waie+yoRVSLkKwZq2q2DuBoUwo5D1Bm5cn1a0swL3ejGwadvajyD/LJYPIlh+xrWe/MSpbbaXff89CxotBClF+zezbiVaz52HcSZdBWYNDRj0u4yojoywwyrbfso5C4fIYl9Foi0gayQcvUQO+2d1+lgHcrR2jM+lGSMhH6IO3tNCdRQlixUziKMK84CtJeaGMouLhYwRncEYVtzaa2wupCrDxdBVOTGdpEWEuwI+M4SVmjIL/Px2FCgiTIh4N5nj8jmuxe7qwl9BJqhOFvuymnt7cAQXVu/uYywSs5YbqULlb+UNpXXYhBrPWLT2Ar2Z5sUBAWhWITEVuZ27Yequ7WHc3ilicLs+f/+vP1uz8v/qAAstaqg8yUsBrGjFkBGwcgndDQDLRsoj/iKU2K+rosSGHFrWjoEYzaxqION/ocRyi+ktrXEE 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: czjUP8I3zd0wNSlcs6cT1gwwoChZNExCf4xM01f86f0yyyKx3krUtbj6jfkV6XD59B8isyiGK+9DG2HukcePhTcAU/hjU8vmC+bfwjSCkgHFhYKM3z+UTPs6LcogInYWl7uP+9pgO+aH1qPHS4kQv0j1aoGPDHZkRyOPZJYp5QDotLQg1hY+CDwqK7uN4WuSPmxmRfZA0sJcqiqjYQUP+VJ5cEGxyeZ7sWn6wObleCbM/HJoBr2FGi99hVFdJIGFVJxq2uriidgEKOEOzTFKwzfnusspMAknOTVjnAoHBs1x0tNw1GwutbNTu4JPq7FKrwnWCG42ixN668BE0WHYiawNptKZeC2FDwJJ1LX7KLlFUChtX1UcHpw/UX5rrf3KwfB/79tHQDcqJjnmV8K22i+ERvBo4ZvXiUAo7y7k5EPvRPm1VHD7HwkmMgvrINT8UwSI/6HFNc5efQCSB097yn358SwICJTa3LmbNY2rqODcEb0WT6TYqNcCjpB/nKOkv5gqF5xKt/N7A9wVXWAnWrBsmYjGjWwYBeBrqEd0zorI/wcQI28cSNLLqaXXV70hLU1oUylYsyNVihVZGWIQeiG0VhvTZnsrJqXJUgVvuf4q51Z/JbNtLywq6WnLwjC+/e1xuBgQkv3l1xt6XDFOGQ== X-OriginatorOrg: napatech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2024 04:19:39.5878 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ae695655-916f-4053-c7ea-08dc3426a725 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: AMS0EPF0000019C.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9P190MB1401 X-BESS-ID: 1708661981-304829-12425-41812-1 X-BESS-VER: 2019.1_20240214.1700 X-BESS-Apparent-Source-IP: 104.47.17.169 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKVpbmJuZAVgZQMNXSNDXZwsDSMt Uk1cjc2DwRKGVhmJiWZGZgap5kaqlUGwsAFVlvaUEAAAA= X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.254410 [from cloudscan10-219.eu-central-1a.ess.aws.cudaops.com] Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.00 MAILTO_TO_SPAM_ADDR META: Includes a link to a likely spammer email 0.00 BSF_BESS_OUTBOUND META: BESS Outbound 0.00 BSF_SC0_MISMATCH_TO META: Envelope rcpt doesn't match header X-BESS-Outbound-Spam-Status: SCORE=0.00 using account:ESS113687 scores of KILL_LEVEL=7.0 tests=MAILTO_TO_SPAM_ADDR, BSF_BESS_OUTBOUND, BSF_SC0_MISMATCH_TO 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 --- v4: * No changes. 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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~