Skip to contentSkip to conversation

bonding: update the primary slave when slave's name changed

PATCH Superseded Ding Tianhong 2 participants 3 messages Jan 14, 2014

Subsystems (3)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 bonding: update the primary slave when slave's name changed

If the slave's name changed, and the bond params primary is exist, the bond should deal with the situation in two ways:

1) If the slave is the primary slave yet, clean the primary slave and reselect active slave.
2) If the slave's new name is as same as bond primary, set the slave as primary slave and reselect active slave.

Thanks for Veaceslav's suggestion.

---
 drivers/net/bonding/bond_main.c | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)
drivers/net/bonding/bond_main.c +28 -2
index e06c445..63d6533 100644
@@ -2860,9 +2860,35 @@ static int bond_slave_netdev_event(unsigned long event,
 		 */
 		break;
 	case NETDEV_CHANGENAME:
-		/*
-		 * TODO: handle changing the primary's name
+		/* Handle changing the slave's name:
+		 * 1) If the slave is primary save yet,
+		 * clean the primary slave and reselect
+		 * active slave.
+		 * 2) If the slave's new name is bond
+		 * primary, set the slave as primary
+		 * slave and reselect active slave.
 		 */
+		if (USES_PRIMARY(bond->params.mode) &&
+		    bond->params.primary[0]) {
+			if (bond->primary_slave &&
+			    slave == bond->primary_slave) {
+				pr_info("%s: Setting primary slave to None.\n",
+					bond->dev->name);
+				bond->primary_slave = NULL;
+				write_lock_bh(&bond->curr_slave_lock);
+				bond_select_active_slave(bond);
+				write_unlock_bh(&bond->curr_slave_lock);
+			} else if (!bond->primary_slave &&
+				   !strcmp(bond->params.primary,
+					  slave_dev->name)) {
+				pr_info("%s: Setting %s as primary slave.\n",
+					bond->dev->name, slave_dev->name);
+				bond->primary_slave = slave;
+				write_lock_bh(&bond->curr_slave_lock);
+				bond_select_active_slave(bond);
+				write_unlock_bh(&bond->curr_slave_lock);
+			}
+		}
 		break;
 	case NETDEV_FEAT_CHANGE:
 		bond_compute_features(bond);
Signature · 1 line
1.8.0
#1 lore raw
Quoted 11 lines · Ding Tianhong

If the slave's name changed, and the bond params primary is exist, the bond should deal with the situation in two ways:

1) If the slave is the primary slave yet, clean the primary slave and reselect active slave.
2) If the slave's new name is as same as bond primary, set the slave as primary slave and reselect active slave.

Thanks for Veaceslav's suggestion.

As in my previous email - please, don't use my name until I say so.

I'll add my signed-off-by to any patch that I've worked enough on.

Quoted 10 lines

---
drivers/net/bonding/bond_main.c | 30 ++++++++++++++++++++++++++++--

1 file changed, 28 insertions(+), 2 deletions(-)
drivers/net/bonding/bond_main.c +0 -0
index e06c445..63d6533 100644

