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 0B3E242D46 for ; Sun, 25 Jun 2023 08:41:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0350E42D2F; Sun, 25 Jun 2023 08:41:34 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2071.outbound.protection.outlook.com [40.107.95.71]) by mails.dpdk.org (Postfix) with ESMTP id 3F4F740A7F for ; Sun, 25 Jun 2023 08:41:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hB3yrQHzKekaiAYzCvUt477mGN0wTXX+/+hWmWlODxKdUrDO84hdCkCi2/0V7eXebb9As/NxVAwsJY+PutyOD/qyJXUhJGyU7Zhlu8cL++D0TvdGi6CnHEL+edSBuLLsh7uB1FvAk56o3ASuyIEQSXH320QFP6LiN7xlKk8/RjYi5Oh/MP6gOtULwe9XKO971CUVuLlrlqN9YSKUZ1j3EFWeGaW+XbXwv35mZHblOibtWkaG9JY1Fy4DHYxInSyusEBLENEonLVWyu4Kzhq2n0sGeeEV5q3SF8adu5/SWYVgNE/UmodnMp2Rs6kqNDiqeC5g3j7Cwfay5d8HBxo2tA== 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=aQN6WCtAwppmoSzSdUPY0/Uv6NUC6OxEPhctOl/rcRQ=; b=OtUDcsEDD57y1wnfJDa4pFCZO7qhOrBDUhkMvdbb9w3Q2BdzzfsPGaEZ/WAsI0UlIIar6Pm/WJR6rKLMzaUKNYvtLQz/z7Fq39v6M5oAFkor0l9cnsY7BfYhtvEK4aJAzI0b1fI3CpO+HbyRFRQTk+zexF4NsOKZ+jnTCoLtZKg5jyDTWSnnmKlTInic31Eyhk2/gipSdDZd/v7XrAvoNHp7uxz3Q/5ihA4C6dY2tgLfJvF03+nFpMVnvU/jbXCRlgrJmADNNGjyMxB8+uZp9oPEgkTwUlmAiTjURyfg6vilZv9gNBozbo0gmwcU+6XnaWqDLN666NIJtovz3Dk6hA== 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=aQN6WCtAwppmoSzSdUPY0/Uv6NUC6OxEPhctOl/rcRQ=; b=UQrdc8zTElggoVA3HZ/ETcfUYv9rY3SGQTiYLbAGbzn7aD4cajhxqF1OETZcSUX5E7xl82Xa+Y4VndY56V+UlbHnLv22e+I98D8TAqVN/mLdCxobdYFc7Pv5ySzCoZvbzDSGkMuAW2xjyA/UVka7xaObtg8HBccIwoXKoe00xSdFObql7BGjnFR8itpDLPG2nfLr8ebZMJ6405SpgBWMuvNAhiIXN8MlJDa1QKFxFupyNCWQTc7o8olyRZ4sz5qfGd8R7Nedg1Qe+9Q44WI59dUsigCIy6Zrzea7b0xHaBD00KjdEST7x/z10LBrUvG+EuzDJSrgQ4OtuJ2yyRhrTg== Received: from BN8PR15CA0007.namprd15.prod.outlook.com (2603:10b6:408:c0::20) by IA1PR12MB6355.namprd12.prod.outlook.com (2603:10b6:208:3e1::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.37; Sun, 25 Jun 2023 06:41:30 +0000 Received: from BN8NAM11FT102.eop-nam11.prod.protection.outlook.com (2603:10b6:408:c0:cafe::88) by BN8PR15CA0007.outlook.office365.com (2603:10b6:408:c0::20) 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:41:30 +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 BN8NAM11FT102.mail.protection.outlook.com (10.13.177.27) 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:41:30 +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:41:16 -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:41:15 -0700 From: Xueming Li To: Chaoyong He CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix IPv6 flow item' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:39 +0800 Message-ID: <20230625063544.11183-62-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-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit 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: BN8NAM11FT102:EE_|IA1PR12MB6355:EE_ X-MS-Office365-Filtering-Correlation-Id: b5036b61-89d2-46c5-9abd-08db75473568 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vqgqMmdi+N+KZNqXz3PnV7IZMiAh3UPS1/euwgP1uBYrnNIFYFR7TkdTtVss7B8C/+5+rCc8pv/DfSlgjYSg+JS9hjXV1Pb5wiRR80wCw9/WpyDBRgtrqjJ3TyEl9GO/xzEaZ0kWUaExESyADOQ2EWMAdw0BwgsBjfoLYRNjMpo+cVEGHO4k9LB24URsA3c08UGpfxYj9jIe4PoQPxHHDwxjwhmLT4gPtHX83UcJXhCvJLQTdXZG3hiL+sw8KhH7G2aRQJJdYQ/KkAIt1aCm4H854HXjpq2VhMBxoS0wYfW3VX5kbxedS+Nm7xkcAKuI7VJsyQIDsIae/i7giZlb98cvKxHQBVCtLwU1FHBd/jle9BEUIw7ifyfXW4Xtzemj4eJvVSghxkw3nPp19dOyygWdNsVqTMtcf+RwScS0EMx+tgrcBy4p7t5VAfEAxQ+lJOttDHkjoHrU4Uf5JwYjZ8Lcm4/5YMqdwDayBnnnolrH3eE/2lVXCfpA+jEn2xS0pt+3I5ItFmPkm1ZmuzbHCg3W0/sJOqdb8hjzfycf+ROzO7DpkSwqkV3zONepohtwaVr/B7rOHJxX4AeNMtVgT6a8JmT9GFpGWoiN8CGU8hCOUiXgTmKunJQly7XzbIZx2tFoa4qfrfUsGBsjGlLQe1fOvCkyd/70I2iNK1/UcaQtd0R1d0sAuyQWQsxM+q8r7V4QnjK50mThd3IB2qz7eSkYYkHJPNPWB6ZwMGXjBdJHKSpzUdymRSH8tnN8NCgira7VYsJzJXxmRXxJc/kB9Q== 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)(396003)(39860400002)(346002)(136003)(376002)(451199021)(40470700004)(36840700001)(46966006)(86362001)(36756003)(54906003)(478600001)(6916009)(4326008)(70586007)(70206006)(26005)(6666004)(7696005)(966005)(1076003)(316002)(40480700001)(55016003)(82310400005)(8936002)(8676002)(41300700001)(2906002)(5660300002)(82740400003)(7636003)(356005)(336012)(2616005)(426003)(47076005)(83380400001)(66574015)(186003)(53546011)(6286002)(16526019)(36860700001)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:41:30.0201 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b5036b61-89d2-46c5-9abd-08db75473568 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: BN8NAM11FT102.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6355 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=a1d864c39bde7bbe699b258d50d22cde109778b6 Thanks. Xueming Li --- >From a1d864c39bde7bbe699b258d50d22cde109778b6 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Thu, 8 Jun 2023 11:19:53 +0800 Subject: [PATCH] net/nfp: fix IPv6 flow item MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 78ee6649ee8a862e0c4f5816b8b9145a07489bb8 ] When process the IPv6 flow item, the former logic perform the mask operation between one big endian value and one CPU endian value, which cause the match of DSCP filed not work as expect. Fix it by convert the big endian data into CPU endian and remove the unneeded mask operation. Fixes: d96507404463 ("net/nfp: support IPv6 flow item") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 432e19c357..3aefccc069 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -1221,6 +1221,7 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower, bool is_mask, bool is_outer_layer) { + uint32_t vtc_flow; struct nfp_flower_ipv6 *ipv6; const struct rte_ipv6_hdr *hdr; struct nfp_flower_meta_tci *meta_tci; @@ -1244,12 +1245,12 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower, hdr = is_mask ? &mask->hdr : &spec->hdr; + vtc_flow = rte_be_to_cpu_32(hdr->vtc_flow); if (ext_meta && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) & NFP_FLOWER_LAYER2_GRE)) { ipv6_gre_tun = (struct nfp_flower_ipv6_gre_tun *)*mbuf_off; - ipv6_gre_tun->ip_ext.tos = (hdr->vtc_flow & - RTE_IPV6_HDR_TC_MASK) >> RTE_IPV6_HDR_TC_SHIFT; + ipv6_gre_tun->ip_ext.tos = vtc_flow >> RTE_IPV6_HDR_TC_SHIFT; ipv6_gre_tun->ip_ext.ttl = hdr->hop_limits; memcpy(ipv6_gre_tun->ipv6.ipv6_src, hdr->src_addr, sizeof(ipv6_gre_tun->ipv6.ipv6_src)); @@ -1258,8 +1259,7 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower, } else { ipv6_udp_tun = (struct nfp_flower_ipv6_udp_tun *)*mbuf_off; - ipv6_udp_tun->ip_ext.tos = (hdr->vtc_flow & - RTE_IPV6_HDR_TC_MASK) >> RTE_IPV6_HDR_TC_SHIFT; + ipv6_udp_tun->ip_ext.tos = vtc_flow >> RTE_IPV6_HDR_TC_SHIFT; ipv6_udp_tun->ip_ext.ttl = hdr->hop_limits; memcpy(ipv6_udp_tun->ipv6.ipv6_src, hdr->src_addr, sizeof(ipv6_udp_tun->ipv6.ipv6_src)); @@ -1280,10 +1280,10 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower, *mbuf_off += sizeof(struct nfp_flower_tp_ports); hdr = is_mask ? &mask->hdr : &spec->hdr; + vtc_flow = rte_be_to_cpu_32(hdr->vtc_flow); ipv6 = (struct nfp_flower_ipv6 *)*mbuf_off; - ipv6->ip_ext.tos = (hdr->vtc_flow & RTE_IPV6_HDR_TC_MASK) >> - RTE_IPV6_HDR_TC_SHIFT; + ipv6->ip_ext.tos = vtc_flow >> RTE_IPV6_HDR_TC_SHIFT; ipv6->ip_ext.proto = hdr->proto; ipv6->ip_ext.ttl = hdr->hop_limits; memcpy(ipv6->ipv6_src, hdr->src_addr, sizeof(ipv6->ipv6_src)); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:00.154021100 +0800 +++ 0061-net-nfp-fix-IPv6-flow-item.patch 2023-06-25 14:31:58.415773900 +0800 @@ -1 +1 @@ -From 78ee6649ee8a862e0c4f5816b8b9145a07489bb8 Mon Sep 17 00:00:00 2001 +From a1d864c39bde7bbe699b258d50d22cde109778b6 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 78ee6649ee8a862e0c4f5816b8b9145a07489bb8 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index cb7073f361..68e8654bf9 100644 +index 432e19c357..3aefccc069 100644 @@ -29 +31 @@ -@@ -1231,6 +1231,7 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower, +@@ -1221,6 +1221,7 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower, @@ -37 +39 @@ -@@ -1254,12 +1255,12 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower, +@@ -1244,12 +1245,12 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower, @@ -52 +54 @@ -@@ -1268,8 +1269,7 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower, +@@ -1258,8 +1259,7 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower, @@ -62 +64 @@ -@@ -1290,10 +1290,10 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower, +@@ -1280,10 +1280,10 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower,