From patchwork Tue Oct 12 08:06:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 101178 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 1485FA0C47; Tue, 12 Oct 2021 10:06:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0515B410D7; Tue, 12 Oct 2021 10:06:56 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2048.outbound.protection.outlook.com [40.107.93.48]) by mails.dpdk.org (Postfix) with ESMTP id 548E140E0F for ; Tue, 12 Oct 2021 10:06:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ujgh2Cy65N1pRTZuIYYXMgxOb81yvR1uHd0LR4sLoMw8lva+hF9MB55rLuk/iB78lVR0weCZdyASO/33L7bkG1K61wj7VZ2UVjBDo4uo+brdBIfF/dz31ZG2ke9WqpWl185ccMKhGVqb99eW14V5BBFsviTUkThIJ6sWQZzy8CcF+FMOqp6KnZghartC0JqcU+Ah5SU5+El+ixFgiiPgK8OyIgGdpeJDl4fmMkvxyZXMLpbXKZm5T79TjTJDoAYNzYknHxDnw1sLCJI+tuHOzpZ8UNx3zpz/GvKmIYgr8xwz6yNCHiImHO1en26oDQuD/9hm56KV+AI44cJalE5j8w== 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=LAbYVepU16ZWnqBJlzNZpMeMpkQ7JJNa1pYXbKbsp9Y=; b=S2KzvgaL/x28HxZbntZS2eelMK6fQXU8fssbbgIrtQvkZlhjtgd526WhjybzOwkKMp0xNXw3BTZfzoC4icr03sMXoXYNhrK0AAvRehfpAGLCh5EDheh0Lih75bbHTVUmWuIdJ6JqftIOYYPReeWDpTSgScEH3nFFqne4acTIkfEFF6BOeIx3ZZs7/DglLJHZ40w7JmVcPqy/Fzng4TyLLuxEk2THK53ZNnC+2zv9YdtO7i1Ep5Xhnm3LEmB03SMXdlcznkvNOnVZgwSZkNwfZ8P5iv1dJ43Nf12td1Ks05HQKc3SsHqUU9/0ClpnGizxd3EMSUWBrIcYxO4J9dIi1Q== 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=LAbYVepU16ZWnqBJlzNZpMeMpkQ7JJNa1pYXbKbsp9Y=; b=nl8YxbSjqMLBQZ1eyQGBPYsk0y4Pcu2kZTQ6nR70qzUrYSq5X0fxrzHtVIR2fyX7ONTJcWogWZsw69CPsQCiJ2PWhhpvmRXr0gaVwB7hreIZWAU87AOD6dDQ2w/iBL7TsxwzZ6fJ4DW7xTCDdqOPVnuWy/tdekRtwwCeh7NAyBYVrV7kKppoM0Yf/Q7MkylqYEC+75WmDdqneBZW0TCH5MWUKsJUPkVCk1cEwvPJ9djD0HS4pdyFoBGa1e4h8gHyASYtChfh/pLtf2JpwhJp8ZJlKdD1fEglOb204cYM5Dca7h21CJYxU4PbTCpSXyLsNbxwGahB3h35p8ZDSxVu/Q== Received: from MW4PR03CA0107.namprd03.prod.outlook.com (2603:10b6:303:b7::22) by BN8PR12MB3268.namprd12.prod.outlook.com (2603:10b6:408:6c::18) 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 08:06:52 +0000 Received: from CO1NAM11FT013.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b7:cafe::84) by MW4PR03CA0107.outlook.office365.com (2603:10b6:303:b7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.14 via Frontend Transport; Tue, 12 Oct 2021 08:06: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 CO1NAM11FT013.mail.protection.outlook.com (10.13.174.227) 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 08:06:51 +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; Tue, 12 Oct 2021 08:06:48 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , Date: Tue, 12 Oct 2021 11:06:27 +0300 Message-ID: <20211012080631.28504-2-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211012080631.28504-1-viacheslavo@nvidia.com> References: <20210910141609.8410-1-viacheslavo@nvidia.com> <20211012080631.28504-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: 782b65cb-69fa-4bf1-9d02-08d98d573f52 X-MS-TrafficTypeDiagnostic: BN8PR12MB3268: 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: MV2g+iXRFnXX3fmFfrC2aqAqNoWCMtKy6EnqF8my+1RveACuJoeInlakTUm/TcP/XN4FBCA8vbejq1k0uPKMr2TvPOGYG+Wo4Prb3X/0czCL1JL8Xe+fnMQqPoUgNZntNGDiOih08lm+PU1RzhnsG6rnlsZFsNAYnRqfsIdYBW//M6Zhk3AbwdjJ1usWidELea2Ir15VJUj/7CdhGPx4+77YouyMF9qgST3krk5JMpldh3mChaiaxfZJObUewRvskLWRXqr5PcviIAeO8Av/6t2uyMFx8bi+ZLEyXUpYhfi7YXONw5uo7uC4yQlxgx1ENzxI9WHNdPIZ+PeFjFCfMR7VoPbBY2/MQiXlE29p6nqp3KSLgykeKbv+lUXt8uhHgF6Orx5LXooC6JmU166TNIC6+m+ehJYMbrATL4WxN+L2rLZtydlT+TJBZfkfbUpNKZQPT2dFfhiDJstgFLiobNCPnNjiS/gyNtHOeuYK8ZEdFye1vrsLr7LzBzWM1XR/zLBCfzIzJHQyNM7miNtBw2oRPVg02c6jhHqhSf3jJ59nbgWHivjrCNdPxtsw0M/Hq9Vqy5IKmrcv54bBSHY3A4LdKjMMYLFnizCLtCwZLUQZltVFK5jfhi1pgVMzUG7VYuCUmIKl+UnYABZjGxoSn1sUKmtOXpBvjYaq3bvsHyWtZnC4le36Lc/W+Xg2BezIf1F8btzFaILikW7aa3xi55SowG4lR5ZmBLQzPgbVXAc= 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)(83380400001)(2616005)(8676002)(186003)(8936002)(6666004)(1076003)(16526019)(70586007)(70206006)(4326008)(36860700001)(86362001)(336012)(426003)(316002)(7696005)(2906002)(54906003)(356005)(7636003)(36756003)(6916009)(6286002)(5660300002)(26005)(15650500001)(47076005)(508600001)(55016002)(82310400003)(21314003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 08:06:51.2636 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 782b65cb-69fa-4bf1-9d02-08d98d573f52 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: CO1NAM11FT013.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3268 Subject: [dpdk-dev] [PATCH v3 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 08:06:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 101179 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 A3531A0C47; Tue, 12 Oct 2021 10:07:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 03CFD410E5; Tue, 12 Oct 2021 10:06:57 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08on2065.outbound.protection.outlook.com [40.107.101.65]) by mails.dpdk.org (Postfix) with ESMTP id 1E21A40E0F; Tue, 12 Oct 2021 10:06:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vc6X0odPOS7GRLS4+29HXWc6DkofjIUctgRYgnlPXjEWzbBn3gTMt3knhHgJ8nT+Pj0r/4qZS4ku7pmV7RUiYSILXqSmCv6hal3pN3H2AFYdMFfrJmjEWUoamJ+DDPexajVcaf+yZcs4Ul8SKBsnJCd7lSiczCBDxKqCi27ZJE3iDxRW/CSHWbr/5Etd7ObVXO6Smew0n7tqAm1GsVjm3z+937pz+FOffMidGuyqjBR0Lv6TqM1fXx0hT8OXoBQa4MwfBLCqiRA6GVrT+cDudevfSlmlcy9zh8Ph+eTw9QrmKz6eHo2B7YKmlOqushW/za6CcEyj3GClB6Or+EMaGA== 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=oWvxXwpCOYIyEqXH2E6jJrRo+r6M/y8TWoZTp+9EgHM=; b=gCkGFmcBr8UxBeRO41t5emDRzUYoNPko98QZFP6vFYuWQcNzi6wsJsizfr7DURmNy0vLu7Vib3NJUfBqQb9GlDogQWGgP4mIJA9wqC14H7vo2CC5QCbhEvf6/lNj/gj58kBGwaWWc3DOF/ZCT7CDBf9wuFwEMCF/X8qYNdjy+xJy3oP4ssLYt9CjHw0vJdPkfHnEBpokpW6RfZ1FBJQCGyxo7qTc/5mcqxEj7j6UBVg+EGRp8CM8WwTb1SW+n905OWQIlOHnJnoXNOtY7KStEy9YmwBMcPLFBfzXaxQccJwp1Stbke5e6rGATrOfyFVa26ZqVqq7VanAk7AT+xxuvg== 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=oWvxXwpCOYIyEqXH2E6jJrRo+r6M/y8TWoZTp+9EgHM=; b=duYhXKlOBheZwM4OOrT+y26y7uSkpDJQu/ILWOSCRasEa6+C63ZCseVgFggm+kyYFmcRctJq3SVL67V4nB2qA/RtHo6EOzHipqymj7R9KISOcqoGWbiG6BJJOWRs1GwjbEMUeCEAuxQ+eSgh+UwruUwG2EVzh0TlV5d71cvGz3fLrr2ZC/hJKeYGATfPwabHosI04Y7MoPx/iGXxtgl3IZAOi0Sa5btryNF+eFkBKSMIZn4dk3/MWY/Zv3C7dr5L0V1c2c0IYBarwrBQhtAJLfpyguU0GcuLRglStNRvZm33vgVNf07LehLXXwMYRGhdICzp4kdwC31SZSB3FUdnOw== Received: from MW4PR03CA0103.namprd03.prod.outlook.com (2603:10b6:303:b7::18) by CH0PR12MB5026.namprd12.prod.outlook.com (2603:10b6:610:e1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.24; Tue, 12 Oct 2021 08:06:53 +0000 Received: from CO1NAM11FT013.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b7:cafe::dd) by MW4PR03CA0103.outlook.office365.com (2603:10b6:303:b7::18) 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 08:06:53 +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 CO1NAM11FT013.mail.protection.outlook.com (10.13.174.227) 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 08:06:53 +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; Tue, 12 Oct 2021 08:06:50 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , , Date: Tue, 12 Oct 2021 11:06:28 +0300 Message-ID: <20211012080631.28504-3-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211012080631.28504-1-viacheslavo@nvidia.com> References: <20210910141609.8410-1-viacheslavo@nvidia.com> <20211012080631.28504-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: c026a2e4-5cf6-4bd1-2b88-08d98d57408d X-MS-TrafficTypeDiagnostic: CH0PR12MB5026: 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: jbpGItL4xlEgs+0VIpMCItxjN8Zo7sjIFlIR6RhCc2auFotxhK1i8SC8Lz6WmKqux5ozJsi3NKiCqPcymJENvITXB/UaQZxQlTX2RyJTbSxwoZg33pFvh553AB0ABn8WPECIYI/ufFLxNaynkp2Gm9jv9qqcJIrQ4LfGU5iiLkvHezgj/GUawXvZqQ2irH/9q0ALdQtZQJJ73x9HAT7WmyN/do7/qJ8OmAXpjDCWQToiKulUALmEvHz721iW9uuCfXREcE7mvGab7gltrm5K5J2WH3CjFCTFPY2rIMk0q/h3xYzQPzPC6Kf4Wba3UtkoW0q55/LZHVzMOiSRmBvqXHqXRmPkwoia/AV1x8AiefZ/qTHSihf6mIbFsvmVvUHG7+FTsprpxUh0uR4l6jAyn1Nlrot4M2WLG9Gqka5sOoCx/I767KbR867vQTE679kHazU4184ZKeH2d5ZaZA4621/+cKtWAxxUq+vi4Q/byF5aSqjHhqEsKGo/YH5bkVIiksViq+6V7t81UnY08OhTkW9GeSBy3DuiWcl8fu5prIeOvwUtgcrkMzRu0ndttGxAkGoTxRzJdAkgaSN9R7smBCe6vhAge+DXPJc1LeyfmNs/F/9Qp6FtI1TNVHUzXgjT6vIkvl85n/pmz+MHZLEQDa/uh2u+r4Er0Px1+Pbw2c+yQ78kTAM2CQYhR5RXTTYAM8MDCn5316Onk6ElWOw0gw== 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)(1076003)(8676002)(16526019)(7696005)(356005)(7636003)(55016002)(70586007)(26005)(54906003)(186003)(86362001)(6916009)(336012)(426003)(47076005)(83380400001)(8936002)(4744005)(2616005)(36756003)(6666004)(6286002)(316002)(82310400003)(2906002)(4326008)(70206006)(508600001)(5660300002)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 08:06:53.3211 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c026a2e4-5cf6-4bd1-2b88-08d98d57408d 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: CO1NAM11FT013.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5026 Subject: [dpdk-dev] [PATCH v3 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 08:06:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 101180 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 836FBA0C47; Tue, 12 Oct 2021 10:07:11 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7CE59410F4; Tue, 12 Oct 2021 10:07:00 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2073.outbound.protection.outlook.com [40.107.236.73]) by mails.dpdk.org (Postfix) with ESMTP id 676E4410FE for ; Tue, 12 Oct 2021 10:06:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FPZ1U6Xf9Rivt/ba+koPYqhz7f9sqojDHgPnKfVSMYWxIkJExU6tAngD4NSKNHH4hIz6wii2DweCqRSGOCItBG2WDkBwRtGWvKXV9zSLvqUatKPPEdU2x0N4k34GtZCBJ8WyGODZCfveItUnh3f1mW/RztyxJx6/Cwjyhlg0KSvBXcE3zcnU7ZCrCrLjVXaFMN4YBwUaDM6+sesQZ9qy/ggGgbfGwy7y+FZoEdhSqFl8xCS4fLQqIZlAFyGXkLVfEWedPPNyXpLwCu7yiBUom1PzxrWx9y6hfaeDBcg8xaG18FMayRFZacbOCvMta5dsJpUsti4J70IWpUqNlRFuag== 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=JjLT+HyuwjEf3/BfNdp35qEzkHaVUSZvYDhQiOGridd5qU9M5YDa78VN0dyIZVXzO3j12kYZvU7ZhHHGiBJuRwSl2qXzAIOzVF8HGk2ef3LshQ1m17X/H2ZgYKbS211ZSTc4wIHAdgBxYLMVZsAykhtZPrQGFTTX6v0Yfe07PXSR6VwIdQSio+mZNyQ/urAVZ/IBQmJ3Go0yewZTJvdsLr7g4IjyZAlD6AweT0sW10/nvCj64+PfX/v2xNLUlU/R6GvE4pdVmmLLrMQay4T5hwJicQGHRJsSBhx/YLuEBdF59nh3MgcAOAlJOm5OI0E28fmVlRiUAv5IELT2M7ofdA== 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=Zgt4thGuLKMoAlAf7Bhq7NkEPmYFqo2IIuKXCT26VXfmjCDoxKspWhNLVjU2+zaCEd/LaQRJBJmJtx2m5wxJ2++m6ZD7AHCIr79wGx8vhNMC44sqMPV1d9qVrM514RCZg15px0i3621Hda1PhM+ZtQv8Ygq7CCXKVSe7VinZ+0N2VlNw6PhEQGuV0uehrR1vcNM1RQbsoaM5dgfnb8ms2uPYw86IPbK9i/++/+MeJ2xY7E5aGwtaYHFWxhZzCk5cxXHp/uxeKLoSX8sxRKB8oakz/y+1svub8f62tOzBVibY+jIY/CAsA4E60zYE5KIt6SnGjmOYHit22xGyREIVLA== Received: from MW4PR03CA0093.namprd03.prod.outlook.com (2603:10b6:303:b7::8) by CY4PR1201MB0120.namprd12.prod.outlook.com (2603:10b6:910:1c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.22; Tue, 12 Oct 2021 08:06:55 +0000 Received: from CO1NAM11FT013.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b7:cafe::ba) by MW4PR03CA0093.outlook.office365.com (2603:10b6:303:b7::8) 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 08:06:55 +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 CO1NAM11FT013.mail.protection.outlook.com (10.13.174.227) 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 08:06:55 +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; Tue, 12 Oct 2021 08:06:53 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , Date: Tue, 12 Oct 2021 11:06:29 +0300 Message-ID: <20211012080631.28504-4-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211012080631.28504-1-viacheslavo@nvidia.com> References: <20210910141609.8410-1-viacheslavo@nvidia.com> <20211012080631.28504-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: 21fc5184-2377-465f-05ed-08d98d574191 X-MS-TrafficTypeDiagnostic: CY4PR1201MB0120: 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: unMFKtf8eNZ/deEUYRYilGChqOpKYgn30/gs1TVnY0AOIm2TEn1kKW7OUlKZHjnSn7+q2aTgra2q/2JnBDa002Li4f3TS/8GpESxnffH/vm6GKmHAnnghQJ8DqNEAIHHWFGK1wTT92UKUcas0jZ1MtBKroQc7Jy7ywSVs1RlfSlmNt4QCE6cr0xH0/nO90qWcfsbgky1KaKhyGvvP41wz0et6H33+QLw6tj+pr9xtC3f8CTPKaDmHDRK9Z/RbH3Ic+41XGFpiMDwFccnH8wen7SB0dT3BpUIqvjckRGr2rKXQi9D7YXYBxjjOJxlFq/vWWMWjqnFjY/9sQ+svVstws84htYVYIMUhXNCDmOWtrx7n8rhulk1RU0SBQb5Rx+HPfGnlWYMjh9unpLue4AxIDEYjgeOHIsRrG+D7YFGTvG4NZ5t3Q18NWx4JZLng2AzYl48Wi0Jnh/rW6oScgfV5ShJhVfVBNSHrt+xvqQxkB3o5nNGW6Wz0SzNgmGc5cZguj3ee+9kptTszLpkm2hqMcAemd6oywDCDFGPr2uW2lQoroOTRA68LOHP+pflK3DAz5lwxe3njKnnN/DZJ0clHIyBFaLudMFFAJ7sOJNqnfuwglFjbLPPN+pHaSowYWGKc5MrqYc++O103PN4yKIjHE1VF4PC2hLbj3kWYy50BjxtYcU7o1zR09AAWDDNH8U4SPlhf8LZdcsCB6h02O5Hlw== 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)(83380400001)(86362001)(82310400003)(70206006)(70586007)(36860700001)(2616005)(47076005)(36756003)(356005)(16526019)(7636003)(508600001)(55016002)(8676002)(15650500001)(6286002)(4326008)(6916009)(186003)(1076003)(8936002)(5660300002)(2906002)(336012)(426003)(26005)(7696005)(316002)(54906003)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 08:06:55.0240 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 21fc5184-2377-465f-05ed-08d98d574191 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: CO1NAM11FT013.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0120 Subject: [dpdk-dev] [PATCH v3 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 08:06:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 101181 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 B3A4CA0C47; Tue, 12 Oct 2021 10:07:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B91FC41104; Tue, 12 Oct 2021 10:07:02 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2066.outbound.protection.outlook.com [40.107.92.66]) by mails.dpdk.org (Postfix) with ESMTP id 14FCC40150; Tue, 12 Oct 2021 10:07:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gRumCJVh2hqnGulTZ/e/BlX5d2dE0l2oAtRuUAnGufXcuY0zaYlCNz+Bfm5ekjb+2jRWkQGx6bPtr2OqJSy6weVej13WP4yPfYyCqvzkFEEIuU19S2I9eeB/YXPiiUgZOLTYz2rpFRjyM/CRhQuFGK/Q9jNPw0jnvgWB0n6Jq0XY4/JXsyrPueumfFELQnJytBs33Gon2bUgLlWomFFVmfv5SJOOCvXlw1mu1nI9KXv7/oAmZEzdRBJufpBKWvWUKwCDo2hcAG3HkCriUsudtFBgzVVXQq1no9cIlv2dIFBIFB3WxDeTTqwRoRL5BnObrtrqak9yM8GIJdRJ745pAg== 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=VQu/gGzMe+CW/ExbhUODLGDb8leP6a8uRsNi+wmFRGSimypBi5+56XF4Vunp7WQafWWWnzcBAsjVSaLSikvPr5sWJxNq73Hr39TOYbST/v1htW/5I9fz9VwxiDnjtO7Q0MagtT6kLryE23xdMxPljKXMQhD/fxGsqlJB86Jt121tKvkxF6xBBlVYFfI4U3Ij0NLIY3o7QPDV1pIJP00ie7kBXKFSXkB2rNjIkOC1wYswvIkbLQtXldl9PQjPoDDq9RoP7kdPgP1UEzrdvy5pzs1lBujFBBsTwk5oAFYtprlOaMcbydNP1iTGktmzpuAHJEfLl3jo/sIQURCvSmi16A== 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=DwtK5zZzdFpm98nJdXVUqkIIayCb1KjEdnh+1l8t6lb8ZnfO0UPpF9l2GZDsGPTh/TB/skT3UNEfepYH4ZiSiqBSuDZLsBPuwCt06Nxdu+D5RR8DIypeFfMGTtCAfM6MO1p3NrTZvGdH6GL/1agv8KAaLmp3/80UP44LvvQbO4qFnw3VPpS+1RqK8/0Ed5r0Mp/mkjjQoCl/ZaExktIvsAC2CBlCdAMusaRJL8GGoC2k7X++HootUdtNm+Lf+RQ54K/4WdLPWK1DPnzOb7WNpCAZMu6OXv8kueAbITd+E6Hw7zJ6Sf7tHPLAV4O6/lhF4YS48Ebee8XbO+CuFODFTw== Received: from MWHPR1601CA0002.namprd16.prod.outlook.com (2603:10b6:300:da::12) by MN2PR12MB4989.namprd12.prod.outlook.com (2603:10b6:208:38::22) 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 08:06:58 +0000 Received: from CO1NAM11FT053.eop-nam11.prod.protection.outlook.com (2603:10b6:300:da:cafe::d2) by MWHPR1601CA0002.outlook.office365.com (2603:10b6:300:da::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18 via Frontend Transport; Tue, 12 Oct 2021 08:06:58 +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 CO1NAM11FT053.mail.protection.outlook.com (10.13.175.63) 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 08:06:57 +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; Tue, 12 Oct 2021 08:06:55 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , , Date: Tue, 12 Oct 2021 11:06:30 +0300 Message-ID: <20211012080631.28504-5-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211012080631.28504-1-viacheslavo@nvidia.com> References: <20210910141609.8410-1-viacheslavo@nvidia.com> <20211012080631.28504-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: 0bc65271-921f-49b5-8c2e-08d98d57432f X-MS-TrafficTypeDiagnostic: MN2PR12MB4989: 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: miplFy9H0VQWvG0YnqP6eal8muOqBgZ0S9muJL6OpDoE3LZApgLpq0B2DYFaPKvA8coDgZgamO4KPQWsm9Emn7gJO7VgMFujNQXHUxWfrrVC0vYDQ9tRvveTJsQB0sO2i7ejo+sgGzHrX92Z1RyvTlUvDDPP8LeL0KkqOyUROMzGz7mdeAHJ3aLw+6T7FGz/+umVg0H/Co+aXdcqmOu93emmwx1CXPqiJMeXPAJjoI94LHiKGUwrqB3CfWp9cXfV/8VfOUr1OrppzI846uFIkL/5CIaqFJ/inxT14Gz0yx+IoOBBmxAyRd5h7qrj3yuiZVc+mxO6Zb7AYMgSxtMrtMpxlOSrVGPmWl6tvmhxWFuNBOpaRGj9wkcC0Uh3ywk+iaLTyUepidRw10KFETFGIHWliXR1hgk+xkr9wrUtZt0/zxhboz0frKxIGJu0V9In06PjC/tkUUW3n+EqofgODirR5pK8VUrauxdxcAiF2Tfqj6l+T6QOEKs2NfslP+DTjVr9hVSWkZd7OkQWP3mwNhSA4rO+utSVplSBmwFm3OZu9zbb2MluYanQR1XfbvDgpcuxjVXnCKMYHQIa4zpf+PebVU5aNZ9P3APCTeegatnAq5aYsWKbxSlcG8oSUGO4FjGLuRXf92pEy0eUgyqOKq70pNmFcmN3GKpdTXtWwLueMs4SDgy3lMCVTV7vXAA0Vx4ESjHsVm+4Y4T6EUw1oQ== 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)(5660300002)(86362001)(426003)(70586007)(1076003)(336012)(26005)(6916009)(508600001)(47076005)(2616005)(70206006)(54906003)(82310400003)(4326008)(8936002)(186003)(8676002)(356005)(83380400001)(36756003)(16526019)(55016002)(316002)(6666004)(36860700001)(6286002)(7636003)(2906002)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 08:06:57.7497 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0bc65271-921f-49b5-8c2e-08d98d57432f 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: CO1NAM11FT053.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4989 Subject: [dpdk-dev] [PATCH v3 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 08:06:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slava Ovsiienko X-Patchwork-Id: 101182 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 51A74A0C47; Tue, 12 Oct 2021 10:07:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C9DEF4111E; Tue, 12 Oct 2021 10:07:03 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2084.outbound.protection.outlook.com [40.107.93.84]) by mails.dpdk.org (Postfix) with ESMTP id 468E2410F6 for ; Tue, 12 Oct 2021 10:07:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f2s7pG5W4HTPXBRpTlMvjILz4NFec/p83Rw3+0fU3uQ6uTqhWAioVaHl4jUGvSgAkdNmjIdc2nC+iFG/0vPh+DOJ/yfva3yaLAPMUam/B9oKINqjrCwHjLcdUYqhSdjEklIzdIP+9A4NfSzXa59808JYXA6qv3wTO5rV0IRRaqHnvFMX/MW1GACOcxKFYrVM7MTW2InuO8KMTYTHAyhSOP075zIrBGRHzNEBcjY+QGFe4KI7VyfdrF70kMCus3thDcQ7LsCnD0w18Hgq/hAIfgmoy75Wp1SKHlO7fIyeA8vL1OB8GIyMkLkAYcHQn8kmDUGCR8eOPkS0ltvlCZuPlA== 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=BOwMKzepGTCygzx2JmZsW4nLTyHpCUfHp3kh4oVQrJY=; b=DkWNAEem+Yl+94aMEQoII3JziDqeq6GzdrBFmWJxRghY/71JNG4hYHKAcChchPIoZBqWgw1hmJwWrP/KMHDSKVjrPYXUIbcuFFu0zJBk6AlCmBxipxHG8DJV/1o4xfaN1iB+ODzBvaOO816WjXnhkyAYCdUzIUudo+mfWlvFsUu8t0yVc5l6KVdBKB29redScu1DFK0MLk795xbYQAF8/Vrd7ZBn/OwJBwpl/ayiC77WpG/Is+9BPB2NQQtsBwt8FZ/gOuO5OoDIJQS9dXdCnu6fxNU1mr73ot8DDxvR8HZWKN0uUTDJ2BgMF7290MxkO1MtczsyaJqUVJRhYeLOyQ== 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=BOwMKzepGTCygzx2JmZsW4nLTyHpCUfHp3kh4oVQrJY=; b=CKtuWVMcMHOPRECrV7ON12J/ODYfu9inSmRzFZ5yh++A5S+4fTxn08QA8bR/CKQdPKzsOsl4SfjFpExPTwqRkme0TJKbuLSR7S2IxZvvERiChLz1nryxFeRl/Rxm6OXVBeJUDBy2KHC2OaFVBfPzDm4x/yPR3TB3WY5cW0Nbkos5dgdlyh2sRcBFmoKi3D5P3Cm4XO5dymvc0ntNUcxakY2ca1DAgsrmTM8O561lUuDXflg3dVumwPFtSsZuOopFlOhFeq6Vby6MUi3aZ4xQt2aRtTFDmY3hJMznye+LjVnjHTFqU7d1a0vdlAWCO4fv0pk2zMgnHmXysx5U+au1sg== Received: from MWHPR20CA0035.namprd20.prod.outlook.com (2603:10b6:300:ed::21) by DM6PR12MB4579.namprd12.prod.outlook.com (2603:10b6:5:2ac::7) 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 08:07:00 +0000 Received: from CO1NAM11FT007.eop-nam11.prod.protection.outlook.com (2603:10b6:300:ed:cafe::c8) by MWHPR20CA0035.outlook.office365.com (2603:10b6:300:ed::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18 via Frontend Transport; Tue, 12 Oct 2021 08:07:00 +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 CO1NAM11FT007.mail.protection.outlook.com (10.13.174.131) 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 08:06:59 +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; Tue, 12 Oct 2021 08:06:57 +0000 From: Viacheslav Ovsiienko To: CC: , , , , , Date: Tue, 12 Oct 2021 11:06:31 +0300 Message-ID: <20211012080631.28504-6-viacheslavo@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20211012080631.28504-1-viacheslavo@nvidia.com> References: <20210910141609.8410-1-viacheslavo@nvidia.com> <20211012080631.28504-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: c52bdf76-29b5-405a-3358-08d98d574478 X-MS-TrafficTypeDiagnostic: DM6PR12MB4579: 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: +HJkRhFvo0zoUfDgJPR5W4ZN985t8itw759SjI65u7QjYNEu53huZEG36Jrz2u8ut2nvpVAf914WA56y/W9bi+EXqPATsfI92JvtiE9Jnzuu2SkOJw5pFIMknxA96Vxz/hLJS90c6/rd6P63z9k97srSLQbuKB78Qn0EJs+JVYV8s/bNOeyUx3t/KljOseYTvDcyyr0wpwj52MTSjU/FK57j0i++fPaLHObWTpVKcTdT38062iZEsZnfKJtrlMJb96W8HXROJfC/0Rqt4AfHRtfyWPlf8a17ABbRKW6jJRCdy+qQrqIez4AlWRkWOqNdk4LUoHEHcGS6oh24LfsDJ4dC6jKVI/RYjLmsoyZbQxL096Pu5vEmeJM7Jhsnf/I66PIObhkdj9bXh0gIx+fNHQB3FIkBObAUAoSIwL7zOwGdDMEjruzxEAMAw4ZFCsCjf+oM04XhHBq+wPU0xVuN++EeuEiidx/0S93X7uGnAQi6swjoVydhVFEn81utvzus29PQa0zMy1S6K1VlS+31P3whVoFraSU7JQDyjXcjcnT4hwe5Hs0wnY9gfXJfU+bTX/jMoerbI34Qc2mgN7RxwhB1FR4BH0kzIUbkp69xjtfzFRmv+GH9A2ILlY6d0qEoA00Fo42FLvVi1TkcvD9q/H/LUDkv/LWgl0/YWzlaNJ1vbJfkm1sD2T+i7qj5e05H8GdBcsuOrrmhx+7Qt+Dtjw== 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)(8676002)(16526019)(47076005)(26005)(5660300002)(508600001)(336012)(7696005)(36756003)(83380400001)(54906003)(2616005)(70586007)(8936002)(186003)(55016002)(6666004)(15650500001)(6916009)(426003)(356005)(6286002)(36860700001)(2906002)(316002)(1076003)(70206006)(86362001)(7636003)(82310400003)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 08:06:59.8413 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c52bdf76-29b5-405a-3358-08d98d574478 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: CO1NAM11FT007.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4579 Subject: [dpdk-dev] [PATCH v3 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 Acked-by: Ori Kam --- 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)