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 6DDC04301E for ; Thu, 10 Aug 2023 01:51:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 68ABC43258; Thu, 10 Aug 2023 01:51:30 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2048.outbound.protection.outlook.com [40.107.93.48]) by mails.dpdk.org (Postfix) with ESMTP id 8D170406B6 for ; Thu, 10 Aug 2023 01:51:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N6aBSTdhJQc2Y4I1lAKW9Iml/C3RtGPmVgW3kmnCh8XP3nndWsHIH8uExZefH8z2mhzxOeQq/5rlc9WLXY/WA6k/PB7dhdoPDvOxs9p5kGR9yfymrcBEHysvPn0LgDKXQhTpLCY6KeccmkC9sVI5GHN6k32uTWk2kLNGWcQxDPf7t94Gk32Yv3s/1J4QA6VpZ6NG4PTyBUzas5921GlCmZ//Gjob4fid8I/aAy/eg50IbYOTYUQdeG5sC1KRb4CYAvTrXOR8kGK6JkSJJV03SNbszDxu7P1vytUchRSZZsMy/IjQNCHi2lDd8T5acU/33vmNJCKfs0/hGVV5PNDVcg== 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=OPdZkSGxlWcvejLvKZWkyA3NlXnHLCpUEkrmWEJ3qPg=; b=Oq7oF0fv0GuxTnS/kFjYoYyU98aJNZB6yCsu232X1zGtvzV1mYlHXbN9ADzchr4eXZC4xHsJkg9WKszK+UXa6b1gWcMVf3InB6WRW7lwPl+MpY9qnrdL+Osf3/J9BF4sxkrHWiq78KxnpOU3a8CU9dAbLUbMnI0aCdc7aPpJAHAQ5y9HYM8m02ctqwMA+omKV7et8unm/USA41HHCRVVlpL6IXsVfiJ2VjlQTvcbHoVqL4q+G82dLAOIVQqt5Nnd178wdc+Ss86yyYE5MGnl3I4avcCOoaA2iXUYuAXnkuGt5pcdgl8gf9KTM3bRQXxKuPq5KsPXJf257CZw0/tO2g== 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=OPdZkSGxlWcvejLvKZWkyA3NlXnHLCpUEkrmWEJ3qPg=; b=hKm0lZ+GTIrWRUb4iYpV+dU1ocncvb7VRtWFrfxq/ixIcfbLA+ilbqsJvbsPEiqHG0Evp2P3cstFTjtKieyzTD0YlPBEXoXU7UKNouIF/lB6LVL51oxMCDGGemBs6GAE9q4DZ+165LnUcchu7RirbkV6ZGKJYdZ6GWARg4MTZyiT+p0FE2hBm61o0whiacW9JZlwwpJv6p/aVv3Y5N1wn4yh9Z3v3RT4klMfoSvdDoquKSwKsPBi843YlSmLMOPT3sCKODTKH28OEpqabM3SYqUnRHRHOGd5Ji8ibIt7gdcKabPPezoCGhrQ+IUKataULnaXHoyx35bLPLejVEM55A== Received: from DS7PR03CA0003.namprd03.prod.outlook.com (2603:10b6:5:3b8::8) by PH7PR12MB6953.namprd12.prod.outlook.com (2603:10b6:510:1ac::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Wed, 9 Aug 2023 23:51:27 +0000 Received: from CY4PEPF0000E9D7.namprd05.prod.outlook.com (2603:10b6:5:3b8:cafe::f1) by DS7PR03CA0003.outlook.office365.com (2603:10b6:5:3b8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 23:51:27 +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 CY4PEPF0000E9D7.mail.protection.outlook.com (10.167.241.78) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 23:51:26 +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; Wed, 9 Aug 2023 16:51:15 -0700 Received: from nvidia.com (10.126.230.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; Wed, 9 Aug 2023 16:51:13 -0700 From: Xueming Li To: Chaoyong He CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix VNI of IPv4 NVGRE encap action' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:47:40 +0800 Message-ID: <20230809234930.32424-19-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809234930.32424-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809234930.32424-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.37] 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: CY4PEPF0000E9D7:EE_|PH7PR12MB6953:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f36952e-66bc-4408-fb0b-08db99338bb2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KErlXSrDh3ihK7lb9j6eQjMbpLlOY02vRy4IWJfzA9LWt9xDc3jnNYbOLxFXQe4f3oRIPUmrUXKW4D2uuvlRFG2iSPW5eCo8ivEp1vlm+u2qTwX3SOVNlcKceMMd8Cr0Y28/rwVFSOz0ueNrMMWKPLe4zQkAmDnlnTGH5cvkET0EaxCM1r9JWGnBuJh8GBKuYaQQmRHPx0qODYe+1AhIx5x69Y0JvwS9CVsGZJIKai5Z8AVfR01vx8XDBhhkmXNqJ7P9Spf6CYIDWIRdTTg+FWCODG3SkXeGDZDOaySqpgE9TfugxsIt5uT0wwWIU8W076/Th5iRKjmEwJU4tA7rOaub9kehKOocadFiWbANtlvqSwJTCpdaDkYuq73TU6ko1iWnMHfARfBtfroSUhDkHnau8MdD/wmcoOL5nRE+XAkHcXlLKlUwnFbj4h2X6xRP87Qw6radpuH6MTafo/pZc6SS0mDXnVSLIcIA8r4yv1V5FT5vpgqRcq164U4bMLJC/MIo/KEnjQ8ayjrjOnLJjHxEMQHuyXNZf3CY/WpagV1tgGYfyD6mG98Wbc56tiLuUMZQwc0cROMmyWxCZyejqjDcJ15A4S3+GWhnqbuKSm5AkdiHv2LCkz7zN+nk6diF/eRML3g15t/Qr+JApBqBlONPFKDskiW6kifOx/D75rbDjC78lO/9+SKelZbI9WD4d0DZgDGw9x6nLRk1vTTgAO8I5FvI3stEatLAWvP900kwdRxSv7raTh0Nz4g98TZG+4yj91EzKspiKiT8dfbacw== 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)(376002)(396003)(39860400002)(346002)(136003)(186006)(82310400008)(1800799006)(451199021)(46966006)(36840700001)(40470700004)(66574015)(47076005)(83380400001)(6916009)(2616005)(4326008)(316002)(426003)(41300700001)(36860700001)(7696005)(70586007)(6666004)(54906003)(336012)(478600001)(70206006)(26005)(16526019)(1076003)(6286002)(53546011)(86362001)(966005)(36756003)(2906002)(8936002)(8676002)(5660300002)(7636003)(82740400003)(356005)(40480700001)(40460700003)(55016003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:51:26.8107 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9f36952e-66bc-4408-fb0b-08db99338bb2 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: CY4PEPF0000E9D7.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6953 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 08/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/commit/?h=22.11-staging&id=7797d05cd90272f4fcc78b3ae3932e7d79d4fc18 Thanks. Xueming Li --- >From 7797d05cd90272f4fcc78b3ae3932e7d79d4fc18 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Tue, 13 Jun 2023 11:20:35 +0800 Subject: [PATCH] net/nfp: fix VNI of IPv4 NVGRE encap action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 47e7e5bd044479fcb824966252f2ddc11efb9974 ] Complete the missing logic of parse the tunnel id of IPv4 NVGRE tunnel and send it to the firmware by control message. Fixes: 88cce0538073 ("net/nfp: support IPv4 NVGRE encap flow action") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 6f242d13a6..55cc21b672 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -3164,6 +3164,7 @@ nfp_flow_action_nvgre_encap_v4(struct nfp_app_fw_flower *app_fw_flower, struct nfp_fl_rule_metadata *nfp_flow_meta, struct nfp_fl_tun *tun) { + uint64_t tun_id; const struct rte_ether_hdr *eth; const struct rte_flow_item_ipv4 *ipv4; const struct rte_flow_item_gre *gre; @@ -3175,6 +3176,7 @@ nfp_flow_action_nvgre_encap_v4(struct nfp_app_fw_flower *app_fw_flower, eth = (const struct rte_ether_hdr *)raw_encap->data; ipv4 = (const struct rte_flow_item_ipv4 *)(eth + 1); gre = (const struct rte_flow_item_gre *)(ipv4 + 1); + tun_id = rte_be_to_cpu_32(*(const rte_be32_t *)(gre + 1)); pre_tun = (struct nfp_fl_act_pre_tun *)actions; memset(pre_tun, 0, act_pre_size); @@ -3182,7 +3184,7 @@ nfp_flow_action_nvgre_encap_v4(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); - nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_GRE, 0, + nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_GRE, tun_id, ipv4->hdr.time_to_live, ipv4->hdr.type_of_service); set_tun->tun_proto = gre->protocol; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:18.755066300 +0800 +++ 0018-net-nfp-fix-VNI-of-IPv4-NVGRE-encap-action.patch 2023-08-09 21:51:18.134352000 +0800 @@ -1 +1 @@ -From 47e7e5bd044479fcb824966252f2ddc11efb9974 Mon Sep 17 00:00:00 2001 +From 7797d05cd90272f4fcc78b3ae3932e7d79d4fc18 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 47e7e5bd044479fcb824966252f2ddc11efb9974 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index ac4b15c763..697f78673a 100644 +index 6f242d13a6..55cc21b672 100644 @@ -25 +27 @@ -@@ -3171,6 +3171,7 @@ nfp_flow_action_nvgre_encap_v4(struct nfp_app_fw_flower *app_fw_flower, +@@ -3164,6 +3164,7 @@ nfp_flow_action_nvgre_encap_v4(struct nfp_app_fw_flower *app_fw_flower, @@ -33 +35 @@ -@@ -3182,6 +3183,7 @@ nfp_flow_action_nvgre_encap_v4(struct nfp_app_fw_flower *app_fw_flower, +@@ -3175,6 +3176,7 @@ nfp_flow_action_nvgre_encap_v4(struct nfp_app_fw_flower *app_fw_flower, @@ -41 +43 @@ -@@ -3189,7 +3191,7 @@ nfp_flow_action_nvgre_encap_v4(struct nfp_app_fw_flower *app_fw_flower, +@@ -3182,7 +3184,7 @@ nfp_flow_action_nvgre_encap_v4(struct nfp_app_fw_flower *app_fw_flower,