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 A46C8457A2 for ; Mon, 12 Aug 2024 14:59:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 185AF40A67; Mon, 12 Aug 2024 14:59:16 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2070.outbound.protection.outlook.com [40.107.236.70]) by mails.dpdk.org (Postfix) with ESMTP id 1C3A94069F for ; Mon, 12 Aug 2024 14:59:14 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=C7HSzmA7QuYXifhoofb05wEvqULdT7lEM459xb8SGsmFKywTmmLdsRCUcu7ofHGEpgUXfkek2vSuwmz0rV+SBkm1aSljSQKSAHj11aviMfKKLHuTVzZ63PPtHWIPzctVpzfdQOvcCciMziC/OTN9dLwvgF8nRk2k0f+LDFVrCS8H8AUDSjgAHYAweEiCs2U87cfLEgOoHATkvaSFllbVtL8dOg8bkoVwANgY1LGhs35+m930OxAhqf0SxCJex4faKmaMqle361x8YXsH8jR3AcKwPn846XNWwR6Wsl6PZRDtlyFlygfgf6vJnWWvqRtH6lzryWpDHOYkkXT78w6zSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=PdHICl1z3ZRw0EeijD8qE5hs4nLUgN7qfDlqDY3N+II=; b=Xm6TKTcsiyrCPPdPtav362m7XnPAhjix1MrxatTrulI3NRbGTAR8x9J3cL7GeyrMw4QZSPUEMza5UTdl3x1r366LJbTo3kQIvTIOkqZOlFHw3uE3dnU0Eu/iqC6vlU/oLyTR0Lyl4RXM/wubzoHFrIoABwz7hEVLFl95xOD7BsPHATCIz7xzgh+a7qf3XwfkGwhep8VQ0qN3uMAoxNZQBqVc1AQmfqIaf9Kng281cy/4NqLRmFVlS6nY8jh8j9qrz3T+FlIqyPRyLcc0Ed+R1ZFaGkyzxx9PtSg4B8iP84np6bHxxFtWta6EbfZqKYdVfuXXD+xzOUdJ4JrOuNxShw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.com 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=PdHICl1z3ZRw0EeijD8qE5hs4nLUgN7qfDlqDY3N+II=; b=OIrWWQySzEVVRkJE/kXcf1AdqpEpJF4Z6V1XhYFPuNwKnuDt0iu4YQ2O+PHWsLGaYRS1AFCFydZQBNOnTIji6Er2/+2Q0wDFSkjuw3Hs6F7LkdimzFSSPKGqxUdW4yFoOnvqWz5gLZwFE+VgcNFF18dmtASJfVP7dkEIP/R8PsZEgd1ee0qAImMwEb24wANlyRds/Oo5khhwFF23w1IhWaAnDiX5zzOurpz/WY6ZXT7vQt++ewgVJDhr+e97rCG51oRdPWCmOiGBxEjvtA2dd2xQxCeRuKy1GheCcno7VcVEiEbJDbkXuNqpHNKplXLXhbWd5PFYISz0wo1hKSpXHw== Received: from BN9PR03CA0471.namprd03.prod.outlook.com (2603:10b6:408:139::26) by SJ2PR12MB8009.namprd12.prod.outlook.com (2603:10b6:a03:4c7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:59:10 +0000 Received: from BL02EPF0001A0FD.namprd03.prod.outlook.com (2603:10b6:408:139:cafe::9d) by BN9PR03CA0471.outlook.office365.com (2603:10b6:408:139::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.33 via Frontend Transport; Mon, 12 Aug 2024 12:59:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF0001A0FD.mail.protection.outlook.com (10.167.242.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:59:09 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:58:56 -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.1544.4; Mon, 12 Aug 2024 05:58:54 -0700 From: Xueming Li To: Chaoyong He CC: , Long Wu , Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix IPv6 TTL and DSCP flow action' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:23 +0800 Message-ID: <20240812125035.389667-87-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A0FD:EE_|SJ2PR12MB8009:EE_ X-MS-Office365-Filtering-Correlation-Id: 915ec5c8-be1b-44eb-577e-08dcbace8e82 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Gj+/oB6OB26KrQkEdtBpUhHTjZqpCHO+jI/tQqdceMvy8Yy7JjQhbaYt9U5C?= =?us-ascii?Q?PRgWmVVh8zYBgVrFSAKqbBiVWRVVD0c61bt1qAEQFQlpMyXHflNUbyOsy3Cd?= =?us-ascii?Q?o1Rnc4aw2JSAeDlAzx0g4aItPic8qsQj+TXR9gneT4bvnFTKHpukXOYxHMXh?= =?us-ascii?Q?dU9U0Io6wVwT5YyCVOXa0yMH+dsU1yv2yQAQ9eyylM8t8bZn0pdEGQRLSjic?= =?us-ascii?Q?9qfvuezeGnAgB6m5BRP8VeQ0u8CDs5i7m3eiXl60bYQgszFxjHy2zKa5HGyt?= =?us-ascii?Q?gNQKLOQXwyVhIxxRfPpS1ue9wheD5GVmfuPsGnqRTfLOfUyUYa9C3AHXUtJI?= =?us-ascii?Q?RvaCrleUR2KslmFHavssL8hppBSQWvo/uYRSx4rhBF9thbWhtbkjLCvLBoz0?= =?us-ascii?Q?kQy89hpRG+SfeI1DD1UiMeknxxJ4GNdMib8fY4QAKEsBHJACQ4WWpZ1YFAfC?= =?us-ascii?Q?Si/VAcUzE9HZtIqx+TNcJXd/h4VDBdLDy7iD2me5uUTuzwO3fMwShyX742zP?= =?us-ascii?Q?8OPxb4Xum9AbcHyfDQ8Pl1D29antFz0V4nEL07oA+ksCub/cNQHpDQXaDzp4?= =?us-ascii?Q?0bLNFB2khrtsdGfaeYLYP1uRgX8kz9fhmsRG8fSyDoxOGmOYJDZR0NnxPsP5?= =?us-ascii?Q?BHSioB87PGXFBgOVIy1XVkDPYsqkgV1ro71/qtFY1dq328wXpSwXeZvM1xIx?= =?us-ascii?Q?2uRq/deDPES407m8WLVqyJWyq9gpZN+arGMoCBRfLmKEp6AtVuRNYqYy/ogN?= =?us-ascii?Q?ImIHFWVlphGOZSWxLFXTF3lBSEEDFJ03hX3yasLWkBMzRA6ObvW5jPm8odHn?= =?us-ascii?Q?aVJQfTVddQZg/a+aNlY+sUX7GkNtyOhDTseW3af7tWDM7hZw3wsdgqr/gH7z?= =?us-ascii?Q?6qxg7L76a4Fj3a3xl/O2REUa4W7GsOl5gmtTQ+NlR/f75ohhGUh7fc0UMb9g?= =?us-ascii?Q?eVrS1pMViDqBvWlqsPwXOPgdJF3qiYmjxoUdCH2B+p3aT9v0g7KDBrgg7F62?= =?us-ascii?Q?w/3eAEr6qdg/DCNjVSAzkcfswaLHwIAxaGSVpEX6rcfMlugWs7W5DJVpjQWb?= =?us-ascii?Q?utLYfi85QdbsU9Wbtet1fhvlEhYRS8RLfofoniKSH8UlBHMcO8vJb7Vk6dbn?= =?us-ascii?Q?zcy51mqUc7/zw0JmP9wpfw1jLEm06aU8Rop6iKn5KxUcVgzqoXlTQZqyFFMY?= =?us-ascii?Q?VHvjpTPMqfy8DgQATe5dtNXyI2rv/omUiMTHVMNxm8fvUH36BLntpgy27dd6?= =?us-ascii?Q?X1GPPl7Lu6NjkRDCa4ld1RGm+ad6g70QjXp8/3NpDwtU8t+2lex/3IDtlUAo?= =?us-ascii?Q?gsAMPM8JhphuVISb5vZnL4ZVtnTiZL0cy+V+TVUMCfPf4CwhJtRgNhd3UKew?= =?us-ascii?Q?a+ExCWeGPyxs3xeTAB3ithpa7Sg88B7emOM4xTdi/+HLbLi9Tw=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:59:09.4672 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 915ec5c8-be1b-44eb-577e-08dcbace8e82 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0001A0FD.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8009 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/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=e2ef427581f5d746c3266b1a3f7dc2aa6f251763 Thanks. Xueming Li --- >From e2ef427581f5d746c3266b1a3f7dc2aa6f251763 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Wed, 19 Jun 2024 17:13:38 +0800 Subject: [PATCH] net/nfp: fix IPv6 TTL and DSCP flow action Cc: Xueming Li [ upstream commit 76caca76bf62efb041642194adf47181f9fe1bc2 ] The IPv6 TTL and DSCP flow action logic use 'ttl_tos_flag' wrongly, actually it should use 'tc_hl_flag'. Fixes: ac12e126c482 ("net/nfp: support TTL flow action") Fixes: 3202b003bec1 ("net/nfp: support IPv6 DSCP flow action") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_flow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index f832b52d89..942301f855 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -3658,7 +3658,7 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, ttl_tos_flag = true; } } else { - nfp_flow_action_set_hl(position, action, ttl_tos_flag); + nfp_flow_action_set_hl(position, action, tc_hl_flag); if (!tc_hl_flag) { position += sizeof(struct nfp_fl_act_set_ipv6_tc_hl_fl); tc_hl_flag = true; @@ -3675,7 +3675,7 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, break; case RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP"); - nfp_flow_action_set_tc(position, action, ttl_tos_flag); + nfp_flow_action_set_tc(position, action, tc_hl_flag); if (!tc_hl_flag) { position += sizeof(struct nfp_fl_act_set_ipv6_tc_hl_fl); tc_hl_flag = true; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:05.343922374 +0800 +++ 0086-net-nfp-fix-IPv6-TTL-and-DSCP-flow-action.patch 2024-08-12 20:44:02.315069338 +0800 @@ -1 +1 @@ -From 76caca76bf62efb041642194adf47181f9fe1bc2 Mon Sep 17 00:00:00 2001 +From e2ef427581f5d746c3266b1a3f7dc2aa6f251763 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 76caca76bf62efb041642194adf47181f9fe1bc2 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -17 +19 @@ - drivers/net/nfp/flower/nfp_flower_flow.c | 4 ++-- + drivers/net/nfp/nfp_flow.c | 4 ++-- @@ -20,5 +22,5 @@ -diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c -index bd77807db0..45a020b228 100644 ---- a/drivers/net/nfp/flower/nfp_flower_flow.c -+++ b/drivers/net/nfp/flower/nfp_flower_flow.c -@@ -3833,7 +3833,7 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, +diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c +index f832b52d89..942301f855 100644 +--- a/drivers/net/nfp/nfp_flow.c ++++ b/drivers/net/nfp/nfp_flow.c +@@ -3658,7 +3658,7 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, @@ -33 +35 @@ -@@ -3850,7 +3850,7 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, +@@ -3675,7 +3675,7 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor,