From nobody Tue Apr 7 15:26:16 2026 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 071882DA769 for ; Thu, 26 Feb 2026 12:53:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772110435; cv=none; b=iBZre22rXMv5b9SUPY8+4DvayZsWfvXDYfxc3mmIOc0eFV0Hvwv3+WHY3rz5TzhTpHQQmJh8K4atIGL40G4jol67UM/t3K6ER95lqglgLupnpDOSp9VfSwmC/zUR5oLrLYTA9CxzEpaBVVatwo3r8uLxGwtONQGHA4+fpo7ix7w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772110435; c=relaxed/simple; bh=fFttaZMGeLdp3UAEasDbHujAJF5yaSFRST6gXJrpxk8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WYXhtGfRoJ/vOQbTSVCzb/+cYECo9Vy+slAQtTFo8cG6pxnOzMm2WApTKhM7Qu6luopvXOimO+LoR5tlupBti2aJFefRDKyrz88z7oobZXGeHTH2PWYbRPWYzVZGoTZ/l/Sr2gMD/pGgk5r58roWZ30ZPzvR3mxpK4LUF5FHKWU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=h8FryCGa; arc=none smtp.client-ip=209.85.215.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="h8FryCGa" Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-c6e2355739dso293008a12.2 for ; Thu, 26 Feb 2026 04:53:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772110433; x=1772715233; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cyD5MkH20QdTZJ8Vxn6Kuz/fsHPnaaXUSaeZ35cNF/E=; b=h8FryCGabceH9Uy/AtyN5Lz6GYCvlmmIf7UfGPYiuWu0iCZw2yIhli6nqTrYPByTXk n2jN/4pvIKrXTzq0bnXPhHgfW0Sfrg/op9I1LUkMuCjZ70rim2QeGZEvfGF/SYBQMSvc w+ZotR4ZQl5MRpI9hWpaAqHt4YIJhii9Vp5KS9/9oGYGBEVKxhFylDK/c9CSv+k5zTY8 fVWoKcBzq30qkW+C+vUeG2LJs97YcPJ2qD3rkfnG4oxbu/KRLq6vMdYPwUVnpIVNyxnM c8Xak5sObzy/ZEZFahWvrCDkwJUbFcgwhCvJWq4uDkto89yzAZXnt1d5rCPCdhFu8GXE T21g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772110433; x=1772715233; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=cyD5MkH20QdTZJ8Vxn6Kuz/fsHPnaaXUSaeZ35cNF/E=; b=ITH0twAmM6I9S46+6YIbdIDpb+io2olbTIeA2R31u9g4/Irp/5RH/4sH9wrsXNnbG9 hIcSxmWFyyJa3/nPnXwolgtBI/kT8FnqtWOHrp1SYXgdZ4Wgd6umaCV4Z1sCTZIElyRG VS2b0dwobdbvefd6LM053umWLJ5giTOEUM94GxZVOGWvGY9FzxLX06ssaHMDplNGDSWq AhlZsT8qH1nBPzQt57lEKmAwGM5fIMR3Q3gFIFMPW8IIDqoaJ9GoJtDNMy7smQRbAbAQ kstXJ44auhochf1NTbv3EZU/qSopdcujZB7EcmbZ6lucuMTPqtnjX082D9mAzSJKa9B6 5INQ== X-Forwarded-Encrypted: i=1; AJvYcCWW2NzAOgBV23WIO8C60Vms4sokIwGXBshFCR5jhfId/SeImFLTu9xR6UlCcY/lxEsfmBRKdwfDketJcRw=@vger.kernel.org X-Gm-Message-State: AOJu0YyDKAfUbLCD+oloosAwbF9YE4L6PB6DndD9Svp54yyA3y9XONSL TH8ZN+zzjP7Uq8jp7Km9yHuzjv64+Q+C2Ri6xDD03fwF9Kbw2G10+7Ly X-Gm-Gg: ATEYQzwbKTL9SGnTCiojNUy9dyFPhg61sWr1YSK3EFjewpbfTFmIMkSmTpsw561P3wE 0Pm+ykZB9FeSXzZVUoqN+GsP+ttG1zfmBwcnHDXKq3n7UyqntjQpPrwm0ZazriL82H9DD+L8nCU OgFu3oaNhmBlDcCS9yBNb7+mSnDwWpyvfwpLSgUBcs042nEvLxZavTrt+eFlLX0joOW+O+Ur18I ilw4foBNrxmCbEfFhNT6vhUrlkVNY53WfKE7ExNgk7aNA7dwGhtmCbu5OJTndNYXiDNeIzB0FEa HuN6NihDs9QjACxwO1wCH2p4j2XutnY4+4BkUsLKwhsYKeeH3Yoivl2mU7yoQc1QcDzCTVLJ6VE 1jWX/rx5Ia7DqdqFVtAle52vA6gbJMw4QEbSoLU4kJvx47S/KxIGIBrpHVcStBNshxNfHxn3d5s U1uj3fHWz7vZHApkEyaX1D0tcbQMA= X-Received: by 2002:a17:902:ec81:b0:2aa:d29f:1444 with SMTP id d9443c01a7336-2ae02969668mr21350065ad.10.1772110433295; Thu, 26 Feb 2026 04:53:53 -0800 (PST) Received: from fedora ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2adfb705b53sm25276715ad.92.2026.02.26.04.53.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 04:53:52 -0800 (PST) From: Hangbin Liu To: netdev@vger.kernel.org Cc: Jay Vosburgh , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Nikolay Aleksandrov , Mahesh Bandewar , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Hangbin Liu Subject: [PATCHv3 net 1/3] bonding: set AD_RX_PORT_DISABLED when disabling a port Date: Thu, 26 Feb 2026 12:53:28 +0000 Message-ID: <20260226125331.28147-2-liuhangbin@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260226125331.28147-1-liuhangbin@gmail.com> References: <20260226125331.28147-1-liuhangbin@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable When disabling a port=E2=80=99s collecting and distributing states, updatin= g only rx_disabled is not sufficient. We also need to set AD_RX_PORT_DISABLED so that the rx_machine transitions into the AD_RX_EXPIRED state. One example is in ad_agg_selection_logic(): when a new aggregator is selected and old active aggregator is disabled, if AD_RX_PORT_DISABLED is not set, the disabled port may remain stuck in AD_RX_CURRENT due to continuing to receive partner LACP messages. The __disable_port() called by ad_disable_collecting_distributing() does not have this issue, since its caller also clears the collecting/distributing bits. The __disable_port() called by bond_3ad_bind_slave() should also be fine, as the RX state machine is re-initialized to AD_RX_INITIALIZE. Let's fix this only in ad_agg_selection_logic() to reduce the chances of unintended side effects. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Hangbin Liu --- drivers/net/bonding/bond_3ad.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index af7f74cfdc08..c47f6a69fd2a 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -1932,6 +1932,7 @@ static void ad_agg_selection_logic(struct aggregator = *agg, if (active) { for (port =3D active->lag_ports; port; port =3D port->next_port_in_aggregator) { + port->sm_rx_state =3D AD_RX_PORT_DISABLED; __disable_port(port); } } --=20 2.50.1 From nobody Tue Apr 7 15:26:16 2026 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DE38261B9B for ; Thu, 26 Feb 2026 12:54:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772110441; cv=none; b=pbmePu9W3E17GDaoz/VZKcoKhbVU9x4G3m837B5MBrEdC9dNBKDPui0D12cXNSsrNmTbg6fHy4RDrR0496cGRbTwd7pU28kWbjNWU+57FqR+9Wl9KTaRdwiHW7ws2pG/PJES+XXFNogMzjwsGgYRrjnWGREKxE8+Df4RIk8X8FA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772110441; c=relaxed/simple; bh=EOlFZQfF9Me2mXWrNa0wqh7Ijd2um5Sdh6uvsfuEhsc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hVJu1EbVOC+f8F1NUIjLspexZhzHiF+Zlu9LA2LlmAIm9uY5DZqGuqhMHg0X+TB+guiSPKwu/kmKuT/YBgOBQBJBsJAu+PNXe73J2kiSGoxwq5q8vB6Lpr1Xxe9S0+iRhuiTZuni7Y2hXimMnmODdWU5lBR8N9sCdYWDBAydD5w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NgyXd5B8; arc=none smtp.client-ip=209.85.215.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NgyXd5B8" Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-c6e23cb81f4so309876a12.2 for ; Thu, 26 Feb 2026 04:54:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772110439; x=1772715239; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mqli0nfMs/A4Vg2iZeEDlDkF30pGRggTn9I8T0+gOmI=; b=NgyXd5B83JIEu9HmSVvI/DjvZ2nH5gHSTf0Y9bb1bRA6G2YuYxWi6XhcqUu343ksfB yfaYQvC3GjebDrsuTrrcLjYzB/HGSMeI9rhb3P+AHFY8i4YdrzQKyU/ldKiUGCU57kLa 0qLmR2H7+aUpzxdRsPUFvZNx4NQ1g7vzFhzYOfiigyzzfAOqYpGN1escWZt49yT8eEXu kS6oiR79IP7Kp8f7vpbRdrdg6TZqTA+f1R/Okra/CC1W3Xuhgdc7ZBz0dzN78kuhd2/b qIvfF0mvuk2iNiH8cN3AJ+8y90HokEJBTh7CNeJ5yzfFrhpT5iZqnjkej9d/GEJtZfzC R1Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772110439; x=1772715239; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=mqli0nfMs/A4Vg2iZeEDlDkF30pGRggTn9I8T0+gOmI=; b=WuIuHDTMlw7iO46YyqKarUYyQhRsCMmjvZtBgMV/ifnreLaD4nf0ZYz5zbaCyucz0s bMNFZDpSArNWV/6qdtW+QrgFvXMvUbQPQ6AwX/ciYx568dEPY0BMYTmk2S5SRh2h2i6G VVbdLyAcVFC7RAW9kXhSy3YZP/q9LKQlLkvmwG8eu1etT1SuBWe6zXMDu1awfnoN8WKP XbXYl6+lhhVpt4gXwqGHPwcUoyVqSXtATrQVQFDQBWMmnnCi3tRvO8vZTyRRaT3TmtAu RlJAA+TBLGzBNOB4E/uUsvCvmqUJ3t8xNb0kDkK4OWbZqbtSoIjjg+MPdnsq9f6jKcsj 8+CA== X-Forwarded-Encrypted: i=1; AJvYcCXsOIo9KTUzEaiJPtjlFy0HSbslbShQP0hdfKjUaEBPTNH0L7aY+oMZoQjypqBU1Dmodi5ndupV7mXDwSw=@vger.kernel.org X-Gm-Message-State: AOJu0YzFKjUCjoIeZPyUwttMW9KNcNg/2mTXp6t/Q1hWTqaajPRkb8xG H6m5wpMIdB1t2QKhlybgxDXpqEqr3h9ce1mouuSrUWjWZl3iHlxA993ksG+nI5G2wp0= X-Gm-Gg: ATEYQzyB6xDG1sStbrxtjRQrwMJFzeiOE3ge3B2sv7JT4hvysN2ma+10eAjs8JOrFae MmQRw3EDlg2fxSYITfC59xsG9z+ja8BnMlrhvbayGy0Z0Me+oArvE7JnmTEp9VAe3X+jpCfbWZp TNZpQKy8gLftLn1vF1+U3CxMuxGHj1SIRI7ZZmpAQjgdbLtnqISh2n98ZidiaX+8HcTb97Ebn02 wRcbOMJicOc+6htZWMYtrdhXOLuSSU/oSJb07cfsFzg1JQUBCW7HLIRVQNo66oju0jZl/VgfW4q 6MiiFFzqUZthtipuOvMIE0KZcRWf7gFYfh5FYBc85o3BFdT4FTx+q1dKbI2Sc5uhmByK273KkoH ZJXy8xmBwjRgOohbXdbzUZ1i4WSRxRJxteaIzTYBXNkdpBDTfCEVT5l+a40HNo9iWUKeFQpFxvw H1pN9eto3D8iM8IoMP63rcGmsNy4Y= X-Received: by 2002:a17:903:985:b0:2a0:823f:4da6 with SMTP id d9443c01a7336-2ad7456d474mr188212875ad.50.1772110439413; Thu, 26 Feb 2026 04:53:59 -0800 (PST) Received: from fedora ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2adfb705b53sm25276715ad.92.2026.02.26.04.53.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 04:53:58 -0800 (PST) From: Hangbin Liu To: netdev@vger.kernel.org Cc: Jay Vosburgh , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Nikolay Aleksandrov , Mahesh Bandewar , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Hangbin Liu , Liang Li Subject: [PATCHv3 net 2/3] bonding: restructure ad_churn_machine Date: Thu, 26 Feb 2026 12:53:29 +0000 Message-ID: <20260226125331.28147-3-liuhangbin@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260226125331.28147-1-liuhangbin@gmail.com> References: <20260226125331.28147-1-liuhangbin@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The current ad_churn_machine implementation only transitions the actor/partner churn state to churned or none after the churn timer expires. However, IEEE 802.1AX-2014 specifies that a port should enter the none state immediately once the actor=E2=80=99s port state enters synchronizatio= n. Another issue is that if the churn timer expires while the churn machine is not in the monitor state (e.g. already in churn), the state may remain stuck indefinitely with no further transitions. This becomes visible in multi-aggregator scenarios. For example: Ports 1 and 2 are in aggregator 1 (active) Ports 3 and 4 are in aggregator 2 (backup) Ports 1 and 2 should be in none Ports 3 and 4 should be in churned If a failover occurs due to port 2 link down/up, aggregator 2 becomes activ= e. Under the current implementation, the resulting states may look like: agg 1 (backup): port 1 -> none, port 2 -> churned agg 2 (active): ports 3,4 keep in churned. The root cause is that ad_churn_machine() only clears the AD_PORT_CHURNED flag and starts a timer. When a churned port becomes active, its RX state becomes AD_RX_CURRENT, preventing the churn flag from being set again, leaving no way to retrigger the timer. Fixing this solely in ad_rx_machine() is insufficient. This patch rewrites ad_churn_machine according to IEEE 802.1AX-2014 (Figures 6-23 and 6-24), ensuring correct churn detection, state transition= s, and timer behavior. With new implementation, there is no need to set AD_PORT_CHURNED in ad_rx_machine(). Fixes: 14c9551a32eb ("bonding: Implement port churn-machine (AD standard 43= .4.17).") Reported-by: Liang Li Tested-by: Liang Li Signed-off-by: Hangbin Liu --- drivers/net/bonding/bond_3ad.c | 96 +++++++++++++++++++++++++--------- 1 file changed, 71 insertions(+), 25 deletions(-) diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index c47f6a69fd2a..68258d61fd1c 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -44,7 +44,6 @@ #define AD_PORT_STANDBY 0x80 #define AD_PORT_SELECTED 0x100 #define AD_PORT_MOVED 0x200 -#define AD_PORT_CHURNED (AD_PORT_ACTOR_CHURN | AD_PORT_PARTNER_CHU= RN) =20 /* Port Key definitions * key is determined according to the link speed, duplex and @@ -1254,7 +1253,6 @@ static void ad_rx_machine(struct lacpdu *lacpdu, stru= ct port *port) /* first, check if port was reinitialized */ if (port->sm_vars & AD_PORT_BEGIN) { port->sm_rx_state =3D AD_RX_INITIALIZE; - port->sm_vars |=3D AD_PORT_CHURNED; /* check if port is not enabled */ } else if (!(port->sm_vars & AD_PORT_BEGIN) && !port->is_enabled) port->sm_rx_state =3D AD_RX_PORT_DISABLED; @@ -1262,8 +1260,6 @@ static void ad_rx_machine(struct lacpdu *lacpdu, stru= ct port *port) else if (lacpdu && ((port->sm_rx_state =3D=3D AD_RX_EXPIRED) || (port->sm_rx_state =3D=3D AD_RX_DEFAULTED) || (port->sm_rx_state =3D=3D AD_RX_CURRENT))) { - if (port->sm_rx_state !=3D AD_RX_CURRENT) - port->sm_vars |=3D AD_PORT_CHURNED; port->sm_rx_timer_counter =3D 0; port->sm_rx_state =3D AD_RX_CURRENT; } else { @@ -1347,7 +1343,6 @@ static void ad_rx_machine(struct lacpdu *lacpdu, stru= ct port *port) port->partner_oper.port_state |=3D LACP_STATE_LACP_TIMEOUT; port->sm_rx_timer_counter =3D __ad_timer_to_ticks(AD_CURRENT_WHILE_TIME= R, (u16)(AD_SHORT_TIMEOUT)); port->actor_oper_port_state |=3D LACP_STATE_EXPIRED; - port->sm_vars |=3D AD_PORT_CHURNED; break; case AD_RX_DEFAULTED: __update_default_selected(port); @@ -1379,11 +1374,41 @@ static void ad_rx_machine(struct lacpdu *lacpdu, st= ruct port *port) * ad_churn_machine - handle port churn's state machine * @port: the port we're looking at * + * IEEE 802.1AX-2014 Figure 6-23 - Actor Churn Detection machine state dia= gram + * + * BEGIN || (! port_en= abled) + * | + * (3) (1) v + * +----------------------+ ActorPort.Sync +--------------------= -----+ + * | NO_ACTOR_CHURN | <--------------------- | ACTOR_CHURN_MONIT= OR | + * |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D| = |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D| + * | actor_churn =3D FALSE; | ! ActorPort.Sync | actor_churn =3D F= ALSE; | + * | | ---------------------> | Start actor_churn_t= imer | + * +----------------------+ (4) +--------------------= -----+ + * ^ | + * | | + * | actor_churn_timer ex= pired + * | | + * ActorPort.Sync | (2) + * | +--------------------+ | + * (3) | | ACTOR_CHURN | | + * | |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D| | + * +------------- | actor_churn =3D True | <-----------+ + * | | + * +--------------------+ + * + * Similar for the Figure 6-24 - Partner Churn Detection machine state dia= gram + * + * We don=E2=80=99t need to check actor_churn, because it can only be true= when the + * state is ACTOR_CHURN. */ static void ad_churn_machine(struct port *port) { - if (port->sm_vars & AD_PORT_CHURNED) { - port->sm_vars &=3D ~AD_PORT_CHURNED; + bool partner_synced =3D port->partner_oper.port_state & LACP_STATE_SYNCHR= ONIZATION; + bool actor_synced =3D port->actor_oper_port_state & LACP_STATE_SYNCHRONIZ= ATION; + + /* ---- 1. begin or port not enabled ---- */ + if ((port->sm_vars & AD_PORT_BEGIN) || !port->is_enabled) { port->sm_churn_actor_state =3D AD_CHURN_MONITOR; port->sm_churn_partner_state =3D AD_CHURN_MONITOR; port->sm_churn_actor_timer_counter =3D @@ -1392,25 +1417,46 @@ static void ad_churn_machine(struct port *port) __ad_timer_to_ticks(AD_PARTNER_CHURN_TIMER, 0); return; } - if (port->sm_churn_actor_timer_counter && - !(--port->sm_churn_actor_timer_counter) && - port->sm_churn_actor_state =3D=3D AD_CHURN_MONITOR) { - if (port->actor_oper_port_state & LACP_STATE_SYNCHRONIZATION) { - port->sm_churn_actor_state =3D AD_NO_CHURN; - } else { - port->churn_actor_count++; - port->sm_churn_actor_state =3D AD_CHURN; - } + + if (port->sm_churn_actor_timer_counter) + port->sm_churn_actor_timer_counter--; + + if (port->sm_churn_partner_timer_counter) + port->sm_churn_partner_timer_counter--; + + /* ---- 2. timer expired, enter CHURN ---- */ + if (port->sm_churn_actor_state =3D=3D AD_CHURN_MONITOR && + !port->sm_churn_actor_timer_counter) { + port->sm_churn_actor_state =3D AD_CHURN; + port->churn_actor_count++; } - if (port->sm_churn_partner_timer_counter && - !(--port->sm_churn_partner_timer_counter) && - port->sm_churn_partner_state =3D=3D AD_CHURN_MONITOR) { - if (port->partner_oper.port_state & LACP_STATE_SYNCHRONIZATION) { - port->sm_churn_partner_state =3D AD_NO_CHURN; - } else { - port->churn_partner_count++; - port->sm_churn_partner_state =3D AD_CHURN; - } + + if (port->sm_churn_partner_state =3D=3D AD_CHURN_MONITOR && + !port->sm_churn_partner_timer_counter) { + port->sm_churn_partner_state =3D AD_CHURN; + port->churn_partner_count++; + } + + /* ---- 3. CHURN_MONITOR/CHURN + sync -> NO_CHURN ---- */ + if ((port->sm_churn_actor_state =3D=3D AD_CHURN_MONITOR || + port->sm_churn_actor_state =3D=3D AD_CHURN) && actor_synced) + port->sm_churn_actor_state =3D AD_NO_CHURN; + + if ((port->sm_churn_partner_state =3D=3D AD_CHURN_MONITOR || + port->sm_churn_partner_state =3D=3D AD_CHURN) && partner_synced) + port->sm_churn_partner_state =3D AD_NO_CHURN; + + /* ---- 4. NO_CHURN + !sync -> MONITOR ---- */ + if (port->sm_churn_actor_state =3D=3D AD_NO_CHURN && !actor_synced) { + port->sm_churn_actor_state =3D AD_CHURN_MONITOR; + port->sm_churn_actor_timer_counter =3D + __ad_timer_to_ticks(AD_ACTOR_CHURN_TIMER, 0); + } + + if (port->sm_churn_partner_state =3D=3D AD_NO_CHURN && !partner_synced) { + port->sm_churn_partner_state =3D AD_CHURN_MONITOR; + port->sm_churn_partner_timer_counter =3D + __ad_timer_to_ticks(AD_PARTNER_CHURN_TIMER, 0); } } =20 --=20 2.50.1 From nobody Tue Apr 7 15:26:16 2026 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 73C0F2DA76F for ; Thu, 26 Feb 2026 12:54:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772110446; cv=none; b=DgqSbSKSNEl//RGkzNLy2Aly9lUw+h9L7HVMEMgRNr+gR5JZiR7wv1t8IqMYX6V/P81UKwfmKBCyGB2OXNVug7abGRKIIV3lezaf3/w3C60Tq7zLOChD5gmOYvol1/ClM72NpE9QwfvI6d0xASLs8OW9jitn1pLNsP3nxMJ1aQ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772110446; c=relaxed/simple; bh=gjny3v/eTWHbeutrMbxDNE40G5kG1Ylj5usbZJzU9HE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r9PpB9nQvuf81gbugH2swxYydmIihgFiam5lHXbHo/I+azYf6itdZhErX3QbM7stBKVG1EfHj5kQB63tD6Z0zp4qp6pOTNtGwPOg/PgClggAHE/sMRvX6tszCSZpSIvdgaQ3DNm04QlCrRFW/tFL24nqbMGDkEjW/1Jpa3WDW8U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jKBpYqkv; arc=none smtp.client-ip=209.85.215.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jKBpYqkv" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-c70ea5e9e9dso317424a12.1 for ; Thu, 26 Feb 2026 04:54:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772110445; x=1772715245; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OUrXcfq9vgrgpVWA1902DBETXrF91GneB4Umctz9Jao=; b=jKBpYqkvvDZ43qLCn2J9H4npJeUPeMOS9kff2arjTHxORA+TyDvzDTmJKgUR9vSPRM 4kxaXdZRt3EIzDhYrrkDN8izIYcRg0G+M87P/2NZhLN4HFEXjD4M9irA2L2cUoA35++P 7qNvnTGAlRIC2rNm+CsDZtNky5I/iYV6trVfRW+MW607IhCbZxifrp5tfhTd7F0v9kS6 a5V7/hXG9DxaahZ/9s62ioznhaRzRr9dWCSGek4iCBsT4rAmPDeiz1xKg3jXhE3wtQGd pRffVY3Gbg7snti1KKLL8R5lHANi74c95kRZJ9+x10+VoYXeL31TrGPmJw/QCRE/An4Q IIfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772110445; x=1772715245; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=OUrXcfq9vgrgpVWA1902DBETXrF91GneB4Umctz9Jao=; b=g/m6hHpJH0Jxw02Xj34lgprfD6fV+aNxf5dIYIqfdubK1v+Dpd9sAlulmE32ve+ExS Ctjw09+jjox1EXpiQl66MZi8q926/Z7zaqH1fx4+gdwVDLH71lr2mDUs6jlL+ryIRLSJ 2cDWvJ4iOq/EqCJ8TTIqXPLuYw2FEshF2MXenKvf080+19fsFjNWofnZAe0bWcaGd0mj 8LVhc8KQDTTLmLjobZkwa+BaNtfOTouu+sbOf1bkQU4BTb/DGB45HCR/nqjlYOwr55pn F+fh3xHc62Jlx4MQ7bEtmOhl9sboBGgfM9p1E0HSqRpZC1tYsb5QdM7QaKzFJvCIvdiF +7Aw== X-Forwarded-Encrypted: i=1; AJvYcCWIE4by2V+sAeDZc+1I3fCLnyxzrbBqynd43PCQWkE+ez681ibujb4Q/bz0HeAj/u8Y2cC3BcJa7RTip8M=@vger.kernel.org X-Gm-Message-State: AOJu0YwLR4ZtoRFpMUD++aWqgeB4vfEp4gj5kMCuUPwyXchAAh9F7Aye oQn4WNVJKEonlLJ8n7Ja4nj+atQsaQjhA7zLZlvhtg6f9eK+sqRuBzSB X-Gm-Gg: ATEYQzxK/MG0qNTkJiY0lRxRhvf4tK1vLE71bInAIZxjBF7e0xcslX7SUirlbL7HH3x TOHSyqplu6fs3CgMb/pgLLOv3DMTopwWbYOPVrwoPZJQgk1Emd+Ajylswut18iCuoPKMPoZCIx2 SCjNYEVv/qUY5VsdZdLMz8p0lqwoLQ2WdN1f9QDhMezAHYrMRJ+wzB57cj7Jm9KZeQ0Wco05MVC QFO7743jv5lAUJ6oKvNGTzdkuKOvwKivF5R4R4IjV1O+avenuzDsAHkmBTOlZ7nijVusD6YJswE C8O6b+y8XqwQ8ubE6RMVUYLcWSV/7BLkA41lGHhZ2si7Gi3Zr8mq8EFjBzwjcgiPEckEef0mzE5 MLrxtUpu1pYNQMUXh1stwriEyzCXTzrKITKf2uPI70BjHjLFGOMtH5LhoBkaSj3NwobvDk1DmZt ET8XjQFUlhpgyTWiI4zxNWj0B7/Ho= X-Received: by 2002:a17:903:19eb:b0:2ad:99bb:3129 with SMTP id d9443c01a7336-2ade9a9fa34mr42879505ad.50.1772110444926; Thu, 26 Feb 2026 04:54:04 -0800 (PST) Received: from fedora ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2adfb705b53sm25276715ad.92.2026.02.26.04.53.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 04:54:04 -0800 (PST) From: Hangbin Liu To: netdev@vger.kernel.org Cc: Jay Vosburgh , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Nikolay Aleksandrov , Mahesh Bandewar , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Hangbin Liu Subject: [PATCHv3 net 3/3] selftests: bonding: add mux and churn state testing Date: Thu, 26 Feb 2026 12:53:30 +0000 Message-ID: <20260226125331.28147-4-liuhangbin@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260226125331.28147-1-liuhangbin@gmail.com> References: <20260226125331.28147-1-liuhangbin@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename the current LACP priority test to LACP ad_select testing, and extend it to include validation of the actor state machine and churn state logic. The updated tests verify that both the mux state machine and the churn state machine behave correctly under aggregator selection and failover scenarios. Signed-off-by: Hangbin Liu --- .../selftests/drivers/net/bonding/Makefile | 2 +- ...nd_lacp_prio.sh =3D> bond_lacp_ad_select.sh} | 73 +++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) rename tools/testing/selftests/drivers/net/bonding/{bond_lacp_prio.sh =3D>= bond_lacp_ad_select.sh} (64%) diff --git a/tools/testing/selftests/drivers/net/bonding/Makefile b/tools/t= esting/selftests/drivers/net/bonding/Makefile index 6c5c60adb5e8..e7bddfbf0f7a 100644 --- a/tools/testing/selftests/drivers/net/bonding/Makefile +++ b/tools/testing/selftests/drivers/net/bonding/Makefile @@ -7,7 +7,7 @@ TEST_PROGS :=3D \ bond-eth-type-change.sh \ bond-lladdr-target.sh \ bond_ipsec_offload.sh \ - bond_lacp_prio.sh \ + bond_lacp_ad_select.sh \ bond_macvlan_ipvlan.sh \ bond_options.sh \ bond_passive_lacp.sh \ diff --git a/tools/testing/selftests/drivers/net/bonding/bond_lacp_prio.sh = b/tools/testing/selftests/drivers/net/bonding/bond_lacp_ad_select.sh similarity index 64% rename from tools/testing/selftests/drivers/net/bonding/bond_lacp_prio.sh rename to tools/testing/selftests/drivers/net/bonding/bond_lacp_ad_select.sh index a483d505c6a8..9f0b3de4f55c 100755 --- a/tools/testing/selftests/drivers/net/bonding/bond_lacp_prio.sh +++ b/tools/testing/selftests/drivers/net/bonding/bond_lacp_ad_select.sh @@ -89,6 +89,65 @@ test_agg_reselect() RET=3D1 } =20 +is_distributing() +{ + ip -j -n "$c_ns" -d link show "$1" \ + | jq -e '.[].linkinfo.info_slave_data.ad_actor_oper_port_state_str | ind= ex("distributing")' > /dev/null +} + +get_churn_state() +{ + local slave=3D$1 + # shellcheck disable=3DSC2016 + ip netns exec "$c_ns" awk -v s=3D"$slave" ' + $0 ~ "Slave Interface: " s {found=3D1} + found && /Actor Churn State:/ { print $4; exit } + ' /proc/net/bonding/bond0 +} + +check_slave_state() +{ + local state=3D$1 + local slave_0=3D$2 + local slave_1=3D$3 + local churn_state + RET=3D0 + + s0_agg_id=3D$(cmd_jq "ip -n ${c_ns} -d -j link show $slave_0" \ + ".[].linkinfo.info_slave_data.ad_aggregator_id") + s1_agg_id=3D$(cmd_jq "ip -n ${c_ns} -d -j link show $slave_1" \ + ".[].linkinfo.info_slave_data.ad_aggregator_id") + if [ "${s0_agg_id}" -ne "${s1_agg_id}" ]; then + log_info "$state: $slave_0 $slave_1 agg ids are different" + RET=3D1 + fi + + for s in "$slave_0" "$slave_1"; do + churn_state=3D$(get_churn_state "$s") + if [ "$state" =3D "active" ]; then + if ! is_distributing "$s"; then + log_info "$state: $s is not in distributing state" + RET=3D1 + fi + if [ "$churn_state" !=3D "none" ]; then + log_info "$state: $s churn state $churn_state" + RET=3D1 + fi + else + # Backup state, should be in churned and not distributing + if is_distributing "$s"; then + log_info "$state: $s is in distributing state" + RET=3D1 + fi + if [ "$churn_state" !=3D "churned" ]; then + log_info "$state: $s churn state $churn_state" + # shellcheck disable=3DSC2034 + RET=3D1 + fi + fi + done +} + trap cleanup_all_ns EXIT setup_ns c_ns s_ns b_ns setup_links @@ -98,11 +157,25 @@ log_test "bond 802.3ad" "actor_port_prio setting" =20 test_agg_reselect eth0 log_test "bond 802.3ad" "actor_port_prio select" +# sleep for a while to make sure the mux state machine has completed. +sleep 10 +check_slave_state active eth0 eth1 +log_test "bond 802.3ad" "active state/churn checking" +# wait for churn timer expired, need a bit longer as we restart eth1 +sleep 55 +check_slave_state backup eth2 eth3 +log_test "bond 802.3ad" "backup state/churn checking" =20 # Change the actor port prio and re-test ip -n "${c_ns}" link set eth0 type bond_slave actor_port_prio 10 ip -n "${c_ns}" link set eth2 type bond_slave actor_port_prio 1000 test_agg_reselect eth2 log_test "bond 802.3ad" "actor_port_prio switch" +sleep 10 +check_slave_state active eth2 eth3 +log_test "bond 802.3ad" "active state/churn checking" +sleep 55 +check_slave_state backup eth0 eth1 +log_test "bond 802.3ad" "backup state/churn checking" =20 exit "${EXIT_STATUS}" --=20 2.50.1