| Message ID | 20220129055815.694469-1-maheshb@google.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2,net-next] bonding: pair enable_port with slave_arr_updates | expand |
Mahesh Bandewar <maheshb@google.com> wrote: >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 >krpobes I discovered that 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. > >Change-Id: I6c9ed91b027d53580734f1198579e71deee60bbf >Signed-off-by: Mahesh Bandewar <maheshb@google.com> Please remove the Change-Id line. >--- > drivers/net/bonding/bond_3ad.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > >diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c >index 6006c2e8fa2b..4d876bfa0c00 100644 >--- a/drivers/net/bonding/bond_3ad.c >+++ b/drivers/net/bonding/bond_3ad.c >@@ -1021,8 +1021,9 @@ 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); >+ /* Slave array needs update */ >+ *update_slave_arr = true; Given the name of the variable here, I think the comment is superfluous (both here and the change below). Functionally, though, I think the change is reasonable. Could you fix these two nits and repost? -J > } > } > break; >@@ -1779,6 +1780,8 @@ static void ad_agg_selection_logic(struct aggregator *agg, > port = port->next_port_in_aggregator) { > __enable_port(port); > } >+ /* Slave array needs update. */ >+ *update_slave_arr = true; > } > } > >-- >2.35.0.rc2.247.g8bbb082509-goog > --- -Jay Vosburgh, jay.vosburgh@canonical.com
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index 6006c2e8fa2b..4d876bfa0c00 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -1021,8 +1021,9 @@ 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); + /* Slave array needs update */ + *update_slave_arr = true; } } break; @@ -1779,6 +1780,8 @@ static void ad_agg_selection_logic(struct aggregator *agg, port = port->next_port_in_aggregator) { __enable_port(port); } + /* Slave array needs update. */ + *update_slave_arr = true; } }
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 krpobes I discovered that 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. Change-Id: I6c9ed91b027d53580734f1198579e71deee60bbf Signed-off-by: Mahesh Bandewar <maheshb@google.com> --- drivers/net/bonding/bond_3ad.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)