drivers/net/bonding/bond_main.c static int bond_slave_netdev_event(unsigned long event, · line 2866

Quoted 9 lines
drivers/net/bonding/bond_main.c +4 -2
@@ -2860,9 +2860,35 @@ static int bond_slave_netdev_event(unsigned long event,
 		 */
 		break;
 	case NETDEV_CHANGENAME:
-		/*
-		 * TODO: handle changing the primary's name
+		/* Handle changing the slave's name:
+		 * 1) If the slave is primary save yet,
+		 * clean the primary slave and reselect
+		 * active slave.

I usually don't mind bad english (as I myself am speaking quite horrible one), but I can't really understand what you've meant here. And given that it's a comment in code - please, proof-read it first.

drivers/net/bonding/bond_main.c static int bond_slave_netdev_event(unsigned long event, · line 2872

Quoted 6 lines
drivers/net/bonding/bond_main.c +5 -0
+		 * 2) If the slave's new name is bond
+		 * primary, set the slave as primary
+		 * slave and reselect active slave.
 		 */
+		if (USES_PRIMARY(bond->params.mode) &&
+		    bond->params.primary[0]) {

Too many indentions. Verify if we're not using primary or primary string name is null and break, otherwise go further.

drivers/net/bonding/bond_main.c static int bond_slave_netdev_event(unsigned long event, · line 2874

Quoted 2 lines
drivers/net/bonding/bond_main.c +2 -0
+			if (bond->primary_slave &&
+			    slave == bond->primary_slave) {

Useless verification, slave can't be NULL.

drivers/net/bonding/bond_main.c static int bond_slave_netdev_event(unsigned long event, · line 2879

Quoted 5 lines
drivers/net/bonding/bond_main.c +5 -0
+				pr_info("%s: Setting primary slave to None.\n",
+					bond->dev->name);
+				bond->primary_slave = NULL;
+				write_lock_bh(&bond->curr_slave_lock);
+				bond_select_active_slave(bond);

Get bond_select_active_slave() out of if()s, you use it twice here.

drivers/net/bonding/bond_main.c static int bond_slave_netdev_event(unsigned long event, · line 2881

Quoted 2 lines
drivers/net/bonding/bond_main.c +2 -0
+				write_unlock_bh(&bond->curr_slave_lock);
+			} else if (!bond->primary_slave &&

Useless verification, if the name of a slave changed to our params.primary
- then it means that bond->primary_slave was NULL, as it can only be not-null when we have a matching interface, and that would mean that we have two interfaces with the same name.

Quoted 17 lines
drivers/net/bonding/bond_main.c +10 -0
+				   !strcmp(bond->params.primary,
+					  slave_dev->name)) {
+				pr_info("%s: Setting %s as primary slave.\n",
+					bond->dev->name, slave_dev->name);
+				bond->primary_slave = slave;
+				write_lock_bh(&bond->curr_slave_lock);
+				bond_select_active_slave(bond);
+				write_unlock_bh(&bond->curr_slave_lock);
+			}
+		}
 		break;
 	case NETDEV_FEAT_CHANGE:
 		bond_compute_features(bond);
Signature · 1 line
1.8.0
#2 lore raw
Quoted 64 lines · Veaceslav Falico
Quoted 11 lines · Ding Tianhong

If the slave's name changed, and the bond params primary is exist, the bond should deal with the situation in two ways:

1) If the slave is the primary slave yet, clean the primary slave and reselect active slave.
2) If the slave's new name is as same as bond primary, set the slave as primary slave and reselect active slave.

Thanks for Veaceslav's suggestion.

As in my previous email - please, don't use my name until I say so.

I'll add my signed-off-by to any patch that I've worked enough on.

Quoted 10 lines

---
drivers/net/bonding/bond_main.c | 30 ++++++++++++++++++++++++++++--

1 file changed, 28 insertions(+), 2 deletions(-)
drivers/net/bonding/bond_main.c +0 -0
index e06c445..63d6533 100644

drivers/net/bonding/bond_main.c static int bond_slave_netdev_event(unsigned long event, · line 2866

Quoted 9 lines
drivers/net/bonding/bond_main.c +4 -2
@@ -2860,9 +2860,35 @@ static int bond_slave_netdev_event(unsigned long event,
         */
        break;
    case NETDEV_CHANGENAME:
-        /*
-         * TODO: handle changing the primary's name
+        /* Handle changing the slave's name:
+         * 1) If the slave is primary save yet,
+         * clean the primary slave and reselect
+         * active slave.

I usually don't mind bad english (as I myself am speaking quite horrible one), but I can't really understand what you've meant here. And given that it's a comment in code - please, proof-read it first.

drivers/net/bonding/bond_main.c static int bond_slave_netdev_event(unsigned long event, · line 2872

Quoted 6 lines
drivers/net/bonding/bond_main.c +5 -0
+         * 2) If the slave's new name is bond
+         * primary, set the slave as primary
+         * slave and reselect active slave.
         */
+        if (USES_PRIMARY(bond->params.mode) &&
+            bond->params.primary[0]) {

Too many indentions. Verify if we're not using primary or primary string name is null and break, otherwise go further.

drivers/net/bonding/bond_main.c static int bond_slave_netdev_event(unsigned long event, · line 2874

Quoted 2 lines
drivers/net/bonding/bond_main.c +2 -0
+            if (bond->primary_slave &&
+                slave == bond->primary_slave) {

Useless verification, slave can't be NULL.

drivers/net/bonding/bond_main.c static int bond_slave_netdev_event(unsigned long event, · line 2879

Quoted 5 lines
drivers/net/bonding/bond_main.c +5 -0
+                pr_info("%s: Setting primary slave to None.\n",
+                    bond->dev->name);
+                bond->primary_slave = NULL;
+                write_lock_bh(&bond->curr_slave_lock);
+                bond_select_active_slave(bond);

Get bond_select_active_slave() out of if()s, you use it twice here.

Quoted 26 lines

drivers/net/bonding/bond_main.c static int bond_slave_netdev_event(unsigned long event, · line 2881

Quoted 2 lines
drivers/net/bonding/bond_main.c +2 -0
+                write_unlock_bh(&bond->curr_slave_lock);
+            } else if (!bond->primary_slave &&

Useless verification, if the name of a slave changed to our params.primary
- then it means that bond->primary_slave was NULL, as it can only be not-null when we have a matching interface, and that would mean that we have two interfaces with the same name.

Quoted 17 lines
drivers/net/bonding/bond_main.c +10 -0
+                   !strcmp(bond->params.primary,
+                      slave_dev->name)) {
+                pr_info("%s: Setting %s as primary slave.\n",
+                    bond->dev->name, slave_dev->name);
+                bond->primary_slave = slave;
+                write_lock_bh(&bond->curr_slave_lock);
+                bond_select_active_slave(bond);
+                write_unlock_bh(&bond->curr_slave_lock);
+            }
+        }
        break;
    case NETDEV_FEAT_CHANGE:
        bond_compute_features(bond);
Signature · 1 line
1.8.0

fix in v2, thanks.

Regards
Ding

Quoted 2 lines

.