From patchwork Wed Dec 21 07:39:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 121162 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru 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 D0680A034C; Wed, 21 Dec 2022 08:39:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4C33842D15; Wed, 21 Dec 2022 08:39:52 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2071.outbound.protection.outlook.com [40.107.96.71]) by mails.dpdk.org (Postfix) with ESMTP id 2D8FC4113F for ; Wed, 21 Dec 2022 08:39:50 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K1QHZdcNamV69USBXbFSTZqEgdwLGJvG7wvSEp3BPp8jXPh+pkv53SIE/m3k9+jSTFtxN1cqovChJwUxINbY5/Dfko/y8cSvjDtmXgfqIAkopFIXb+dl4CWt6HGtxmf0pVazIQAp0nQqvQSZUWRtpA3GQi8ZE7oz0643VINL8GwbUShxSPHP/G69zEmGp/pgYRebKEwwl+UBnt7fwL3dwTPP8PAMHcOsv7h2RXv+zgRd1TwAOE6ZrCWrfpX5IkklmEIM9hx8yyX6+uqtfCP7csmUD6Ugpc2WjqApT1EtnSzCMoDoX7g9SY05fSC5qtrxXyAeMUolnhWa7eySTha1NQ== 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=M6FkawKT15obQVAYk00rusmDZG05ou78lTEIOZ8jFHs=; b=PVP/EV0D+/6wrvNjjsg+nNhkM24Wx/cbRO2iDSenagAj4rH3pVtnic1Zx34DrY6mvz8GUuDtqWPytKy0qkBPaEXVpslvVM2cofeUmU6qOmNqU2zwld4wxj71Cj+lu9XjJfFAKBOygVywZVXYqs2c8+PQGM91IPtUU4hS4DPBJq6ljPFVvKjrrbdro5e0T7Pl514WNWRIMFh4hfQ0rt0IzII3LbNbb8Bcz2/j5mGKuJ/ZkEVb+0hoY6ooEE4zXcKW3gPEBDCGgQjOK91sPFKNh6jhAE/++9bunkrW2PrWKYW0czp3Dk7lPRdW5j7tTvIEtOdcsCNdgE5xbV4XFWAQfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net 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=M6FkawKT15obQVAYk00rusmDZG05ou78lTEIOZ8jFHs=; b=Nqfv/spnJes47kGYh+6B7wB7UIQqQTPMQdQYyvhtBZsItVPaweWZIMjCwbC3V2L2i3nJ8vmPF5q5ClrXx6RUBc7G0qaSIIOg3QvOO1yaJ3CSmsWw/3659OQiDy32hiUw16mGcFbMbBFAlG51MWGrA23qHU6iNRuBdMpu2YvGpr9tg7CJCRzdrO1wdVOb7vxcoHUb68dtMPdVjBvenEWy2hK4fy0D2nBa1eH/d6lf2lBKBaTkPsaMKXMyypfCpDwYd5nPXOK0bg9/RKCuOr/BHUyClq/GAkHqHi7zv843wYTbQ+3dQlFiDqO6vXarVW/Ru9YRIdPwCKDKOsoB/bDrig== Received: from DM6PR03CA0009.namprd03.prod.outlook.com (2603:10b6:5:40::22) by DM4PR12MB5325.namprd12.prod.outlook.com (2603:10b6:5:390::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Wed, 21 Dec 2022 07:39:48 +0000 Received: from DM6NAM11FT018.eop-nam11.prod.protection.outlook.com (2603:10b6:5:40:cafe::dc) by DM6PR03CA0009.outlook.office365.com (2603:10b6:5:40::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Wed, 21 Dec 2022 07:39:48 +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 DM6NAM11FT018.mail.protection.outlook.com (10.13.172.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.10 via Frontend Transport; Wed, 21 Dec 2022 07:39:48 +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; Tue, 20 Dec 2022 23:39:40 -0800 Received: from nvidia.com (10.126.231.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; Tue, 20 Dec 2022 23:39:37 -0800 From: Rongwei Liu To: , , , , Aman Singh , Yuying Zhang CC: , Subject: [RFC 2/9] app/testpmd: add flex item modify field cmdline support Date: Wed, 21 Dec 2022 09:39:11 +0200 Message-ID: <20221221073918.3581151-3-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221221073918.3581151-1-rongweil@nvidia.com> References: <20221221073918.3581151-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT018:EE_|DM4PR12MB5325:EE_ X-MS-Office365-Filtering-Correlation-Id: 6e61183a-3a40-4b71-c598-08dae32689c5 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: 5koQv2UBuE7sZxaDtwORXyymTWUKaAXJIFnXFbuYaXuL9GmyFAVsw1r8+Y6NuZixnOo9W6ddt8j0sPpVKouo9xVId0yWGJRuzNlZc4695N3wqwd8XbkMjdyxeDogXhuv9A+KjpE68pQLPLn8YshzM59fUD0pdt8IVj53dooR43fDtqA25QfoZSXmc/oePIdyy+QGF223/F6u/AY7LQ1ricAEalZGoLVqHO81JX4ly2SnHR7vwGtSjeQDzvxpPyOxQysbm+vblUB6gO5VOTgJiOL+dwGsRqmFmATQ/gG4oDB9RkCogGAlyuXB/IjDnsG/o6z35LgxRpYGAuwqJYc2QTg2f1BanhIbol+tesyEfmQcHB0L0ad06GX63/D3j+bmsQMooV2nMNjA+Sj6X/3Keidmk7a5kDGM0MmdrCtK1rQUp3r5hl8ImEeRC2YfNiJdloezCKp7mg6XZz0sGbtnraOa26oCYIMLL4swbFa+UhxZuFJjweTc9fcgjzljzY9u+FMicqu+y+1V3vcfchm7JWtTHge4u4cf4a8XxHER0tZ4vpTMcibZQ0wIiNQtcUwaaA6DJq7KJKXyW6t0ik1tv0oe3K5P+tNEkEypQ+VvNdnWn7QuwuOBjQ4bvfooCOMA/ZiNr23SibSJcVI9VlNUUl9d0VVDEpo+wGBHx6zxBYCy/SxyYvaXOLqex2ruED5l7Rh/xkFrcY+QKGBaiY7KAw== 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)(376002)(136003)(346002)(396003)(451199015)(36840700001)(40470700004)(46966006)(316002)(36860700001)(2616005)(4326008)(8676002)(5660300002)(16526019)(1076003)(6286002)(26005)(40460700003)(86362001)(6666004)(107886003)(70206006)(70586007)(478600001)(186003)(8936002)(7696005)(83380400001)(36756003)(82740400003)(47076005)(356005)(41300700001)(426003)(2906002)(54906003)(55016003)(110136005)(336012)(82310400005)(40480700001)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2022 07:39:48.4486 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6e61183a-3a40-4b71-c598-08dae32689c5 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: DM6NAM11FT018.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5325 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 flex item modify field cmdline support. Now user can use testpmd cli to specify which flex item to be modified, either source or destination. Syntax is as below: modify_field op set dst_type flex_item dst_level 0 dst_offset 16 src_type value src_value 0x123456781020 width 8 Signed-off-by: Rongwei Liu --- app/test-pmd/cmdline_flow.c | 88 ++++++++++++++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 7 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 426585387f..d25bd2f348 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -651,10 +651,12 @@ enum index { ACTION_MODIFY_FIELD_DST_TYPE, ACTION_MODIFY_FIELD_DST_TYPE_VALUE, ACTION_MODIFY_FIELD_DST_LEVEL, + ACTION_MODIFY_FIELD_DST_LEVEL_VALUE, ACTION_MODIFY_FIELD_DST_OFFSET, ACTION_MODIFY_FIELD_SRC_TYPE, ACTION_MODIFY_FIELD_SRC_TYPE_VALUE, ACTION_MODIFY_FIELD_SRC_LEVEL, + ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE, ACTION_MODIFY_FIELD_SRC_OFFSET, ACTION_MODIFY_FIELD_SRC_VALUE, ACTION_MODIFY_FIELD_SRC_POINTER, @@ -881,7 +883,7 @@ static const char *const modify_field_ids[] = { "vxlan_vni", "geneve_vni", "gtp_teid", "tag", "mark", "meta", "pointer", "value", "ipv4_ecn", "ipv6_ecn", "gtp_psc_qfi", "meter_color", - "hash_result", + "hash_result", "flex_item", NULL }; @@ -2557,6 +2559,10 @@ parse_vc_modify_field_id(struct context *ctx, const struct token *token, const char *str, unsigned int len, void *buf, unsigned int size); static int +parse_vc_modify_field_level(struct context *ctx, const struct token *token, + const char *str, unsigned int len, void *buf, + unsigned int size); +static int parse_vc_action_conntrack_update(struct context *ctx, const struct token *token, const char *str, unsigned int len, void *buf, unsigned int size); @@ -6461,11 +6467,15 @@ static const struct token token_list[] = { .name = "dst_level", .help = "destination field level", .next = NEXT(action_modify_field_dst, - NEXT_ENTRY(COMMON_UNSIGNED)), - .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field, - dst.level)), + NEXT_ENTRY(ACTION_MODIFY_FIELD_DST_LEVEL_VALUE)), .call = parse_vc_conf, }, + [ACTION_MODIFY_FIELD_DST_LEVEL_VALUE] = { + .name = "{dst_level}", + .help = "destination field level value", + .call = parse_vc_modify_field_level, + .comp = comp_none, + }, [ACTION_MODIFY_FIELD_DST_OFFSET] = { .name = "dst_offset", .help = "destination field bit offset", @@ -6492,11 +6502,15 @@ static const struct token token_list[] = { .name = "src_level", .help = "source field level", .next = NEXT(action_modify_field_src, - NEXT_ENTRY(COMMON_UNSIGNED)), - .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field, - src.level)), + NEXT_ENTRY(ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE)), .call = parse_vc_conf, }, + [ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE] = { + .name = "{src_level}", + .help = "source field level value", + .call = parse_vc_modify_field_level, + .comp = comp_none, + }, [ACTION_MODIFY_FIELD_SRC_OFFSET] = { .name = "src_offset", .help = "source field bit offset", @@ -9542,6 +9556,66 @@ parse_vc_modify_field_id(struct context *ctx, const struct token *token, return len; } +/** Parse level for modify_field command. */ +static int +parse_vc_modify_field_level(struct context *ctx, const struct token *token, + const char *str, unsigned int len, void *buf, + unsigned int size) +{ + struct rte_flow_action_modify_field *action; + struct flex_item *fp; + uint32_t val; + struct buffer *out = buf; + char *end; + + (void)token; + (void)size; + if (ctx->curr != ACTION_MODIFY_FIELD_DST_LEVEL_VALUE && + ctx->curr != ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE) + return -1; + if (!ctx->object) + return len; + action = ctx->object; + errno = 0; + val = strtoumax(str, &end, 0); + if (errno || (size_t)(end - str) != len) + return -1; + /* No need to validate action template mask value */ + if (out->args.vc.masks) { + if (ctx->curr == ACTION_MODIFY_FIELD_DST_LEVEL_VALUE) + action->dst.level = val; + else + action->src.level = val; + return len; + } + if ((ctx->curr == ACTION_MODIFY_FIELD_DST_LEVEL_VALUE && + action->dst.field == RTE_FLOW_FIELD_FLEX_ITEM) || + (ctx->curr == ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE && + action->src.field == RTE_FLOW_FIELD_FLEX_ITEM)) { + if (val >= FLEX_MAX_PARSERS_NUM) { + printf("Bad flex item handle\n"); + return -1; + } + fp = flex_items[ctx->port][val]; + if (!fp) { + printf("Bad flex item handle\n"); + return -1; + } + } + if (ctx->curr == ACTION_MODIFY_FIELD_DST_LEVEL_VALUE) { + if (action->dst.field != RTE_FLOW_FIELD_FLEX_ITEM) + action->dst.level = val; + else + action->dst.flex_handle = fp->flex_handle; + } else if (ctx->curr == ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE) { + if (action->src.field != RTE_FLOW_FIELD_FLEX_ITEM) + action->src.level = val; + else + action->src.flex_handle = fp->flex_handle; + } + return len; +} + /** Parse the conntrack update, not a rte_flow_action. */ static int parse_vc_action_conntrack_update(struct context *ctx, const struct token *token,