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 CD46F43E57 for ; Sat, 13 Apr 2024 14:55:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C7FC540A81; Sat, 13 Apr 2024 14:55:09 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2076.outbound.protection.outlook.com [40.107.223.76]) by mails.dpdk.org (Postfix) with ESMTP id 9E339400D6 for ; Sat, 13 Apr 2024 14:55:08 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CnncN6MIq1DnFsNS+MHuTL2d0RzveOFPtl7UFnBfvF5AtW++XRYG+cLepe09kEepAd1QVqtjy+8mCpdFoyMkVusaTTcsWhctUHdAXKW0qfgcvmbuT0Kh6BBeDi8ED8IdvJxLFk0YbWXIKxwUMqa8hUVdkRJgpL0Ygp/QHA5F6q+F7T8yYhN9MCAzol3zLtQa3X7tYGVRBwmKUfVbk8/Z45+1+gZMo0skMXG6Gc4F8EWeVF021vjdMoRZDQfy9IlwtRWrm0KThBZtoHODwJqY/qmg6R2CST7kUKmymKCmMJI2mI8ZjKqyPF59wfPvCnwNBnuiTk/AykVDvgYkd/gxwg== 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=kKYbKoRcPy0ieUOHtIG9K0Y1OqhLK+Jis5PfFB4zhiM=; b=SzftaOrm0LGqBWEJCGMjhShTTClc4oExHUKf5SwK7urwJi4jT013Sy/rotzWqD4E9EEOn/nZrggmGBhRyyoc/WCBPhu8t/m2F0gEglDrCXQ1CTXhQD2wE2BhmfViPfnoxUiCSQOOmcc8XfYlWlRahGfOHpwgCGdHNtG4/IiZ8SHoNsJh/a2c0DOhWXFGZcfCvDkdhq5B++nAOxQd5iX4zNzbV3uRcSI1KmPtp6sKwnzZJF4jh3F3+YXKCOBtmcAZW1IsKJrACyvuMOpB5sz0FpYY9Zzo3ArPgZwimJjFIQutsb7BMJZq6wtdVZKRj+kOsK5cMMXCYb08FlhjTGtZAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=kKYbKoRcPy0ieUOHtIG9K0Y1OqhLK+Jis5PfFB4zhiM=; b=uizfVVJgwuLVgghg9AOKov2JiZTx7KBor986klYzH0pJHhDG7OdXY3UrnUBgWDtsv/0Uni+XCosBtnYlM9tYV//Y6+ZnQV5Umq6JmhSuQX/sKAkNCX+5A+CckX4t4SAGBblXajHhEySC8lgAwfyanijzkaHbkUMc/dd7BzWLUgONcTxHBq1capD8kaQMF46ZZWvqpPJErpUC+LJhNKe1vMINluF6XAQvRL7/Ij0I3iFBv0hbVTsQkdx3GZqkFn1MvmhfrpqSCL01K+4sjLL49QrVd1wGQrkHdXgZAVw9hLEzeMam1NI6DJv1JTEBbNUZSthynUf54VisJAI1u2njNw== Received: from DM6PR21CA0008.namprd21.prod.outlook.com (2603:10b6:5:174::18) by LV3PR12MB9356.namprd12.prod.outlook.com (2603:10b6:408:20c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Sat, 13 Apr 2024 12:55:05 +0000 Received: from DS3PEPF0000C381.namprd04.prod.outlook.com (2603:10b6:5:174:cafe::8e) by DM6PR21CA0008.outlook.office365.com (2603:10b6:5:174::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.0 via Frontend Transport; Sat, 13 Apr 2024 12:55:05 +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 DS3PEPF0000C381.mail.protection.outlook.com (10.167.23.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:55:04 +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.986.41; Sat, 13 Apr 2024 05:54:47 -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.1258.12; Sat, 13 Apr 2024 05:54:45 -0700 From: Xueming Li To: Hamdan Igbaria CC: Erez Shitrit , Suanming Mou , dpdk stable Subject: patch 'net/mlx5/hws: fix VLAN inner type' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:48:51 +0800 Message-ID: <20240413125005.725659-51-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.230.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: DS3PEPF0000C381:EE_|LV3PR12MB9356:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f1d83ef-e7fa-428c-6c2f-08dc5bb8f0b3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?F7WenBO6XItAx6qq/5dygzO1Uz79wnzeJSEfI+p3a0suNuTUfmqU63WkTeri?= =?us-ascii?Q?1ts3oWQsEVj0SSViWkob28Ge5tLuPH/CgCRzxD7ohgH3HHF2wESzgRDz+K7U?= =?us-ascii?Q?wzrXpkfGj0iHRVU5K9gEctpuf/Jmht9L1laD3tFcx8/eL38t5jl49HjmpNzX?= =?us-ascii?Q?TPOHZRkda4rZfZc/LSeUmtYPKGSBXFEs+hhVdWOtVC3oKj2ZCmFRrM/i3HOW?= =?us-ascii?Q?Wy/t6D996+8O0bEk/1KbbWxgEe8TM2hPXWuqAG+8rbjkWnYt8gJwBnCQZCRC?= =?us-ascii?Q?slgivCNHQNQkxCUgonQjrYlKLHZibv9RdetYtctflUJikbh/H711qPZUILgI?= =?us-ascii?Q?MPelhDTmnk7rCSKTwIJDipMBYVx7dYEvf4L19Nny1ZA9nCcmwJXk7ru03NvI?= =?us-ascii?Q?MWyaiZvyNTJHpB3SUscDSbkZfAs3KfTMf95/CXhisW3meneQvY7FESLiQiYy?= =?us-ascii?Q?KjhlLIqHIwnL1Kr0T4/ZMDleTGHesGYQEiwuiYlOvWzk3HAe7uzrrBIrN43q?= =?us-ascii?Q?64AsWJLD6MRhsLkVzqGgpu04rhIeme+IVMbUKuR9S6u6v6n5+oPqOwXfuPmq?= =?us-ascii?Q?+24uf7AIcwvzL1M65ia7gCgl7w1bAg9rCefMxKlv+68tLwp5o89glT0WYSiX?= =?us-ascii?Q?vQyP7+NB76nQW/OMmicY8jnlOo9E+qTfpNOwJe1rvD96LDPiy5w4yLBF1WCm?= =?us-ascii?Q?g3V3xyshou1Ot4br8Qt83t//+kMVxLUteWerOW3IuZfrUCALiqu2k//EUS1q?= =?us-ascii?Q?sZOJRyJnYolCM/JPLMw80tLy6pqpBLKgVfhA9ReNdTENSLTpkYcGE9JtN+tp?= =?us-ascii?Q?Bw1nNTtjaqZMgrHhd+nnAT9N7XzsT3jY6bHf2yEBsZQSneQX6b6VupVeZC4s?= =?us-ascii?Q?04aVYnp9DF5PD+YzylEQTXUbuEYeVkLz3BRLqhY06uqjL25v6e9y5iydEmL/?= =?us-ascii?Q?d86xstZSvBY6CbYR9kS8Pbr31qHIYRNa2UNH16+JRid923fc5lH93pqxuAMj?= =?us-ascii?Q?A1ZoFibV2uxpzK58qnc9ls7Z/73T6wzMwqpAstkaliMiKq+ENv1wiOkB9I0p?= =?us-ascii?Q?O7q3F1vk2Dscp/deVyWG9VeRQFpjZ6LtGIG31p0KIqsWMMaXxK7wCmKE0iai?= =?us-ascii?Q?nfGSFgGzQTH+yqWfYOkjb1JkhGT+RLho9RhO9RtJ6O0Rn83spq4bwTT0NG+a?= =?us-ascii?Q?B5Coy2mkkysSaRk5xiNEr21LqGr7DFlHHrw4EGLjxx9+40EFcLpp1EPsSxv0?= =?us-ascii?Q?f6PIwXAapJNxeVk+SxkODjKqBtZG4AGgDYfoJuGpGN8pCRy3YUBAv4A1OlTz?= =?us-ascii?Q?dD4kNjamULyfYH27xW9dfG7xoXY7B1DKuMnwvWH50gUKpXWiSeD7TIBMwevC?= =?us-ascii?Q?w7QbeXAUOBDsI4c+vCRBZXbDUDfX?= 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:(13230031)(36860700004)(82310400014)(376005)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:55:04.8762 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0f1d83ef-e7fa-428c-6c2f-08dc5bb8f0b3 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: DS3PEPF0000C381.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9356 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=17f644b4a810b7938d2a63317a5b12454302320e Thanks. Xueming Li --- >From 17f644b4a810b7938d2a63317a5b12454302320e Mon Sep 17 00:00:00 2001 From: Hamdan Igbaria Date: Wed, 21 Feb 2024 08:28:11 +0200 Subject: [PATCH] net/mlx5/hws: fix VLAN inner type Cc: Xueming Li [ upstream commit d1d350d868439357e750297d5719670f706facc2 ] Set the correct VLAN inner_type value, till today the once the VLAN inner_type field was set, an incorrect value was taken instead of the inner_type field. Fixes: c55c2bf35333 ("net/mlx5/hws: add definer layer") Signed-off-by: Hamdan Igbaria Reviewed-by: Erez Shitrit Acked-by: Suanming Mou --- drivers/net/mlx5/hws/mlx5dr_definer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index f047ffdab3..34a5174aa8 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -184,6 +184,7 @@ struct mlx5dr_definer_conv_data { X(SET, ib_l4_opcode, v->hdr.opcode, rte_flow_item_ib_bth) \ X(SET, ib_l4_bth_a, v->hdr.a, rte_flow_item_ib_bth) \ X(SET, cvlan, STE_CVLAN, rte_flow_item_vlan) \ + X(SET_BE16, inner_type, v->inner_type, rte_flow_item_vlan) \ /* Item set function format */ #define X(set_type, func_name, value, item_type) \ @@ -805,7 +806,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd, if (m->hdr.eth_proto) { fc = &cd->fc[DR_CALC_FNAME(ETH_TYPE, inner)]; fc->item_idx = item_idx; - fc->tag_set = &mlx5dr_definer_eth_type_set; + fc->tag_set = &mlx5dr_definer_inner_type_set; DR_CALC_SET(fc, eth_l2, l3_ethertype, inner); } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:06.614457920 +0800 +++ 0051-net-mlx5-hws-fix-VLAN-inner-type.patch 2024-04-13 20:43:04.967753971 +0800 @@ -1 +1 @@ -From d1d350d868439357e750297d5719670f706facc2 Mon Sep 17 00:00:00 2001 +From 17f644b4a810b7938d2a63317a5b12454302320e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d1d350d868439357e750297d5719670f706facc2 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index c1508e6b53..e036aca781 100644 +index f047ffdab3..34a5174aa8 100644 @@ -24,2 +26,2 @@ -@@ -224,6 +224,7 @@ struct mlx5dr_definer_conv_data { - X(SET, random_number, v->value, rte_flow_item_random) \ +@@ -184,6 +184,7 @@ struct mlx5dr_definer_conv_data { + X(SET, ib_l4_opcode, v->hdr.opcode, rte_flow_item_ib_bth) \ @@ -32 +34 @@ -@@ -990,7 +991,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd, +@@ -805,7 +806,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd,