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 EB28945CE3 for ; Mon, 11 Nov 2024 07:41:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DC9614067A; Mon, 11 Nov 2024 07:41:17 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2053.outbound.protection.outlook.com [40.107.93.53]) by mails.dpdk.org (Postfix) with ESMTP id 954DE4067A for ; Mon, 11 Nov 2024 07:41:16 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cXLUEkZwm4cMZU2Y5OGJSnAUNpwE4eRbCMkAdF1QqAlr4yjtIhW85NvyjVI3HUZZdkBh9BfaR1cX3cuOeuuzlVPuJq1IpqF8onT8lgDhgXjB7h8talmcXHj0V+IhtzCDqH0EuqDm5kqTJA8zPiMmGwy7SuF3IX0Hvh0GpHvmY4mW42pMJYCCC56BJPJAAQtskRxgdwRLcLuJM+0AXGeeel6CxbjLnZT+C/Q9yaiiPiKGTecmQWAJIXy9sbLateWmgKvdlnUeT2idmD50Z9GefDxlYOKqtpA2oKoZL3pDQv9FZ7xVaZX7h22YTh4yO6gTuJq2OL5V2JAOMf/Il4Knaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=U4C9YKkFu1ehjB77b48ojjysuRpKI/uZlfc0h2MmM3M=; b=jWiZvP6+U2Zy3iK1VzA1bn2YgJB5n1MziC+t3SsRMfHjxahNXQHysYh3s5CCcrzxMtp99CZhoFl2kf+cT4vxQ5WUrf/cUsLexSmcmuPC/tbev6jaYjEnEm1kgBHtA30jrY7I62HcuK9d8XYdSo+EPo5X0/vvotMOxUlGytiqavIWqM/Z9TWdejdmbCBWq/VzlAZMCo4XTMwidP66/IZVFo/xns9M83QaAwHh1pkIJMFOF3iW/ddbwxT98AVE9prCVKYOfRbfPP1AyjJrSlVqzZYkkCFZCjss+L4npxwO28ECa2VlpY62y1BXqOkGtHUwM9hgqa19ipnUlU+rfXvGwA== 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 (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=U4C9YKkFu1ehjB77b48ojjysuRpKI/uZlfc0h2MmM3M=; b=JAn6rEfJ9fYjjaaFI1/Z4NZw8V6QWh0VPtIyYuVTR2jdtJRy+I5E2IdpYB3/UXgHdfWffnrr08PYrqfSyrk36Ut6hUSX6z2e4UJIOPsDy5Uu0kkV8Vj/AVIQvmxnNFH0gjmijVJQD/AYpi9RRjPAuaT4WzAz8iOikReKH9gIfXMIrWFTKUo71tkHOyqXP3ucN4cXBKmKhaD/DY4XSZz+hgUOYYBfcoROybZub3GsXtNTGeetGAdi9kvaXqvrRgEZmsZhpa5kcxjmPQ8+3+G8JAFYPpNZD6MyaErmq4vrbZZPQnV0VQiDckveh4aHw+W3Ex3mf4zC5Wa9Yxevaw6VlA== Received: from SN6PR04CA0097.namprd04.prod.outlook.com (2603:10b6:805:f2::38) by DM6PR12MB4044.namprd12.prod.outlook.com (2603:10b6:5:21d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28; Mon, 11 Nov 2024 06:41:13 +0000 Received: from SN1PEPF00026367.namprd02.prod.outlook.com (2603:10b6:805:f2:cafe::76) by SN6PR04CA0097.outlook.office365.com (2603:10b6:805:f2::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28 via Frontend Transport; Mon, 11 Nov 2024 06:41:12 +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 SN1PEPF00026367.mail.protection.outlook.com (10.167.241.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 06:41:12 +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.1544.4; Sun, 10 Nov 2024 22:41:01 -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.1544.4; Sun, 10 Nov 2024 22:40:58 -0800 From: Xueming Li To: Shihong Wang CC: , Long Wu , Peng Zhang , Chaoyong He , "dpdk stable" Subject: patch 'net/nfp: do not set IPv6 flag in transport mode' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:28:42 +0800 Message-ID: <20241111062847.216344-117-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-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: SN1PEPF00026367:EE_|DM6PR12MB4044:EE_ X-MS-Office365-Filtering-Correlation-Id: a83e0c49-dd5d-4757-b0f8-08dd021bd5a2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?RK7tOBFDrdHVbO73RNrzmeLcd7f870INAd4wLV50w6giAVuluRXJe+zU5D6o?= =?us-ascii?Q?OrOiYVUfLayDUosPfG+8AuyIpe4rSlLfjyHWe7d25KhFmqNH1WbZJ4Um9GAA?= =?us-ascii?Q?2riaGZT+01cukSmEgLZlcVObNkoYKbztGUF9p/LVbfuIPzP4DvqCleBWfyJk?= =?us-ascii?Q?lWpt0NLz/iPHUtKo68uD9XUyVRbg4Y1NiZIcE/IqSIiX6FzMPaqSHcOHuqfl?= =?us-ascii?Q?A/RmQ96o8eePIuKsK/jroAh1CUwzScPjmC+9JxRSfR9g0mCQKx+qXFCEOYPA?= =?us-ascii?Q?GWYlX4Tk6kFnZB7YQKu/sVaZjud1aiGPOftivXJmwFcxnnJN1RIq6bZ7VWt7?= =?us-ascii?Q?/kc47UEpVLf566nBaquejxJoCMNB6LqW4NlOALgRmojNQkp9MZF2LVuzDRA4?= =?us-ascii?Q?RobWBPRq1evctBMRlW1PMNcDlQTTPkJgYb8v0GBhuicwBqgV6+7uzsRJlLnG?= =?us-ascii?Q?IBFXv1NJpgBkUaTJT89j2uA57vfAMg7m3Fcmd6ntrUCe1mY/k49PTlgkTpiq?= =?us-ascii?Q?IGY1yz1/xCT4gjp2S0DHl6dYwugfSWVYVlrLE1rvxTGGSuozH74Ab41zf5TM?= =?us-ascii?Q?AlO8LMYyH0CghEm/bRDD9UdVwZkw453QLC/UDG59W7w6FNMCA3ROuNmDa/xL?= =?us-ascii?Q?wVIzpffOBcl0x5ueCNeFSokU66jlmZ9cOjouwdZ3ZCb4g4+igFF5vYcnczS5?= =?us-ascii?Q?Nw0uv5LavwQRKO1zcz6WvrWWN384lO4ciitBJREfnnvJBazmIlT8aLv1zc+E?= =?us-ascii?Q?+ZtsiyJS8MFwVe9q57+wPTyGIHqwNbKc6GRY4miFjhe/P3jpzGCaaJA3p7uq?= =?us-ascii?Q?Udc1HuKKQgTkBV9amWfuU6txnWA79/jakPrGrAmfJYI0g+Uhl794TZeEtA19?= =?us-ascii?Q?+teK7GwyZc7ZEhqaCIjFq/PdlNKzRMnH/LMjIEWYywxHkSmZFkJaNQJaTb/X?= =?us-ascii?Q?+VmvuFLo8ZTUZAy31Qtbz0vprHEjn7t9POQwxwDvg8fdKuU820WEkLqkRLLC?= =?us-ascii?Q?KZ7LC1qXCHwhd2znKl6rq+TaYhqcDEUR4HpqFwEzHNZ8PcyAeykVFoCbnWFY?= =?us-ascii?Q?SvdIE0P345UvV/A4LPWqxP/mio5nSlXa+DO1ltQlmJFQq2RZpDOS09WD8rD+?= =?us-ascii?Q?fTM8z7QiJZLR83P/siTXY9eqh8p7dZJjjdYv/ZvygwFlg+snUfTBVzDq8DZW?= =?us-ascii?Q?BhiOhyL/8lgUS+w/9JlrDb8pC3LvpPwDSPVM9kUMu9ZUlCqF+V/pwl0D0NaF?= =?us-ascii?Q?kk4XIObxZtQr9qYNMwlN5zRtwiuuStzoJCGSgvajajPF0PZCw21EAlUeMGxi?= =?us-ascii?Q?mRQyXHsaILMMcSQ37yE+hYqeM9tdpNhV0UGp0TUSYw18Q/ZQcdY2syPg64ss?= =?us-ascii?Q?BJO2UcXZLwmMxn1riFjyzCJjfIcYNG5leurMH3YGXXDAdz7Btg=3D=3D?= 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:(13230040)(36860700013)(376014)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:41:12.6966 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a83e0c49-dd5d-4757-b0f8-08dd021bd5a2 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: SN1PEPF00026367.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4044 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.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 11/30/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=0b75611d8ab73a141d4141de7ba56b927eb05414 Thanks. Xueming Li --- >From 0b75611d8ab73a141d4141de7ba56b927eb05414 Mon Sep 17 00:00:00 2001 From: Shihong Wang Date: Mon, 14 Oct 2024 10:43:56 +0800 Subject: [PATCH] net/nfp: do not set IPv6 flag in transport mode Cc: Xueming Li [ upstream commit 4f64ebdd41ce8bb60dba95589a5cc684fb9cb89c ] The transport only encapsulates the security protocol header, does not pay attention to the IP protocol type, and need not to set the IPv6 flag. Fixes: 3d21da66c06b ("net/nfp: create security session") Signed-off-by: Shihong Wang Reviewed-by: Long Wu Reviewed-by: Peng Zhang Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_ipsec.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c index b10cda570b..56f3777226 100644 --- a/drivers/net/nfp/nfp_ipsec.c +++ b/drivers/net/nfp/nfp_ipsec.c @@ -1053,20 +1053,9 @@ nfp_ipsec_msg_build(struct rte_eth_dev *eth_dev, break; case RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT: - type = conf->ipsec.tunnel.type; cfg->ctrl_word.mode = NFP_IPSEC_MODE_TRANSPORT; - if (type == RTE_SECURITY_IPSEC_TUNNEL_IPV4) { - memset(&cfg->src_ip, 0, sizeof(cfg->src_ip)); - memset(&cfg->dst_ip, 0, sizeof(cfg->dst_ip)); - cfg->ipv6 = 0; - } else if (type == RTE_SECURITY_IPSEC_TUNNEL_IPV6) { - memset(&cfg->src_ip, 0, sizeof(cfg->src_ip)); - memset(&cfg->dst_ip, 0, sizeof(cfg->dst_ip)); - cfg->ipv6 = 1; - } else { - PMD_DRV_LOG(ERR, "Unsupported address family!"); - return -EINVAL; - } + memset(&cfg->src_ip, 0, sizeof(cfg->src_ip)); + memset(&cfg->dst_ip, 0, sizeof(cfg->dst_ip)); break; default: -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:10.506232932 +0800 +++ 0116-net-nfp-do-not-set-IPv6-flag-in-transport-mode.patch 2024-11-11 14:23:05.352192835 +0800 @@ -1 +1 @@ -From 4f64ebdd41ce8bb60dba95589a5cc684fb9cb89c Mon Sep 17 00:00:00 2001 +From 0b75611d8ab73a141d4141de7ba56b927eb05414 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4f64ebdd41ce8bb60dba95589a5cc684fb9cb89c ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 647bc2bb6d..89116af1b2 100644 +index b10cda570b..56f3777226 100644 @@ -25 +27 @@ -@@ -1056,20 +1056,9 @@ nfp_ipsec_msg_build(struct rte_eth_dev *eth_dev, +@@ -1053,20 +1053,9 @@ nfp_ipsec_msg_build(struct rte_eth_dev *eth_dev,