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 F3C9B428F8 for ; Sun, 9 Apr 2023 17:29:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EED0F410EF; Sun, 9 Apr 2023 17:29:36 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2075.outbound.protection.outlook.com [40.107.237.75]) by mails.dpdk.org (Postfix) with ESMTP id EB331410EE for ; Sun, 9 Apr 2023 17:29:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QWXRzJmcd9cyYKtMgRWViB68PCf2Kc+ky7PhGcuyCvhcTuATopQ20sGLNbhktva3/FTiZkNBOl/Q29KdxZtRNcEk2C1ksKVMjCpkoOQPXlxcR9ZlBDvDQY/EFgMvAnOb0PUWCnssChGgG6EvEdaS5vu/wmI7Hj94yiwVvmbBzUk9pxsxcgUNbaI9QtzYWc9GpmZ6Ht/Z9cZUtRbPOGroXjipJ3bESLxF1SF2nX0KGjt0H16VTXV9CUVwP2Pj8WwYtFebEVUx6xqEPOXPgMoMLKnheqtTKLdA3VczE+ltHIM8SjipxmwxEB5IysqtikuXw7jJovNvIwr2Ps/ynJllxQ== 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=5bGz9i5qm/yg09tm24h3gTtY5dtI5XmFhUX+uskZLFE=; b=Qv7Qem19kA5LCSqROuCfX9t/P4rjS4nLhCfS8+7lnyo9dL82IFqCVPt1tU3OUy4vpz57kdGXHj7pHB1kW9tYdJdycptR5h99Tj2EeJowj7OkuFQkuEPMpZABa4omQjESUw+wYfM172+uKOKs0CTT9pTcTe+4Z1pJJDOfkRzVpiw0mmCuIQDt8Din7VMn6uANZyuqo8M6+X66nwMx0uJwf9SqSjgkFLDsAd7enG2e1TgX5nO/N6mexcs7w+Ge0vZSEbHb6MxFMBYuDXdXwE+egdtTZA0hji2DxJxDatgfYNWSxnZhjb9/zjN4jTntEL4Qx5QTqOepJobXEpWPlShxMg== 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 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=5bGz9i5qm/yg09tm24h3gTtY5dtI5XmFhUX+uskZLFE=; b=AVoBr8Acsx5XSI67AgAuHofM+MQIG5ZR5lbPi4ugAmDF7xncHvLokQIhIqQHYX4EShT5IR5rk9dzyPkt2P53x5mUujMDH05pb6Ulwl9XMnXjI2tBLtb6Btr16wVSw+GM6ZD+tVC8NpaAIWUyrsHHcbchaRWKZiSzUKzRhh9aYV0JTI3B4HdeaO6wZ5n3oCHKPw8R1uXoEYX11l9ZM2z9uQ1asVBTIA3kVNY63z1Og95KDPhKpfCWe2xUgpTR/CKjO+uFIYauIKC6f9lo7msyPlUOeKQJrWGSCABUH3wfTuvSkkUlEEji1LAoDretuWQykS38gvpuj7hDHsqS7IM05Q== Received: from BN8PR16CA0012.namprd16.prod.outlook.com (2603:10b6:408:4c::25) by DS7PR12MB6165.namprd12.prod.outlook.com (2603:10b6:8:9a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36; Sun, 9 Apr 2023 15:29:32 +0000 Received: from BN8NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:408:4c:cafe::94) by BN8PR16CA0012.outlook.office365.com (2603:10b6:408:4c::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.34 via Frontend Transport; Sun, 9 Apr 2023 15:29:32 +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 BN8NAM11FT050.mail.protection.outlook.com (10.13.177.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.26 via Frontend Transport; Sun, 9 Apr 2023 15:29:32 +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.986.5; Sun, 9 Apr 2023 08:29:17 -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:15 -0700 From: Xueming Li To: Chaoyong He CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix set DSCP flow action' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:23:52 +0800 Message-ID: <20230409152529.5308-45-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: BN8NAM11FT050:EE_|DS7PR12MB6165:EE_ X-MS-Office365-Filtering-Correlation-Id: 884f84f3-9652-49c4-cce1-08db390f37b2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NgyTbqLWjVjgK5l2/Fr2RP8eMQdudRhR5D+9MgpQAnOiyczCranwiM/d70DjI1W4/JCUzCDxsMNY/OviD3zm0wA7P081yCQFFoc3uSpFH0z3vhJFY23bMtqWj7AQkVFKuKDRVMFN/UkJzETbWlBeZsdnq4c67QO7YUZ/9BHwfyKvj/C+S1hJWl3i3f1yEE8/RznDF1JuaWkrJkFCa8HtULIXXFuvXRAbdoH2QmtjXmfc63SRGUrck/P8UUNmWZzbsggTB0mdDy6aYNOAp847DLaVpp1kw2VYgi4x5XxhavAONYplrS98tU19dLUWeD44piM1yJQEUvVPpHGwohAljidsFj3fVXuK9Fqymg4OG2/Vg2QZgqwUkAw6q1pMubY9LC/niaTvMB7CA8usE56Mu3bRd7W9bgFnsDaBjkBAzBuguyip+RbLXZqSDoPaCC8VWCK3Bq8WFIThKlkQ2prQZq2nlitQNz6BryJ0oabj8GVC9NgpuTpTwidYRvyghITfr5WcFdrSMI2NCLZvNCpqcdqZi8Nnp8ilFA6s5skU1mbpbzpRCA46Fm/I3SsxtmLSK9e5pZVXRHLMGSnbTgcOUoK1+ejlKRN57LWZeGYXKD20U6kN59eBiOCnsp10sM2VqJsobS7i0Lvd6Qz33nRhMuFMBDwoaMhDfse0EOuNVO2VP91F1O+TPpJ795RKeOZIJqXYQZjR9RjtxTYVa5Gc6eCoAgRmbqRMVSj3C0VeXQlVhE/LMUVa/og9AaKGQtDNZ8p0mivbn4WBJtcUedDeq4rXgoJvTy/2KZnqIq91a4SJ0x7GiMo+Lt/Ln4KW5q0lD0PDpI0N99cPXLTGRdgkXw== 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:(13230028)(4636009)(346002)(39860400002)(396003)(136003)(376002)(451199021)(40470700004)(36840700001)(46966006)(86362001)(36756003)(316002)(41300700001)(8676002)(70206006)(4326008)(966005)(6916009)(7696005)(70586007)(54906003)(478600001)(40480700001)(55016003)(82310400005)(5660300002)(8936002)(2906002)(36860700001)(82740400003)(356005)(7636003)(16526019)(6286002)(186003)(6666004)(53546011)(1076003)(26005)(336012)(2616005)(426003)(66574015)(47076005)(83380400001)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:29:32.2783 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 884f84f3-9652-49c4-cce1-08db390f37b2 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: BN8NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6165 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/fc325877f64eba2eca025c9a449b1a910e912566 Thanks. Xueming Li --- >From fc325877f64eba2eca025c9a449b1a910e912566 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Tue, 21 Feb 2023 18:35:13 +0800 Subject: [PATCH] net/nfp: fix set DSCP flow action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 449c68dc9c9475ba780b12046825ae643947742c ] The former logic of set IPv4/v6 DSCP 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 IPv4/v6 DSCP as expected. Fixes: 9c665d70f7a7 ("net/nfp: support IPv4 DSCP flow action") Fixes: 3202b003bec1 ("net/nfp: support IPv6 DSCP 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 660a777e6d..49305a4152 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -2289,6 +2289,7 @@ nfp_flow_action_set_tos(char *act_data, tos_conf = (const struct rte_flow_action_set_dscp *)action->conf; ttl_tos->ipv4_tos = tos_conf->dscp; + ttl_tos->ipv4_tos_mask = 0xff; ttl_tos->reserved = 0; } @@ -2312,6 +2313,7 @@ nfp_flow_action_set_tc(char *act_data, tos_conf = (const struct rte_flow_action_set_dscp *)action->conf; tc_hl->ipv6_tc = tos_conf->dscp; + tc_hl->ipv6_tc_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.915271700 +0800 +++ 0044-net-nfp-fix-set-DSCP-flow-action.patch 2023-04-09 21:45:38.639042200 +0800 @@ -1 +1 @@ -From 449c68dc9c9475ba780b12046825ae643947742c Mon Sep 17 00:00:00 2001 +From fc325877f64eba2eca025c9a449b1a910e912566 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 449c68dc9c9475ba780b12046825ae643947742c ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 77f249e2b9..53029d00c9 100644 +index 660a777e6d..49305a4152 100644 @@ -28 +30 @@ -@@ -2300,6 +2300,7 @@ nfp_flow_action_set_tos(char *act_data, +@@ -2289,6 +2289,7 @@ nfp_flow_action_set_tos(char *act_data, @@ -36 +38 @@ -@@ -2323,6 +2324,7 @@ nfp_flow_action_set_tc(char *act_data, +@@ -2312,6 +2313,7 @@ nfp_flow_action_set_tc(char *act_data,