From patchwork Tue Oct 12 10:49:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 101196 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 C80E2A0C47; Tue, 12 Oct 2021 12:49:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3759F4115C; Tue, 12 Oct 2021 12:49:45 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2058.outbound.protection.outlook.com [40.107.244.58]) by mails.dpdk.org (Postfix) with ESMTP id 04A864115B for ; Tue, 12 Oct 2021 12:49:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gQ4fKO4a7U/YapnD3CCvtgdcEVObonUx7ScFsE955qmomOse4kpG+J7obkvMueYJ9NrzpdoQLmLkfM/aeEYg1PnlJ8v+UmuvT+f0y6V6Y3qPudaIpefQDr1/3Fp5gLHoxevI3mdHNS24wAlMEouOqsoafVGd7K1YyJ9nlaf+5BoNIoVYTRuSLUUAjFXsUFXzKg4/6MTPb79KK67/3pKsZshU6A/KMR/LOC/6XBAx2n/UKUiD32TY1WaTQ4ox5CAdUe7wIIahUSTSNFfDe+a8ToQ/DHI9O3JIWGiYf7+GaxBqTdmf1sAYyFpNtniOitGSFQqMN+otfnj70sDRCyyRuA== 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=fJQlXd4sWlmMAshUvDkUS8JWKCbLuTdzFTgDzj7TR6s=; b=muCbE1D0ol8VZSSS1Y6sGsNBH+5iU9YuuPgWXJoyISiytkmTjdblXDXDli2qZ0hbQqHisjUx0rPI7hpfqdl7iP+ShxVu9Kbx/5gG70itmclLFhA7muM5CNxCftuWXm4HNacyIbX5h7fLRPx71qpzaoBsJ3j+WUVVj8brJPCAygurWYu7uD6RvjdpVQCcV5Po8oCc7cWifwcZvCqLwO86Uvr28PXIrk7C7TLw67j3rXmp2lxdTbZk1XuKO87Zea5uLIoSmBa1XPs7+ReNuMn3ENfm59sTjJphV2FEUkPV5ULkhU5AOrgBlcvSJPGV3hO9IiQn+ws4UwyPUanriPR76w== 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=fJQlXd4sWlmMAshUvDkUS8JWKCbLuTdzFTgDzj7TR6s=; b=c3lL7gUu2TL+czI1y7mIE6C1FplvJh9nSQQ0kM6eJBOtHdU0KhYmr04KUodgV0dQCxg3EHiZTFHT3vAxXXzmUlj8UXl/EiOy3SihpF4fzsv2vWI4cxtVq/71X2YwvLEAj7uHiQmvJWgw80DbkNJWhH08T0+J0OMmWo62kuFT7edpIy8o8YDdknG/UQZcgq3bC23BiFmDvenIVl3xmjkJzEN2zopx/tEtfQ5r+ZCaHGIIAOUM5ran4lmlpYEyiOYzEclYvatq9h/IDmAQnYtn9iCFNohmLVMPAigPZvafhrS5hoEUbbHyYiet44i5Dj5vfBufA4jEO/jxOin4gLr0tQ== Received: from BN0PR07CA0012.namprd07.prod.outlook.com (2603:10b6:408:141::34) by BN9PR12MB5212.namprd12.prod.outlook.com (2603:10b6:408:11d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.20; Tue, 12 Oct 2021 10:49:42 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:408:141:cafe::75) by BN0PR07CA0012.outlook.office365.com (2603:10b6:408:141::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.19 via Frontend Transport; Tue, 12 Oct 2021 10:49:42 +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 BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Tue, 12 Oct 2021 10:49:41 +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; Tue, 12 Oct 2021 10:49:38 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , Date: Tue, 12 Oct 2021 13:49:15 +0300 Message-ID: <20211012104919.13145-2-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211012104919.13145-1-viacheslavo@nvidia.com> References: <20210922180418.20663-1-viacheslavo@nvidia.com> <20211012104919.13145-1-viacheslavo@nvidia.com> MIME-Version: 1.0 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: af4bc75d-8af6-4967-3383-08d98d6dfecf X-MS-TrafficTypeDiagnostic: BN9PR12MB5212: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l8oS9UrO+O369DHSsF3RMy036Strcw1tFBkTwQAIJs6YLVLhez5Z2hhPukZlOfBqf63SpXo0y4u9szLg/gh/B9WJRDvfWL4tVg6PKn2sXQLTctGXnbY4XhITMxGWbknVALcbAFqcdPP6YQjmXbr/UQ5gQCCVG92HqqV7nYexplT9H+u/VUkzg09OuZV7nI6/soSPgN/fz3ISImKCmqW8KQXDdXjY+ZBZ0Wj1GzZN3odU26EFxb8Ps9TPFPf16AuTOiezW6jMhtmZmlzGhfe594KV0hMByxK7fAP0b8k2fJszUPJjro/i7CO+aj8vkyG9CuE70EX+R33bRIk7teMa80tChbmYcnJoqQ96YTZU9Dwc3Lkk79QL1Vps7JMY3/Ty2WquAnJ5C5zbpHJ/3K9SXqcJ4CZBmncnmXqGsQiKUBqLuue6jvdfzf5K2BhgyOftftUWbzF3OQBUH2QIqn4T1/pql9U0w905EmCRdFo7aGqYF/f9Hgl8Hb3eCt+0ZKQ1U8UOf4VelOkScswXbxphd6Y+xjQ10gU2zaxxP1PCxaUFzG4ziBacRwiz5LZERLQdfzIoruoI5fAw7PG1JBhSuIWUkOgwAPgUu3n1cmT2+EAt+0kGytMUowmRepBKTLCJ/klSJbQxNj/+mBjjGc+Sn6tqmMCn/hQD3NrN3qcIvrGYR9Ebvd1Yd/LnIC6Zr1JYZW/zT3YjrbOT6x4nfYW2sy8Ri0MGcJ0TRgVlPg98bF8= 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)(15650500001)(356005)(2906002)(70586007)(26005)(55016002)(7696005)(2616005)(36756003)(70206006)(54906003)(8936002)(47076005)(1076003)(6916009)(4326008)(36860700001)(316002)(16526019)(6666004)(7636003)(6286002)(186003)(83380400001)(82310400003)(86362001)(508600001)(336012)(426003)(5660300002)(8676002)(21314003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 10:49:41.3900 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: af4bc75d-8af6-4967-3383-08d98d6dfecf 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: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5212 Subject: [dpdk-dev] [PATCH v4 1/5] ethdev: update modify field flow action 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 generic modify field flow action introduced in [1] has some issues related to the immediate source operand: - immediate source can be presented either as an unsigned 64-bit integer or pointer to data pattern in memory. There was no explicit pointer field defined in the union. - the byte ordering for 64-bit integer was not specified. Many fields have shorter lengths and byte ordering is crucial. - how the bit offset is applied to the immediate source field was not defined and documented. - 64-bit integer size is not enough to provide IPv6 addresses. In order to cover the issues and exclude any ambiguities the following is done: - introduce the explicit pointer field in rte_flow_action_modify_data structure - replace the 64-bit unsigned integer with 16-byte array - update the modify field flow action documentation Appropriate deprecation notice has been removed. [1] commit 73b68f4c54a0 ("ethdev: introduce generic modify flow action") Fixes: 2ba49b5f3721 ("doc: announce change to ethdev modify action data") Signed-off-by: Viacheslav Ovsiienko Acked-by: Ori Kam Acked-by: Andrew Rybchenko --- doc/guides/prog_guide/rte_flow.rst | 24 +++++++++++++++++++++++- doc/guides/rel_notes/deprecation.rst | 4 ---- doc/guides/rel_notes/release_21_11.rst | 7 +++++++ lib/ethdev/rte_flow.h | 16 ++++++++++++---- 4 files changed, 42 insertions(+), 9 deletions(-) diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 2b42d5ec8c..b08087511f 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -2835,6 +2835,22 @@ a packet to any other part of it. ``value`` sets an immediate value to be used as a source or points to a location of the value in memory. It is used instead of ``level`` and ``offset`` for ``RTE_FLOW_FIELD_VALUE`` and ``RTE_FLOW_FIELD_POINTER`` respectively. +The data in memory should be presented exactly in the same byte order and +length as in the relevant flow item, i.e. data for field with type +``RTE_FLOW_FIELD_MAC_DST`` should follow the conventions of ``dst`` field +in ``rte_flow_item_eth`` structure, with type ``RTE_FLOW_FIELD_IPV6_SRC`` - +``rte_flow_item_ipv6`` conventions, and so on. If the field size is larger than +16 bytes the pattern can be provided as pointer only. + +The bitfield extracted from the memory being applied as second operation +parameter is defined by action width and by the destination field offset. +Application should provide the data in immediate value memory (either as +buffer or by pointer) exactly as item field without any applied explicit offset, +and destination packet field (with specified width and bit offset) will be +replaced by immediate source bits from the same bit offset. For example, +to replace the third byte of MAC address with value 0x85, application should +specify destination width as 8, destination offset as 16, and provide immediate +value as sequence of bytes {xxx, xxx, 0x85, xxx, xxx, xxx}. .. _table_rte_flow_action_modify_field: @@ -2865,7 +2881,13 @@ for ``RTE_FLOW_FIELD_VALUE`` and ``RTE_FLOW_FIELD_POINTER`` respectively. +---------------+----------------------------------------------------------+ | ``offset`` | number of bits to skip at the beginning | +---------------+----------------------------------------------------------+ - | ``value`` | immediate value or a pointer to this value | + | ``value`` | immediate value buffer (source field only, not | + | | applicable to destination) for RTE_FLOW_FIELD_VALUE | + | | field type | + +---------------+----------------------------------------------------------+ + | ``pvalue`` | pointer to immediate value data (source field only, not | + | | applicable to destination) for RTE_FLOW_FIELD_POINTER | + | | field type | +---------------+----------------------------------------------------------+ Action: ``CONNTRACK`` diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index a2fe766d4b..dee14077a5 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -120,10 +120,6 @@ Deprecation Notices * ethdev: Announce moving from dedicated modify function for each field, to using the general ``rte_flow_modify_field`` action. -* ethdev: The struct ``rte_flow_action_modify_data`` will be modified - to support modifying fields larger than 64 bits. - In addition, documentation will be updated to clarify byte order. - * ethdev: Attribute ``shared`` of the ``struct rte_flow_action_count`` is deprecated and will be removed in DPDK 21.11. Shared counters should be managed using shared actions API (``rte_flow_shared_action_create`` etc). diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst index dfc2cbdeed..578c1206e7 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -187,6 +187,13 @@ API Changes the crypto/security operation. This field will be used to communicate events such as soft expiry with IPsec in lookaside mode. +* ethdev: ``rte_flow_action_modify_data`` structure updated, immediate data + array is extended, data pointer field is explicitly added to union, the + action behavior is defined in more strict fashion and documentation updated. + The immediate value behavior has been changed, the entire immediate field + should be provided, and offset for immediate source bitfield is assigned + from destination one. + ABI Changes ----------- diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index 7b1ed7f110..f14f77772b 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -3217,10 +3217,18 @@ struct rte_flow_action_modify_data { uint32_t offset; }; /** - * Immediate value for RTE_FLOW_FIELD_VALUE or - * memory address for RTE_FLOW_FIELD_POINTER. + * Immediate value for RTE_FLOW_FIELD_VALUE, presented in the + * same byte order and length as in relevant rte_flow_item_xxx. + * The immediate source bitfield offset is inherited from + * the destination's one. */ - uint64_t value; + uint8_t value[16]; + /** + * Memory address for RTE_FLOW_FIELD_POINTER, memory layout + * should be the same as for relevant field in the + * rte_flow_item_xxx structure. + */ + void *pvalue; }; }; @@ -3240,7 +3248,7 @@ enum rte_flow_modify_op { * RTE_FLOW_ACTION_TYPE_MODIFY_FIELD * * Modify a destination header field according to the specified - * operation. Another packet field can be used as a source as well + * operation. Another field of the packet can be used as a source as well * as tag, mark, metadata, immediate value or a pointer to it. */ struct rte_flow_action_modify_field { From patchwork Tue Oct 12 10:49:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 101197 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 3183AA0C47; Tue, 12 Oct 2021 12:49:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BCF9541163; Tue, 12 Oct 2021 12:49:48 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2076.outbound.protection.outlook.com [40.107.212.76]) by mails.dpdk.org (Postfix) with ESMTP id EA46041143; Tue, 12 Oct 2021 12:49:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EZsIJHIhAymIi06D2EBe+7bNJWdf4k+OWNjJjKdN/blpkQfW/3n0ztJTWA4lFL4wqhCFIodvNZq6el5rF8vmhM12HiWG3IJumTPwt818L0s/Dl29VPnlAhFSXDruL8qesoQDZKpDI1R1jHUH/F5gVwriJp25DJE13pSRCi3QBNydISMJ5n7RVz00r0RgBEmZ2d7KlpKdfNPcRrpLqcdVbjv0LsorH6zKZDTdeyElw7lUbfJ9uUQ/rhFk8tKmyLQm5j5ibWYpS/qJSPDAFM88zxEtZj/9pY8CthRvTVM8keC33mVfWUh7uonc+y3M3OL1cWaoTsv3koXsMCeLfqT1Bg== 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=yGIXHE/BwsULhYMEb0LRwQJ+Pvb7WhfDtERcWiJQ/Dw=; b=fQC0kIdRNiukB5hnM8mXeHrp/VLwY13T0BFNRy1sdxJ8JKtFCVB0d78N3AW2Bkt5ulKrd8i1Cg6Z2X7xmyMrbYMWqLQPXxYIs4PTHT/1evgobDfZ93KVnYMftI0POjAzcR+chgDTqBy6BH849bB/0FMPU9hT8okV5j02G+x2OnxMGsMl1k2kPks8S7U59NQok6oXvAFg6H51SXpMMor4ZlouFw37oyV51oNZ4MMJP6BgXAfH28+AwI4Si6Vx2Xl1HgF+MapY9WA0JKgjd2pjj/aioq381i7e3U3MPOE3wafIsv/irNtmFzxGqddoa2ul/lt4duWZhYX95LdiDEKVXg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org 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=yGIXHE/BwsULhYMEb0LRwQJ+Pvb7WhfDtERcWiJQ/Dw=; b=MAw2kP4ZNlbeiFw+fuJwHxlq7TgyK5P9MD6Lwei68Olm5WaDvt9aTeNJkTVoAeoCYdTDdU6c+0qHMnug5xTRGWqRdOj1gbxdxvLAi3xVk1TQ/BlMCsjHYmJVlgh7aKzJyADtF/+uO/9MPgwBuhcI1kC1N2TFrOMyZTYWNcaJiwnIpX+h1MHiXWIWHiH9C6GzBRYJ2p15C93hjx4CSt/7LjRlHZYkbJiYzy0/pwne5vZ2RT5gNLbAy2Ig6H/Y0Jc06QTI6acS352XrsrC4a5Ch3Q2g9/GB2JXb+Y94oe/2LoPwd3vyf0TWEj2s8HdxkSNSBlut/BvQj5zKVzufsO77g== Received: from BN0PR07CA0017.namprd07.prod.outlook.com (2603:10b6:408:141::31) by SN6PR12MB4703.namprd12.prod.outlook.com (2603:10b6:805:ee::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25; Tue, 12 Oct 2021 10:49:43 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:408:141:cafe::17) by BN0PR07CA0017.outlook.office365.com (2603:10b6:408:141::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.19 via Frontend Transport; Tue, 12 Oct 2021 10:49:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; 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 BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Tue, 12 Oct 2021 10:49:43 +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; Tue, 12 Oct 2021 10:49:40 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , , Date: Tue, 12 Oct 2021 13:49:16 +0300 Message-ID: <20211012104919.13145-3-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211012104919.13145-1-viacheslavo@nvidia.com> References: <20210922180418.20663-1-viacheslavo@nvidia.com> <20211012104919.13145-1-viacheslavo@nvidia.com> MIME-Version: 1.0 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: fa90bf60-0e10-484b-2e4a-08d98d6dffce X-MS-TrafficTypeDiagnostic: SN6PR12MB4703: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1443; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q4DGAWMqvu9Cs6cclpVuQn4jx199RhCnEecmLQg9TNDnjVa3n5w2eXcBzzpOTWi1wQ/AfkUz6PJF3j4RmqDr7ImIBPOuhc0/e3cXm4/OOm2+aSw1KG+smivjV9TlB3d9eF6ZLunONIZ1eKiv+Nr5hWp5SOR3WJyCiPkmJ+3XxtTgkD24v4nvOISRvprmLf+oTRg2aOkmGbt17EedahQxDiChM3SWtNIkwc5wIBxzWNQhXeUJbBLzLEWXprAKeCzy/+5GM+07wm2BtpqYmbuG68I1lD0fSVzQwHvWgSoIoEdTpPWfGZVJLcI7P90P60NpMI8B3wWThTal43QJCehiz8+9OE10mbYi2D80XKyUVrOctwvONwuxL6v/by6TfUCSTqQOO3wuMQOdgLJOR/Oug5AWCmm5AyKjlJFOMPxl9y82DPAtgMRagWB/Ouwg/z3hEbu63wGlt0AatpEl1ux/+4vqmJD1xGSRcaT17KiOs+UoA4RPfqGDELkuqBt8iin0DGkmyO+nHK3WXA2nlhqjWW8fWKZSAx1pMg/RPAyElxyKxu94UFTIhppx+gV8XngnFqO3cYYofuvjMdOY6CU3LDVdmmWH9LuNnDYa6LSJvxf3Rm78KbEgkjWuesyQ8mJdK6eI6vV/VZtcVcqXZ9B8MocC76qIpkiHDPCqeOU5BH2QJk9pW4SO4bgCIjwUT6PfbvjjiVjJiZbPwRpfGFUqbA== 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)(426003)(7696005)(36860700001)(26005)(186003)(16526019)(8676002)(7636003)(4744005)(1076003)(70586007)(8936002)(6286002)(508600001)(356005)(83380400001)(82310400003)(70206006)(2616005)(4326008)(6916009)(55016002)(336012)(2906002)(54906003)(47076005)(6666004)(86362001)(316002)(5660300002)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 10:49:43.0590 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fa90bf60-0e10-484b-2e4a-08d98d6dffce 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: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB4703 Subject: [dpdk-dev] [PATCH v4 2/5] ethdev: fix missed experimental tag for modify field action 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" EXPERIMENTAL tag was missed in rte_flow_action_modify_data structure description. Fixes: 73b68f4c54a0 ("ethdev: introduce generic modify flow action") Cc: stable@dpdk.org Signed-off-by: Viacheslav Ovsiienko Acked-by: Ori Kam Acked-by: Andrew Rybchenko --- lib/ethdev/rte_flow.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index f14f77772b..8a1eddd0b7 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -3204,6 +3204,9 @@ enum rte_flow_field_id { }; /** + * @warning + * @b EXPERIMENTAL: this structure may change without prior notice + * * Field description for MODIFY_FIELD action. */ struct rte_flow_action_modify_data { From patchwork Tue Oct 12 10:49:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 101198 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 33B9AA0C4C; Tue, 12 Oct 2021 12:50:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E6EF141171; Tue, 12 Oct 2021 12:49:49 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2048.outbound.protection.outlook.com [40.107.92.48]) by mails.dpdk.org (Postfix) with ESMTP id 489FA41161 for ; Tue, 12 Oct 2021 12:49:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ak4fe4H/1lyCxWwRCRlG3duH9gzvaUKXV2TcNwWisuR3w2A4ICocX3Hsnm3Ajf/mDTYpKzVCGAwc33I1IO8xg6yoWwkJoMxnTV0tqTWCUz3H06tSCYEQKSsrA2TKyaZr6fYip2luvqNC+zzmd66b9kPEwSN8Okpp/FQL9RJ+rKD6H9KCKrr+85LM2LI9oSzVtINseiQRmbio1JlGhTwMX3vBQ75VoJ9LothOev546Iqaisf/fn4co08mmOXawH6n55YpRuyf4qQ0CXKkWxNVBAioW7C2VOvt4KA15Q/7GpUKZcwlw287nwOYaD9mq1SNNMmE/7+kSMlAy7N2KQXA5Q== 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=SkJ1Pbx808k2d3/i+bfPsDy30p72C9yYZBItVN3Wh/Liw+rXtKHzkGy/in44rG685kogVwayIm8sFTrKN33IS35Nx71qBeusNXb0TlZyjdskY4LQKPK/xfxH5Cg5jBS4IXYWlSgdJIr3Ue0AWhQwQEEK6ShVvdMlceVlC6MOs2QDAFBPvNX/SlTWPXb/W5V4LVg1zCJLVLnO5GNtVlwXYmEWFV3H5YVFqedSOKOjKfF11vs4Dz0G6iCaFqsamnDjhXJtnP+/WzQ8xN9OFFRTmrA3ckjGemjRz5VzGkc1wurbe1XZY/Io6uhaYhhLGZDuAtufuJh2WRiEsqNn1zXCEg== 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=nMnWJvDHSJWoB2XFrmDQPDbjBdfXSQOJYirNTyF8MWaG19zvPH+e25Qj+J5auKA5TLPVdZMcaQu5evWzOniq/7fclWBNT3YWKUqywPCoIKDZivQR3OCFhn/sJPSKVnqYCw9WfKfDldcttaJr8ySyG5SY9SlbidZW612WnJzHfXIa5vFOTu4HcZ2jcSHVq8UU+tE5SSQN0xry3EglVFyLjtgurByDK8vt8E8d2oWFMTkEljPjAnpbq7CuglEOzF3NE8G0uu4uF3UuzKUknwJkRbctJ4umvpS6z2DRI64dCosXjv5OGT5C30ErOjnbNqzGKoxtAT1My7EAxPW9JYJMSQ== Received: from BN0PR07CA0024.namprd07.prod.outlook.com (2603:10b6:408:141::33) by BY5PR12MB4950.namprd12.prod.outlook.com (2603:10b6:a03:1d9::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Tue, 12 Oct 2021 10:49:46 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:408:141:cafe::72) by BN0PR07CA0024.outlook.office365.com (2603:10b6:408:141::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25 via Frontend Transport; Tue, 12 Oct 2021 10:49:45 +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 BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Tue, 12 Oct 2021 10:49:45 +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; Tue, 12 Oct 2021 10:49:42 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , Date: Tue, 12 Oct 2021 13:49:17 +0300 Message-ID: <20211012104919.13145-4-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211012104919.13145-1-viacheslavo@nvidia.com> References: <20210922180418.20663-1-viacheslavo@nvidia.com> <20211012104919.13145-1-viacheslavo@nvidia.com> MIME-Version: 1.0 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: 52fb7a15-29ec-4312-f206-08d98d6e0133 X-MS-TrafficTypeDiagnostic: BY5PR12MB4950: 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: +3tbrM/xkp4661U/fYH7AWUxmlWvskz4Q9tQuSWEcgyP0rj4h6Ha7n+wWUa58V7MpkBzj5/M1l+mATCiIQLhNjskiw95s0V4aCUrDluuy/Wio9qaFgjfmrscjx1qg5UlQUTC7MYbyu4BOVhWkqIF48OfEl+Wu5EoxbrH1YeuhU0XLvbudqKgWN09R+JG2c506QWA5B47tvwJYyzSS0j+kUOgIyY3niq4+s17jjrmYl/gPnbD4lWFzAG9b1S23UFsWrU/TjpISfYD68jfK1/LMO7RmV3j4LTVXX8Wc3gTHFUOUrTF/98thz/zJK3dmygkKBsixnRRGIyL4N1Am0Q+RRTkt8vSHD1Eux93aV5QC3EVncvR/m+IagVz2IpfqyvuZMkpTKtFrI0hiHlCTSTKw4BTdmYtbmya/MsExQhqlV/U+HXI8cRtaoQPkvjYJemihvPlgxKcaGrWY4RtT9PGpcAhrooq7qfYzA7lypk8xxR+8jG7aBJY3Zem1BrxSU4PiP/oZovFPj54TXL1O31yuOyIQVMzj2iU9oNwunhoXqUKKX9VnIp9qKNapKHX35RlBceo8bXSjtaXBijjXy5FJoap7J2nJYrIpbCeiRuRVD13bvCGhhirWsAkBj4D9TRrSyir1WSolQLfuw8tOTypDH0BT6HxxJ6YH1mSSsrHI9KvX0eGiSTMKTLh+NdKYAdsiGAKkx/ImwneiIok/Ppo8g== 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)(46966006)(36840700001)(70586007)(6666004)(83380400001)(7696005)(8936002)(6286002)(186003)(36860700001)(26005)(16526019)(8676002)(86362001)(36756003)(5660300002)(1076003)(70206006)(2906002)(316002)(55016002)(6916009)(7636003)(426003)(356005)(2616005)(508600001)(54906003)(15650500001)(336012)(4326008)(82310400003)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 10:49:45.4037 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 52fb7a15-29ec-4312-f206-08d98d6e0133 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: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4950 Subject: [dpdk-dev] [PATCH v4 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; } From patchwork Tue Oct 12 10:49:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 101199 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 A890DA0C47; Tue, 12 Oct 2021 12:50:09 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE22D4116C; Tue, 12 Oct 2021 12:49:51 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2069.outbound.protection.outlook.com [40.107.243.69]) by mails.dpdk.org (Postfix) with ESMTP id 5C38C4116C; Tue, 12 Oct 2021 12:49:49 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CVX5fT/+Ms97nZqReyLq6x7S60NJQ3fDqF+WvpwWu/6td4OZlhfqzLuXo+uzdUS0v8Zuj1/N2lHFOKzfBxQldRGDSu4GlKLY7rx2MPzF6QkKaoUnOKnVMONQ4moQnYK6B6KYWh/edS1x9vOfwQraEt0Exf03rRYxVOm4xAMW2WxmG60COdDt2pToXqiXcVAc9z8hynyAK9KckyVyh8tCliXLcbtWYszWvtL40PXG8psMifAa591O9/cBgPR2iV89QNoxGfeOjJbr+2XQNVzYk04yChb4w04Akr2cp+ggGKxLg+Fi4CMFn9i77JHkdv4gB5nv4CYQesnATpasK2QcfQ== 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=TJ3ma+w+SZM3lSH36wTvF3MwpDEU6LoJpX8Xc8eQXg8=; b=REgR+ue4VjJeXR2R9cVMAYeNY3Q6ZzjEhFaxH4wzMdBhvOhvj3ucfUSRSYgRtQxGrK4KMreVnbeD6/ayb0RmbQqu6m0TKiRDu/d4DyHEjX4YAUQiO3kiJlGULgKqOChuMGAErxRKetsTZpRBnRWLKSVQlu07VlVDvULl9ko8xosTI3P2jJGZc4A72IG/idSub4wuWa9EC/DMpFtipfsH9JXzYcY3QidVFNfjdGrmAqh06HaTIXdhmneZ2CmcslQ3or5r+1Wawq4+PaXHnA8TuomuDsLCXrh0OjKUt9+kXpFY1eKLsNxfS9VOrKVGxB0O1vMty9k5ZxuA9OtLpGaDmA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org 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=TJ3ma+w+SZM3lSH36wTvF3MwpDEU6LoJpX8Xc8eQXg8=; b=m4oG+LDyucE0Q7um7/HZx/82FAZWreW9vS5SX9vIOOgOVdO88BQSw1QT4+4WdZ0/ZKQqxH+axEXsBjpXiWpQfn+L60e7Pjx0PPuRPwssV21GN1VJ69fUuE9naBjEgwqQhlDnIiWjEsZmVHTtBmXIAJ7LDmyKUWGBxg5lgDsH9YJYRVm+SXQbQmNS0c0TH6+9wxvhSCRZEJx/mdfLxcFkVTvOO+F55H4QBqoStca7igUfFzO0Wej7Yfn/KA/2IEhMyrKMk+x40SMUvAHyERpJf3mK7Fz61zP8BGf/eYx707PyNowbVPfQrCv7CyyLbIX6K0N7rfghXV40i8a9mA9xGQ== Received: from BN0PR07CA0007.namprd07.prod.outlook.com (2603:10b6:408:141::24) by SN1PR12MB2528.namprd12.prod.outlook.com (2603:10b6:802:28::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.26; Tue, 12 Oct 2021 10:49:47 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:408:141:cafe::e5) by BN0PR07CA0007.outlook.office365.com (2603:10b6:408:141::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25 via Frontend Transport; Tue, 12 Oct 2021 10:49:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; 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 BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Tue, 12 Oct 2021 10:49:47 +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; Tue, 12 Oct 2021 10:49:45 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , , Date: Tue, 12 Oct 2021 13:49:18 +0300 Message-ID: <20211012104919.13145-5-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211012104919.13145-1-viacheslavo@nvidia.com> References: <20210922180418.20663-1-viacheslavo@nvidia.com> <20211012104919.13145-1-viacheslavo@nvidia.com> MIME-Version: 1.0 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: da08c311-6b7c-4b1c-ee15-08d98d6e025d X-MS-TrafficTypeDiagnostic: SN1PR12MB2528: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2803; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hNvcnF5fdy9ede1cXU0yoswdqNoZCH+6DFtXDl41j4GWXywgbPdMteFWqOW12G5V3gRFU8LmLwlzBBS2Jk/j8UmH6FKNWNFLLlWgM+1qSRzcO2CTRDWRoiMgmsQxTm8+Wm5ORdSkEO663RlbSeZOZhlrnORpEb9XreHVHGXNmR5ysyKuBQBCaBlQET/yyiwmziGw0tGxhAbDDtdPhlWCkHgjn1vEKcgrp3o0Z+LcM1jnHfsmGU9yCyKeCTu0DAsEs2S5BMB+nfsGxYFUOSFsBpnfJxIsf28Ca0fc2JgCKOPdrVLQfQJidtLK/NxoZICxbBccR+tAJVqOkfk4K1wdAQbkuGPjuwalgelMx4N+hDAYBgvGQfJ3OVLTT+AyFd1K88llFg0OxbwheNzCktSEUBdP3vC5x3v20R9OeyFTgLl9j/7xuTLu/iwoj7DfyCyOu06iH9qCZWLRGIJjpWWsLD4pXvJALewyEHJ/NYEqYb6hMhO9PdD3Hy6rC1Gogr9IZgbv+1H3wT83uajvz2SDqHBjiWVnyI6gEltOni64WLqqsH8kBZ/kKZdy/aRPw/t4NQGPx1eVH2qrEL5l83qEBAmjvWVSRBhFIhyrQWfOfgNk4P+BPBPS1DlgiiOg8RlZXSco/9PmMPrPyZtrBSbevrTLjZXo+vr/mfXJDjjOwT+a9+N6ah9KSo+Jehn+cqoUXHjv+UvoKWEKJj7ihdtu5w== 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)(46966006)(36840700001)(356005)(1076003)(70206006)(36860700001)(86362001)(16526019)(186003)(47076005)(26005)(8936002)(70586007)(2906002)(336012)(8676002)(2616005)(426003)(7636003)(6666004)(5660300002)(83380400001)(6286002)(36756003)(54906003)(316002)(4326008)(55016002)(508600001)(7696005)(6916009)(82310400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 10:49:47.2726 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: da08c311-6b7c-4b1c-ee15-08d98d6e025d 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: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2528 Subject: [dpdk-dev] [PATCH v4 4/5] app/testpmd: fix hex string parser in flow commands 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 hexadecimal string parser does not check the target field buffer size, buffer overflow happens and might cause the application failure (segmentation fault is observed usually). Fixes: 169a9fed1f4c ("app/testpmd: fix hex string parser support for flow API") Cc: stable@dpdk.org Signed-off-by: Viacheslav Ovsiienko Acked-by: Ori Kam --- app/test-pmd/cmdline_flow.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 736029c4fd..6827d9228f 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -7291,10 +7291,13 @@ parse_hex(struct context *ctx, const struct token *token, hexlen -= 2; } if (hexlen > length) - return -1; + goto error; ret = parse_hex_string(str, hex_tmp, &hexlen); if (ret < 0) goto error; + /* Check the converted binary fits into data buffer. */ + if (hexlen > size) + goto error; /* Let parse_int() fill length information first. */ ret = snprintf(tmp, sizeof(tmp), "%u", hexlen); if (ret < 0) From patchwork Tue Oct 12 10:49:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 101200 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 BA82FA0C47; Tue, 12 Oct 2021 12:50:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4572141167; Tue, 12 Oct 2021 12:49:56 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2086.outbound.protection.outlook.com [40.107.244.86]) by mails.dpdk.org (Postfix) with ESMTP id 1C6DA41161 for ; Tue, 12 Oct 2021 12:49:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ckq4+qbNDpDR7v4ktpOF/GAri6F8zrE94hBt7em6r1aQNKPD2kMSSVfQOcsRMa3EoULZUM+NjQq0LKGs48XlxaDilSjKslEDmViG6Pe8Kz1QcDTPU/RG8dtcE6ZZNkb46L+rEYiCHPSGWHFQpHxTBW7B1x5S0tTWXzEhvl2RPiNAeVKgUZffTRINPXqsEnX/WTwgLNDblxeROIUB3jKJglI8sTzqZxbi2gnu/PyueaSDNQv1xxAvl3KnIudqREfb5S63H+HaCMd5HLOHSvdbRZYjjeGyLw5gQUS+JJtXena4ecRO2mLHGldPJCMBvUY5cpRoLY3XVQFbmKUeSnqcWA== 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=mAvdepYTuyOuZhcvu5h+FVd7/VRzpZ3oscpVCUlUSng=; b=ZaZ7C4HHyxP71Kzx7tFZd0SU1PN6sx6p0Ea2dsJq1WXAu9JkHWVpluNF1lK9w9+B+WTRRxplsQtDYGLIUQKZXm6luVg1NP0JGOD8zcMbyEDrFHsSugWsaPEnR7lcG7nX11qrJmUrWEqTz4L5Oz0AfimKeHUHTXKgmUhDI+cAGDSUjIdETKRnQD7is9Qd+QfDJzVUsfX2oLNyRLFJIK4jcSh7ehOZwORJNkCDMOC9VjoDse2IMZYlGM7h4w2cBvV37mCgyy1CKtCN8Xr+9AkCfBLL90j33Z/+xfqzo40k79JkNdO6F94kuVcCykr8BC9OadvgK1cMCXtCYhAtq4hSwA== 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=mAvdepYTuyOuZhcvu5h+FVd7/VRzpZ3oscpVCUlUSng=; b=HYaeSQZmc0pz8ysSUlNQEVChsW1M2v3IwjqoP637BGslKYj065gHK8B6f1ehm6vbxbmNfuJoj7ZsJIQiSAkZOMrY4FWrXidT3G2fZsu2R67sijMeDNEcXttRAuV6Kas/rC/42kamab1cSbHH4rNulDyCCeJqOiCBliMq8SwvTlIi5EtaT4lAgbLZGCPJceRUnBtu4/cL5GVI9pGiADW1A+mTbkpq6NYLbKi41IKoIdlQZT8QvVVWpnhzDGvgi3Os8MfC8UMrnmaUphVjP75n88P1D0WbscZ+vM2CiFi/sD+rMTRNEfn4U//rkHGPddXZYq8Ec3KCERgBT5ngUGtlCw== Received: from BN0PR07CA0026.namprd07.prod.outlook.com (2603:10b6:408:141::26) by BYAPR12MB2774.namprd12.prod.outlook.com (2603:10b6:a03:71::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25; Tue, 12 Oct 2021 10:49:51 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:408:141:cafe::d1) by BN0PR07CA0026.outlook.office365.com (2603:10b6:408:141::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25 via Frontend Transport; Tue, 12 Oct 2021 10:49:51 +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 BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Tue, 12 Oct 2021 10:49:50 +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; Tue, 12 Oct 2021 10:49:47 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , Date: Tue, 12 Oct 2021 13:49:19 +0300 Message-ID: <20211012104919.13145-6-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211012104919.13145-1-viacheslavo@nvidia.com> References: <20210922180418.20663-1-viacheslavo@nvidia.com> <20211012104919.13145-1-viacheslavo@nvidia.com> MIME-Version: 1.0 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: 09e56af5-a454-4fa8-15a2-08d98d6e043d X-MS-TrafficTypeDiagnostic: BYAPR12MB2774: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TQySU3sVz+tzSRwa9YHHknM+RQmlFd6CnuC6/DmXKHzmVkKJuQpgvjjUBYV0Mh0mHX03DjXOAjKZK5yeiapIol4kaT9RHNmKm7bgjAHTDb+RsBLoviBwkg/Reo0suS5kedBlIpH4Ib3e+7fu32kVHTqeb9s7aR2S4BiglPqKX62qRieyG+LHgb9ro7IxfJ2/UkwTOw7ccbcl+OZCcwdhFUmHwPb6qJBzmg8fUxrc+L6aIpq2T+FqhmmUe1umMUWFRoswUJfXX0GbwGouf5vLYHyqtVEPSw/1v/nB6bAzAfDg3frqGeI0xtDOHcork8kDtxAWTswRUdeCxG71RXCGvrsljaE/Y9gN2BV+eOquZQt0813lk3tIj4mDll6mbAyaiNoGsRxKHsM4CaKNK+HfX7dM0mmhDqy0KuxprsvuC4kzsePSRq7K4cXc6ZtmE/FXNu6u/k5dwREgE7YQ+3Ad3mJmswi0e1DXRqrk/f1SQi0iirIBCSc4kQTHl3zZPt5jV7y9v+sFKfjfwa7p33sYst7XW8dVZU4hJ6z9WnWaPfqoJdTZD3hQ7iMpb+atNBrP+9Bz59Cexb5MmhVZdTY0MfbaXeHGHDnn50O61JEuq4VrORENRTeWzsE0cjdjqWc/IGWsDv7WHyiK/LjT7ndHa0HkwmGn9QimuVzd/zHyr9ztWmxjY7wTRf66HN1AW64pQP+ALqvNHmUepEoPgvsP9Q== 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)(36756003)(36860700001)(4326008)(86362001)(426003)(6666004)(2616005)(54906003)(5660300002)(316002)(336012)(356005)(7696005)(6916009)(6286002)(1076003)(8676002)(47076005)(82310400003)(55016002)(83380400001)(8936002)(26005)(70206006)(70586007)(508600001)(186003)(7636003)(2906002)(15650500001)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 10:49:50.4418 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 09e56af5-a454-4fa8-15a2-08d98d6e043d 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: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2774 Subject: [dpdk-dev] [PATCH v4 5/5] net/mlx5: update modify field action 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" Update immediate value/pointer source operand support for modify field RTE Flow action: - source operand data can be presented by byte buffer (instead of former uint64_t) or by pointer - no host byte ordering is assumed anymore for immediate data buffer (not uint64_t anymore) - no immediate value offset is expected Signed-off-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 123 +++++++++++--------------------- 1 file changed, 42 insertions(+), 81 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index c6370cd1d6..d13e0d14e9 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1391,7 +1391,7 @@ flow_dv_convert_action_modify_ipv6_dscp static int mlx5_flow_item_field_width(struct mlx5_priv *priv, - enum rte_flow_field_id field) + enum rte_flow_field_id field, int inherit) { switch (field) { case RTE_FLOW_FIELD_START: @@ -1442,7 +1442,8 @@ mlx5_flow_item_field_width(struct mlx5_priv *priv, return __builtin_popcount(priv->sh->dv_meta_mask); case RTE_FLOW_FIELD_POINTER: case RTE_FLOW_FIELD_VALUE: - return 64; + MLX5_ASSERT(inherit >= 0); + return inherit < 0 ? 0 : inherit; default: MLX5_ASSERT(false); } @@ -1452,17 +1453,14 @@ mlx5_flow_item_field_width(struct mlx5_priv *priv, static void mlx5_flow_field_id_to_modify_info (const struct rte_flow_action_modify_data *data, - struct field_modify_info *info, - uint32_t *mask, uint32_t *value, - uint32_t width, uint32_t dst_width, - uint32_t *shift, struct rte_eth_dev *dev, - const struct rte_flow_attr *attr, - struct rte_flow_error *error) + struct field_modify_info *info, uint32_t *mask, + uint32_t width, uint32_t *shift, struct rte_eth_dev *dev, + const struct rte_flow_attr *attr, struct rte_flow_error *error) { struct mlx5_priv *priv = dev->data->dev_private; uint32_t idx = 0; uint32_t off = 0; - uint64_t val = 0; + switch (data->field) { case RTE_FLOW_FIELD_START: /* not supported yet */ @@ -1472,7 +1470,7 @@ mlx5_flow_field_id_to_modify_info off = data->offset > 16 ? data->offset - 16 : 0; if (mask) { if (data->offset < 16) { - info[idx] = (struct field_modify_info){2, 0, + info[idx] = (struct field_modify_info){2, 4, MLX5_MODI_OUT_DMAC_15_0}; if (width < 16) { mask[idx] = rte_cpu_to_be_16(0xffff >> @@ -1486,15 +1484,15 @@ mlx5_flow_field_id_to_modify_info break; ++idx; } - info[idx] = (struct field_modify_info){4, 4 * idx, + info[idx] = (struct field_modify_info){4, 0, MLX5_MODI_OUT_DMAC_47_16}; mask[idx] = rte_cpu_to_be_32((0xffffffff >> (32 - width)) << off); } else { if (data->offset < 16) - info[idx++] = (struct field_modify_info){2, 0, + info[idx++] = (struct field_modify_info){2, 4, MLX5_MODI_OUT_DMAC_15_0}; - info[idx] = (struct field_modify_info){4, off, + info[idx] = (struct field_modify_info){4, 0, MLX5_MODI_OUT_DMAC_47_16}; } break; @@ -1502,7 +1500,7 @@ mlx5_flow_field_id_to_modify_info off = data->offset > 16 ? data->offset - 16 : 0; if (mask) { if (data->offset < 16) { - info[idx] = (struct field_modify_info){2, 0, + info[idx] = (struct field_modify_info){2, 4, MLX5_MODI_OUT_SMAC_15_0}; if (width < 16) { mask[idx] = rte_cpu_to_be_16(0xffff >> @@ -1516,15 +1514,15 @@ mlx5_flow_field_id_to_modify_info break; ++idx; } - info[idx] = (struct field_modify_info){4, 4 * idx, + info[idx] = (struct field_modify_info){4, 0, MLX5_MODI_OUT_SMAC_47_16}; mask[idx] = rte_cpu_to_be_32((0xffffffff >> (32 - width)) << off); } else { if (data->offset < 16) - info[idx++] = (struct field_modify_info){2, 0, + info[idx++] = (struct field_modify_info){2, 4, MLX5_MODI_OUT_SMAC_15_0}; - info[idx] = (struct field_modify_info){4, off, + info[idx] = (struct field_modify_info){4, 0, MLX5_MODI_OUT_SMAC_47_16}; } break; @@ -1584,8 +1582,7 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_IPV6_SRC: if (mask) { if (data->offset < 32) { - info[idx] = (struct field_modify_info){4, - 4 * idx, + info[idx] = (struct field_modify_info){4, 12, MLX5_MODI_OUT_SIPV6_31_0}; if (width < 32) { mask[idx] = @@ -1601,8 +1598,7 @@ mlx5_flow_field_id_to_modify_info ++idx; } if (data->offset < 64) { - info[idx] = (struct field_modify_info){4, - 4 * idx, + info[idx] = (struct field_modify_info){4, 8, MLX5_MODI_OUT_SIPV6_63_32}; if (width < 32) { mask[idx] = @@ -1618,8 +1614,7 @@ mlx5_flow_field_id_to_modify_info ++idx; } if (data->offset < 96) { - info[idx] = (struct field_modify_info){4, - 4 * idx, + info[idx] = (struct field_modify_info){4, 4, MLX5_MODI_OUT_SIPV6_95_64}; if (width < 32) { mask[idx] = @@ -1634,19 +1629,19 @@ mlx5_flow_field_id_to_modify_info break; ++idx; } - info[idx] = (struct field_modify_info){4, 4 * idx, + info[idx] = (struct field_modify_info){4, 0, MLX5_MODI_OUT_SIPV6_127_96}; mask[idx] = rte_cpu_to_be_32(0xffffffff >> (32 - width)); } else { if (data->offset < 32) - info[idx++] = (struct field_modify_info){4, 0, + info[idx++] = (struct field_modify_info){4, 12, MLX5_MODI_OUT_SIPV6_31_0}; if (data->offset < 64) - info[idx++] = (struct field_modify_info){4, 0, + info[idx++] = (struct field_modify_info){4, 8, MLX5_MODI_OUT_SIPV6_63_32}; if (data->offset < 96) - info[idx++] = (struct field_modify_info){4, 0, + info[idx++] = (struct field_modify_info){4, 4, MLX5_MODI_OUT_SIPV6_95_64}; if (data->offset < 128) info[idx++] = (struct field_modify_info){4, 0, @@ -1656,8 +1651,7 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_IPV6_DST: if (mask) { if (data->offset < 32) { - info[idx] = (struct field_modify_info){4, - 4 * idx, + info[idx] = (struct field_modify_info){4, 12, MLX5_MODI_OUT_DIPV6_31_0}; if (width < 32) { mask[idx] = @@ -1673,8 +1667,7 @@ mlx5_flow_field_id_to_modify_info ++idx; } if (data->offset < 64) { - info[idx] = (struct field_modify_info){4, - 4 * idx, + info[idx] = (struct field_modify_info){4, 8, MLX5_MODI_OUT_DIPV6_63_32}; if (width < 32) { mask[idx] = @@ -1690,8 +1683,7 @@ mlx5_flow_field_id_to_modify_info ++idx; } if (data->offset < 96) { - info[idx] = (struct field_modify_info){4, - 4 * idx, + info[idx] = (struct field_modify_info){4, 4, MLX5_MODI_OUT_DIPV6_95_64}; if (width < 32) { mask[idx] = @@ -1706,19 +1698,19 @@ mlx5_flow_field_id_to_modify_info break; ++idx; } - info[idx] = (struct field_modify_info){4, 4 * idx, + info[idx] = (struct field_modify_info){4, 0, MLX5_MODI_OUT_DIPV6_127_96}; mask[idx] = rte_cpu_to_be_32(0xffffffff >> (32 - width)); } else { if (data->offset < 32) - info[idx++] = (struct field_modify_info){4, 0, + info[idx++] = (struct field_modify_info){4, 12, MLX5_MODI_OUT_DIPV6_31_0}; if (data->offset < 64) - info[idx++] = (struct field_modify_info){4, 0, + info[idx++] = (struct field_modify_info){4, 8, MLX5_MODI_OUT_DIPV6_63_32}; if (data->offset < 96) - info[idx++] = (struct field_modify_info){4, 0, + info[idx++] = (struct field_modify_info){4, 4, MLX5_MODI_OUT_DIPV6_95_64}; if (data->offset < 128) info[idx++] = (struct field_modify_info){4, 0, @@ -1838,35 +1830,6 @@ mlx5_flow_field_id_to_modify_info break; case RTE_FLOW_FIELD_POINTER: case RTE_FLOW_FIELD_VALUE: - if (data->field == RTE_FLOW_FIELD_POINTER) - memcpy(&val, (void *)(uintptr_t)data->value, - sizeof(uint64_t)); - else - val = data->value; - for (idx = 0; idx < MLX5_ACT_MAX_MOD_FIELDS; idx++) { - if (mask[idx]) { - if (dst_width == 48) { - /*special case for MAC addresses */ - value[idx] = rte_cpu_to_be_16(val); - val >>= 16; - dst_width -= 16; - } else if (dst_width > 16) { - value[idx] = rte_cpu_to_be_32(val); - val >>= 32; - } else if (dst_width > 8) { - value[idx] = rte_cpu_to_be_16(val); - val >>= 16; - } else { - value[idx] = (uint8_t)val; - val >>= 8; - } - if (*shift) - value[idx] <<= *shift; - if (!val) - break; - } - } - break; default: MLX5_ASSERT(false); break; @@ -1907,33 +1870,31 @@ flow_dv_convert_action_modify_field struct field_modify_info dcopy[MLX5_ACT_MAX_MOD_FIELDS] = { {0, 0, 0} }; uint32_t mask[MLX5_ACT_MAX_MOD_FIELDS] = {0, 0, 0, 0, 0}; - uint32_t value[MLX5_ACT_MAX_MOD_FIELDS] = {0, 0, 0, 0, 0}; uint32_t type; uint32_t shift = 0; - uint32_t dst_width = mlx5_flow_item_field_width(priv, conf->dst.field); + uint32_t dst_width; + dst_width = mlx5_flow_item_field_width(priv, conf->dst.field, -1); if (conf->src.field == RTE_FLOW_FIELD_POINTER || conf->src.field == RTE_FLOW_FIELD_VALUE) { type = MLX5_MODIFICATION_TYPE_SET; /** For SET fill the destination field (field) first. */ mlx5_flow_field_id_to_modify_info(&conf->dst, field, mask, - value, conf->width, dst_width, - &shift, dev, attr, error); - /** Then copy immediate value from source as per mask. */ - mlx5_flow_field_id_to_modify_info(&conf->src, dcopy, mask, - value, conf->width, dst_width, - &shift, dev, attr, error); - item.spec = &value; + conf->width, &shift, dev, + attr, error); + item.spec = conf->src.field == RTE_FLOW_FIELD_POINTER ? + (void *)(uintptr_t)conf->src.pvalue : + (void *)(uintptr_t)&conf->src.value; } else { type = MLX5_MODIFICATION_TYPE_COPY; /** For COPY fill the destination field (dcopy) without mask. */ mlx5_flow_field_id_to_modify_info(&conf->dst, dcopy, NULL, - value, conf->width, dst_width, - &shift, dev, attr, error); + conf->width, &shift, dev, + attr, error); /** Then construct the source field (field) with mask. */ mlx5_flow_field_id_to_modify_info(&conf->src, field, mask, - value, conf->width, dst_width, - &shift, dev, attr, error); + conf->width, &shift, + dev, attr, error); } item.mask = &mask; return flow_dv_convert_modify_action(&item, @@ -4874,9 +4835,9 @@ flow_dv_validate_action_modify_field(struct rte_eth_dev *dev, const struct rte_flow_action_modify_field *action_modify_field = action->conf; uint32_t dst_width = mlx5_flow_item_field_width(priv, - action_modify_field->dst.field); + action_modify_field->dst.field, -1); uint32_t src_width = mlx5_flow_item_field_width(priv, - action_modify_field->src.field); + action_modify_field->src.field, dst_width); ret = flow_dv_validate_action_modify_hdr(action_flags, action, error); if (ret)