* [PATCH net-next] bonding: handle slave's name change with primary_slave logic
@ 2014-01-14 10:50 Veaceslav Falico
2014-01-14 11:50 ` Veaceslav Falico
0 siblings, 1 reply; 2+ messages in thread
From: Veaceslav Falico @ 2014-01-14 10:50 UTC (permalink / raw)
To: netdev; +Cc: Veaceslav Falico, Ding Tianhong, Jay Vosburgh, Andy Gospodarek
Currently, if a slave's name change, we just pass it by. However, if the
slave is a current primary_slave, then we end up with using a slave, whose
name != params.primary, for primary_slave. And vice-versa, if we don't have
a primary_slave but have params.primary set - we will not detected a new
primary_slave.
Fix this by catching the NETDEV_CHANGENAME event and setting primary_slave
accordingly. Also, if the primary_slave was changed, issue a reselection of
the active slave, cause the priorities have changed.
Reported-by: Ding Tianhong <dingtianhong@huawei.com>
CC: Ding Tianhong <dingtianhong@huawei.com>
CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
---
drivers/net/bonding/bond_main.c | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index e06c445..b16d7ec 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2860,9 +2860,26 @@ static int bond_slave_netdev_event(unsigned long event,
*/
break;
case NETDEV_CHANGENAME:
- /*
- * TODO: handle changing the primary's name
- */
+ /* we don't care if we don't have primary set */
+ if (!USES_PRIMARY(bond->params.mode) ||
+ !bond->params.primary[0])
+ break;
+
+ if (slave == bond->primary_slave) {
+ /* slave's name changed - he's no longer primary */
+ bond->primary_slave = NULL;
+ } else if (!strcmp(slave_dev->name, bond->params.primary)( {
+ /* we have a new primary slave */
+ bond->primary_slave = slave;
+ } else /* we didn't change primary - exit */
+ break;
+
+ pr_info("%s: Primary slave changed to %s, re-electing.\n",
+ bond->dev->name, bond->primary_slave ? slave_dev->name :
+ "none");
+ 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);
--
1.8.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] bonding: handle slave's name change with primary_slave logic
2014-01-14 10:50 [PATCH net-next] bonding: handle slave's name change with primary_slave logic Veaceslav Falico
@ 2014-01-14 11:50 ` Veaceslav Falico
0 siblings, 0 replies; 2+ messages in thread
From: Veaceslav Falico @ 2014-01-14 11:50 UTC (permalink / raw)
To: netdev; +Cc: Ding Tianhong, Jay Vosburgh, Andy Gospodarek
On Tue, Jan 14, 2014 at 11:50:45AM +0100, Veaceslav Falico wrote:
>Currently, if a slave's name change, we just pass it by. However, if the
>slave is a current primary_slave, then we end up with using a slave, whose
>name != params.primary, for primary_slave. And vice-versa, if we don't have
>a primary_slave but have params.primary set - we will not detected a new
>primary_slave.
>
>Fix this by catching the NETDEV_CHANGENAME event and setting primary_slave
>accordingly. Also, if the primary_slave was changed, issue a reselection of
>the active slave, cause the priorities have changed.
>
>Reported-by: Ding Tianhong <dingtianhong@huawei.com>
>CC: Ding Tianhong <dingtianhong@huawei.com>
>CC: Jay Vosburgh <fubar@us.ibm.com>
>CC: Andy Gospodarek <andy@greyhouse.net>
>Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Self-NAK, too busy reviewing other patches.
Sent v2.
>---
> drivers/net/bonding/bond_main.c | 23 ++++++++++++++++++++---
> 1 file changed, 20 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
>index e06c445..b16d7ec 100644
>--- a/drivers/net/bonding/bond_main.c
>+++ b/drivers/net/bonding/bond_main.c
>@@ -2860,9 +2860,26 @@ static int bond_slave_netdev_event(unsigned long event,
> */
> break;
> case NETDEV_CHANGENAME:
>- /*
>- * TODO: handle changing the primary's name
>- */
>+ /* we don't care if we don't have primary set */
>+ if (!USES_PRIMARY(bond->params.mode) ||
>+ !bond->params.primary[0])
>+ break;
>+
>+ if (slave == bond->primary_slave) {
>+ /* slave's name changed - he's no longer primary */
>+ bond->primary_slave = NULL;
>+ } else if (!strcmp(slave_dev->name, bond->params.primary)( {
>+ /* we have a new primary slave */
>+ bond->primary_slave = slave;
>+ } else /* we didn't change primary - exit */
>+ break;
>+
>+ pr_info("%s: Primary slave changed to %s, re-electing.\n",
>+ bond->dev->name, bond->primary_slave ? slave_dev->name :
>+ "none");
>+ 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);
>--
>1.8.4
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-14 11:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-14 10:50 [PATCH net-next] bonding: handle slave's name change with primary_slave logic Veaceslav Falico
2014-01-14 11:50 ` Veaceslav Falico
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.