From patchwork Fri Sep 10 14:16:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 98658 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 4B5D2A0547; Fri, 10 Sep 2021 16:16:34 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D96D6410FE; Fri, 10 Sep 2021 16:16:33 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2056.outbound.protection.outlook.com [40.107.93.56]) by mails.dpdk.org (Postfix) with ESMTP id 2273F40DFD for ; Fri, 10 Sep 2021 16:16:33 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fxz9z3MFAT8ZFgjzZ52mhCpVgp3GZ0OkFnwKmx5iZ+PT5Cdia0qM2Mg/R9OI5AlK3uK4a7scQoK8pe6PjwMlj8vyW+DCYP+/DFLpZjQhB+rJch7nUCdts/Oo6NsMRQ7rprqACqt5ssObeJRtIk0QhhxW2SIP7CZT5lrShb10IJUWk1kj3k9vUBu7DdoPhBu343tVOpTwVUbnHLsi/9BHeYw/PwDChDBWhDBCx5O2EtPyKDrM/K1dWZBUpw+KApPHsam9ugn8PjeUeLwbkVW9XsSvk6zJAZykhvMxKxwi5FMb9NgsUKEYzaQxCqPPE352/QsfT2WZQqLqnN1/LKBDdw== 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; bh=F7Ys34kzTCglEiP8D7HCRld+xLj4RXrcW1kpXPM7YmU=; b=hWgd69Qq6KhD3XDH+XJcQGMI1abzrd/pTPdij2UpDvGXW9gWNXuJgDT/1H9AkcxyEDhaRogFhG3rNG/XAIh9LXHC1Hv4TmmVPbeYXkSz5/R5HVXkN7qOlBLa/Co6s/c6fPeyuIiD0sEB8DQz2a2k7CErQ5sdwG7wIhmnK9riU33QD6PRE4ZD2rgT6Ug/wlkJ0DIPYKQQUsr+HUkzfVSDDm/X21B2PIzczLc9PHwtzNu5f8HwA6ert6TffnguTG9aienq8DeQwpVVOzvLuwIVmmGhFRDoMqB77Cxz87Xkqp25yII18ttD78rKsTNm1IxyyylxysUx9BoN4rbKazxt5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.32) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=F7Ys34kzTCglEiP8D7HCRld+xLj4RXrcW1kpXPM7YmU=; b=kcbzQhShaNSDr5cOVIiP0RE1EpojIykzr3nLMfuUa21huqKLZEeecBayq9m5KnhpiaFkjMe0AnjyLLFgonvjKYRCskjI9/E0FD8DrmF/ST8VtFcWThzI7WmF/SaRgie2xtWTQCI9AMRk+iy8LVgmJDQnN74Ask504wB3j6ZYpvuwoLhdBMpPtciuWZlt/ru9lVEps4MQrG/NXjxJEr+AQiokBLqPGoVYFh6ep4GHhgZBAw1PFpMoPRV9FrzDmMUd8PQ10Z9ok8AtdieqEd2XLNLnp4VkzutjEfBnMmNrPhsCMuqN/FmNw/7hvP1hF12VT3LTwilDi+OFkZr2qcBVaw== Received: from BN6PR11CA0058.namprd11.prod.outlook.com (2603:10b6:404:f7::20) by BN6PR1201MB2545.namprd12.prod.outlook.com (2603:10b6:404:b1::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.17; Fri, 10 Sep 2021 14:16:31 +0000 Received: from BN8NAM11FT043.eop-nam11.prod.protection.outlook.com (2603:10b6:404:f7:cafe::1a) by BN6PR11CA0058.outlook.office365.com (2603:10b6:404:f7::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16 via Frontend Transport; Fri, 10 Sep 2021 14:16:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.32) 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.32 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.32; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.32) by BN8NAM11FT043.mail.protection.outlook.com (10.13.177.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4500.14 via Frontend Transport; Fri, 10 Sep 2021 14:16:31 +0000 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 10 Sep 2021 07:16:30 -0700 Received: from nvidia.com (172.20.187.5) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 10 Sep 2021 14:16:29 +0000 From: Viacheslav Ovsiienko To: CC: Date: Fri, 10 Sep 2021 17:16:07 +0300 Message-ID: <20210910141609.8410-1-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1d437fea-c175-49f6-e0eb-08d974659651 X-MS-TrafficTypeDiagnostic: BN6PR1201MB2545: 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: GRkSHHgLENvGfZqSHZjAlO8XhCH5A3zR5F49rfkRZanPHxTvlPd1Yk1o4k6bJ5mFwh8ZwOBjoyhlXKEEDyfpPoYAkNAweWDGBYnD0giBM9wgVMC3c6Q9WsVEn03B+XLIPvR+8H+WBJRRHNoSvIMdvlZ7fjfeEUbYPRa+CIv9fb7HslyNtsGLjvNmTUtf0jK/nO6/QIoao1O6lfV3kXQ8ozEtrYwL3lajOii/CVszx8Rn439CUwRmSnlRucJHir4SZTQIwz/THi3elJYG+8Dj+NlhJ8ZyUfMh6IUrpgriBzuSTtyb7tflojBY2Uzj8iUKaahbp2BrmVxym7bxnw5hiiq8C+Ll1KytDwiI4X0elwwKhQ8I4FqF9moMe9vL5r9RGCIJixeLaeJpvzjlC/XLuOxRIm7L2IS1yPd3PesjbWXgf+sXI1DSqAdzHfRJiiKnXoDwnY2UvF2UKOnyiknnsxdz9aDiobWKCxvL71H6rf6jGW6NYd7UPK71Qi4S2zGyaNV5aiNtvZqUeODxYNjCrtrvRPKuztkVy95GsFW9e1MNLyFl0o0FBoZ0JJaB/HUo2ftviMGl+/P63Fa3m3l7oC4XtHXgu59qy5S4ecAv1ppsdaVUKE/4wiCG5/c58Ha7JrgUNfAJfwP87A5xHxS93N453XxdK/rzKVcgUfwiHTRQEtSaI0uYvxBGIhdShYEue154BaFsi30ePdWmywjuOPZosOvvKcSNQuApslcmaqs= X-Forefront-Antispam-Report: CIP:216.228.112.32; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid01.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(82310400003)(1076003)(6916009)(4326008)(7696005)(2906002)(2616005)(6666004)(5660300002)(8676002)(70586007)(70206006)(508600001)(86362001)(26005)(316002)(7636003)(47076005)(36860700001)(8936002)(36756003)(426003)(186003)(6286002)(83380400001)(16526019)(55016002)(336012)(15650500001)(107886003)(356005)(21314003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2021 14:16:31.0364 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1d437fea-c175-49f6-e0eb-08d974659651 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.32]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT043.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB2545 Subject: [dpdk-dev] [RFC 1/3] 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 lesser 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 MAC and 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 [1] commit 73b68f4c54a0 ("ethdev: introduce generic modify flow action") Signed-off-by: Viacheslav Ovsiienko --- doc/guides/prog_guide/rte_flow.rst | 8 ++++++++ doc/guides/rel_notes/release_21_11.rst | 7 +++++++ lib/ethdev/rte_flow.h | 15 ++++++++++++--- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 2b42d5ec8c..a54760a7b4 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -2835,6 +2835,14 @@ 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. The bitfield exatracted from the +memory being applied as second operation parameter is defined by width and +the destination field offset. If the field size is large than 16 bytes the +pattern can be provided as pointer only. .. _table_rte_flow_action_modify_field: diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst index d707a554ef..fdeba27e14 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -84,6 +84,10 @@ API Changes Also, make sure to start the actual text at the margin. ======================================================= +* ethdev: ``rte_flow_action_modify_data`` structure udpdated, immediate data + array is extended, data pointer field is explicitly added to union, the + action behavior is defined in more strict fashion and documentation uddated. + ABI Changes ----------- @@ -101,6 +105,9 @@ ABI Changes ======================================================= +* ethdev: ``rte_flow_action_modify_data`` structure udpdated. + + Known Issues ------------ diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index 70f455d47d..50e6f34579 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 { @@ -3217,10 +3220,16 @@ 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. */ - 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; }; }; From patchwork Fri Sep 10 14:16:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 98659 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 02F4FA0547; Fri, 10 Sep 2021 16:16:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E1BD44114A; Fri, 10 Sep 2021 16:16:42 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2052.outbound.protection.outlook.com [40.107.244.52]) by mails.dpdk.org (Postfix) with ESMTP id 17C8A41147 for ; Fri, 10 Sep 2021 16:16:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P/lfMd6jXCB+24srNpCSLsiUCXFCSFqxZGIutDrYZen5t0EREiDBMCLIW4Q7BOYojWkiewhqk8D5Z6gox2WaF1bMutkjibsIaIrFFGBB6jEKgLRVXUxaP8OHbXua5tXv7GaiYq0AxY96z+lNYjWzFYKjaNx8MlZZ6Mk/C5fBdnPSjtcAbkOMYfc4yyekrEek66ugcRDrTqlmETUWf8zi14zvNhg9o7+PU/F56YMIzWLetMwxPw93bUut/xZTSX5KXZ/bhL7XdNB7rzca+3b+GVqz2hws464DhuynUe7gaW3ddcXd/mlotxKS9XbM9kXmMHJ3hqqWuVm7b47lekJ4Yg== 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; bh=Crmpkuj5cuqYtw7mGu85F7budcOrt9snT+ohlHbjOfA=; b=j3kYVBE9jDy96QZUY3DNLrlLvx7UFtgruMVIOWHui+xBe2dv0F8MuxVGMprFYnw+qjXnHBKXNL7AH+xgzxhdkoE4JJrM8seLdllp2yHqou0eqBlkz3IGzROAe+LNFd6HFcYIy3cAfbtdBf2Uy4QivQAoB5gcQsnIpLKNQnUrjEeCALInq39aX9nt8pfFJJzU2frnDgT6djqg7Ab/a6ReQyAAlQrvLVpTDllGcUJowFQCvIsEAjAtG2nc9Y82AUp+X1K2ojUHpElNUo8xBVeAJlI3ixsfjA/iJrsTWnPVwgsC312KLiiSDKLQRh/UEy+ScmPqh0aCtsyF9WfSNJskRA== 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=none 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=Crmpkuj5cuqYtw7mGu85F7budcOrt9snT+ohlHbjOfA=; b=FMDJxOsQy7XYi+aL4Lli8HAi1EZ/o9DAn/Mgbad2sea9juQLfOQFenGLnq9Nctj4f9Y+/DmJfTgj629bhBmG7nWp0WDA91ybl+/DaxGVkqHYQbtxU/dSorpm5AOjbGjbeXoZnrUeKp3I2xBzk3Kt1AP3MoFpRz39iaklYt3HYogdpZGJfhd5vz7A6ojTRcGFFKBJZDoxzlTVxjWkdpuqWcd15HX4v0Nh0sPgjLzmvgufH8dnSxs/L5AEfbeluIWVdfHhgwEFIUVRjOvX0frwnpNTKFmDBtpZbhPpcFVaYLy2nRIWdBdd+GxXSBMsWW8t4gueahdPSSevVlkeYpYfzQ== Received: from DM6PR08CA0032.namprd08.prod.outlook.com (2603:10b6:5:80::45) by BN6PR12MB1588.namprd12.prod.outlook.com (2603:10b6:405:7::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15; Fri, 10 Sep 2021 14:16:40 +0000 Received: from DM6NAM11FT014.eop-nam11.prod.protection.outlook.com (2603:10b6:5:80:cafe::4d) by DM6PR08CA0032.outlook.office365.com (2603:10b6:5:80::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Fri, 10 Sep 2021 14:16:40 +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 DM6NAM11FT014.mail.protection.outlook.com (10.13.173.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4500.14 via Frontend Transport; Fri, 10 Sep 2021 14:16:39 +0000 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 10 Sep 2021 14:16:39 +0000 Received: from nvidia.com (172.20.187.5) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 10 Sep 2021 14:16:38 +0000 From: Viacheslav Ovsiienko To: CC: Date: Fri, 10 Sep 2021 17:16:08 +0300 Message-ID: <20210910141609.8410-2-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210910141609.8410-1-viacheslavo@nvidia.com> References: <20210910141609.8410-1-viacheslavo@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fad581d0-ff7e-4e57-d4c1-08d974659b96 X-MS-TrafficTypeDiagnostic: BN6PR12MB1588: 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: +xcUq726mortWLWWSolufmu0gSVsGln/r42SBL82E41g+zec1VFrwSzYjPDNonaEjLYPxa3Tf9DNJMk8ho9F4Yk6+um0kA/dqsMTfp5xcuImUqXK1S7vYRHxiJ8ugYlqOyj8nMw9oFZ5CGSA7JBesC+epPys4BniTOLsgddb3JaFL/IYWK2neFW5UQ6431oQFpDmpuiLxp279617FX5e3xV/zwYU+Fr9Q94KCCaP3FkmIfBlqFsfzgH6FhjqXsByaineXNkhTNluGhU9VLm9Ia0b4sVLW/3u1ZUD3MObYXKHKcaFcvJHx/sQB6qWHmm3meFyWTnNqN0qQbz5Wmpa0DRc+yfT6yiODxKMEWwAavoePaEunLTQoHwRe12gr2H/xJp666XxiljHmNsnMZg43P3UHhjChZ4HpOloLCdhd4afXDyMMPPgXW2npkobJ4LFCAqksMKCJhkkWHJAXZ9yJqEXAx3kIt32DG4vyRYBDAdjHI82UXJ+Z4eWIB3e+FDmqv+yEby41jERO4RIBvNWl5Q9aYy36rWP9GI+RKTFlhjZUElLVlyrPYLZzrh4Q84tNb3XWq9H2tn8TMrpZ7k3d+8sq7RAq2WunQHf5yClL3fFsSt3aFpqT1a+BvNpB6+KgUrGghCSDyM8b2uguN/kNKzXJnGh/cO9aq3zldCLhIGX+9ulMV/EsxVAS2hMxkhyDdLT0QcnWNX5Quh7SeIP7g== 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)(7696005)(15650500001)(2906002)(336012)(426003)(8676002)(86362001)(16526019)(186003)(7636003)(83380400001)(6286002)(36756003)(107886003)(4326008)(26005)(36906005)(356005)(47076005)(1076003)(55016002)(316002)(5660300002)(508600001)(36860700001)(82310400003)(70206006)(8936002)(2616005)(70586007)(6916009)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2021 14:16:39.9468 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fad581d0-ff7e-4e57-d4c1-08d974659b96 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: DM6NAM11FT014.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1588 Subject: [dpdk-dev] [RFC 2/3] 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 --- 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 6cd99bf37f..529ead6b2a 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 Fri Sep 10 14:16:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 98660 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 08B8AA0547; Fri, 10 Sep 2021 16:16:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6235841157; Fri, 10 Sep 2021 16:16:46 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2053.outbound.protection.outlook.com [40.107.94.53]) by mails.dpdk.org (Postfix) with ESMTP id EA24741160; Fri, 10 Sep 2021 16:16:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UcMcPHLLoRwWjAbQcyBwyqZm8PEwXk3urd/oB5rMTk82UCerONCquJKpKEgdwZRuOQ1RsbNKexHeewsYLzFOccyFiLCBBOd8jnlptcYNV+LuQ0dm9i0kEGa5ue1nmEck5NphEud6cdbkotemQ9v5ITtUU+s3gYVP8ZFsI/2A5eROtu3BByLHWmsCj/ZWcT9JmR5pD5QxBwXgCb0GnnX1PXUQ8n5kQ6nFQZdgKQDedEyM63HyNIJt75hOWYCGCqBN5rbMMIKENN1xCm5IEVprLKe2C6mKjH2xVsIH/J8bI9sgsYbV9dMzQVGK19VcCQU6HRRjT9lSFnLI3vFU3LcyJw== 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; bh=aZ6V/GmkdQoXsOHTmfhUatN7JYWUFcVXnH7s612b7wU=; b=PNZwy9LI/ooZgaV3aJaENIiEBf01cKjQuKn14AyNRKlLCuk8Z7UIar7ZfVVp/0q8AGgMYpByeYWfBv3opBaVXafHy3cV9X4JKBU4VeSNScrmdRBu6dCMpejk0EXTybhY8VcIMj3/+x9m4FW5F6yFz2UCvi/48xIHvIrPngWVtiATy3qnzwtlkEAM+WJEIdK+S75XyRme5Pjj14HFbCF25++TvWLo0dJR4cz/yW6sUGU5vRboYdKu+/bU2g2jJUvvd67/j0McI9bo1w8XvKBP++tFgjF4apemo0qC30jasxXidkzwnJdzTYeOkAxoytqRzdJyRDcQnKVt92Ymf+ZHTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.36) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=aZ6V/GmkdQoXsOHTmfhUatN7JYWUFcVXnH7s612b7wU=; b=d4xUzIcsGovFN+KilRHIRDgOCtpv1JVkr81ySuF8L9RWvKu8BCYKQPO3l6wB6nsW7+LVDoN0XGrt9PEIUzNx3cuhiHaPV/ldNuMu0eqFzoeJqq6OwFIe+4SIZYgHc1RjCNv06gDnXwzH4r2T9dcl+z2oGNOdsEkmdEnN9CuW4jYhNk2LXujLn8wJIQECrm5VSgbagMbE9VOb37odJfR4OWtAu16TWhcboFFd1hMnRACQaH3e6/sV1ck5KffDPmP8vwO40i7r0hPgrrzLWRBJm1CgM1JArgYYpjmxcT+9zPOIqDSRTZGUkPRIscyflGY8Z8GttFpcirL8UWlrcHZaxg== Received: from MW4PR03CA0256.namprd03.prod.outlook.com (2603:10b6:303:b4::21) by MW3PR12MB4505.namprd12.prod.outlook.com (2603:10b6:303:5a::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Fri, 10 Sep 2021 14:16:43 +0000 Received: from CO1NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b4:cafe::3c) by MW4PR03CA0256.outlook.office365.com (2603:10b6:303:b4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Fri, 10 Sep 2021 14:16:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.36) 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.36 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.36; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.36) by CO1NAM11FT034.mail.protection.outlook.com (10.13.174.248) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4500.14 via Frontend Transport; Fri, 10 Sep 2021 14:16:42 +0000 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 10 Sep 2021 14:16:42 +0000 Received: from nvidia.com (172.20.187.5) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 10 Sep 2021 14:16:41 +0000 From: Viacheslav Ovsiienko To: CC: , Date: Fri, 10 Sep 2021 17:16:09 +0300 Message-ID: <20210910141609.8410-3-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210910141609.8410-1-viacheslavo@nvidia.com> References: <20210910141609.8410-1-viacheslavo@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 231c6d12-4744-4aae-abfb-08d974659d63 X-MS-TrafficTypeDiagnostic: MW3PR12MB4505: 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: kpmT1EFgyHorHVzwmVGxcQe9hnL++vgj4VBUkzsVbeayjDDUWQEVZYJSKWbjHOH3M+3LkOSPkxvw60vNCFvIzTzDfOXfdOzML51QNwdxPMUP3mfCGBLYh5H9Jr3tWs2mZ87CdROhs22gyB2XP198E0PuGJlwqm0s0TOcq8QBJDWdv/sMxS1WKeklq/K8/LAV9BTSyVI0GLCo1MiRajAx+qpCVCsuoHOttnlYMUm17Jev/a8gbOeYxdsbnApABSaFRrQAGwX3BHtQkUQDAOxUaD9Qx9LRlX1QrNLeO7YqCUMKPns+1BM+gfginSDR9KfpY2hjxFxwvBPmR21jG1ipdJgWKuFE55MxJZuA5q7eoSL3plVtR1EqQA57BJRrhYVVENW8mIzGayISfw6XUJ/51gShDYmFV/YGV3yQDQP5c6v12QN1AmJLSPxuwrmPqorMxeRF5qU4UVJ43swvJD0iNFev+DeiazeTs+ftz5qUHD9zX8JWk/5MkyBIxHmB3tFJ6ZPolFCVnAcX+yEPyn3z9Rfa4UxEZbdHbBm4hITeN+IUQHL6WgVJpKP+7GWqja9cR1xiWLi4Jx1X1jcxqmusdrK13mQW46kH2ThdjCkA88WZCmTbxiGZemYCetAOlD9d9dhm9Jake/z9o1rRwFw+XvePff1CMv3Se0ZjHxEjQmXMfLdKWmANuffZqnvR+vZRkFFX5ydxzMORPRK/szeMcw== X-Forefront-Antispam-Report: CIP:216.228.112.36; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid05.nvidia.com; CAT:NONE; SFS:(4636009)(136003)(396003)(39860400002)(346002)(376002)(46966006)(36840700001)(6286002)(7636003)(6916009)(86362001)(70206006)(55016002)(478600001)(82740400003)(8936002)(7696005)(82310400003)(36860700001)(356005)(47076005)(4326008)(26005)(426003)(16526019)(186003)(36906005)(36756003)(336012)(2616005)(2906002)(1076003)(450100002)(8676002)(5660300002)(70586007)(54906003)(6666004)(316002)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2021 14:16:42.9721 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 231c6d12-4744-4aae-abfb-08d974659d63 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.36]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4505 Subject: [dpdk-dev] [RFC 3/3] 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 --- 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 529ead6b2a..9e7fe1ae9f 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)