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 9991842D46 for ; Sun, 25 Jun 2023 08:41:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 93EE240ED8; Sun, 25 Jun 2023 08:41:40 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2047.outbound.protection.outlook.com [40.107.243.47]) by mails.dpdk.org (Postfix) with ESMTP id 0D83A40A7F for ; Sun, 25 Jun 2023 08:41:39 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H3UOvBwGmP73M9aO8R1jjRGu3Apfwy+0IOx8ZVFFIrdS1qfSequq0KTuiPbJa5KxCl9YZVFFeR7gluuCLpX991Dpt8XMbFKwafRIxX1r9Cg9sjDeAcWnm6J2IJBt/NT+FgnTUIDTVfovPOe3YLFkuqt0e1wKhQt4+WdP4Ca/VTjSzKtubeZS/g8tEEYLo4eamnTKZ/7Snj7vPU4/MwgCH423L/URV5IEQr7e+CfZjkX11joSBjE8fOeYIM4LL9QE7KSs+2CjTADQYZGTl8Fp3hqiu1QKmIjVfrGeeuaqKexwDaY11z+4SqOfLp3yDNLEqLH5rrMjWNq34wXsvQ7geg== 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=agkpjLneKAlpvJSzQ2ZTD+THUaWZK5G1GPnhoOQZXI4=; b=J8oj3EzffYn2fwG8FPVzi82+CAd1XTgE4XqHGWBfLcCJYtHUR5cIfEIegFXu4bZYbSZ19uFROcVDGn9k9gcp/avClvjm3DvZOymVQZc2zkgbnecoI3I7v8Fe3Uodb+Z8DOUBUpkVdHcFGiVh/U59HlJM8RwhFcLEchXYCLXXcIufLqPz7jZGwjvSfy0owYCmExmPi8fddXlwlGMVSUJOkQdKM58lAzM2DaM6wX2pU1wtraVzEivuSn7/ebDdEJzrHWoX7MWNYr+9voJFcQhRvM5tKal6/zmjifejhiSWoGB10XvI/vLvqVjSgkGR9EkZWUtnO8Re56tWuq/70DCebw== 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=agkpjLneKAlpvJSzQ2ZTD+THUaWZK5G1GPnhoOQZXI4=; b=tJbZWIpD8IM2LfR3Q90H5PldPN1eGuc/nDeH65YAZCVRnytEIjR3J1yU/zGisCcIpeiGM2vN2z+72NgXbS04O6d248LmwZEsmyptRKiw2/BsAMQzKDBLz0mrUdC9hj4GdXQGNPOCitwpDsgwMLM//fgsZSVPzgzS/H1HuMzHq8mzHfzb2d/Vv/GPhmOiA6lhbwSG75ASv8rLW4A0sqalbJgbkQd/3VmEcAUUTyFuZqHdg31Hx1vpgIYraydBd6RLd7idceC8aA6HlG9GvP3Uz3LXprNfzdXlssI2wl+D4RNAHW1RwO4adG24ryX1dB+zMEnu1oIPtLdTDl3OAOXSsw== Received: from SJ0PR03CA0185.namprd03.prod.outlook.com (2603:10b6:a03:2ef::10) by CY8PR12MB7171.namprd12.prod.outlook.com (2603:10b6:930:5c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.23; Sun, 25 Jun 2023 06:41:37 +0000 Received: from CO1NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:a03:2ef:cafe::ec) by SJ0PR03CA0185.outlook.office365.com (2603:10b6:a03:2ef::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.32 via Frontend Transport; Sun, 25 Jun 2023 06:41:37 +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 CO1NAM11FT022.mail.protection.outlook.com (10.13.175.199) 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:37 +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; Sat, 24 Jun 2023 23:41:21 -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:19 -0700 From: Xueming Li To: Chaoyong He CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix TOS of IPv6 NVGRE encap flow action' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:42 +0800 Message-ID: <20230625063544.11183-65-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: CO1NAM11FT022:EE_|CY8PR12MB7171:EE_ X-MS-Office365-Filtering-Correlation-Id: f7851f41-2c3a-48d6-c6ac-08db7547399c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YOX75kpszgHXKCbxMVPPLQNZlymi5hkYVnb+GhFaidySmbCOZc+hgvjoD/zMVYcdXXxW5b+2BhKnEJrTE4TrgbNzVty/Bw5YORA8fMmMwzVD+dr7J4TD/ZS81Z7WN4sbbCKLvk66iBNHhP5PEcbCF2vZDtydbjfoOyIT4OATeh0/fAEKpeRwD6XEBf1QbyQnDRILjS4SgxoXN5qX0nJziluXeO07+W1TMOQ+SWgW9ZC9dCbu3eo6pSFa6OcDn8WIpmWjy1r5YyfMSrOcPHnWvhpcBUwMc7p2KUZ7Uwgh+4kKQZp9gvo4RunawVZ56F1PzHOot8l13AMkNsVRnym0X2SJL5CqhQHlz71q+GQVSbDexEHJfzE27NGAH41ENwkKaJFJxbJRNIz7HWRZvopozZ2h0Fp9wQ0R0EMRA5Cr3MG7+z/qcSEzgYml012MCVrZH9Z4Ra3ow095SfIMrXfNEWMpGyhsyV4vFqOUIWdouSDv6S4/FERLflNcARj1e7lWiVYlqUdYf7glsXz48P7rm9TC/yJCvkIJMHwasSQVBTROrGDxJSgkTe55o3M2JMEwgsAh0twcou+hXS1s0aeBxBj6CL3jKfG9yzo77qibaSk9Kr+pH8ezjxII3EhWsj8+xO397W/5Zx1KxEVZWNylNfY1WlJNn4imY3+XMMYbMim4IFaCKd6wcGwNhYxmhhZ+b1KjWW/KB5z0V59pEdC5Y9wCbPWQPXu9SESGh3KfpTo6SHOFcjYwkKGbKtm/dQR/eruwuw7zPAl1y6kXCORm3g== 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)(136003)(346002)(396003)(39860400002)(376002)(451199021)(40470700004)(36840700001)(46966006)(36860700001)(82310400005)(66574015)(47076005)(966005)(478600001)(7696005)(6666004)(2616005)(54906003)(426003)(83380400001)(336012)(26005)(53546011)(1076003)(186003)(16526019)(6286002)(2906002)(5660300002)(40460700003)(36756003)(70206006)(356005)(4326008)(7636003)(70586007)(82740400003)(55016003)(40480700001)(316002)(86362001)(8936002)(8676002)(41300700001)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:41:37.1823 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f7851f41-2c3a-48d6-c6ac-08db7547399c 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: CO1NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7171 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=caa96e94b0fe196c4807a033312b05941f253d39 Thanks. Xueming Li --- >From caa96e94b0fe196c4807a033312b05941f253d39 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Thu, 8 Jun 2023 11:19:56 +0800 Subject: [PATCH] net/nfp: fix TOS of IPv6 NVGRE encap flow action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 6f22d3576116f2f2e9f8e9aa1782b75c64565211 ] The former logic directly do shift operation on big endian data, fix it by convert the big endian data into CPU endian firstly. Fixes: fff680eef7f9 ("net/nfp: support IPv6 NVGRE encap flow action") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index d4a5735c88..23dc9f06ce 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -3196,7 +3196,7 @@ nfp_flow_action_nvgre_encap_v6(struct nfp_app_fw_flower *app_fw_flower, set_tun = (struct nfp_fl_act_set_tun *)(act_data + act_pre_size); memset(set_tun, 0, act_set_size); - tos = (ipv6->hdr.vtc_flow >> RTE_IPV6_HDR_TC_SHIFT) & 0xff; + tos = rte_be_to_cpu_32(ipv6->hdr.vtc_flow) >> RTE_IPV6_HDR_TC_SHIFT; nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_GRE, 0, ipv6->hdr.hop_limits, tos); set_tun->tun_proto = gre->protocol; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:00.235475900 +0800 +++ 0064-net-nfp-fix-TOS-of-IPv6-NVGRE-encap-flow-action.patch 2023-06-25 14:31:58.415773900 +0800 @@ -1 +1 @@ -From 6f22d3576116f2f2e9f8e9aa1782b75c64565211 Mon Sep 17 00:00:00 2001 +From caa96e94b0fe196c4807a033312b05941f253d39 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 6f22d3576116f2f2e9f8e9aa1782b75c64565211 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 520b4dcc2e..a224d01670 100644 +index d4a5735c88..23dc9f06ce 100644 @@ -25 +27 @@ -@@ -3203,7 +3203,7 @@ nfp_flow_action_nvgre_encap_v6(struct nfp_app_fw_flower *app_fw_flower, +@@ -3196,7 +3196,7 @@ nfp_flow_action_nvgre_encap_v6(struct nfp_app_fw_flower *app_fw_flower,