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 3D3F043E57 for ; Sat, 13 Apr 2024 14:54:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 37CA940294; Sat, 13 Apr 2024 14:54:45 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2086.outbound.protection.outlook.com [40.107.237.86]) by mails.dpdk.org (Postfix) with ESMTP id 900F1400D6 for ; Sat, 13 Apr 2024 14:54:43 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lGno31V+qCmGdb+vRfZbcN5Ujul4pEx6F/tkiNiuAESoYhcWxJIlPStd6FgWsO521XOBvZzJAT1kf6Nbw5GFEdvfG3xkXqG+oXHwdF59mI4GeKrQWoxem5YJ+v5fOlfg+Z6In8yaOuWnAHi/buz38PCC4j8LeMjKMykvYx8OVl8IPXem35frkzGhhfUAsslADp28xOs7uGvLakwr4VEwHIlg9Jjv1sAJ132yXSnmkcb+Yxkc+LRurKCDvxwQXkVOeZcFncMc2wctfC4o4FHUtZ12rqVUz/tF7vUaj2Us/hWOxK0ePoGzKtWTHnLy7NHlrLK6N8excN01/kpWPYMXXQ== 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=Opnp0Eso+XWhJmkvdfK2muIMhpD/jpLhjC16Qc/v0bw=; b=TmAHHVFV7MbXrTlni6ZZcg86BNb6jdH6VGK8Jlbp4UC5/5GDFUhzCpMPwRPiOHAXIt5A1StlcOwicZjEEiNtdwNRvf5zHbhoCE3UQcnTvPmIwLHIFJHqQx94VtHX0WiiTyHdNRuGr7+xY+wNgrNsNj6iy1g7GNeyGG4ZXv8x3CCbXKmkRGfgD6GRz9m4ubXZQzZqGMKsCEK8VVqhKjIPVA6tLdp3Vpl3ICoPk5fMJhdHnEyZvg/4QNj1siXOCza4evIXLtww3U0a50c9J256ArKwBeM088ZSWNiVOuBPyeEDLLWJ3kvJYkJv3oihs7BgJ0FYtvlOPDQjIXnpWH4egQ== 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=Opnp0Eso+XWhJmkvdfK2muIMhpD/jpLhjC16Qc/v0bw=; b=CVqiUsGkewzEbxc1x3Cu1Hh9FugIRzm1yz9R8DKj6Bo7Ixu1Wj+7DAeMpqkM9rXKOkJYyqkgt+mxu9Y1tahgv6Bv7ULKv+vTJpq0ioHZnllpaf8y0Mv321Zfx5afW6rJsrXmGfNNbDXbfLCZy2izk37g9S2hx6he5GvhGkGDcYqrSI7EiWzdCs9iwbWkIIbPrcwbxG2BBQeE9EnUCFKZITv0Si/kjMwM7f2TtR5s85fmQQ+sMkhmZ7k/smPkQAMwogWGZ5Fgu091DAjl2x0zhBrgLaO3mhq5kt7KSXYcEJrHYug6E30ZzlU4ahugOpPHtZhNuVl0y7mNLIV0ESPEuA== Received: from CH5P222CA0006.NAMP222.PROD.OUTLOOK.COM (2603:10b6:610:1ee::27) by SA1PR12MB8988.namprd12.prod.outlook.com (2603:10b6:806:38e::22) 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:54:41 +0000 Received: from DS3PEPF0000C37D.namprd04.prod.outlook.com (2603:10b6:610:1ee:cafe::f2) by CH5P222CA0006.outlook.office365.com (2603:10b6:610:1ee::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:40 +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 DS3PEPF0000C37D.mail.protection.outlook.com (10.167.23.7) 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:40 +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:23 -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:21 -0700 From: Xueming Li To: Hamdan Igbaria CC: Matan Azrad , dpdk stable Subject: patch 'net/mlx5/hws: fix VLAN item in non-relaxed mode' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:48:47 +0800 Message-ID: <20240413125005.725659-47-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: DS3PEPF0000C37D:EE_|SA1PR12MB8988:EE_ X-MS-Office365-Filtering-Correlation-Id: 6e0a1be9-ffd9-4c54-0745-08dc5bb8e246 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5oCl8+TLvY0m2hIXTGC5LhiMzQOLiDV87BOfCfDxD1TiXJbQAX055F7L7A5+GR5gPtvZifLJZ7i83KijFXsRZt6uDOWsG9LUS7mZyIUvfItQUTehM+x/qvubvNCb6fVlFma27u6bPrFeDT4w8nraxKyx6N6YckUBhJA9kYy0WEXQHyzr00I+6eWzkqISy5Biqqg81kuEfZfaAWJuDyGJe47g6pa0z4wb2B4mjdBQ2KgjHy0DSLuYoZrt4j5zbDcz7BvuKXvlhhgIyR67AvVoFN8jJgNWNrgcjUEl17QzEKI9g/ZrdfcduRPxgAhpMernQAlVt7ov24lzOWR2Wt0Ab56zTgX6OsygINvsBjP2bdyISwiYBlqNKnrzPRv+NukXWR/X5AxSun0nDGIvsj9lWuT0mWDVFAmYJYg4o5TFxuiIgTPLPM+D1TfQPycI8y4RpWOe9a+4mBnGXMmDI03OAYlTQD/8EEJ2mbNq/2gR4EC17GvecfcKiONphFGrrv2ZIYQAuUVav3ngMV4sN5v33rAQBkMDE6paq8MU5bN+Vy65gpkGvHLLV1GnA3ydwdiybXYDTmKQPUMJHxzPcRH2u33x2ZibCOrTbhY+EEVO82cRrGMUkRHjjRZW6yiqCvbvK6UW4LhWYPd3zqIRv/hxjN3VYhbPk7MmT5dZS4pF0oR3f2kc9TInNamAwAUaWv6qvpX/RHE8C1Oo6vnOPecutoUZFfeDrk2YiYMuAfb57vzX7Lc9ivs1cEbj8kKXQ5hp 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)(376005)(1800799015)(82310400014)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:54:40.6399 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6e0a1be9-ffd9-4c54-0745-08dc5bb8e246 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: DS3PEPF0000C37D.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB8988 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=a06ab8044ac854dff30f8705f30baf2a8f7e61b2 Thanks. Xueming Li --- >From a06ab8044ac854dff30f8705f30baf2a8f7e61b2 Mon Sep 17 00:00:00 2001 From: Hamdan Igbaria Date: Sun, 18 Feb 2024 07:11:20 +0200 Subject: [PATCH] net/mlx5/hws: fix VLAN item in non-relaxed mode Cc: Xueming Li [ upstream commit 0aacd886e93df862f010a45ed333d08355f4bca8 ] If a VLAN item was passed with null mask, the item handler would return immediately and thus won't set default values for non relax mode. Also change the non relax default set to single-tagged (CVLAN). Fixes: c55c2bf35333 ("net/mlx5/hws: add definer layer") Signed-off-by: Hamdan Igbaria Acked-by: Matan Azrad --- drivers/net/mlx5/hws/mlx5dr_definer.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 720d271179..f047ffdab3 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -183,6 +183,7 @@ struct mlx5dr_definer_conv_data { X(SET, ib_l4_udp_port, UDP_ROCEV2_PORT, rte_flow_item_ib_bth) \ 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) \ /* Item set function format */ #define X(set_type, func_name, value, item_type) \ @@ -769,6 +770,15 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd, struct mlx5dr_definer_fc *fc; bool inner = cd->tunnel; + if (!cd->relaxed) { + /* Mark packet as tagged (CVLAN) */ + fc = &cd->fc[DR_CALC_FNAME(VLAN_TYPE, inner)]; + fc->item_idx = item_idx; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->tag_set = &mlx5dr_definer_cvlan_set; + DR_CALC_SET(fc, eth_l2, first_vlan_qualifier, inner); + } + if (!m) return 0; @@ -777,8 +787,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd, return rte_errno; } - if (!cd->relaxed || m->has_more_vlan) { - /* Mark packet as tagged (CVLAN or SVLAN) even if TCI is not specified.*/ + if (m->has_more_vlan) { fc = &cd->fc[DR_CALC_FNAME(VLAN_TYPE, inner)]; fc->item_idx = item_idx; fc->tag_mask_set = &mlx5dr_definer_ones_set; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:06.499237470 +0800 +++ 0047-net-mlx5-hws-fix-VLAN-item-in-non-relaxed-mode.patch 2024-04-13 20:43:04.967753971 +0800 @@ -1 +1 @@ -From 0aacd886e93df862f010a45ed333d08355f4bca8 Mon Sep 17 00:00:00 2001 +From a06ab8044ac854dff30f8705f30baf2a8f7e61b2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0aacd886e93df862f010a45ed333d08355f4bca8 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index eb788a772a..b8a546989a 100644 +index 720d271179..f047ffdab3 100644 @@ -24 +26,2 @@ -@@ -223,6 +223,7 @@ struct mlx5dr_definer_conv_data { +@@ -183,6 +183,7 @@ struct mlx5dr_definer_conv_data { + X(SET, ib_l4_udp_port, UDP_ROCEV2_PORT, rte_flow_item_ib_bth) \ @@ -26 +28,0 @@ - X(SET, random_number, v->value, rte_flow_item_random) \ @@ -32 +34 @@ -@@ -864,6 +865,15 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd, +@@ -769,6 +770,15 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd, @@ -48 +50 @@ -@@ -872,8 +882,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd, +@@ -777,8 +787,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd,