From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E200842D46 for ; Sun, 25 Jun 2023 08:44:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DDA9440ED8; Sun, 25 Jun 2023 08:44:01 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id F170640A7F for ; Sun, 25 Jun 2023 08:44:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jkPytQqn2JEXUiOtReNLnJCmhJqgzAJcOybddOI9JrSqf6g+BXH8VSrZGpkLeLP7+ZbscyQ5noZmnnlNDaSNq+psB+ahy8R9NbhHrPu9RlV0nOqbXnFP7DX94wqvx3lDMvHSAKbhy+z2ilYuydMazRaIKbsAea3UQbMNpJUgKiWjs2fUIUpuIIIYUhiFd8brEcX7vtU2lhDItoqeEsJAUh2VWjhN24CvfGeezB9+BSaES8F6Wdv9nnL/GHGOTvKMSA0P4a+EBT5+3GccRiNbLSbyFbQOvZbRARxI4XGAkQzHXCdE2EndWI3lo7tlLuE9pJccs+RS1FF5sH50oIYNDA== 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=w85CSC7GJz5OfV4ajts6kV6SqWiHljknO3NL9QNiOlE=; b=Fo1miVd9vlcTceqLdItD48j8vkkH/S/NGcp8ox+TfDlzVemafbrMTnOknWtE+VdXInCjttRpZGuCovOQD9j+ULyWAAAnN6rQNAUfcMaBCHbarGpxJxFDxoXHk4DJJfmvZM3MaVewfttPybLtDLgGHeuYnhzkcqvJ1kOJ5esx3I4kj7VbH+vhp8RU1HoJZK9Qvz4xnuARNCcnHXfP2f8fdnevwvmyBQ5ZoC9pEV0Ofxb8eSGmbuRS+XHOdqfuYLxmn4tQu1zz4uD6tpNUWfnW2GoaU1jyVJAbDNs10wHVGCH3o5lLIrC+HKXeeUBAmFrbXME7FWKms5fkffAlPF95EA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=w85CSC7GJz5OfV4ajts6kV6SqWiHljknO3NL9QNiOlE=; b=Qm6pWygo+XHjouLGmtx1PX9gV7zLIUtMHTPT/LV2TM1naEyfmU81vrPtWIyoGk8qiiElbW9lLhscLpEoKn0maN4f3aX/6LEeMiwe2jpyjtpDElb3SIRasG6S01p4iBGLA82ckWTAOy3t5Z+/FWYR/6SiaG1WXN6O1JjbMjKRvZa/niAKzZdTYL3/OEspeK+ni1b9blDkcKxVUKvzca+RtjeazzX8AWSzG2Dbu7XIdF6oJsUuZ0WqKgpIyw/X6W9Ic0UAwkSSF+UM4arYIWYDKOwLRG8j43erJhkfKVvBztigsuW+b7FM43hoqBSbFB+O5ceQqumPBc5dNnH/IpYp2w== Received: from BN8PR15CA0028.namprd15.prod.outlook.com (2603:10b6:408:c0::41) by MW4PR12MB7238.namprd12.prod.outlook.com (2603:10b6:303:229::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:43:58 +0000 Received: from BN8NAM11FT015.eop-nam11.prod.protection.outlook.com (2603:10b6:408:c0:cafe::d1) by BN8PR15CA0028.outlook.office365.com (2603:10b6:408:c0::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:43:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT015.mail.protection.outlook.com (10.13.176.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:43:57 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:43:48 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sat, 24 Jun 2023 23:43:46 -0700 From: Xueming Li To: Rongwei Liu CC: Viacheslav Ovsiienko , Ori Kam , dpdk stable Subject: patch 'net/mlx5: forbid duplicated tag index in pattern template' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:08 +0800 Message-ID: <20230625063544.11183-91-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT015:EE_|MW4PR12MB7238:EE_ X-MS-Office365-Filtering-Correlation-Id: 87898194-71da-40e8-ea51-08db75478d69 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ouFZQ6ck2Mwe6V0t28Pa6QwOci62wAHHAxBRzXRQjOP6eUlj2LVewM/s0YmDFdm5D1NyDBS1vx+yZCUOOJ+RSfWbIOh+Q4wKB8CTV1sKYzCjHrmdDQFDvKGYSwRS4Nb1H0kp2oTKxNnasdtYv38uHxaI4rcqTwYpzH9yTGGUY4gJE9EansnWY2CraPzfwJHoLT8cmYG+rVVl7EzE9BV09+EuO+zs6owv3yjJYrVc1eaWZQ2hzg4N75Kgyc+X22ImhcsTZQLDLX8f2SeX87zU3YoBKezi0jlqOoffRvPDVP/GIDBW7D4Iyqu9bZw0O3nF0+ZlX+zBuN2C/KHpZlTi6HdNKIeae7wDz/2GKfo0LvCF+d6WF9H1qy2SiKkSF3SFVFCKk3gw0IbcCv5VlglXN/tn2eEKo/2zQtPkFkULcZ08cz9precC/uCKpX2++4RAVvbkYHQb7sPErmhNN9d0J8Rn3wAv65wuQtjNEIoK6mL0EzxMHMViefVcSAzW0Yh0E7KiqcAQN4SVIfMSHjHMt/4RFtA/DAkmZ1++jUkoRgBrGTHmtxs41RPfbALp15crps2+QfDdSNJiDdabu8Xp8dCJ00+RY+AKDa+fjHSSZI5fDp/PqxGc1dIpejVvp69yemtkNRdVNJvtcbd0lnsic1f0WMIDlDg0QmulfhTJ94nJvBaBeR816+Vp9i0fWXbmYgG0EFohBKe4CKnRUROS4YMCo8mw1D5kUa/N26ZWkUlBpin91eC4n7AiTdg/k1A3MBOjRS1SgWxjjg+doiRSsA== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(396003)(346002)(376002)(136003)(451199021)(46966006)(36840700001)(40470700004)(966005)(7696005)(6666004)(478600001)(54906003)(37006003)(53546011)(16526019)(6286002)(186003)(26005)(1076003)(2906002)(82310400005)(6636002)(4326008)(316002)(70586007)(70206006)(8936002)(8676002)(6862004)(41300700001)(5660300002)(7636003)(356005)(36756003)(40460700003)(82740400003)(86362001)(55016003)(36860700001)(83380400001)(47076005)(2616005)(426003)(336012)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:43:57.6682 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 87898194-71da-40e8-ea51-08db75478d69 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT015.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7238 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=124a919b4e64a96ef61c072db5c287b4f878534d Thanks. Xueming Li --- >From 124a919b4e64a96ef61c072db5c287b4f878534d Mon Sep 17 00:00:00 2001 From: Rongwei Liu Date: Tue, 16 May 2023 08:43:28 +0300 Subject: [PATCH] net/mlx5: forbid duplicated tag index in pattern template Cc: Xueming Li [ upstream commit ad4d51d277fa23a2266c6a098ce51cfa07b3fbbd ] Duplicated tag index in pattern template will most likely cause matching failures such as "template tag index is 0 data mask 0xff / tag index is 0 data mask 0xffff / end" If the upper layer application needs to match the same tag twice with different masks, it should be consolidated into one rte_item with the desired mask. "template tag index is 0 data mask 0xff / tag index is 0 data mask 0xff00 / end" should be present as "template tag index is 0 data mask 0xffff / end" Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_flow_hw.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index ead14a0530..ea0159406f 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4621,8 +4621,9 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, struct rte_flow_error *error) { struct mlx5_priv *priv = dev->data->dev_private; - int i; + int i, tag_idx; bool items_end = false; + uint32_t tag_bitmap = 0; if (!attr->ingress && !attr->egress && !attr->transfer) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ATTR, NULL, @@ -4664,16 +4665,26 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, switch (type) { case RTE_FLOW_ITEM_TYPE_TAG: { - int reg; const struct rte_flow_item_tag *tag = (const struct rte_flow_item_tag *)items[i].spec; - reg = flow_hw_get_reg_id(RTE_FLOW_ITEM_TYPE_TAG, tag->index); - if (reg == REG_NON) + if (tag == NULL) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "Tag spec is NULL"); + tag_idx = flow_hw_get_reg_id(RTE_FLOW_ITEM_TYPE_TAG, tag->index); + if (tag_idx == REG_NON) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "Unsupported tag index"); + if (tag_bitmap & (1 << tag_idx)) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + NULL, + "Duplicated tag index"); + tag_bitmap |= 1 << tag_idx; break; } case MLX5_RTE_FLOW_ITEM_TYPE_TAG: @@ -4687,6 +4698,12 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "Unsupported internal tag index"); + if (tag_bitmap & (1 << tag->index)) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + NULL, + "Duplicated tag index"); + tag_bitmap |= 1 << tag->index; break; } case RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT: -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:00.923549100 +0800 +++ 0090-net-mlx5-forbid-duplicated-tag-index-in-pattern-temp.patch 2023-06-25 14:31:58.495773900 +0800 @@ -1 +1 @@ -From ad4d51d277fa23a2266c6a098ce51cfa07b3fbbd Mon Sep 17 00:00:00 2001 +From 124a919b4e64a96ef61c072db5c287b4f878534d Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ad4d51d277fa23a2266c6a098ce51cfa07b3fbbd ] @@ -18,2 +20,0 @@ -Cc: stable@dpdk.org - @@ -28 +29 @@ -index afc42ac7e7..5df439105a 100644 +index ead14a0530..ea0159406f 100644 @@ -31 +32 @@ -@@ -4840,8 +4840,9 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, +@@ -4621,8 +4621,9 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, @@ -42 +43 @@ -@@ -4883,16 +4884,26 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, +@@ -4664,16 +4665,26 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, @@ -72 +73 @@ -@@ -4906,6 +4917,12 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, +@@ -4687,6 +4698,12 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev,