From patchwork Wed Feb 21 06:49:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 136945 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6C16C43B31; Wed, 21 Feb 2024 07:50:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 26701402ED; Wed, 21 Feb 2024 07:50:22 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2079.outbound.protection.outlook.com [40.107.94.79]) by mails.dpdk.org (Postfix) with ESMTP id 3A61A402B9; Wed, 21 Feb 2024 07:50:21 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AntBqiOeaUlK7b8V7DMWHAYdtFUHEnU66EC/Bqt6DLjX7rDz32fx0WKoBI4PpTRbqddPEtZJ1Zg1Vg6XifGT6b2sU4F+uRDJIpo1nwPBhI1fjl8+SQdOEnkzxNfDX+g25aO3ku5mjZpzDGKW8ft4cZoexM/omQ/bjReXR8+TnJ9quYaeMaKbYGzXISocOEO7cup82Z50PIkaZvDjVVgszZ8ctnxVBhe8s0rL3deNuf9XstueHW1QuQ2CETb3LBmgiwrzkAQC57aId5MDRQvyDAVtr/UEVsKuOzcT28D7a4ieQBuuq+KBO1SJHDg5PTUPIH2x0eCEtgvfoVzbtUDjng== 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=7BeHxYZBdJfBcTyvOalZ0MKvirGfSch2yqeFUlPN8WE=; b=Qt2UScHnfcgFqS3tU1ruH5Kz5HCCNNbgtAwCJOrN1LfNdUNZjo2qMsseDMm08n0UOSLnBYN/bVGhGSPtr/j9h81s9wKi7ApILiL7dpUqFIyK8qYxR4ESOwHbK2TzU0CCZYztDgEwy8KveshlPZgctEZ7i4bIIEf1RCTQCwKL/PCV1tNPArfbKHYaV4Ry2SCYvqJZNgSbbLc5ZQ4r7W+KxPXtJzYsnerUMdx3LimOf3HxbwbReqBsXxPQHyujpKGAhnjvqSZIJ6GP0tY65opWLb9MB2+dcnidfjTqYJxvs0/wAB87YDBio2nUZlg65klGmNqgSZCCVk0QhGetSbITaA== 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=7BeHxYZBdJfBcTyvOalZ0MKvirGfSch2yqeFUlPN8WE=; b=jcr4zCf35ursmpxn55x6f3HSIbzYoTYMZIwMChpx1R8sIEpa65Oic9f29U0sNwH4F1ohIClQKp/mutj+sJlboOkmstM9BigqxNT56ZG95M1ntJ3NjLo4YmgvxoKlUyKgOGFQhkrL1I5zSZf9hH7TT+Ceoyd3BaPCmviiUA89uWFL1QyHgGXmD1MUy4TUP47jwphcGgXR3TmPv5PDXeX2X7sSqHdMsWJ0ShN2MHJOTGyjEmJG3fH1Y/TBm9VTuc7sAM8heiwVp4XUrWe76iO+xpn1mACvudj7PFMTptZH8Mu4Mx2DTJg6ylEpkb80sI6w7u7ey2Bj2xwbVubbPAyhZQ== Received: from CYZPR10CA0012.namprd10.prod.outlook.com (2603:10b6:930:8a::10) by SN7PR12MB7934.namprd12.prod.outlook.com (2603:10b6:806:346::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.21; Wed, 21 Feb 2024 06:50:18 +0000 Received: from CY4PEPF0000E9D4.namprd03.prod.outlook.com (2603:10b6:930:8a:cafe::4a) by CYZPR10CA0012.outlook.office365.com (2603:10b6:930:8a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.41 via Frontend Transport; Wed, 21 Feb 2024 06:50:18 +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 CY4PEPF0000E9D4.mail.protection.outlook.com (10.167.241.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Wed, 21 Feb 2024 06:50:18 +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; Tue, 20 Feb 2024 22:50:04 -0800 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; Tue, 20 Feb 2024 22:50:01 -0800 From: Bing Zhao To: , , CC: , , , , Subject: [PATCH] net/mlx5: fix condition of LACP miss flow Date: Wed, 21 Feb 2024 08:49:48 +0200 Message-ID: <20240221064948.298863-1-bingz@nvidia.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9D4:EE_|SN7PR12MB7934:EE_ X-MS-Office365-Filtering-Correlation-Id: 29edd130-ea41-4d5e-0228-08dc32a95dc3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yCKFGXqdZtWJYxOmfysa2lyKlbd3UgXOO/S/wy1f2CUfwyMnGCJK4YS2x8PRZcAC//TpwjEr/fDDkabhvn45GC5gVr+NpQyv0nTLk7mpUrN4mYjyOEjqAqjnLbR1TwVkWafF8q5MRgDh5AMKeOG0WbfglsuGoJvsAXJa1FBZm1sRXs7jYy3vmdCGAAAU0szeOnNZTrws4WfsHyQrhrLkmU7DSIxEKWCgQUuMvCEEUlGgEpBj5D1FvZJyQkgp9mAmlmEhhWcznSGaAvkxDI9MM7cZ/IGQ2egU1SQ0+NWFtNf0GD25TdBR0wcv0AvIvmB3yMLiY6LTSKCtTjJVAzy2AlgaSms3L8s5jwRzejNXKNuM6XaSaloLO0nC8ZKI0cN/35ALk5/H6zJS7VZ8vM83WOxIsa+ImWsMSXMV+JqRbdM5FRW3UH7Ei7cW7KFe26RaX82xJgvRjrLrRTgxjahEDh5YT6Jv11BdCiVz07RntvvyBfDss0SZShKTXIej1ArqogApNfOd5dD/Xx/tbMV5q5UmaIvYYk1+1NThT0LOfi5C6qzh0YJV7982VdGdoY98xS/yV/pULvjnVLEbNpYFlSazJZoR1pJW9g/S+bwwcv5dcqjicDTOxWppJf2QmAbOUSpDwxlOi+184JDOfRNumLDSdDtOCU7Ad5lp5/d0NFY= 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)(40470700004)(46966006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2024 06:50:18.0878 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 29edd130-ea41-4d5e-0228-08dc32a95dc3 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: CY4PEPF0000E9D4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7934 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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") Cc: stable@dpdk.org 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 3bb3a9a178..d346c93677 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -8718,7 +8718,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" @@ -12475,7 +12475,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;