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 6A05243B86 for ; Tue, 5 Mar 2024 10:54:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 638C84026B; Tue, 5 Mar 2024 10:54:53 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2061.outbound.protection.outlook.com [40.107.94.61]) by mails.dpdk.org (Postfix) with ESMTP id 0C9074014F for ; Tue, 5 Mar 2024 10:54:52 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RW45/3dbdz/vkA2e0TxYKz4lCzPGyC7e/lehqr5cWh6pitvvv/oZKrIRui2310bBCSVkbPGL54mh4xZGkXC4vkDSqzR+aiIVYEN0+92IhxOEDLl9OdpwZi7sleFAk8MeNdmlZrW0U8eKurk9VtLd/dk7iDI/uh2dZ1o+KWpaDrX93Sh6hYZv7zcU1jj7GNCq22kAzqWQaClCscdx9X++zP93Mog8zyKATVisCOeD4ICNvbxUfJJ7MoDdMdadSUaj58POkuVhfp6HA41qVTdSWTk67BDsi+X5Fk0Hq3oPZ6mx07+lcjE4XEduKxvINT65fpiQMMrZ971lDshws7SxPQ== 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=8ISgAfVY3Ohe9/E6Ht6QI06795D5w3oFu76WeAVXnd8=; b=VyOdSpgsjar2rETic6cn+DiQEuqkqnwNyCxHMM4PPw1iHcFExOmHeDvMEul16QfBIy3qM2W+kIRap5BiOOsnAKY4/j62UZnUl4OvFAJ4ckVkoYeNtJBfWPr/fpoTXbmp9SH/BqcheiltAlP3mu3oFf5RoSxx/QTKmWOIi0dsSl/sWytbottm8IarUNMKtYz0x/EZDCdQY0Z1lrJcgN8ryF+NUcPQD2IqL/uUjBRd7hdIGERegLwdqWv2x5QQnCPlnuJQzLBSqyxJt6L5lWHamL/ur9SezGckheccSmhgXtlNw5ryLqlzST7Z1YFqXN5FMO+97nVe5QcIzLb83Lo0lw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=jaguarmicro.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 (0) 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=8ISgAfVY3Ohe9/E6Ht6QI06795D5w3oFu76WeAVXnd8=; b=aADfcYUzwQlK+KhD8R7OvFBLooFZZEgEPompWaKK/2RYtSzkIaWD0j2ui1gpKan3y+ZOGJF1oM6JB7+AuMWJePsWqqngluK7hSnc1VKmxaefc2N3UyaIv2HCeQlJbhDFqLDyLIhnye6Mmb0WFPUaZmcGe1V3KPJvsNHvB9V2wB++ME3oLhV4F4meAaPywrMWqZ97AWaH2l/c6feUzZYCGCCE47tyfq6+mH44XFRy+aAjZt0ld7s1Lsy9kZ88aLSi+Hr0glc+Dc/cY2sQryYtcD2CgKu6na7eeWCpCd2DrKOPEvs4LI/gQCTuXUtlT3bwVj84Z6+x4QpGYawgCgGf+g== Received: from SJ0PR03CA0091.namprd03.prod.outlook.com (2603:10b6:a03:333::6) by CH3PR12MB9026.namprd12.prod.outlook.com (2603:10b6:610:125::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Tue, 5 Mar 2024 09:54:47 +0000 Received: from CO1PEPF000042AD.namprd03.prod.outlook.com (2603:10b6:a03:333:cafe::db) by SJ0PR03CA0091.outlook.office365.com (2603:10b6:a03:333::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38 via Frontend Transport; Tue, 5 Mar 2024 09:54:46 +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 CO1PEPF000042AD.mail.protection.outlook.com (10.167.243.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:54:46 +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.41; Tue, 5 Mar 2024 01:54:29 -0800 Received: from nvidia.com (10.126.231.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.1258.12; Tue, 5 Mar 2024 01:54:27 -0800 From: Xueming Li To: Sunyang Wu CC: Joey Xing , Ori Kam , "Ferruh Yigit" , dpdk stable Subject: patch 'ethdev: fix NVGRE encap flow action description' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:53 +0800 Message-ID: <20240305094757.439387-73-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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: CO1PEPF000042AD:EE_|CH3PR12MB9026:EE_ X-MS-Office365-Filtering-Correlation-Id: d9eb8716-8a88-4804-287d-08dc3cfa4a17 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RyopKXp3o0JDOwJsFd5CP5YawvleKuo09PeSinENe+SDiRlBwh0edP9Tj9Tu/7DI9JAXiU8qamCVJzGf+ZPbc5qa9vdg+SX8VIjw9bqVeytAZi6AdM6qPvgJwO7/jT6aI2lFliSqnglEtW4dKkH4gMMvuoHm/bYzSe/VioEN7jbT+PNTwcTpxo1WSIxdTwCyoOM+CVheZLG97J9//9K1sZCTwmGGt5QxnxFWQHwFgCxew3oJVfpPInzwLY23f71VDjGmFGcfrM+xLNTYVCGRwfQf0gszIbeOmabe+hW7QhNpk5xoQo2b6qWALR57J0eKWj7vBf9noz12hbG5O2GVoKl3Um7JKub8mA2Q5jKxgABkxNy6a/tSBWK+XMFwSrIeGmXP8NJbEljjF61AHTovIdhklc4qmdX1ZGL5JvMUYhmmWeizJHWppLQThvV8PpWSb3kc9GZxPqtMTVhKHcwL3b1J9xZ4U9d9U7Jh5w2KQBnTuRXUNH1uK2pD72tI8F484yl4R4j30u2Lrmmo8wiCYK0CsLxUSeZ8wDQzQXt7nQrIDiRamp35aX+H8RW5pa1C9HrHjAnmxnTFonTX+/mCDRKqNNP4ickqchSIeTQDP8Hy0ZtpnSFgZPe7ScONPe0z7+bQmNQ+U+B2UkNmAW8WKd+ZpMV2+LF+Kf2SB63umDL49Mmno3GHXbBqnlQKNTzgf54hxKUcchzMEZQiBorpCZpvF0Cz13bnKKAlxu1s71AhMmSHRLTvwjagIQUS1JjD 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:(13230031)(376005)(82310400014)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:54:46.0727 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d9eb8716-8a88-4804-287d-08dc3cfa4a17 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: CO1PEPF000042AD.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9026 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 23.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=8610d2715d3fd6822556a6e45a31d42846dd83a7 Thanks. Xueming Li --- >From 8610d2715d3fd6822556a6e45a31d42846dd83a7 Mon Sep 17 00:00:00 2001 From: Sunyang Wu Date: Thu, 30 Nov 2023 14:22:21 +0800 Subject: [PATCH] ethdev: fix NVGRE encap flow action description Cc: Xueming Li [ upstream commit f59d78b5803be7b0c0831309c703273bd2c92a50 ] Fix incorrect definition of 'NVGRE_ENCAP', and modified the error comments of 'rte_flow_action_nvgre_encap'. Fixes: c2beb1d469d2 ("ethdev: add missing items/actions to flow object converter") Fixes: 3850cf0c8c37 ("ethdev: add tunnel encap/decap actions") Signed-off-by: Joey Xing Signed-off-by: Sunyang Wu Acked-by: Ori Kam Acked-by: Ferruh Yigit --- lib/ethdev/rte_flow.c | 2 +- lib/ethdev/rte_flow.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index 549e329558..04348e0243 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -216,7 +216,7 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = { sizeof(struct rte_flow_action_of_push_mpls)), MK_FLOW_ACTION(VXLAN_ENCAP, sizeof(struct rte_flow_action_vxlan_encap)), MK_FLOW_ACTION(VXLAN_DECAP, 0), - MK_FLOW_ACTION(NVGRE_ENCAP, sizeof(struct rte_flow_action_vxlan_encap)), + MK_FLOW_ACTION(NVGRE_ENCAP, sizeof(struct rte_flow_action_nvgre_encap)), MK_FLOW_ACTION(NVGRE_DECAP, 0), MK_FLOW_ACTION(RAW_ENCAP, sizeof(struct rte_flow_action_raw_encap)), MK_FLOW_ACTION(RAW_DECAP, sizeof(struct rte_flow_action_raw_decap)), diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index affdc8121b..4cdc1f1d8f 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -3471,7 +3471,7 @@ struct rte_flow_action_vxlan_encap { */ struct rte_flow_action_nvgre_encap { /** - * Encapsulating vxlan tunnel definition + * Encapsulating nvgre tunnel definition * (terminated by the END pattern item). */ struct rte_flow_item *definition; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:33.114564671 +0800 +++ 0072-ethdev-fix-NVGRE-encap-flow-action-description.patch 2024-03-05 17:39:30.803566494 +0800 @@ -1 +1 @@ -From f59d78b5803be7b0c0831309c703273bd2c92a50 Mon Sep 17 00:00:00 2001 +From 8610d2715d3fd6822556a6e45a31d42846dd83a7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit f59d78b5803be7b0c0831309c703273bd2c92a50 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 2cd30d63b7..43a41bdb1d 100644 +index 549e329558..04348e0243 100644 @@ -26 +28 @@ -@@ -219,7 +219,7 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = { +@@ -216,7 +216,7 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = { @@ -36 +38 @@ -index 78b6bbb159..440396be78 100644 +index affdc8121b..4cdc1f1d8f 100644 @@ -39 +41 @@ -@@ -3468,7 +3468,7 @@ struct rte_flow_action_vxlan_encap { +@@ -3471,7 +3471,7 @@ struct rte_flow_action_vxlan_encap {