Messages in this thread Patch in this message | | | From | jin yiting <> | Subject | bonding: 3ad: update slave arr after initialize | Date | Thu, 15 Apr 2021 14:59:49 +0800 |
| |
From 71e63af579edd15ad7f7395760a19f67d9a1d7d3 Mon Sep 17 00:00:00 2001 From: jin yiting <jinyiting@huawei.com> Date: Wed, 31 Mar 2021 20:38:40 +0800 Subject: [PATCH] bonding: 3ad: update slave arr after initialize MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
The bond works in mode 4, and performs down/up operations on the bond that is normally negotiated. The probability of bond-> slave_arr is NULL
Test commands: ifconfig bond1 down ifconfig bond1 up
The conflict occurs in the following process:
__dev_open (CPU A) --bond_open --queue_delayed_work(bond->wq,&bond->ad_work,0); --bond_update_slave_arr --bond_3ad_get_active_agg_info
ad_work(CPU B) --bond_3ad_state_machine_handler --ad_agg_selection_logic
ad_work runs on cpu B. In the function ad_agg_selection_logic, all agg->is_active will be cleared. Before the new active aggregator is selected on CPU B, bond_3ad_get_active_agg_info failed on CPU A, bond->slave_arr will be set to NULL. The best aggregator in ad_agg_selection_logic has not changed, no need to update slave arr.
Signed-off-by: jin yiting <jinyiting@huawei.com> --- drivers/net/bonding/bond_3ad.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index 6908822..d100079 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -2327,6 +2327,12 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
aggregator = __get_first_agg(port); ad_agg_selection_logic(aggregator, &update_slave_arr); + if (!update_slave_arr) { + struct aggregator *active = __get_active_agg(aggregator); + + if (active && active->is_active) + update_slave_arr = true; + } } bond_3ad_set_carrier(bond); } -- 1.7.12.4
| |