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 B6B9E46A63 for ; Thu, 26 Jun 2025 14:06:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AFF0E400D6; Thu, 26 Jun 2025 14:06:56 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2083.outbound.protection.outlook.com [40.107.220.83]) by mails.dpdk.org (Postfix) with ESMTP id 2E0C9400D6 for ; Thu, 26 Jun 2025 14:06:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TVaMef8/ddih1BBGEf0FfglNZPNvSv+JK+fC7Q4Egmg5RK69s0MeB9sxc/s/ndzlmrd2f/r4+M/BLgli8LMLEcL8L4/nPTpTufknbRiBOb+YwvnaveRSj8RVzy1vkch3VYzKzi50L7ozj7VaYD71/dZPhTP0VmIdrejuhoq6/7lNBxM8gonxwUH7RK81oxoSsFZzk2mA/HBbrPMmJQLz4WX/fnvD4SHZzR9db1TVNLDVJl5+u/RFxfdANOo3bursowvoXf6AJ9ta4GsS04HzTIn5lAmpQd3dLdCeBU10CUpO79x1FrDEcAltYJRP5leXAp3gPF9GSShhp4mrnClL6Q== 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=tGw69HmtMBErZNx6tLZBgqfN08kUu6ljqZ+2w3tq9w4=; b=PFTsvMe2AnS6fvwtHS/OIjb04xhrz2XyEjNYBWje3D4ZfTrkpJxiVn45Hrjge5SJEFY/pF5uvr8pjULuIGRiddb5GayQKSCrV55EXOX5qrRQLNH8mS532svojykBiY5ZnEPs0D/cvath/06uBOpsS2e4x6AGisuXWU/1o4L9monJC2dhgK1YIP5MzoeqdTMMFHNbhuhzuVe5aUEm/ieVqLHL+bqFF2SZ/lNb+3pAm343GAlRXw3e8+1CmRmmz2xWZAh2fqwXTSOxfxtCtPPsi+hpFbcrqMrEFDP8ElbncrkNSVPHCCTvVS134gpKDGrJqNFSmlAzoIF/cZ/1qKtpGw== 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=tGw69HmtMBErZNx6tLZBgqfN08kUu6ljqZ+2w3tq9w4=; b=WNgSYcuXc2A3K5BMi41TZqSzLZk/bLfiDaiabdm8hgtacqT2eUeimRsLtYRIXSJ8yjybX+VDK1zwdpquooEzjAyZgUYHseOBqXX2cM9bEE/C8R6yQv1FkPtMx9PPFilnMilpnHYdH0+dojJFLYjV1g9E1+yOIQJGygSqts6adnPF7//iE/eaz0NH6nYZ0bWbd5Br8WFfSYd/WzE8iQ0Ab3Bl0EcN02s8k+eBX/+9gC7xSIqpE66n/mq+kAFQy/dzxYTCrCAEbdrhitIDT5TZ0GuobCMYMe+RUCYTSesn95QC0mvG5s9ZEOSHdJxZUgW7m3I0is0q/+rm5vwtlnrlow== Received: from MW4PR03CA0110.namprd03.prod.outlook.com (2603:10b6:303:b7::25) by DS7PR12MB8203.namprd12.prod.outlook.com (2603:10b6:8:e1::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.20; Thu, 26 Jun 2025 12:06:52 +0000 Received: from SJ5PEPF000001D1.namprd05.prod.outlook.com (2603:10b6:303:b7:cafe::2d) by MW4PR03CA0110.outlook.office365.com (2603:10b6:303:b7::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.16 via Frontend Transport; Thu, 26 Jun 2025 12:06:52 +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 SJ5PEPF000001D1.mail.protection.outlook.com (10.167.242.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:06:52 +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; Thu, 26 Jun 2025 05:06:36 -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.1544.14; Thu, 26 Jun 2025 05:06:34 -0700 From: Xueming Li To: Dariusz Sosnowski CC: Xueming Li , Bing Zhao , "dpdk stable" Subject: patch 'net/mlx5: fix VLAN stripping on hairpin queue' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:01:14 +0800 Message-ID: <20250626120145.27369-55-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-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: SJ5PEPF000001D1:EE_|DS7PR12MB8203:EE_ X-MS-Office365-Filtering-Correlation-Id: f82fa5aa-3ac0-4bcf-014e-08ddb4a9efd2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MpGryJgMDlh6vKjRnW/7tTT9kxM3QGN62+TmK6k0L3sh86zATsLxwFghMYe7?= =?us-ascii?Q?MCfjnhFiYLsXeidD4DSrVaIwfG14RjWVGluv2MiHQG/tsJAqkFzgxOuTk9So?= =?us-ascii?Q?OWugu0CSnb5IMB3nN3ul0nbLA6CFpA63UYZG9KhzSBwRi4pnkQD4j/etPaFP?= =?us-ascii?Q?VGCAUczpR08k3VB9TkF0U/+hzH1SBG6x7VajVgawjFmU3EDfDm2M8V1/QwV+?= =?us-ascii?Q?5ZTk3np7/d4vSfptSnFGLucg16A9WU1h+AdhfZrUtM5BEL/VmZ9edfpwJeRS?= =?us-ascii?Q?TEaATiJoQllAiUMEJhzvWir2WCKLIO1UPSrPkLJuRileup26ym2NPTyAddX6?= =?us-ascii?Q?m9R4wzaETbPXHC/FSYmshLWQlUPqCy+tiFrC4W0hrzfvcotUZqVEHzXTYug0?= =?us-ascii?Q?xpW4A6YChTMEgC++apJcu1m3YP/5Vj4nnLDr4Cs2ylLVDcbfEbnVJuRpmSjl?= =?us-ascii?Q?QPdjtRng046dknszvJlOtRxkuRuGHWcUwsG9toidGquIfz1+OA8gOyeCCMc/?= =?us-ascii?Q?nrdgOydYl8VD55ivE1LB/m09zVw1IxJzgaf4SRDbOpYX4s8+O9IbLf226ZlO?= =?us-ascii?Q?wxAWNVXjJIqXKcWPdhGyV3oCevfaR0fivaYF8wtvplAfj8RdJnvPwv6VpVg0?= =?us-ascii?Q?T3pSaoDq/ZvtpbVhkXnGIU2Md57Wse/3a0V/LG9Hg5NruEqaQ7lQCxvZOTQ5?= =?us-ascii?Q?GDpqtZENT/PcClI00Jlx0fe72G2TStIuvjrk7F3YmpzRyrDT33+g46AQrMhn?= =?us-ascii?Q?43K9BEBuhIPNzfJ5n8nOcrx44zgXs9yIoHeneMeETLKx5Pn/RN3CKtRy3hxg?= =?us-ascii?Q?IOOV71HmdL2kSxQFy0dCbdwr3gMRmQFCo5c/He0B8al2Fc3hsHbMKK0HC53Y?= =?us-ascii?Q?0Lb4xSsA9ApSgRmYx0HsyRhjV+waXiJfguLU0tJVmRiJ7ST9VEZBj/3tfnpZ?= =?us-ascii?Q?0/gwj2Bzh7sTN61j8rCuHLnE1JO0FBRPxeviZYyadi1elJpYxoIYUyiD6Pfk?= =?us-ascii?Q?wzwB4i9s9GeLvs4fBZl4rShCyEhGl5wBuJnlfQ4GttNFct9QagzePh9/Ueqb?= =?us-ascii?Q?vdVCQUQ6WgoFhiuOPSKzGjKUffl2teAcObz33ncbEafW46WQWSloix4L8yVF?= =?us-ascii?Q?V9Z7F1qLv8wElLKLnAt6wUW4qWUkUgzl73rUis5huQEIdbAeDALqq/zQNg0L?= =?us-ascii?Q?0nzjXoECU5vk2QKHwRm4mTI7SUQZSSvmjg96iWAlN+nUHxxH/mXMaCJpiVU4?= =?us-ascii?Q?Jma8FHXlrhF1LNjfnEnFbb8yPHggfnByh+XOS1vvuNSc+1JgxSe+sD2ujbmu?= =?us-ascii?Q?160O4nQFzG3I0CELv9Kgc9SzZ7mvIncuIP/uNFgcPFwNyi8ceZsXolKHE/6/?= =?us-ascii?Q?v0IMVYm3zCfpLh0i/9wcppnNyBlobwDNriiehYqTDF55AyLNxNZBvFgeU9l4?= =?us-ascii?Q?nfg/hCJYb+ZTzqiR6LDkEKrgPA7u0Nq2sXD3IZkakbjT0d39h0P1TmhydtVl?= =?us-ascii?Q?PJgGmLIBohRqKX7fGKMUGh3OYmVc+sbPW9OwMxyK6/90NJYeDcanuyTB+w?= =?us-ascii?Q?=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)(82310400026)(376014)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:06:52.2111 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f82fa5aa-3ac0-4bcf-014e-08ddb4a9efd2 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: SJ5PEPF000001D1.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8203 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/28/25. 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=1f7a996079c1bf45760c9b9448f2fd0e43b344fc Thanks. Xueming Li --- >From 1f7a996079c1bf45760c9b9448f2fd0e43b344fc Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Fri, 25 Apr 2025 21:49:13 +0200 Subject: [PATCH] net/mlx5: fix VLAN stripping on hairpin queue Cc: Xueming Li [ upstream commit 468334f07a9298fb4ff05e6cdcbbde64b0da4aa2 ] Rx hairpin queues support VLAN stripping, but if port was started and application attempted to configure stripping on hairpin queue, segfault was triggered because of NULL dereference. Underlying function, which was updating the RQ was passing wrong object handle for hairpin queues. This patch fixes that. Fixes: e79c9be91515 ("net/mlx5: support Rx hairpin queues") Signed-off-by: Dariusz Sosnowski Acked-by: Bing Zhao --- drivers/net/mlx5/mlx5_devx.c | 2 ++ drivers/net/mlx5/mlx5_vlan.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c index 3f8fb9512b..47e86197b8 100644 --- a/drivers/net/mlx5/mlx5_devx.c +++ b/drivers/net/mlx5/mlx5_devx.c @@ -48,6 +48,8 @@ mlx5_rxq_obj_modify_rq_vlan_strip(struct mlx5_rxq_priv *rxq, int on) rq_attr.state = MLX5_RQC_STATE_RDY; rq_attr.vsd = (on ? 0 : 1); rq_attr.modify_bitmask = MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_VSD; + if (rxq->ctrl->is_hairpin) + return mlx5_devx_cmd_modify_rq(rxq->ctrl->obj->rq, &rq_attr); return mlx5_devx_cmd_modify_rq(rxq->devx_rq.rq, &rq_attr); } diff --git a/drivers/net/mlx5/mlx5_vlan.c b/drivers/net/mlx5/mlx5_vlan.c index e7161b66fe..d0459024f1 100644 --- a/drivers/net/mlx5/mlx5_vlan.c +++ b/drivers/net/mlx5/mlx5_vlan.c @@ -108,7 +108,7 @@ mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) dev->data->port_id, queue); return; } - DRV_LOG(DEBUG, "port %u set VLAN stripping offloads %d for port %uqueue %d", + DRV_LOG(DEBUG, "port %u set VLAN stripping offloads %d for port %u queue %d", dev->data->port_id, on, rxq_data->port_id, queue); if (rxq->ctrl->obj == NULL) { /* Update related bits in RX queue. */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:19.894527839 +0800 +++ 0054-net-mlx5-fix-VLAN-stripping-on-hairpin-queue.patch 2025-06-26 19:59:17.426418042 +0800 @@ -1 +1 @@ -From 468334f07a9298fb4ff05e6cdcbbde64b0da4aa2 Mon Sep 17 00:00:00 2001 +From 1f7a996079c1bf45760c9b9448f2fd0e43b344fc Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 468334f07a9298fb4ff05e6cdcbbde64b0da4aa2 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 9711746edb..6c79a634f9 100644 +index 3f8fb9512b..47e86197b8 100644 @@ -28 +30 @@ -@@ -88,6 +88,8 @@ mlx5_rxq_obj_modify_rq_vlan_strip(struct mlx5_rxq_priv *rxq, int on) +@@ -48,6 +48,8 @@ mlx5_rxq_obj_modify_rq_vlan_strip(struct mlx5_rxq_priv *rxq, int on) @@ -38 +40 @@ -index 43a314a679..7c7ac78dfe 100644 +index e7161b66fe..d0459024f1 100644 @@ -41 +43 @@ -@@ -107,7 +107,7 @@ mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +@@ -108,7 +108,7 @@ mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)