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 AF4B5A0C55; Wed, 13 Oct 2021 20:46:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E1A3741215; Wed, 13 Oct 2021 20:45:43 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2074.outbound.protection.outlook.com [40.107.237.74]) by mails.dpdk.org (Postfix) with ESMTP id 208F5411F6 for ; Wed, 13 Oct 2021 20:45:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mey3jYnBUxV0DcjTUobhgwTSlBPWfTj1qMVFFknzCOwA5hCeVZ6lhVxtBQcpe1vYFnxBIxIqDR+D2NKDt6tNU3pQfgoTEGpSSZH4TLCYMFAW+76W9pl3p49eyegWmwhjxrqC6+R0gtmXsXOwyx76zYlLLMe0eYofTzZYj6OHWQtVzEyJpvS1PHJRN0TNniFpD/ve78v2Vv3hHt7AXBjweMcToayX5GLhm1dB2DAM2ph75i0FOvbRA2EsOnxvu2ELHp2m7hl7yHlUOB7MbpBpYaxb81WGmcvCNAWAM19Ju81HqHcjb+MZA4vKB5HhYmPCXuzCWXALM3k+7k2XLdP33g== 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=7dCXAxZpE5+0obHyfmSp680hj9gaTcERFOgjUbNe7MU=; b=h0uKuRypwVYeVW+64QTm0RsK4LCpH3LLDvPnU6rbJ8L8RbYg6F+CIqqshFRJ2kYngCGn1xoxFjLUcOsEpKbdB39ybICcdL6UHeEqMdjCH7/2oe6wh/0szLkNfXDXlZtLdoSslhQPgrd/HmfccjxJy9tiy6DmPVgOO2DV9WOWn/RrX6pefOAUEm1J6upPDR4yfCgiZu5heu+CiVI3x0InrCc1D2yyoAwvjmaCPWxNuqOTmMlZaxRQJNokzqaDv/oHbOUwT/0ujxR0U9THoGnieFldr6/sL0GbtvhpHZL4i6FSeNen1KOFNgDpl0SMt2q8fUkfXgkyhR4ZSUyLdsMWTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=7dCXAxZpE5+0obHyfmSp680hj9gaTcERFOgjUbNe7MU=; b=tlPJJQypjaklqE2S8je+CJgqYrdDSgrwY9lISL6F2peZ68oncbSpRk8ZBwQRrlTdMAK9KdJtSr0Z5cq/7fsxMq+VvpqDFNqVLecFUpz6LVrtVHwJJMJe+2/QQecqRtqd1UpVRIvuHoze2GRvE9H0G40tlZmqG3Qy7hsCvMhwziDulIPgClEoxR9z0+/C/FBd5blUZwCSgAXjOPpOmfUpmvkNyhQQoWuCpo8Hj62qFDbVtnX0pvVr5TZry/ZsnKJ5GTbDF1PzDRvETnDoHyQWP4r25cbjBDHsbhho/LOTssa+EFvE+1mqepRCvaAwc/77G7ZrOpI1ewpwiQ6FReykyQ== Received: from MWHPR14CA0057.namprd14.prod.outlook.com (2603:10b6:300:81::19) by MWHPR12MB1167.namprd12.prod.outlook.com (2603:10b6:300:8::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Wed, 13 Oct 2021 18:45:40 +0000 Received: from CO1NAM11FT016.eop-nam11.prod.protection.outlook.com (2603:10b6:300:81:cafe::f2) by MWHPR14CA0057.outlook.office365.com (2603:10b6:300:81::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Wed, 13 Oct 2021 18:45:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT016.mail.protection.outlook.com (10.13.175.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Wed, 13 Oct 2021 18:45:40 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 13 Oct 2021 18:45:38 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , Date: Wed, 13 Oct 2021 21:45:14 +0300 Message-ID: <20211013184516.25338-4-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211013184516.25338-1-viacheslavo@nvidia.com> References: <20210910141609.8410-1-viacheslavo@nvidia.com> <20211013184516.25338-1-viacheslavo@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cffabcb9-7720-4b9c-b268-08d98e79a777 X-MS-TrafficTypeDiagnostic: MWHPR12MB1167: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X9jLCLzRDMro3Ovfd0CHObmLUad4fei6OHDkrZi1vTFKVTPurHIBP5SI9uowO2NtF7PqGDPFOwJgJa4ZawLU3K0Hr1Lkx2zQmwfQev7PRleidLgAl/1iyefSwin5MCKYV5AXbXMP96kaa4VYOU/8tvohjKA86cQs9ljyEj5+flsfULUIx0TFRJdvp7qXhP1+X3fz4HVKVGX1Z1HXzVIV7Srm5GxFB4oAW1fu9S2FWc9kY+G59089kU1YePoQiRYd5OJHGi/2UXEPXo70eUE5aLUkufJ3YyRFzuNvtLbkwcTqxfuupJ+JtIxZPUoJvINguyncgJVJnB07FkWHneGL+vlgtEAEhmo8xAytPrTMjiUt4AExzQrEZisK8JeVvtkdnrRNOfnBhwxOyPm9FoHXKKchYclbyeuSXB7dASR9iRc0do1BcOrWLQRb1r4TNA078cHuKXRh/91LdYj+UaSHiAo30BCqL6I4QmF+Mk8OwSK0V9xwT3DbHt7wm8IE/gvB80hqNDtsvyMIRMzOwZorZqIG6c4F9rm1hDnthaGGTZsMoko+GoF0Md6/Sohmr8jq9uU44fNEeIoLLJukNkwp9A9pQyPPnNzYXaHrio0UNr90QKxxuDBYrfqC+syMgQvsqtcNbDEzu4UV5UmYwvLp2u1cxyFjLxW/ofS/95t2qKCKRrMVvDJGWLR2zrZfJsh6rIAcKvUD0oNoecMPhHROcg== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(6916009)(55016002)(2616005)(1076003)(4326008)(82310400003)(83380400001)(508600001)(8676002)(426003)(356005)(36756003)(36906005)(7636003)(186003)(36860700001)(6286002)(26005)(16526019)(316002)(336012)(2906002)(6666004)(47076005)(70586007)(70206006)(7696005)(15650500001)(8936002)(54906003)(5660300002)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2021 18:45:40.0434 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cffabcb9-7720-4b9c-b268-08d98e79a777 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT016.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1167 Subject: [dpdk-dev] [PATCH v6 3/5] app/testpmd: update modify field flow action support 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 Sender: "dev" The testpmd flow create command updates provided: - modify field action supports the updated actions - pointer type added for action source field - pointer and value source field takes hex string instead of unsigned int in host endianness There are some examples of flow with update modified field action: 1. IPv6 destination address bytes 4-7 assignment: 0000::1111 - > 0000:xxxx:4455:6677::1111 flow create 0 egress group 1 pattern eth / ipv6 dst is 0000::1111 / udp / end actions modify_field op set dst_type ipv6_dst dst_offset 32 src_type value src_value 0011223344556677 width 32 / end 2. Copy second byte of IPv4 destination address to the third byte of source address: 10.0.118.4 -> 192.168.100.1 10.0.168.4 -> 192.168.100.1 flow create 0 egress group 1 pattern eth / ipv4 / udp / end actions modify_field op set dst_type ipv4_src dst_offset 16 src_type ipv4_dst src_offset 8 width 8 / end 3. Assign METADATA value with 11223344 value from the hex string in the linear buffer. Please note, the value definition should follow host-endian, example is given for x86 (little-endian): flow create 0 egress group 1 pattern eth / ipv4 / end actions modify_field op set dst_type meta src_type pointer src_ptr 44332211 width 32 / end 4. Assign destination MAC with EA:11:0B:AD:0B:ED value: flow create 0 egress group 1 pattern eth / end actions modify_field op set dst_type mac_dst src_type value src_value EA110BAD0BED width 48 / end Signed-off-by: Viacheslav Ovsiienko Acked-by: Ori Kam --- app/test-pmd/cmdline_flow.c | 55 +++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index bb22294dd3..736029c4fd 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -448,6 +448,7 @@ enum index { ACTION_MODIFY_FIELD_SRC_LEVEL, ACTION_MODIFY_FIELD_SRC_OFFSET, ACTION_MODIFY_FIELD_SRC_VALUE, + ACTION_MODIFY_FIELD_SRC_POINTER, ACTION_MODIFY_FIELD_WIDTH, ACTION_CONNTRACK, ACTION_CONNTRACK_UPDATE, @@ -468,6 +469,14 @@ enum index { #define ITEM_RAW_SIZE \ (sizeof(struct rte_flow_item_raw) + ITEM_RAW_PATTERN_SIZE) +/** Maximum size for external pattern in struct rte_flow_action_modify_data. */ +#define ACTION_MODIFY_PATTERN_SIZE 32 + +/** Storage size for struct rte_flow_action_modify_field including pattern. */ +#define ACTION_MODIFY_SIZE \ + (sizeof(struct rte_flow_action_modify_field) + \ + ACTION_MODIFY_PATTERN_SIZE) + /** Maximum number of queue indices in struct rte_flow_action_rss. */ #define ACTION_RSS_QUEUE_NUM 128 @@ -1704,6 +1713,7 @@ static const enum index action_modify_field_src[] = { ACTION_MODIFY_FIELD_SRC_LEVEL, ACTION_MODIFY_FIELD_SRC_OFFSET, ACTION_MODIFY_FIELD_SRC_VALUE, + ACTION_MODIFY_FIELD_SRC_POINTER, ACTION_MODIFY_FIELD_WIDTH, ZERO, }; @@ -4455,8 +4465,7 @@ static const struct token token_list[] = { [ACTION_MODIFY_FIELD] = { .name = "modify_field", .help = "modify destination field with data from source field", - .priv = PRIV_ACTION(MODIFY_FIELD, - sizeof(struct rte_flow_action_modify_field)), + .priv = PRIV_ACTION(MODIFY_FIELD, ACTION_MODIFY_SIZE), .next = NEXT(NEXT_ENTRY(ACTION_MODIFY_FIELD_OP)), .call = parse_vc, }, @@ -4539,11 +4548,26 @@ static const struct token token_list[] = { .name = "src_value", .help = "source immediate value", .next = NEXT(NEXT_ENTRY(ACTION_MODIFY_FIELD_WIDTH), - NEXT_ENTRY(COMMON_UNSIGNED)), - .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field, + NEXT_ENTRY(COMMON_HEX)), + .args = ARGS(ARGS_ENTRY_ARB(0, 0), + ARGS_ENTRY_ARB(0, 0), + ARGS_ENTRY(struct rte_flow_action_modify_field, src.value)), .call = parse_vc_conf, }, + [ACTION_MODIFY_FIELD_SRC_POINTER] = { + .name = "src_ptr", + .help = "pointer to source immediate value", + .next = NEXT(NEXT_ENTRY(ACTION_MODIFY_FIELD_WIDTH), + NEXT_ENTRY(COMMON_HEX)), + .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field, + src.pvalue), + ARGS_ENTRY_ARB(0, 0), + ARGS_ENTRY_ARB + (sizeof(struct rte_flow_action_modify_field), + ACTION_MODIFY_PATTERN_SIZE)), + .call = parse_vc_conf, + }, [ACTION_MODIFY_FIELD_WIDTH] = { .name = "width", .help = "number of bits to copy", @@ -7830,15 +7854,11 @@ static int comp_set_modify_field_op(struct context *ctx, const struct token *token, unsigned int ent, char *buf, unsigned int size) { - uint16_t idx = 0; - RTE_SET_USED(ctx); RTE_SET_USED(token); - for (idx = 0; modify_field_ops[idx]; ++idx) - ; if (!buf) - return idx + 1; - if (ent < idx) + return RTE_DIM(modify_field_ops); + if (ent < RTE_DIM(modify_field_ops) - 1) return strlcpy(buf, modify_field_ops[ent], size); return -1; } @@ -7848,16 +7868,17 @@ static int comp_set_modify_field_id(struct context *ctx, const struct token *token, unsigned int ent, char *buf, unsigned int size) { - uint16_t idx = 0; + const char *name; - RTE_SET_USED(ctx); RTE_SET_USED(token); - for (idx = 0; modify_field_ids[idx]; ++idx) - ; if (!buf) - return idx + 1; - if (ent < idx) - return strlcpy(buf, modify_field_ids[ent], size); + return RTE_DIM(modify_field_ids); + if (ent >= RTE_DIM(modify_field_ids) - 1) + return -1; + name = modify_field_ids[ent]; + if (ctx->curr == ACTION_MODIFY_FIELD_SRC_TYPE || + (strcmp(name, "pointer") && strcmp(name, "value"))) + return strlcpy(buf, name, size); return -1; } -- 2.18.1