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 3530345610 for ; Fri, 12 Jul 2024 12:46:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2F44D402E5; Fri, 12 Jul 2024 12:46:38 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2048.outbound.protection.outlook.com [40.107.223.48]) by mails.dpdk.org (Postfix) with ESMTP id 5814140261 for ; Fri, 12 Jul 2024 12:46:36 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gUflWKqFP+PX1rIow3t218vMSU7LhsEkmmRheQ3UmEMVJe48hfSklEFK32ffHrlIBvUpZBR7G2FxqsScd4QRJO4Yn0K2eS9Vj86LEgAQgaCU/YvMlaUfXZdUV4YqDqcdO6oOhKodOMQxJSie4TvZLTcLz4YtXQ3ngsJj/4a+Dzbu4VxZJSTcb0bkXI2kVcvVfZavytwFUZLyAAbhQmd9CtL5prSnyydhQIFARhRFFOFy7+m4kgbHruJGaBXSs36FGV9slLwvGW2jzMsXdZvD7SyizixFvh+L5opHDtR5yzi80HGGspk7Stlct3eXwppp2/WTGICzoxhCGkPEqejYuQ== 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=tx6UvF6vGIRCxD06QLx5Sh8Msv4Y3WCLmJfWBk8h4qQ=; b=ZiXo7KEKGN24ZUxUjxhYxYuAXPOY1uAgWRMS2E/ACYfRVmQR1HmftehFEBuLfeFY7bPv4YN9nfBKwPUjgdWSLaupJLX4gmRGw4QIz6DpDX7tG1aIp0vOAsLCb+s8EAFkdxUs8UIkvYQ/HDEImHPMvWuErdPWlSuCYi2MVqq4Od7q1IfA4x0QzesYCF4jU+p6sBKELZ6QmyemlgTwn9rQQpl8fXzpif1/JAsPhQP9cgZBbgpDZsFbne2wldUeyAS9sS/0AJGRnolQrpHc5/1hBuNFNJGQ8sSWIoGJyqBreFgENinLxT0r6/q/J7pKSlO8VS6gqC+kpU8EtGf3kS7TNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.com 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=tx6UvF6vGIRCxD06QLx5Sh8Msv4Y3WCLmJfWBk8h4qQ=; b=Z4CwfO2dIG3+oa+Iw2q5lZJjhWi+kbaMswAjP/SFYWEgRVlaY7dflge4t3h9eoXeVj0cS1ziTKzb1zNSEM+pQ6p+ZcenDZKn2/yqn3LOyyLhL0HVKDdnxowuk6+I79w87hg6FsZzodcdK+gX2d3s5tFLiQLsv45YOJIkV0GRIR67aAhOzHfor1Pxr5PjUHITbRK8nO2meLPCOEAal9NKf3eNONC6Q2LqhGNh7ZvygMXhpoGlg5COqAFF2RknQXcGS6C36qr4JdICRIZLU/80nYHuwuL3ENZpHJdImtUzxn/H/6nHCGP8FzlAj7+et09/JqIqfaaxlgVDQZek7demyQ== Received: from CH0PR03CA0052.namprd03.prod.outlook.com (2603:10b6:610:b3::27) by CH3PR12MB8545.namprd12.prod.outlook.com (2603:10b6:610:163::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23; Fri, 12 Jul 2024 10:46:31 +0000 Received: from CH1PEPF0000A34C.namprd04.prod.outlook.com (2603:10b6:610:b3:cafe::a5) by CH0PR03CA0052.outlook.office365.com (2603:10b6:610:b3::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:46:31 +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 CH1PEPF0000A34C.mail.protection.outlook.com (10.167.244.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 10:46:30 +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; Fri, 12 Jul 2024 03:46:21 -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.1544.4; Fri, 12 Jul 2024 03:46:19 -0700 From: Xueming Li To: Gaoxiang Liu CC: dpdk stable Subject: patch 'net/bonding: fix failover time of LACP with mode 4' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:43:55 +0800 Message-ID: <20240712104528.308638-10-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-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: 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: CH1PEPF0000A34C:EE_|CH3PR12MB8545:EE_ X-MS-Office365-Filtering-Correlation-Id: 926f02b5-51f0-42f6-19c0-08dca25fe3d4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?xAPGwGcxv1yMUQCzlvYGgVjo1LLbMJLpXkPDKiDaKMB3DeIVzWHcYQ7SeAR8?= =?us-ascii?Q?qRG39MYrqdWJWVusT+/aS85bNVqN5ocXKtwJ+UosmMSbW66/Yvix7gjgrg24?= =?us-ascii?Q?uIXcBsl0d5OGP0N8r7EfpKownX/vPhKdRZZlXrrCZTarp8UG0jpE5Hu9exD1?= =?us-ascii?Q?m/AIDBGav18SV7XZoso8C4QVfeMnoR3TzL6dhk2A0676bgK9L+lwJ0WbU1wk?= =?us-ascii?Q?bBtqyPpw8wednB0lB9rrhekuVM8Hjo30hIURscHmKnESTkZ9n/UtwX3p5d7r?= =?us-ascii?Q?u54BeRisbhDVhODe7KjLJDLir1X4OaibJxjaX5KxhegIbgZQ0X1GhQmSYgln?= =?us-ascii?Q?Qley0sKxwW7NfJyy8Kz55p8cFv3pmXD85cKf2U4QERSEhwEL/4wIB5ZtxwDU?= =?us-ascii?Q?VbV/8kaBKABx86yTHcofnAH5VQNBZWcceMwFz4jAKhS0OSyR+eMTULOp9bRV?= =?us-ascii?Q?2rhOOtvlZfLWa2/a7XoEn1Scv6LvRhEPW6fJC8szWupMDBw4V2QZC4jKF3Uf?= =?us-ascii?Q?873lWz0JJ+QXe+qHJ6wPZscLwoo3l5M3zu3dAuEqEZoPU/UZQ1neEO/iu6EC?= =?us-ascii?Q?q7HGix8tBBwgeu67BsnBDiYHRooQH9M30aSZY7kjZOtkpLwn5t3s98VHFynL?= =?us-ascii?Q?q747IJ7F9YGQy9qvlAT1cDEfjRzJVjcvQvvf+Uz6e51jqWfBTxbh8vSPmCUd?= =?us-ascii?Q?sYEz9J8L5pV6yN67B+wrE2NGpcHJDTZrOu7qAriZMZVatSF0aAy+tHaQaBCX?= =?us-ascii?Q?NQHJa314tgE5q/DqJsklAGHkc+B/dphKB1qJo+HIjw64WTEJW36h1+9r33RM?= =?us-ascii?Q?AYTfnydChsXwAn6ExeVr9/YsYva6dQmHD7ga58NXc7M0mRqR6Yc708W2S2E6?= =?us-ascii?Q?pSVbOVI337QbFzpOgYF3euMwG8H3XLtEFZeKLTuJmXOG40Cq+lDw14l3tnQ6?= =?us-ascii?Q?G5xXq+ou1Mm69U8iKifDSxD6Kem0n37lbjggQ5JiqYHweX9SwzH0VvoLWiEB?= =?us-ascii?Q?v/wrSbXjLvs6xgiR0o0p8R1i/JrIEs9RlBmjew7CuKIHfRlDY4r3m6gRSq3g?= =?us-ascii?Q?dYAkZ1+pvCZ7wr1G2+f2onNwweuo/20bTUg7Dc8O3Bx5RHcaKVP9PGoaJame?= =?us-ascii?Q?aGZYn8UYHaoWBwyGOqoIjaUWjwF8mbBl9Lz60V0oq2KfpHTXnykJaPvT1AtZ?= =?us-ascii?Q?2ofG3d9GoyRh75IlSrYRqfkanqDgwEgnOeMqXClSqdP0mlx2V2vl6ogTprpF?= =?us-ascii?Q?8JhrSOjA9KYjH2jsW4PHs8nIBXnc3KUdS0rslY4oEkNECe1Iop5z+9ARSIOX?= =?us-ascii?Q?6+fvNTDHZK3itUPLRgV4u+STPB+Pjx+kY8eEBoZd9oc4xjM3imq3HY1g+HAL?= =?us-ascii?Q?05eKpaNl6v/l3HOGLTPeA0cpTXdqL9KY/HhZ794bKgVVP0ZLqizd/6DL5XLc?= =?us-ascii?Q?gqX2mUcuN0d/IKWBeymom/qROFrezjFv?= 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)(1800799024)(36860700013)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:46:30.6126 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 926f02b5-51f0-42f6-19c0-08dca25fe3d4 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: CH1PEPF0000A34C.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8545 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/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=19010ae677a1e5fb0927c790fdd8730852b15fed Thanks. Xueming Li --- >From 19010ae677a1e5fb0927c790fdd8730852b15fed Mon Sep 17 00:00:00 2001 From: Gaoxiang Liu Date: Mon, 6 Jun 2022 22:34:45 +0800 Subject: [PATCH] net/bonding: fix failover time of LACP with mode 4 Cc: Xueming Li [ upstream commit a78a1ed8ba6ae7666d13fee1895badb8eb2abf5f ] When the primary port of bond member with bond mode 4 linked down, the system id of the other member ports changed. It may cause some switches to renegotiate, and the process takes a few seconds. It is not acceptable for any Telcos. We need sub-second switch-over time like in Linux. Set the MAC of the bond port to the member port's system to solve the problem. Bugzilla ID: 551 Fixes: 46fb43683679 ("bond: add mode 4") Signed-off-by: Gaoxiang Liu --- drivers/net/bonding/rte_eth_bond_8023ad.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c index 79f1b3f1a0..06c21ebe6d 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -865,7 +865,6 @@ bond_mode_8023ad_periodic_cb(void *arg) struct bond_dev_private *internals = bond_dev->data->dev_private; struct port *port; struct rte_eth_link link_info; - struct rte_ether_addr member_addr; struct rte_mbuf *lacp_pkt = NULL; uint16_t member_id; uint16_t i; @@ -892,7 +891,6 @@ bond_mode_8023ad_periodic_cb(void *arg) key = 0; } - rte_eth_macaddr_get(member_id, &member_addr); port = &bond_mode_8023ad_ports[member_id]; key = rte_cpu_to_be_16(key); @@ -904,8 +902,8 @@ bond_mode_8023ad_periodic_cb(void *arg) SM_FLAG_SET(port, NTT); } - if (!rte_is_same_ether_addr(&port->actor.system, &member_addr)) { - rte_ether_addr_copy(&member_addr, &port->actor.system); + if (!rte_is_same_ether_addr(&internals->mode4.mac_addr, &port->actor.system)) { + rte_ether_addr_copy(&internals->mode4.mac_addr, &port->actor.system); if (port->aggregator_port_id == member_id) SM_FLAG_SET(port, NTT); } @@ -1173,21 +1171,20 @@ void bond_mode_8023ad_mac_address_update(struct rte_eth_dev *bond_dev) { struct bond_dev_private *internals = bond_dev->data->dev_private; - struct rte_ether_addr member_addr; struct port *member, *agg_member; uint16_t member_id, i, j; bond_mode_8023ad_stop(bond_dev); + rte_eth_macaddr_get(internals->port_id, &internals->mode4.mac_addr); for (i = 0; i < internals->active_member_count; i++) { member_id = internals->active_members[i]; member = &bond_mode_8023ad_ports[member_id]; - rte_eth_macaddr_get(member_id, &member_addr); - if (rte_is_same_ether_addr(&member_addr, &member->actor.system)) + if (rte_is_same_ether_addr(&internals->mode4.mac_addr, &member->actor.system)) continue; - rte_ether_addr_copy(&member_addr, &member->actor.system); + rte_ether_addr_copy(&internals->mode4.mac_addr, &member->actor.system); /* Do nothing if this port is not an aggregator. In other case * Set NTT flag on every port that use this aggregator. */ if (member->aggregator_port_id != member_id) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:14.755298349 +0800 +++ 0009-net-bonding-fix-failover-time-of-LACP-with-mode-4.patch 2024-07-12 18:40:13.916594250 +0800 @@ -1 +1 @@ -From a78a1ed8ba6ae7666d13fee1895badb8eb2abf5f Mon Sep 17 00:00:00 2001 +From 19010ae677a1e5fb0927c790fdd8730852b15fed Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a78a1ed8ba6ae7666d13fee1895badb8eb2abf5f ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org