From 1c9e6fb6adff458df2916c581526aa4ca3bcbe56 Mon Sep 17 00:00:00 2001

From: Mahesh Bandewar <maheshb@google.com>

Date: Mon, 7 Feb 2022 14:29:01 -0800

Subject: [PATCH 1/8] bonding: pair enable_port with slave_arr_updates

Git-commit: 23de0d7b6f0e3f9a6283a882594c479949da1120

Patch-mainline: v5.17-rc4

References: git-fixes

When 803.2ad mode enables a participating port, it should update

the slave-array. I have observed that the member links are participating

and are part of the active aggregator while the traffic is egressing via

only one member link (in a case where two links are participating). Via

kprobes I discovered that slave-arr has only one link added while

the other participating link wasn't part of the slave-arr.

I couldn't see what caused that situation but the simple code-walk

through provided me hints that the enable_port wasn't always associated

with the slave-array update.

Fixes: ee6377147409 ("bonding: Simplify the xmit function for modes that use xmit_hash")

Signed-off-by: Mahesh Bandewar <maheshb@google.com>

Acked-by: Jay Vosburgh <jay.vosburgh@canonical.com>

Link: https://lore.kernel.org/r/20220207222901.1795287-1-maheshb@google.com

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>

---

 drivers/net/bonding/bond_3ad.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c

index 69b4eaca8956..e08d479f4d07 100644

--- a/drivers/net/bonding/bond_3ad.c

+++ b/drivers/net/bonding/bond_3ad.c

@@ -1007,8 +1007,8 @@ static void ad_mux_machine(struct port *port, bool *update_slave_arr)

 				if (port->aggregator &&

 				    port->aggregator->is_active &&

 				    !__port_is_enabled(port)) {

-

 					__enable_port(port);

+					*update_slave_arr = true;

 				}

 			}

 			break;

@@ -1755,6 +1755,7 @@ static void ad_agg_selection_logic(struct aggregator *agg,

 			     port = port->next_port_in_aggregator) {

 				__enable_port(port);

 			}

+			*update_slave_arr = true;

 		}

 	}

-- 

2.16.4