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 C71C643E57 for ; Sat, 13 Apr 2024 14:54:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C14BA40294; Sat, 13 Apr 2024 14:54:33 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2040.outbound.protection.outlook.com [40.107.93.40]) by mails.dpdk.org (Postfix) with ESMTP id 4583D400D6 for ; Sat, 13 Apr 2024 14:54:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hDTVrpCWcI/bEkOzNE/gh8vdgWBsypw4LpEKt+DMAsvLktDdHzAkf+BMwkJl/hluo+cK7WPdMQt8f1URQXMfaymyl7Fe08FLL52bkox/Ui3nkq1bJ0dclAkg+F4CiQKS9xPfoNVjMEcj0PeRFqhrV95DhLwEhlGMZEMKZ8ZgC/RoWBf2QXM4uJ1CyDdHq8GFE+ngs/522/lzzNyA9u+knZIYaWwaT9FXuSI6/tbJruHudrbRgevbuY6Cp+4aE2H0Puyj7xA8fnLzfO2DLQ5QFJQ6awdKvKPOr1vkCVToWx7OjeeFhbZX8eQVTDPWHfBJcbPzoG8A3EevY25MEjxurA== 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=tX3yJH7yg9BIXtNRofOulFfuWbdM6j2U9L8sMvnbob0=; b=i5TQ1li2qZ6X2KsvQAiutrIllemDKW9OGoYXSNHTvvg55yr03FBeg1c/4UNnPIUGmBp8p/5BP5zUa0//nFryb4Nn21C6Kmh3vfawTMDkD3gYFesGNQ/PfDKnBjFb7A0tUXOq0COVf3bdFgpqKYc9fwfIr4QVq2kV0SFMDCEyKYMORdkaiAsb+o0GHJqtcoLhnzFhstlGubsQ/yo6qOKEME2gIsQ8NRQLnU+Km9FgRzk9FyDDvb5Jimap5vtFMUjqWdLb91MqiYYXECTtEJlzXfz9wRdGkpO62dYVj6Skb+CPGMOfgI/BC91Voj8/dTwpOR4Nr1yqcr5FQtFnY4yk2w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org 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=tX3yJH7yg9BIXtNRofOulFfuWbdM6j2U9L8sMvnbob0=; b=eAjz6RjZxmu4th6cpUOrJouNw/7uDICYMx9DJZ7Uv8nnc2GqGLH0n+cw4KX8/eofCL0hszbHwIiJnY1U8ZFF1RfO3+Pws4QobzmCSfwGmLwRHr7k1htXBPaaeEg46byNCMUiL6Y9PWioKokzL8jc3pYrlMSxeiL3cliXO6tJ1y0bagm4FwMr4JbZTGYEhxGAzDDoKCMJmtWThaymNJJ6FmB1kROAVl/TNYw74AUxalyYMm+wSayKj3ukADHLsoj9G25fx+2pM56oXGhT6AeOO1ZgyACBRWA1Tac7NRuDXnN/uchVJDu2lpbeQ9UF8/bpbdeBIT5vnkrAAnrHoJ7Iiw== Received: from BYAPR02CA0050.namprd02.prod.outlook.com (2603:10b6:a03:54::27) by SJ0PR12MB6783.namprd12.prod.outlook.com (2603:10b6:a03:44e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Sat, 13 Apr 2024 12:54:29 +0000 Received: from SJ1PEPF00001CE3.namprd05.prod.outlook.com (2603:10b6:a03:54:cafe::3a) by BYAPR02CA0050.outlook.office365.com (2603:10b6:a03:54::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.31 via Frontend Transport; Sat, 13 Apr 2024 12:54:29 +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 SJ1PEPF00001CE3.mail.protection.outlook.com (10.167.242.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:54:29 +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; Sat, 13 Apr 2024 05:54:21 -0700 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; Sat, 13 Apr 2024 05:54:20 -0700 From: Xueming Li To: Erez Shitrit CC: Matan Azrad , dpdk stable Subject: patch 'net/mlx5/hws: check not supported fields in VXLAN' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:48:46 +0800 Message-ID: <20240413125005.725659-46-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE3:EE_|SJ0PR12MB6783:EE_ X-MS-Office365-Filtering-Correlation-Id: b48b5136-046d-4f21-2e19-08dc5bb8dbb0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mhONrOUisxl8WsXkNJGzXM5ErwFJ/MqN5CbFuaEgKqs0Y83ZiULebvoc+oGBivuHluUAZnh4f4KgK9SLC8z5Q0lzsGNEKKwz3UKBGqxgmGwxj6i5dCKUzEYR0rwGilAulikaaFG8Xe3GkxUfMU0imwyMjTghKO6VFYn0vuBs/wxOYiDbL3eAQvTCcLKBO7ghkqsUqbS5o70TP0LyxJAghUPUcRG2OQeVaMMCByVrkju90n8jfQ4JLcr6JCX/EPjOGjmq6Y1US93zR62tHU7J9kZu2RaXI/WtaQhHbSaH8WK0xWAoyXcS2L6WdqxsXo8FDp80XKoeN/2oS6qLlup6NvC4jyRr/wIqqE9sEwb49rp90v+v10PfDkpTDBOeWIeIfyyM4GmNFQjxMxkAyUhYbFYTryP7mHNbTYKKSqerji/jBBnYtefVuyQrBhKKzzQX4tbZn55W+rsVrXmhCxhcmYijAW0pBwHjK5BKPe4vWorhQkD1DDRaX9rSMKt2HLbnukRaiwlWDd+1vKy2S+Yforxf2izyZ7yL6nmxSdDXlReITi70Na6roeCnriPeZNu3lk1ScB5KrQYYul01myo9uMLiJJSFzLfHEa1ehxyftq++m+eZ+jMKji/jEUI4XS5gcTsmzR9yMFaO7+pWkqoIfBFV8BZKsbW/DGtYCIOMCcdwx0mTIID2242hcyCHm4EY5YoKAVCrh8b8fdglxpYJm8o8Ns7L9sj8UrWVXM0Grp+SDaqPqiFu96fSkc2erRLK 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)(36860700004)(82310400014)(1800799015)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:54:29.7165 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b48b5136-046d-4f21-2e19-08dc5bb8dbb0 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: SJ1PEPF00001CE3.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB6783 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 04/15/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=21d51e8848c68523906da07edf69b41a283b6665 Thanks. Xueming Li --- >From 21d51e8848c68523906da07edf69b41a283b6665 Mon Sep 17 00:00:00 2001 From: Erez Shitrit Date: Sun, 18 Feb 2024 07:11:16 +0200 Subject: [PATCH] net/mlx5/hws: check not supported fields in VXLAN Cc: Xueming Li [ upstream commit 4506703cbe96185bf3593a222fb9f51f70de78af ] Don't allow the user to mask over rsvd1 / rsvd2 fields which are not supported. Fixes: 28e69588f417 ("net/mlx5/hws: fix tunnel protocol checks") Signed-off-by: Erez Shitrit Acked-by: Matan Azrad --- drivers/net/mlx5/hws/mlx5dr_definer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 7bd4ea560e..720d271179 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -1347,6 +1347,13 @@ mlx5dr_definer_conv_item_vxlan(struct mlx5dr_definer_conv_data *cd, /* In order to match on VXLAN we must match on ether_type, ip_protocol * and l4_dport. */ + if (m && (m->rsvd0[0] != 0 || m->rsvd0[1] != 0 || m->rsvd0[2] != 0 || + m->rsvd1 != 0)) { + DR_LOG(ERR, "reserved fields are not supported"); + rte_errno = ENOTSUP; + return rte_errno; + } + if (!cd->relaxed) { fc = &cd->fc[DR_CALC_FNAME(IP_PROTOCOL, inner)]; if (!fc->tag_set) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:06.466062214 +0800 +++ 0046-net-mlx5-hws-check-not-supported-fields-in-VXLAN.patch 2024-04-13 20:43:04.957753984 +0800 @@ -1 +1 @@ -From 4506703cbe96185bf3593a222fb9f51f70de78af Mon Sep 17 00:00:00 2001 +From 21d51e8848c68523906da07edf69b41a283b6665 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4506703cbe96185bf3593a222fb9f51f70de78af ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 79d98bbf78..8b8757ecac 100644 +index 7bd4ea560e..720d271179 100644 @@ -22,4 +24,4 @@ -@@ -1414,6 +1414,13 @@ mlx5dr_definer_conv_item_vxlan(struct mlx5dr_definer_conv_data *cd, - struct mlx5dr_definer_fc *fc; - bool inner = cd->tunnel; - +@@ -1347,6 +1347,13 @@ mlx5dr_definer_conv_item_vxlan(struct mlx5dr_definer_conv_data *cd, + /* In order to match on VXLAN we must match on ether_type, ip_protocol + * and l4_dport. + */ @@ -33,3 +35,3 @@ - if (inner) { - DR_LOG(ERR, "Inner VXLAN item not supported"); - rte_errno = ENOTSUP; + if (!cd->relaxed) { + fc = &cd->fc[DR_CALC_FNAME(IP_PROTOCOL, inner)]; + if (!fc->tag_set) {