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 A540243B7D for ; Tue, 5 Mar 2024 10:59:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9F2FB4026B; Tue, 5 Mar 2024 10:59:33 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2051.outbound.protection.outlook.com [40.107.94.51]) by mails.dpdk.org (Postfix) with ESMTP id 4D3134026B for ; Tue, 5 Mar 2024 10:59:32 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X/vzmbEj6jgcz1IvUOwv9O+zcmjPWj1buAjav9WxQaKMEyLAtt5cLU1nGALiWDn/X4KrMCsZaHx9aRAkn4/pRJcPxo3Uf6kfe7nne719rk8kzzxw3Ss1XrdagipZPl9Bz7eHUYMKgN1lvdvaI5iT3q4zArzlC2uBh5RBZdlF01nVvD7ZxPgqXZsgUJvo3mI6uqy6LArIohHdYECJWF/f9SckooCFG3r6gABpVHFaCX7m53iuWhLQO2qzjoOB1N4FgzNzXLdAAUOWeNObsRoqhcwj3/xhMw5iaOdztAyPI/qZuHCR3TShbIuRP4hjpx+rTm2yhqn81rVMXpXvmLGLMw== 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=4ACG71njfv+CL09p2nHykKiHrco72vqMybjg1WhjUUc=; b=lbxI46qVwg9x3buHVn9+fa5UOmdvlRN7QUQDaTosqShj41RnHjkr+EMqOFfAZb09kvuulMIXcOxQGhoLCkgGs1R/DhtfCsvLCanXdHXbEz/hN2htctGVv9XTF6qiynJPzv10jfMdlYQIEasY1Ku7qIJtcMow2rGqWQ9ny87nbFL5NnMkl+NTkKB80F6MZr7CqhhkPWS0swKNY9/HzIbsJ8HILsNaEQqk2RZ/Cdk8pntXvr9DvuRj6tj/TQaEaeJ9xppfcFdRsHrAUb9ZQscFQttEB1YAONduHxzHOgdcyuq/5S+EvxLlRhQvB8spRsS53NiZSv6v3IVL/bxIAgeiDQ== 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 (0) 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=4ACG71njfv+CL09p2nHykKiHrco72vqMybjg1WhjUUc=; b=e5bBkmarLNDQaPUsm5SnCz/fwa6723VsFoHDZOsoSnOOLErSPVKOqzfQUzOHaSkzXOhHY9y4WsbJ9RwIc4+GaXn4yqbf8PPgNdobIwCtA0je7OYrvY9huchhKBjItTGNlDCXuM3RZwLLKhrhzPYc6iajiEqhNmvJZPt5aWByJrJPY6WCNYn07CbzTki6eF9Ro66/GNg2dhZxT/gKUNUvwuA/1A3ID7W82EQxFzIupZeWoPTo3bW277HfX2LN7yVpwPmeYoHYUP5cquVotRKP3BrwKb3ymGBagSPAQ1eDvXATD+aXLBzhMTYUKJSPKJTILJ3d+8qYlgPoF4INEN0ioA== Received: from CY5PR15CA0106.namprd15.prod.outlook.com (2603:10b6:930:7::8) by DS0PR12MB7511.namprd12.prod.outlook.com (2603:10b6:8:139::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:59:29 +0000 Received: from CY4PEPF0000EDD1.namprd03.prod.outlook.com (2603:10b6:930:7:cafe::fb) by CY5PR15CA0106.outlook.office365.com (2603:10b6:930:7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.40 via Frontend Transport; Tue, 5 Mar 2024 09:59:29 +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 CY4PEPF0000EDD1.mail.protection.outlook.com (10.167.241.205) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:59:29 +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.41; Tue, 5 Mar 2024 01:59:18 -0800 Received: from nvidia.com (10.126.231.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.1258.12; Tue, 5 Mar 2024 01:59:17 -0800 From: Xueming Li To: Michael Baum CC: Ori Kam , dpdk stable Subject: patch 'net/mlx5: fix flow tag modification' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:47 +0800 Message-ID: <20240305094757.439387-127-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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: CY4PEPF0000EDD1:EE_|DS0PR12MB7511:EE_ X-MS-Office365-Filtering-Correlation-Id: 436bde71-e4fb-47c0-1959-08dc3cfaf2f9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IP+J7H8b/t7Xy81LyYVwzjX5Z+A/N4ARza4sNv78sSdgGKH/+nuBWxfTtn1MPo94Dq9Tw/oc0s4G1/N5j6fn9yxb3qKsoOYPV0jkPZrH9taPB9rPYYADIvmDbaxTBA6+ogwOgXPykr24VLwxCPlIx5CdGGxLKGcTZzCT7/tGH+kRc36gEff+SFF0eVRdiFgI2wO+P40dIvvaadkxBTka0xJEkTylOiAx6c/lnCg1o+N9JQyn+cc2LXJDhKHdRcc4ZFs40fXaio28DOkPji6pi19z4pbNNR94oOznTtamwzzEO6dNxJtLQ0WVOuWIOk75n9CO4LL77alnAyMtTnql9gvBCrzLvr1rd66xFOEmxQ+zKdO9uR0w6CXBN4Ss88ytfUEoOloVBWevJpLgU5kUwVXA+7nkaNX0r90wdxlWhje97N7jMtp4JTcMPjv/ugky1UpFyUU7ddsAR8RHlYqZiXmPZ3YPM0M7bhIg2a7NOyr4hlZdQXB0Jb87WJvLIpgh7FOxomZMed73FCg2arhL7TV6ZbjWRPnIM1ymVmF2E7Z1YVz+T4KqWMCsYrZbyp48FwvpebuInz7/sDpAGGpqRbtzlirHc3gFtvucNGUsFLdD+/ZU2DlEEcbkuVFKOxT74Tfa3okr/cswpODTNUPI2cj04BajMbb4eHGEPDS6DCYpuv16rDi48JLoc48dnAVILBHalxNTT8oZl0dkqwS3baNI1TJNI+nUbbm6Baf3SeRYzlnkI5LYc80Iz5XFUaqR 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:(13230031)(376005)(36860700004)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:59:29.4575 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 436bde71-e4fb-47c0-1959-08dc3cfaf2f9 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: CY4PEPF0000EDD1.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7511 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 23.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=d25716a8a02dc5568f26c3cdae8705c447d12bff Thanks. Xueming Li --- >From d25716a8a02dc5568f26c3cdae8705c447d12bff Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Mon, 27 Nov 2023 18:01:02 +0200 Subject: [PATCH] net/mlx5: fix flow tag modification Cc: Xueming Li [ upstream commit b9427fe259ac687c3a29f5c13b63945c16a283db ] When MPLS modification support was added [1], the "tag_index" field was added into "rte_flow_action_modify_data" structure. As part of this change, the "RTE_FLOW_FIELD_TAG" type moved to use it for tag array instead of using "level" field. Using "level" is still supported for backwards compatibility when "tag_index" field is zero. The "mlx5_flow_field_id_to_modify_info()" function calls "flow_hw_get_reg_id()" function with "level" without checking first whether "tag_index" field is valid. This patch calls first to "flow_tag_index_get()" function to get the index before sending it to "flow_hw_get_reg_id()" function. [1] commit c23626f27b09 ("ethdev: add MPLS header modification") Fixes: 04e740e69512 ("net/mlx5: separate registers usage per port") Signed-off-by: Michael Baum Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_flow_dv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 5d0cb4278b..cea94e889d 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1925,7 +1925,7 @@ mlx5_flow_field_id_to_modify_info if (priv->sh->config.dv_flow_en == 2) reg = flow_hw_get_reg_id(dev, RTE_FLOW_ITEM_TYPE_TAG, - data->level); + tag_index); else reg = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG, tag_index, error); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:34.753047825 +0800 +++ 0126-net-mlx5-fix-flow-tag-modification.patch 2024-03-05 17:39:31.013566501 +0800 @@ -1 +1 @@ -From b9427fe259ac687c3a29f5c13b63945c16a283db Mon Sep 17 00:00:00 2001 +From d25716a8a02dc5568f26c3cdae8705c447d12bff Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b9427fe259ac687c3a29f5c13b63945c16a283db ] @@ -23 +25,0 @@ -Cc: stable@dpdk.org @@ -32 +34 @@ -index f881dae6e8..60fbdd96e6 100644 +index 5d0cb4278b..cea94e889d 100644