From patchwork Sun Oct 10 23:45:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 100951 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 5AB60A0C43; Mon, 11 Oct 2021 01:46:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B175B410DB; Mon, 11 Oct 2021 01:46:19 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2082.outbound.protection.outlook.com [40.107.92.82]) by mails.dpdk.org (Postfix) with ESMTP id BEB2B410E1 for ; Mon, 11 Oct 2021 01:46:18 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S7aN0miUbUxSq4NQ5oxE4vbD0ymmrmn9aDAXqeVUhd4Xt0lAXb0qfIWfs/WqmZQInNoscLIt8V0x/R+Y0reKO9nnNOD2swNQ2Nj/096uaC8E4IpUE9aedm1n9+yVBxqk5jid/NUt70AqeIxOtF9r+w0gLBaD8Q+/VLbfDVLQfsKjdpi2NE00hL251ieWyeAT36hW5CaD4Rb52GTlCIAXx2s10tYJpOIDbVKheDaUFx4lQxOnB0rl5byl3677/L6dkghrkf0dTt/44xASHjiopeXR8qnO0GTvRV2xax9Me3GitC1xEg4toXk+TFPV2czDIInu0GyoX9IMspm+sTg/nw== 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=mVgcKM46PBf1QhjDtP2+ff05th2L95XFuUybWbSvKnc=; b=dqGErZ+eVblqVOQ4H66mIXWIVH/AYEQ5AlpIkvA4lFa5wRvoxQNQuQp1SRRPl9cfZMYLlpIQd4E8ZFkSQweyDlZyR/ZfinDSnekycceLdTzyHRJKkX1VhXkvTh2xL4gQzLtjWDHkkBOITOzpzAM0842icbbvemuhcUb8IovItFhCpXvgq2ToClQgHIMSdFrZQgWlVXvPtSM9lvPSsa6EQ4oFp4MfLArkMq6MbDR0mamFbkRghHyrvteMcEjhVoZKmFeJDqn6Zf38VrZaJDjExnONM6FCKH939xcxqaND8Ot+WnrS1l/ZO0jvxEQnFJcUO4+mPM5HtCfL0iMm3oJ5Xg== 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=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=mVgcKM46PBf1QhjDtP2+ff05th2L95XFuUybWbSvKnc=; b=e5Uv5AshNP0e+wXwKjMMLzi3xLxDGLEpm0Kgl2lWhQEMZCsOiQJr4otpyZ/c+1zHhLbuthdvhapZr8PqHuUXzy8yiAII64OemI05B7/R+QAFVZQCWzLrCY8jV4K6pKQ+mHq9pino+CmyhrsGs5VhFlWr0Wo+bLiit8gJKszopsrRSH2GzhvQb4JShlmkkNXj/vJ1UtfPw2MynzbAU5meWOxV0l4LHgqEwbc/4QrwkOSFoAM+2LRgP3LOtbHhLBf+uXYls42PQJCttHnzw7U4cElj7IaRTwoLKfBEchkihNb7osgpuvnwcL8gzallOGiQbJuQ50mZnc5iT4f1FWAdLQ== Received: from DM6PR11CA0031.namprd11.prod.outlook.com (2603:10b6:5:190::44) by MW3PR12MB4508.namprd12.prod.outlook.com (2603:10b6:303:5b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Sun, 10 Oct 2021 23:46:17 +0000 Received: from DM6NAM11FT003.eop-nam11.prod.protection.outlook.com (2603:10b6:5:190:cafe::d4) by DM6PR11CA0031.outlook.office365.com (2603:10b6:5:190::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18 via Frontend Transport; Sun, 10 Oct 2021 23:46:17 +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 DM6NAM11FT003.mail.protection.outlook.com (10.13.173.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Sun, 10 Oct 2021 23:46:16 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 10 Oct 2021 23:46:14 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , Date: Mon, 11 Oct 2021 02:45:43 +0300 Message-ID: <20211010234547.1495-2-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211010234547.1495-1-viacheslavo@nvidia.com> References: <20210910141609.8410-1-viacheslavo@nvidia.com> <20211010234547.1495-1-viacheslavo@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] 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: b039c875-d02c-4543-5ca2-08d98c4826b4 X-MS-TrafficTypeDiagnostic: MW3PR12MB4508: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3173; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P+FLnUR8uvMa/69DO3JxQMjmhQzY88SlhX18sqqRQ+rTJ51iuS5N/YBLT+0zYR135oG4HOTdhYzCGvlmK4fxfuSTvQZVnssBZj5VRpwsuQ8c5QgfHpW6gqn/JoMO2tSmL1ns8qaB7Vf3Tl8wjt+E220hpd3jhcYz5wfLPDuEB8W0LKw8jJ0/KUwAF7K9iSANl298vxXBJvLvwSMs69j6wajojNAI1s7PGSpKA63joRgNhUJnSAo/be2KiwTxbSPJezjdNBJIc8I+7TWZsxCyZubF737pDj65gU5BtxReMkQQHnY7krScCvhwbys6gt+98csATlOzTOfTTBYxjMBI3kBqaoBo3H091H91wT/VMQhW3Q2vMWjhdG/CAINF7nan93tZ7q9z5ftbPS3UFf7aLa40iLPJgmf4mg4kqFBdUNsPsRcNAz6hot8ZTR4osHKRx3mkIcXfADMn3IrIqWtBiOJHc79TcCUCmGcSH5AcZysDZr4qYdeHdTc/7dfqhN6XWo3zZOkphbxGx5YGkPLGPcxdzC1eej9VNw8wUZYZcv/kDuNiEvXX2Q91HC2rsImzA8+qxAhcSzc1N54xuUjNiNUpgJ/X/ra4dMmSy3BmAoyLh1MeHeVrhGL1zgFQPmmi+oOrVARjiyKMEU/pH9o27ln99mwmnJ3UU9SVG+wQFUwsYsczQY2xjRwXsYU9Ln9eMSMHY6rg1COTCXR0qkLyiX+tVm8dkJHlGkzysBJVbEc= 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)(1076003)(36756003)(86362001)(8936002)(186003)(7696005)(16526019)(26005)(8676002)(508600001)(70586007)(70206006)(4326008)(7636003)(6666004)(6286002)(2616005)(2906002)(316002)(6916009)(55016002)(36860700001)(356005)(82310400003)(47076005)(5660300002)(426003)(54906003)(336012)(83380400001)(21314003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2021 23:46:16.3414 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b039c875-d02c-4543-5ca2-08d98c4826b4 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: DM6NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4508 Subject: [dpdk-dev] [PATCH v2 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 [1] commit 73b68f4c54a0 ("ethdev: introduce generic modify flow action") Signed-off-by: Viacheslav Ovsiienko --- doc/guides/prog_guide/rte_flow.rst | 16 ++++++++++++++++ doc/guides/rel_notes/release_21_11.rst | 9 +++++++++ lib/ethdev/rte_flow.h | 17 ++++++++++++++--- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 2b42d5ec8c..1ceecb399f 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 large 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 width as 16, and provide immediate +value as sequence of bytes {xxx, xxx, 0x85, xxx, xxx, xxx}. .. _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 dfc2cbdeed..41a087d7c1 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 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 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 ----------- @@ -222,6 +229,8 @@ ABI Changes ``rte_security_ipsec_xform`` to allow applications to configure SA soft and hard expiry limits. Limits can be either in number of packets or bytes. +* 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 7b1ed7f110..953924d42b 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,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; }; }; From patchwork Sun Oct 10 23:45:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 100952 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 AB6B4A0C43; Mon, 11 Oct 2021 01:46:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E086B410E8; Mon, 11 Oct 2021 01:46:24 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2055.outbound.protection.outlook.com [40.107.223.55]) by mails.dpdk.org (Postfix) with ESMTP id C3BA4410E8 for ; Mon, 11 Oct 2021 01:46:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YdE/G+RO3npzXjJw9P2Y9mATLHykq3fCv1jfcmQZOWKrE2PeQKhGw3immb36A/9bqOSkKK7OjKGKbPLDeq+8BY6UPwhl+Wqv/WaSdrmwpC0IbvkKqCVNuzi1dIR7SNvcUJnCaoIRDmtM3wlu3SrLqGMAx+9v/WwX5XG5lq4/T8yW0RF3MXaKX6azVJMkf82wnTdm/uUMHFPlR37gVWNOhF6vIDgSn5F3b2lkbq76fzPXSuEFVl2OrIQZZFAjGHKJOnhAQVTuJ5ZUMJe14Exucjb7KPbmSwENFlFdI4u45BE5Wl5MjAUz5douIKaRvIjGfHNdASYvMfuT531qEUkbXQ== 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=KWGQlI+qNB4vNJXYnfNDrA8iA/1g5rWu0V/RJRVOFW0=; b=DXPPM0eLi2MITTHjCW9Da8tNL0MK9PukOmy/z37k46QdGhUp7e5MgKIVp7f7S8b9gQo7rP0mfgNxiYi4SekB+98w/knk4rKk4iRHVmk9SsZBUuRtvE+Nf+/ez+wd5sN4/CfeOKjV389DUOQwxieVJofP2xw3brQwme8DEGGmqzgVc4HLrh4DWvAEMYrS9s9IR8ww83tTCVcRKMR63KWEIveL5nbLAxudGRBraz+eZiuNerjKOdsqtxQPY6jzvuBl0emw8cKSdb/PJhoiavW5e1EwwmubKSdhzm76FxU8BQYfeoC6DZfS6p404/v+SIE0FuAv/jEyKja7nlrsQucz4A== 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=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=KWGQlI+qNB4vNJXYnfNDrA8iA/1g5rWu0V/RJRVOFW0=; b=tYHmBDqTh8k0JzhbmDpcX/4yr3oKDlCX3M8bdd3ws78S+p1mFUAAnejXjeZFMYIV//e1/J7cBymDgTSWVoIWh6TFfr2z74/vcm8IDrSxvEmbR0l7gm3zaXspgxtz6YXVRWg/aw2SOdp05IMoQXbnc2nVgGya4u/vtdICvFpepphkmBGntkOVLmlYGVCrY+8BEPBiai15PtYHLYackyomZDqrYVc0bE0kUGVQlh9YD56D3uxwMrl4CK2Y5rAJTxTzlrjT1Bj/2UZgkXwDbGnGp5DULLvO4YK37C0utMfDC2wtyXb6jAPgPlIx9hFESsbrRHzrjxApWxy/tsgGudO2ug== Received: from DM5PR15CA0053.namprd15.prod.outlook.com (2603:10b6:3:ae::15) by MN2PR12MB4814.namprd12.prod.outlook.com (2603:10b6:208:1b6::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Sun, 10 Oct 2021 23:46:19 +0000 Received: from DM6NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:3:ae:cafe::72) by DM5PR15CA0053.outlook.office365.com (2603:10b6:3:ae::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18 via Frontend Transport; Sun, 10 Oct 2021 23:46:19 +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 DM6NAM11FT057.mail.protection.outlook.com (10.13.172.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Sun, 10 Oct 2021 23:46:18 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 10 Oct 2021 23:46:16 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , Date: Mon, 11 Oct 2021 02:45:44 +0300 Message-ID: <20211010234547.1495-3-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211010234547.1495-1-viacheslavo@nvidia.com> References: <20210910141609.8410-1-viacheslavo@nvidia.com> <20211010234547.1495-1-viacheslavo@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] 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: 35551c3b-2275-49c0-d4f6-08d98c48283e X-MS-TrafficTypeDiagnostic: MN2PR12MB4814: 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: soA+OIp499z7pVTd36Jx5i16KzD3qF5XzayJ0kL2HO6Elt6enhw3lSZNc+FWdd8XUEH34WOlEZSYxunI3R+hECc4heJPd4qkEWB0nvXoR0DfjEy6HkJYvzPmENMb6Mj6tu/frMP2nvHYwZGx2k0MyvCZd1wGKS6m5ttjH6d2LPKyPVN2Fu/OKj91yVZ//pcCivzNnJSR9oHz9zHJadIzH3noPKTnZGVgOH9Ym1/RfF92XckVuCq+qaSygW0rvREmvTR8M0DHR+qUak6iJytrpRsObtaKKRlekZE57cE+upp/5nxfP/FaSARDiP4ofIJfdE//nychFmA/vCxWMm/mTqeFshgejc4a0hRCNoxaBh5fbCJiq6cH10l4DVL59uUIeWPqLhc0kmlamzPy5XuxJMoV03n3WEDeQhUW4UN0NNM+OGfHIQVJ1LBx5ZYTc6U7JbAYgSO4N1S9UxJ3gY2vtwtBpmm1v8tJ6+/a7HvQh5E8Mib+7hNk/5NR25cuwgmIQAU1GvbCkPnOzlclte62R+QgZwiUsD0gO/PIVV6auHcS2BVV+fDsUcOBkg69k6immkfMkg5ykWzJ/a1BT/9JHXv0hV9Nj+mnmgf1Kg2mWxgZbINGX1Jfy/1LPnzl72qJkADIYJGUi/CbAB8B+zlqzaHio6OMCh8Xt+ls5/te5dGtr0tFiYMqabCgqXLfax/8K+UdefNpy4lfPHZ9DMfPug== 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)(2906002)(70206006)(7636003)(316002)(15650500001)(47076005)(6916009)(55016002)(336012)(4326008)(356005)(82310400003)(2616005)(426003)(54906003)(508600001)(36756003)(8676002)(36860700001)(26005)(16526019)(186003)(6286002)(70586007)(8936002)(86362001)(5660300002)(1076003)(6666004)(83380400001)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2021 23:46:18.9246 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35551c3b-2275-49c0-d4f6-08d98c48283e 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: DM6NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4814 Subject: [dpdk-dev] [PATCH v2 2/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 Sun Oct 10 23:45:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 100954 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 897D5A0C43; Mon, 11 Oct 2021 01:46:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7B28841102; Mon, 11 Oct 2021 01:46:28 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2079.outbound.protection.outlook.com [40.107.212.79]) by mails.dpdk.org (Postfix) with ESMTP id 1C7E2410F4; Mon, 11 Oct 2021 01:46:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H/eCDZS4k2VSlqwS9swOdewaFNQvETJHdMQr69NrqS1lAjkmuT/E+f+/4U16K+lUywb3KkyaaGv8R0zoBu6WG5l3NsG4zlI4UI0tVwWWJpA9+d8hzW0ixYmwjcvFm70Xsw7lF0VO40PhXhUUDD7WMsLaJbmqHG6thGxsapPGU6wWh4VdYXDgRIApuopr2gPvVnks0A+sjMJhSF9kDZrxiy+t0a9SFNsv/VrnBBdr4SGkr/sggbqF1vb1wi4pDer5Ec8vJRFo+3wObK0nrHvl+FQt1v1ipvqAU5z4aVl/O/Gx27V6GYRFLDZVZQdfQkpx3NvitCKvh8Ssr3Z1EeWtvA== 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=M4wHDtZDjG6Ie4BGB5/xbzPQBkcMMEKySVzzMHYQBMk=; b=Ymz6ZoNLJHF409tuFiAc0vYh4FocQSiJ24FIvWRdHsfQZszzW75LytgxYja+kBIOFf9YFfyZRNY4FkkGNLJ3vqWC9t4IxeO2TbJ/MbNMZscI3AgY5cmfx7F8jXSahLBi6qlFji6d6w/cY/7jTKfz6xDIS+L1FQLR/7gfL4jC0OPHKGdWRomjVDEIzLPMJGqvT4sxPpu6xHVxw47fFvgMhevl+FWDU5NViT0wmQAjldcWBWirFOOwUINrJ9gbAl2FYl73oQPLGUVuV1a3PlysA3L+sibc8Tl2hrn5JHq4WVxESXHFYz2MTJJ0VCxuhoBsqoRFlf60CfKfu1eRa3/sjw== 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=M4wHDtZDjG6Ie4BGB5/xbzPQBkcMMEKySVzzMHYQBMk=; b=SW/FjaL3owmSqHcymapbswxrpacc32iDXcXusknr/78VtdVJt/89C85wLPehNp8UCMGU/g8uITrGbtvAmDclpNzTFnLA5mBt1i44k2oAOSL8kCXct+Uo1kXXee3qv24DbeTbXiJY11719AbH8T9jwJddQvocf4uRHqGFiWaCY8rRfSjls+R9bSA0BxlaqrrjC9XIPkSb7lIQtiWPUOSj0OY+Tzrkvo5I5kZlrSqzc/FxXIBHzpXNkssnsJPc6idxlmVwES3OnN8wjx3HWi5McJf37px0RcTsYaQ3JDJUdHQAK552fnSViPnAoc61rhtJkAi2QMyhQYZGolHyFB3HWw== Received: from DM5PR15CA0070.namprd15.prod.outlook.com (2603:10b6:3:ae::32) by BYAPR12MB3415.namprd12.prod.outlook.com (2603:10b6:a03:d5::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25; Sun, 10 Oct 2021 23:46:21 +0000 Received: from DM6NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:3:ae:cafe::86) by DM5PR15CA0070.outlook.office365.com (2603:10b6:3:ae::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18 via Frontend Transport; Sun, 10 Oct 2021 23:46:21 +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 DM6NAM11FT057.mail.protection.outlook.com (10.13.172.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Sun, 10 Oct 2021 23:46:20 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 10 Oct 2021 23:46:18 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , , Date: Mon, 11 Oct 2021 02:45:45 +0300 Message-ID: <20211010234547.1495-4-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211010234547.1495-1-viacheslavo@nvidia.com> References: <20210910141609.8410-1-viacheslavo@nvidia.com> <20211010234547.1495-1-viacheslavo@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] 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: e47050fb-097b-4789-3715-08d98c48295f X-MS-TrafficTypeDiagnostic: BYAPR12MB3415: 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: YpDzOvGoxXgwPIdl59eNwplnLYBbKtVEEMzKBkhomkI7MIpQgW10WZ68tpNmQKyeu3D88seYQyxc5jWn3spTKFZPno1Oh5GcJ0q81RIX5cmMFOJKwGDmmgmxqTo+UganpYiDDZYE1HimZq10/0s0HVySbiKtXFQNtQ3SXQZSnGZiJGmy+g4/KizBqc2q8kQVNMFFu1R0VH1tpmn37MVEMbVmQL+HVeFQGMLmxvbW583d9sIMpa9lbz3jiZh6al00RvkLro61jQAcd3Aga9Oy1oLw4M4hWgcL51Z5xNb8JhCMHMISoC9TPWBq4PDQDlRk2u1E0234e5u2vtyy/v4JNciOQAXGEtdSLm0JzbYWVAuMHYS1dxATMPU3WBAyBgruWi3fiPJwFfKp7tT0E66ILvypwoOgDZnxPCsAFm2g6W+JjZqvP0DaC5H2JHRXQdOrgg6UUJ02u/NNcQ12jwtixDSW5i4bgEp3QVEckBk37s/AbLcT5XsCzkxZBy+L6QBoLTq/OhdGWWn5iLUZwzjH7iZ8JNR/UGeT3WYU+pt2k9AMdnA/NP3HyTPAAmCM06qT0KB/4UaORXU7xaYFW62eyooqEZ+Oao6AyrE/fGkPfiYqFL+5DQHjmmw7VCuwwtfzph6UmFu6XYd31mIO04Eb0eKz1wO07bAVrdfAhlKNMgM3K9XDdVCDmKSob+w3QR/rb7uB6w79WPGhw1zAAInrOg== 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)(70206006)(83380400001)(70586007)(55016002)(6286002)(1076003)(356005)(7636003)(2906002)(6666004)(8676002)(4326008)(36756003)(336012)(54906003)(316002)(8936002)(16526019)(47076005)(86362001)(186003)(7696005)(26005)(2616005)(36860700001)(6916009)(508600001)(82310400003)(5660300002)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2021 23:46:20.8286 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e47050fb-097b-4789-3715-08d98c48295f 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: DM6NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3415 Subject: [dpdk-dev] [PATCH v2 3/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 Sun Oct 10 23:45:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 100953 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 89BFAA0C43; Mon, 11 Oct 2021 01:46:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0BA4D410EF; Mon, 11 Oct 2021 01:46:27 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2071.outbound.protection.outlook.com [40.107.237.71]) by mails.dpdk.org (Postfix) with ESMTP id 6EA1C410EF for ; Mon, 11 Oct 2021 01:46:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AA/b9RKXwQWbb6A7ZaX0ofQ0Dxv0OiyJ5S4ubCLpC1o3WRb7bfrcra94F+3UfxJ68aUIjlaWXQCGGl/4EebwL+zfznnE9tiL9kL1S4cdzEAacXaU4ntAqef7HD0GA9BId64bSyK9XDCC7/bhxXqcek+S8wmoTIrgNTckkVvcbGKooeg55juEN+hfWorTlVSB5WU234QRvgKd6L1GOmHHbRoHRkmFGXLVwJ9A0ymFvqDItN4jpoYb1NWzLe/VzrVQoSR/eiPBU/04GOzdScFBH1X0i4GcQXxrSjX7lZdflWOGnWz+ogiM4VSmej2oRLIzo97IgYQscrqEUStGWHBFsQ== 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=xmHQAVtrm2Pz5awJPtUb3NvascQYAxmyvm+YLZ3MuOw=; b=CCerhtofxErAsPlNIR+YNPTAQCWX6YFUt5D4dP8+P96nXNxHHgTRa3QE8wn+e1607NMl1mnsgn+O/UWnNpqtVGO5NZrSW15DqyWXqVfMozVMn+iqJFgMW+lfmG7jvVEb4LpO+TLvg86luImMi35CMQQ4BXkWC+F4tw3J9oV6TdOl0PnEOLXKEliAVq/cgEiYmXhxwA3OhkNMbBgP2nDg8C37+cD2VPdG6PLS4kToj48FrGqtFAXqg/1YTepu+mVoO6Yw6gz3zh0cHqJjmNE6p4HjYtsDOjI+5b6Np/frjtA+ph9g3bWCg+7hcX09irAtzaoE4ojxR1r53ARRy+dtAw== 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=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=xmHQAVtrm2Pz5awJPtUb3NvascQYAxmyvm+YLZ3MuOw=; b=qd2ZAAAS7tIuGI3jofJBsiPLCo0HDDdxhjXJFtJRM3jLVRRp9uP1WbyM8pDxCa18jzBuEjsPURq1D140SFV/5fOcxAO+2bVVyvypAD1tZksqbh4+vhWJh/lGhtD9WZhN4zI+DJBb8HsOEckFxtFnmiVgargv1bg9+3GrPLzGSua9mn9PB76LEtDaDM+SgcaBrU0YzIUQRJZdBKQxOCHkL/BWPIkCODSPhh2T6bdhtgai5TYfG84vmUTgffNZBlGj7anTJuJWLNuqnnI6zcf6OaCh8FB7VWB5pVPrikmNbuOU/uUvzsj/O4K4mQCJcotZ8hnTiizELAC/+62aIvUIUQ== Received: from DM5PR15CA0057.namprd15.prod.outlook.com (2603:10b6:3:ae::19) by BL1PR12MB5190.namprd12.prod.outlook.com (2603:10b6:208:31c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.22; Sun, 10 Oct 2021 23:46:24 +0000 Received: from DM6NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:3:ae:cafe::97) by DM5PR15CA0057.outlook.office365.com (2603:10b6:3:ae::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18 via Frontend Transport; Sun, 10 Oct 2021 23:46:24 +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 DM6NAM11FT057.mail.protection.outlook.com (10.13.172.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Sun, 10 Oct 2021 23:46:23 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 10 Oct 2021 23:46:20 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , Date: Mon, 11 Oct 2021 02:45:46 +0300 Message-ID: <20211010234547.1495-5-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211010234547.1495-1-viacheslavo@nvidia.com> References: <20210910141609.8410-1-viacheslavo@nvidia.com> <20211010234547.1495-1-viacheslavo@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] 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: 858bd75d-6cc3-4dae-f76c-08d98c482b15 X-MS-TrafficTypeDiagnostic: BL1PR12MB5190: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p+wOVTxyEkYmfnBaaj2FAIqrfJrHlGDjQWYoczzIcdpylna1WyQ52HC+twubJoJwjTtyAkRy4u0ch9kQ62zGZWsIg3CRi+jxIXb7EyVSnGX7HMX5pvAYaCkluhxBR0GXhGx7AdS/qOtIvMZiotVnB7PxVypd34/UWfI+sM1yRmzvaQSFN97TkMK041iD1BgPVBGT2KM1p7pc58ZnrLqMDkVGm6v3b0P8yk/4j8LjkZXTslcPZUGzKLyIdNa3gOoOS1CbkT3McTjGacyCL6csvHSBQbavxCLA2lFYByTbJ83evpFlh+/KyrAmvLI8pji70r5GD1nMY3xSGmuSbHnfSZgpsOY9a9STMnh7NtczvIVVWQ2ll6cAK3B3PYqy+52hVXC6SbOLiEIgMsQ4gwJ/bkr39dBWgKjOVWjzCaB/IpU8/T53hEP1qMwbfUHSNXrA/8hnzFvZW6Ew6LNQQeP3N3KWM2+pNDmVxHQd08w76Ho+ffr8prPmbLLQlwxUV+zdyEfc5Yi9zSyR8rPcqD3I6u3aFQ4+bLS+fL5LIOUNuBbYKdc1p6WZPVGxfEXxkbonp2daA/lcQkryOYhTiG9N7Bcg2N6Q1LaVZbCqjOv2brPisdSM1kGvSYtlDeajj7FC0s3X8FA59BfRmn8WKOpbW6KiWlH5K3Du819sAQO8Jj1ifRWqnX1A9YucGOYldKcyOzzH7Mu1rKAS2vp7ICAZyg== 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)(6916009)(4326008)(7696005)(6666004)(356005)(2906002)(316002)(55016002)(36756003)(83380400001)(426003)(2616005)(47076005)(508600001)(336012)(1076003)(8936002)(5660300002)(70206006)(70586007)(15650500001)(54906003)(186003)(6286002)(82310400003)(16526019)(7636003)(86362001)(26005)(36860700001)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2021 23:46:23.6890 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 858bd75d-6cc3-4dae-f76c-08d98c482b15 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: DM6NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5190 Subject: [dpdk-dev] [PATCH v2 4/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 | 50 +++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index c6370cd1d6..867f587960 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); } @@ -1462,7 +1463,8 @@ mlx5_flow_field_id_to_modify_info struct mlx5_priv *priv = dev->data->dev_private; uint32_t idx = 0; uint32_t off = 0; - uint64_t val = 0; + uint8_t *pval; + switch (data->field) { case RTE_FLOW_FIELD_START: /* not supported yet */ @@ -1838,32 +1840,37 @@ 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; + pval = data->field == RTE_FLOW_FIELD_POINTER ? + (uint8_t *)(uintptr_t)data->pvalue : + (uint8_t *)(uintptr_t)&data->value; for (idx = 0; idx < MLX5_ACT_MAX_MOD_FIELDS; idx++) { + if (!dst_width) + break; if (mask[idx]) { if (dst_width == 48) { /*special case for MAC addresses */ - value[idx] = rte_cpu_to_be_16(val); - val >>= 16; + value[idx] = rte_cpu_to_be_16 + (*(unaligned_uint16_t *)pval); + pval += sizeof(uint16_t); dst_width -= 16; } else if (dst_width > 16) { - value[idx] = rte_cpu_to_be_32(val); - val >>= 32; + value[idx] = rte_cpu_to_be_32 + (*(unaligned_uint32_t *)pval); + pval += sizeof(uint32_t); + dst_width -= RTE_MIN(32u, dst_width); } else if (dst_width > 8) { - value[idx] = rte_cpu_to_be_16(val); - val >>= 16; + value[idx] = rte_cpu_to_be_16 + (*(unaligned_uint16_t *)pval); + pval += sizeof(uint16_t); + dst_width -= RTE_MIN(16u, dst_width); } else { - value[idx] = (uint8_t)val; - val >>= 8; + value[idx] = *pval++; + dst_width -= RTE_MIN(8u, dst_width); } if (*shift) value[idx] <<= *shift; - if (!val) - break; + } else { + pval += sizeof(uint32_t); } } break; @@ -1910,8 +1917,9 @@ flow_dv_convert_action_modify_field 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; @@ -4874,9 +4882,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) From patchwork Sun Oct 10 23:45:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 100955 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 2EE72A0C43; Mon, 11 Oct 2021 01:46:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DB4C4410FA; Mon, 11 Oct 2021 01:46:31 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2040.outbound.protection.outlook.com [40.107.223.40]) by mails.dpdk.org (Postfix) with ESMTP id D57A44111C for ; Mon, 11 Oct 2021 01:46:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IWG3uZQnFFBKyBBLgSodhGk18noojlzYv1Xo5haSdYA5+3LxgH92Wl9l+maxDYoTKNB6JhYn1u/gh3Gz1maHV5YyId0LQKKywb6WlCGicNPWfIJEFM2sQT6e8eJ4Ji5CWEfkobDp73hxcyXb9KRi9nI2mDkYCXGBg2x3nfncQ3xvvGxuminZghK3cdYgdZzHiuoxInuo76qEJDcldnNoN4jNq7wV9mPCv0WZPbdU8Wd5uVQmiI+dnuw4ZQGkGG1qsaYj7/m0dSRHJc3SMUBmE9qEmHyPVFUED7lENDm0Oa30YfMZS9UTOSb9WxG9i4thxcSVRDAcN4KseTZfW/d6pA== 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=CTu45BSN1E3xAehv6lHAlCys+/fHcVCZQn30TU9SlQU=; b=Adv51cTCScnwOcFN7H1OPdacM18CMhNGsxjFHzAI5Ozzzh9M0ll/ycq/Tsw9r87AZsq7NVRhUN6kvhea+fcbtZaLsF+uubw3NkcMxdiFGcFWBqAK6OdY1zhFGlvZB7Vt6At8VxLWrTCQ6f8lP2RLZavjrlb0htB6ShSaj4OOsNmrowlDXEB46fH4FxlT6nbpBBl3LQ+OwKqdsPe4GIcItTCLYKerhdXA51ToNI22uNTpcMRQ9+RWtmMcL4Cju7UqnhgVO7OV604eJ3D5N6TMTMYdDm6I/2q0LX1g2vh6bk8H1J+5sV7sPPbFub/CG92VwhLHF0jubvug0TcgpcriTQ== 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=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=CTu45BSN1E3xAehv6lHAlCys+/fHcVCZQn30TU9SlQU=; b=bnQlXCfA1Ca3Ckipj6yT43q9wAtJj+jT1qolAw8k0rq7TCUvoH7Q9YC5vInb2ISWs18yhtDhNN+7wjSfeXChY7EpWUeKIJ++EbtJgsxzTi889Nuc0ahcTLbzdR6njy0QwDDizUzas2UYv5rKEPOm8TT8/gIxPFOzgtksA2BnO9sXTEugTy96CTehlJ36arlKBTv8TS0IGnwWy7GVLEs+00K3V1/HBPJllHTXCtjwQGFezc9JpMnnwRSG2ljWHAxUEQoKs3/674+MWJYywSIRpDFynxhHlOYYl1yXWyFMBBy9tivbtmWIXRhJQAeqYL4BEQooan7ybtoYjgIJfb9LmQ== Received: from DM5PR15CA0054.namprd15.prod.outlook.com (2603:10b6:3:ae::16) by BN6PR1201MB0002.namprd12.prod.outlook.com (2603:10b6:404:ae::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Sun, 10 Oct 2021 23:46:25 +0000 Received: from DM6NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:3:ae:cafe::b3) by DM5PR15CA0054.outlook.office365.com (2603:10b6:3:ae::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.19 via Frontend Transport; Sun, 10 Oct 2021 23:46:25 +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 DM6NAM11FT057.mail.protection.outlook.com (10.13.172.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Sun, 10 Oct 2021 23:46:25 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 10 Oct 2021 23:46:22 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , Date: Mon, 11 Oct 2021 02:45:47 +0300 Message-ID: <20211010234547.1495-6-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211010234547.1495-1-viacheslavo@nvidia.com> References: <20210910141609.8410-1-viacheslavo@nvidia.com> <20211010234547.1495-1-viacheslavo@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] 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: 9d04633f-9b29-475b-3579-08d98c482c09 X-MS-TrafficTypeDiagnostic: BN6PR1201MB0002: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: thP7+x2UIw4dnAFnRrlYXgO9W3sMWi9225eM+Wq7rI5GSKuxuZcp/Avwrfv612gbym+UKcEqdZS11ZILvuJmJrEM4etCT1oCHIG9pYZiKuf+QvUjbvumEfVmgsQbfmEB8dmHOu7geeUajyw7gD0J7Hfqz0CUgBUhEA29OqB0Gts9Kj7qwDRSnbKk12NEUFU3WVJ+fesm1Z4MsBHTqJZrkJfTNtRENhjWhkDJNSgu5RdakR9K3FYUldWHzvtWl3rUJarCHYkd0NZa2Zatr82ibvg54sZqdJZOansGOgGoVmWGKMmTdipC8A1uvgCb7A2BQNenAl71IJ1IyEMy8MgN8wvYR0S6tdqb8YGldTBhXw882H3jgE3PgKqhY7O/f3GdXDHSkBQGb+gqTLgvWLWMk5jVX/PQdv4uvClYPSF5p9H30CRYJIfrbinvBtt20W9bcfsSen9MxUOO5MPGLRzgaWb7F82gVkSKc5U4kYS+G8Dwfdx7sNhaIMj/qHDdRnNI75YDC7cv1gBmTmdZOAG0CiHbDfOHJsNcWJuDIFVe8UanrCuxDXkOOrUmyLA1PxUDlTuygjYOyLlOvoodr4cl9RswD+dNy3kzvpPCKYJamUXst1E0iGm5r8qeQ9lUmWaKQqUm3QOmrKv7q0EHAmJHwQcamn9cQyRcrD3Z7+soF3rsa/+j/2Y8HVdjgIndJFfhyUFqdJoEF0r+uoPgY/ZFOg== 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)(15650500001)(426003)(2616005)(55016002)(186003)(26005)(70206006)(70586007)(8936002)(6286002)(1076003)(86362001)(356005)(5660300002)(54906003)(8676002)(16526019)(316002)(7696005)(47076005)(83380400001)(36756003)(6916009)(4326008)(6666004)(508600001)(7636003)(336012)(2906002)(36860700001)(82310400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2021 23:46:25.2761 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9d04633f-9b29-475b-3579-08d98c482c09 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: DM6NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB0002 Subject: [dpdk-dev] [PATCH v2 5/5] doc: remove modify field action data deprecation notice 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 is updated, deprecation notice should be removed. Fixes: 2ba49b5f3721 ("doc: announce change to ethdev modify action data") Signed-off-by: Viacheslav Ovsiienko Acked-by: Ori Kam --- doc/guides/rel_notes/deprecation.rst | 4 ---- 1 file changed, 4 deletions(-) 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).