From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2A12C2D0C6 for ; Fri, 27 Dec 2019 17:51:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4B42206CB for ; Fri, 27 Dec 2019 17:51:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577469117; bh=ak+X/1y/5tATN8zqkL0VqH/NAk2cwC2AqzyfNUmUMF8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xMMKBKCuxVbX+9wZgHeHPU3eNAfR2AlPrN0QZMqi1MhqVotCiT/m4olh71jMJCmH2 VIfmhXm2SoShzCkYF+a2IM+RSQwPqK524PhjP1Wa+9EYJ9riXTnQ+NygZQZRAodlOU qT1VSRBhorIIOAbGzknxvFBtIUV6SJVjmlkl3LbM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728185AbfL0RnR (ORCPT ); Fri, 27 Dec 2019 12:43:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:40482 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727642AbfL0RnK (ORCPT ); Fri, 27 Dec 2019 12:43:10 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 88C062173E; Fri, 27 Dec 2019 17:43:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577468589; bh=ak+X/1y/5tATN8zqkL0VqH/NAk2cwC2AqzyfNUmUMF8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EEJeP99j2aHAcw/4TvUZcIw5+cb5X8LBXcgPrKaMm8sIqF9VLBI/ZjOjD/s5SxcCc mWjy4v4gqVXFxxc6yrA2J3SM4RLKXPZqV69X4HHAP3qFzKyYlB5yUB4/7MwZuSKB1j kMaAxkmJ7jX/Ax8tXtvY58FGGj291KLPDA4CeeCo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mahesh Bandewar , Jay Vosburgh , Jakub Kicinski , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 111/187] bonding: fix active-backup transition after link failure Date: Fri, 27 Dec 2019 12:39:39 -0500 Message-Id: <20191227174055.4923-111-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191227174055.4923-1-sashal@kernel.org> References: <20191227174055.4923-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mahesh Bandewar [ Upstream commit 5d485ed88d48f8101a2067348e267c0aaf4ed486 ] After the recent fix in commit 1899bb325149 ("bonding: fix state transition issue in link monitoring"), the active-backup mode with miimon initially come-up fine but after a link-failure, both members transition into backup state. Following steps to reproduce the scenario (eth1 and eth2 are the slaves of the bond): ip link set eth1 up ip link set eth2 down sleep 1 ip link set eth2 up ip link set eth1 down cat /sys/class/net/eth1/bonding_slave/state cat /sys/class/net/eth2/bonding_slave/state Fixes: 1899bb325149 ("bonding: fix state transition issue in link monitoring") CC: Jay Vosburgh Signed-off-by: Mahesh Bandewar Acked-by: Jay Vosburgh Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/bonding/bond_main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 62f65573eb04..92df47055d03 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2225,9 +2225,6 @@ static void bond_miimon_commit(struct bonding *bond) } else if (BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP) { /* make it immediately active */ bond_set_active_slave(slave); - } else if (slave != primary) { - /* prevent it from being the active one */ - bond_set_backup_slave(slave); } slave_info(bond->dev, slave->dev, "link status definitely up, %u Mbps %s duplex\n", -- 2.20.1