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 A9F6B43E57 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 A133540294; Sat, 13 Apr 2024 14:55:09 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2076.outbound.protection.outlook.com [40.107.236.76]) by mails.dpdk.org (Postfix) with ESMTP id 22839400D6 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=G/g3DGbjkBtE8yppM6qQcUCFMmZUObKkrcfaaQazsYPB1NDHIDxgRK0cIkokRmFq+IwRTbZEzDT2MwcaCdc2d3lyoCgJVJorHPKKOib7Rea/qXE8SbZZG6zWFDP01olRc5K/CrcEPMvQtBjb9O37C//1bHogJQS66dCJ16/Miqcx34+Q34Op2hUfiLmAXNDChUo92aCPAatlY9JvUKYRKB+VaOgDBIN6EFkS/Tv3hissKCCdhp6f0eDm6JtzV2bp7b5X5RkzhTYBd9OU+TIIG13olLSC/uIIsZtGDy8pFnkUs8vJbM+Q9pXLyL+zvKgcqysZsaoa6mMB9rIGB2OLTQ== 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=DLksPP3YFYT6En4PvrVDCETsXtXF9pWmKh5nw0ou/Qk=; b=dAXnEC3YV72tLbxk0dFJpHPXRXJCnyDwkWzp9J0hmYm8gI2+6snOWGxOnJfzaQnjgOcbNmTh44cHzB17vsqeeBbaaxT8eLp1Ke8DkfG38RcVRkrvEb9/Xf+t7jsT8G0xdFa4WYlpRF5P/oU99BeTMC2b046QmErAMzyOgGp7p7HujSgksvUtQt2UKJ8LiAFqXHkAkGNplT5PbDUfz6GmfJ+C9O1lShEgLJnIQG+ZTbyd+3N41ESWEy4UBtbypg8VRfB7iZ4IdkNHdWL4xokiMPZkxiAkopbY4SMyinzDxq/dQcy1urpF5C+PTnvSgzr1F8Ie4uX1U83qgQJw7vxQvw== 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=DLksPP3YFYT6En4PvrVDCETsXtXF9pWmKh5nw0ou/Qk=; b=KQxc7KPuHsGdlnwpK/Q4nsn+10pF2b+b2xZE6ocH9mF+nhFZpyRZ3qpxby72DiXuINjdtMXjPcuFSzm4YwhBF0ZTcNMeeIEkQxGIPSdc8+yLVXQTuXc4SLSBJ9Vj2g+QTIW2ccSvKCUNAZxa6fXQNbg1L5h333y6feXhtXBSZcmyzCWxAWx7mL8r3KZdy0H9K0jpZ18rinbKpjecJKmH+Ug2eCfvkzGGmJS42/veYxTRICs5ki5J14D1UbnVgE5ZeYOUWayzXPc4KpvF8hYZgD02HwJHSwuvqDD48ytHjh1w/mOGBhpN6BJoqoTc2dEFccMDiNjrafb9Mq7SYS2iuw== Received: from SJ0PR05CA0133.namprd05.prod.outlook.com (2603:10b6:a03:33d::18) by MW3PR12MB4412.namprd12.prod.outlook.com (2603:10b6:303:58::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.43; Sat, 13 Apr 2024 12:55:04 +0000 Received: from SJ1PEPF00001CDD.namprd05.prod.outlook.com (2603:10b6:a03:33d:cafe::4a) by SJ0PR05CA0133.outlook.office365.com (2603:10b6:a03:33d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7495.15 via Frontend Transport; Sat, 13 Apr 2024 12:55:04 +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 SJ1PEPF00001CDD.mail.protection.outlook.com (10.167.242.5) 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.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:49 -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:47 -0700 From: Xueming Li To: Bing Zhao CC: Suanming Mou , dpdk stable Subject: patch 'net/mlx5: fix condition of LACP miss flow' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:48:52 +0800 Message-ID: <20240413125005.725659-52-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: SJ1PEPF00001CDD:EE_|MW3PR12MB4412:EE_ X-MS-Office365-Filtering-Correlation-Id: 09e0965e-97c3-43c7-26dc-08dc5bb8f056 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zPGs6SliMLLubaumTX8VpM6Eo6SEmUFB0ledT42Xoq3+cyi72ZkOElaoUnxJWWp6HrxOXqu4Gf/HYnS3+MPpWgEJAsyRMbmK/zabnc+tgDIXmuscN2CQcV5M+Kh6Nxvz7cmAj8Um1ilA9y2g4CSUHvXevqx7cSpMocCu7WercWdXrKx+7kLOrkq5PsKsplqDpaUoP7lsaqBfyUDz08JLYGrFOQwhj7nRp8iYutT3KOxP4IIo/ZRvDM/1vdZlJvOqa4TlfMeNIhKZjOJ8jhzgXruYlOPCDbQs3Iguv4KEHb2sHcnY1uBar6K9K61yoSrqRGokkkGYkCrrRmq90IpuJdx4aXAwhNBLNhz1U5dFTn6D6pvT4Mr0gQ+2Qq+KB6bN4Dn2h+Jh1pMDw0rPHlIl3rQgbAkKE6vhQdSyCqHOQp/1DcGHSpUn7eO0U+4RRiJ/REur7ZTJgGOnW0NaFanbLoZNqtum3m9w9wFHCpYZzgn8VvLeUqEh4pnw1QOEeOHgz9R+vgds5ZF4W0KPFX3vcTETrgBZA+4NFYl0pHeXJLezwZE4EKu/7ZTTFgVzJc/PdhAF5Cw5SSUDkfIHaTnfoArL81Hih9+Lig5qfoP9X7DubwD3Y2ivuDtU1lhG2BccRAdkt6gqMXxpRfbb6WZtNRDGMJT++9q/77eky0CUjZZjHc2yScTxmoLc17ph7lBM8s80oup89W1QYBAL1S2Caf36HHDM0T7E9uFnipxrrP/gIzZqtOYw5rSegR60a8BE 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)(1800799015)(82310400014)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:55:04.3430 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 09e0965e-97c3-43c7-26dc-08dc5bb8f056 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: SJ1PEPF00001CDD.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4412 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=a5d0545e5d9d61716e1c22598db5ecf7f1bc0d3f Thanks. Xueming Li --- >From a5d0545e5d9d61716e1c22598db5ecf7f1bc0d3f Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Wed, 21 Feb 2024 08:49:48 +0200 Subject: [PATCH] net/mlx5: fix condition of LACP miss flow Cc: Xueming Li [ upstream commit 87e4384d2662f520bfae28ae14dbff2429c6923d ] The LACP traffic is only related to the bond interface. The default miss flow to redirect the LACP traffic with ethertype 0x8809 to the kernel driver should only be created on the bond device. This commit will: 1. remove the incorrect assertion of the port role. 2. skip the resource allocation and flow rule creation on the representor port. Fixes: 0f0ae73a3287 ("net/mlx5: add parameter for LACP packets control") Fixes: 49dffadf4b0c ("net/mlx5: fix LACP redirection in Rx domain") Signed-off-by: Bing Zhao Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow_hw.c | 3 +-- drivers/net/mlx5/mlx5_trigger.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 25fef8c086..c748e48e31 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -8529,7 +8529,7 @@ flow_hw_create_ctrl_tables(struct rte_eth_dev *dev, struct rte_flow_error *error } } /* Create LACP default miss table. */ - if (!priv->sh->config.lacp_by_user && priv->pf_bond >= 0) { + if (!priv->sh->config.lacp_by_user && priv->pf_bond >= 0 && priv->master) { lacp_rx_items_tmpl = flow_hw_create_lacp_rx_pattern_template(dev, error); if (!lacp_rx_items_tmpl) { DRV_LOG(ERR, "port %u failed to create pattern template" @@ -12222,7 +12222,6 @@ mlx5_flow_hw_lacp_rx_flow(struct rte_eth_dev *dev) .type = MLX5_HW_CTRL_FLOW_TYPE_LACP_RX, }; - MLX5_ASSERT(priv->master); if (!priv->dr_ctx || !priv->hw_lacp_rx_tbl) return 0; return flow_hw_create_ctrl_flow(dev, dev, priv->hw_lacp_rx_tbl, eth_lacp, 0, diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c index 5ac25d7e2d..f8d67282ce 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -1524,7 +1524,7 @@ mlx5_traffic_enable_hws(struct rte_eth_dev *dev) } if (priv->isolated) return 0; - if (!priv->sh->config.lacp_by_user && priv->pf_bond >= 0) + if (!priv->sh->config.lacp_by_user && priv->pf_bond >= 0 && priv->master) if (mlx5_flow_hw_lacp_rx_flow(dev)) goto error; if (dev->data->promiscuous) @@ -1632,14 +1632,14 @@ mlx5_traffic_enable(struct rte_eth_dev *dev) DRV_LOG(INFO, "port %u FDB default rule is disabled", dev->data->port_id); } - if (!priv->sh->config.lacp_by_user && priv->pf_bond >= 0) { + if (!priv->sh->config.lacp_by_user && priv->pf_bond >= 0 && priv->master) { ret = mlx5_flow_lacp_miss(dev); if (ret) DRV_LOG(INFO, "port %u LACP rule cannot be created - " "forward LACP to kernel.", dev->data->port_id); else - DRV_LOG(INFO, "LACP traffic will be missed in port %u." - , dev->data->port_id); + DRV_LOG(INFO, "LACP traffic will be missed in port %u.", + dev->data->port_id); } if (priv->isolated) return 0; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:06.641871884 +0800 +++ 0052-net-mlx5-fix-condition-of-LACP-miss-flow.patch 2024-04-13 20:43:04.977753958 +0800 @@ -1 +1 @@ -From 87e4384d2662f520bfae28ae14dbff2429c6923d Mon Sep 17 00:00:00 2001 +From a5d0545e5d9d61716e1c22598db5ecf7f1bc0d3f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 87e4384d2662f520bfae28ae14dbff2429c6923d ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index 91d1c59fbd..e7f1b5f551 100644 +index 25fef8c086..c748e48e31 100644 @@ -30 +32 @@ -@@ -8934,7 +8934,7 @@ flow_hw_create_ctrl_tables(struct rte_eth_dev *dev, struct rte_flow_error *error +@@ -8529,7 +8529,7 @@ flow_hw_create_ctrl_tables(struct rte_eth_dev *dev, struct rte_flow_error *error @@ -39 +41 @@ -@@ -12761,7 +12761,6 @@ mlx5_flow_hw_lacp_rx_flow(struct rte_eth_dev *dev) +@@ -12222,7 +12222,6 @@ mlx5_flow_hw_lacp_rx_flow(struct rte_eth_dev *dev)