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 9F2FF428F8 for ; Sun, 9 Apr 2023 17:29:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 97CAA42BB1; Sun, 9 Apr 2023 17:29:29 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2079.outbound.protection.outlook.com [40.107.243.79]) by mails.dpdk.org (Postfix) with ESMTP id 0AA15410EE for ; Sun, 9 Apr 2023 17:29:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WXaJYjly4JVa9ksYe9E2C/PJz/XoJ5gG7X7cZ5umgDqwpTt0XVXTSGnsXD179FB6Q37i2iz7Xz4TRdFIdqwac4oiyrF/i2G8+ZRgtwGdv0K43qZZZ/rIB4goyeUJi/FQHVTeQtIZKrV1uuj7fMF8AeptdnPAg6iu51oXthpVR6XroxVDA2FpDzLcktLPL72o18d67UOxlyl4VbWqrbE6P6lP7DvA6lHclDEdhDZ1WnRH0fNJbO5Jt+5VR8dnJMWmI9fpYU3m/niDIMFHO9X+SNWXQu16/y9OIPrd/yjVAYOYkOba/bzPi/6xJ6lqLdZD39QGOuctIPiPCctX16qipw== 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=g6xEhRdI2akF8beYUy/wf0FDEYXdPTPOlt1YuxT0jn8=; b=mgeQNLFEoZtLVleuStAdmBw85qHrzp34wh2BpieMWqs3CuoYlVy2td53W9g5FtInw8u0yL0hltpTe0oNUx+CmsBwOi1c8uDCzt7XZ2kc69hS+0v4gFtV+8fuy2+p++No52QXe4eluofd00UhdAYvwT/ATk3ioi5B1UK7lIqYZ6Sye3CZ5JkPW2MVXbl47lLPh5rOU5Z8egZgQNaKyMV1oYrk6ZH9Fk8JyFspOgBBrZk5ceIm1eYdyTB/i0KvQr5xX+BmNEtFZ4bJxDw/XlsBNzP1037AOxueZzD3A1oqs5kPPQPtQX0+KaEBUUyS7lQN/N4jluwP+553bqT51J+3LQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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 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=g6xEhRdI2akF8beYUy/wf0FDEYXdPTPOlt1YuxT0jn8=; b=RX7s1xEjj4cOaizKqtzMGPeUMnFkivxBm6L5FCZaAfyhBkhH2aI7LyJ4C5jh1pD53fue1wQPCsEdtK1/wfCxmwvd5MOtO2ikcZEzLqmrGlf1BvEtNHVhIkQ2kbqwr0iRxhddJ18Eu9Yx1Xj403eVhgPty2L6wNyh5D6MJyMAhewiWVVnYmraEFBgXmtz0aCNWglTYvJEayj905KbP5vKCSDGBx96vfTBeqQ//P/AAMOJsX/5nw/gXWkqBG1J9j+oSDYkJV6TJm1ydoGPuap7UPdBwVPw1b9a5GTj+EmakaPj2h6ffFZvRKODZOxJ2kn83ouaPORJA1drf1JsHzSJBQ== Received: from DS7PR03CA0237.namprd03.prod.outlook.com (2603:10b6:5:3ba::32) by DM4PR12MB7552.namprd12.prod.outlook.com (2603:10b6:8:10c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.35; Sun, 9 Apr 2023 15:29:25 +0000 Received: from DM6NAM11FT048.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3ba:cafe::9c) by DS7PR03CA0237.outlook.office365.com (2603:10b6:5:3ba::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36 via Frontend Transport; Sun, 9 Apr 2023 15:29:25 +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 DM6NAM11FT048.mail.protection.outlook.com (10.13.173.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:29:24 +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; Sun, 9 Apr 2023 08:29:15 -0700 Received: from nvidia.com (10.126.231.37) 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; Sun, 9 Apr 2023 08:29:14 -0700 From: Xueming Li To: Chaoyong He CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix set TTL flow action' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:23:51 +0800 Message-ID: <20230409152529.5308-44-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT048:EE_|DM4PR12MB7552:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b853409-7630-44ff-f151-08db390f333c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JmBv5etJPEoQRH1HzZ/vWfTNGIXgJqayQNYLsNvXrqSBLB90hGc8JbnGz4C48kZSlVOcMySCK757+oBlterTpl65KtZXmjALlAZ+i9wpLrK3FCBaR9ts/6+sVqGZnUKnVsU9/uNOhoYFqXj90QC3oh/aX6yQl08e4memwY2Y3xY48QDc8Qq+F9CgNIZgOw1uUXn7/YBTAwBuyGgxBFaD9qKAhLYJHBFV+nq4+5/nUR3I1WsssRMEE42AUtGixNyqMqSATte4ne64qaWZ8mLNyCA2PCZR/5OVyEponanrhC76QLwMILrlGTIkVx8vmmzzql5orQRCVXIs3T+GLQrrI5PNpgejfITk4p4unlRST09EyM3KQuYX5a9DYDEDM3RmWTUTZsFXmb2fjTkgMlSNacktc3ybGKYa/6bGYslTwpkQisMYyeUuq0lpEp9isB+Ed02t4puK7u+Qze4K2XxOm9eAaIYuCH7n+PEZBuff+6Ccc75ZeAKxlDVwzvT7Apy3iFAGe+8vlmUmpg13Q516/MM6zTnSdcY6wujfRy4Ic/brx6oVG2dAhGgxGCNQrTbNpEKY7bYmez8GsXANCBZGyP6OGTziTnkUZZPX38vhv1hTaRia2VykAujrzcxknRMqxfyym+eSfyX3QgmVJFZvh47XA+eKmjX3O0QyjOQAHwFrE3B7QRW647Qurb563VFep91vXEO8k3XeVmBigHqPVMdhjPY6pVy57ZLMYBAsTz9C8TqeBPVC0EtxzcGavXB22pDG3ZEJpVyGbfgV7XAmic3DNEqMLVkk2PvLXz2XEKWEeYEDawlprRrbXZebw8XCIHLSg5C6OMSJVwGeLCcnhg== 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)(376002)(346002)(396003)(136003)(451199021)(46966006)(36840700001)(40470700004)(40480700001)(36756003)(2906002)(40460700003)(4326008)(5660300002)(6916009)(55016003)(82310400005)(8936002)(41300700001)(356005)(70586007)(70206006)(7636003)(86362001)(8676002)(2616005)(66574015)(966005)(336012)(83380400001)(82740400003)(426003)(47076005)(36860700001)(53546011)(1076003)(26005)(186003)(6666004)(54906003)(6286002)(7696005)(478600001)(316002)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:29:24.8263 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b853409-7630-44ff-f151-08db390f333c 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: DM6NAM11FT048.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7552 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.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 04/11/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/log/?h=22.11-staging/commit/336d6c1c41f5a31c7d703496125e4e72b345f5d1 Thanks. Xueming Li --- >From 336d6c1c41f5a31c7d703496125e4e72b345f5d1 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Tue, 21 Feb 2023 18:35:12 +0800 Subject: [PATCH] net/nfp: fix set TTL flow action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 7b661f403fabbc7ac55785403cace34f8f6cf21d ] The former logic of set TTL flow action don't consider the mask filed of control message passed to the firmware. This caused the firmware skip the set action logic, and the offloaded packets don't have the right TTL as expected. Fixes: ac12e126c482 ("net/nfp: support TTL flow action") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index dedc2d2dc4..660a777e6d 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -2241,6 +2241,7 @@ nfp_flow_action_set_ttl(char *act_data, ttl_conf = (const struct rte_flow_action_set_ttl *)action->conf; ttl_tos->ipv4_ttl = ttl_conf->ttl_value; + ttl_tos->ipv4_ttl_mask = 0xff; ttl_tos->reserved = 0; } @@ -2264,6 +2265,7 @@ nfp_flow_action_set_hl(char *act_data, ttl_conf = (const struct rte_flow_action_set_ttl *)action->conf; tc_hl->ipv6_hop_limit = ttl_conf->ttl_value; + tc_hl->ipv6_hop_limit_mask = 0xff; tc_hl->reserved = 0; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:39.891022400 +0800 +++ 0043-net-nfp-fix-set-TTL-flow-action.patch 2023-04-09 21:45:38.629042200 +0800 @@ -1 +1 @@ -From 7b661f403fabbc7ac55785403cace34f8f6cf21d Mon Sep 17 00:00:00 2001 +From 336d6c1c41f5a31c7d703496125e4e72b345f5d1 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 7b661f403fabbc7ac55785403cace34f8f6cf21d ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 5be4c4f18a..77f249e2b9 100644 +index dedc2d2dc4..660a777e6d 100644 @@ -27 +29 @@ -@@ -2252,6 +2252,7 @@ nfp_flow_action_set_ttl(char *act_data, +@@ -2241,6 +2241,7 @@ nfp_flow_action_set_ttl(char *act_data, @@ -35 +37 @@ -@@ -2275,6 +2276,7 @@ nfp_flow_action_set_hl(char *act_data, +@@ -2264,6 +2265,7 @@ nfp_flow_action_set_hl(char *act_data,