search for: devnet_rename_seq

...e 1197 * name change, as they are only expected to operate 1198 * on master interface directly. 1199 */ 1200 if (dev->flags & IFF_UP && 1201 likely(!(dev->priv_flags & IFF_FAILOVER_SLAVE))) 1202 return -EBUSY; 1203 1204 write_seqcount_begin(&devnet_rename_seq); 1205 1206 if (strncmp(newname, dev->name, IFNAMSIZ) == 0) { 1207 write_seqcount_end(&devnet_rename_seq); 1208 return 0; 1209 } 1210 1211 memcpy(oldname, dev->name, IFNAMSIZ); 1212 1213 err = dev_get_valid_name(net, dev, newname); 1214 if (err < 0) {...

...re only expected to operate 1199 * on master interface directly. 1200 */ 1201 if (dev->flags & IFF_UP) { 1202 if (likely(!(dev->priv_flags & IFF_FAILOVER_SLAVE))) 1203 return -EBUSY; 1204 reopen_needed = true; 1205 } 1206 1207 write_seqcount_begin(&devnet_rename_seq); 1208 1209 if (strncmp(newname, dev->name, IFNAMSIZ) == 0) { 1210 write_seqcount_end(&devnet_rename_seq); 1211 return 0; 1212 } 1213 1214 memcpy(oldname, dev->name, IFNAMSIZ); 1215 1216 err = dev_get_valid_name(net, dev, newname); 1217 if (err < 0) {...

...change, as they are only expected to operate >+ * on master interface directly. >+ */ >+ if (dev->flags & IFF_UP) { >+ if (likely(!(dev->priv_flags & IFF_FAILOVER_SLAVE))) >+ return -EBUSY; >+ reopen_needed = true; >+ } > > write_seqcount_begin(&devnet_rename_seq); > >@@ -1198,6 +1215,9 @@ int dev_change_name(struct net_device *dev, const char *newname) > return err; > } > >+ if (reopen_needed) >+ dev_close(dev); Ugh. Don't dev_close/dev_open on name change. >+ > if (oldname[0] && !strchr(oldname, '%'...

...ev, const char *newname) > BUG_ON(!dev_net(dev)); > > net = dev_net(dev); > - if (dev->flags & IFF_UP) > + if (dev->flags & IFF_UP && > + !(dev->priv_flags & IFF_SLAVE_RENAME_OK)) > return -EBUSY; > > write_seqcount_begin(&devnet_rename_seq); > diff --git a/net/core/failover.c b/net/core/failover.c > index 4a92a98..34c5c87 100644 > --- a/net/core/failover.c > +++ b/net/core/failover.c > @@ -80,14 +80,14 @@ static int failover_slave_register(struct net_device *slave_dev) > goto err_upper_link; > } > >...

...ev, const char *newname) > BUG_ON(!dev_net(dev)); > > net = dev_net(dev); > - if (dev->flags & IFF_UP) > + if (dev->flags & IFF_UP && > + !(dev->priv_flags & IFF_SLAVE_RENAME_OK)) > return -EBUSY; > > write_seqcount_begin(&devnet_rename_seq); > diff --git a/net/core/failover.c b/net/core/failover.c > index 4a92a98..34c5c87 100644 > --- a/net/core/failover.c > +++ b/net/core/failover.c > @@ -80,14 +80,14 @@ static int failover_slave_register(struct net_device *slave_dev) > goto err_upper_link; > } > >...

...slave > + * name change, as they are only expected to operate > + * on master interface directly. > + */ > + if (dev->flags & IFF_UP && > + likely(!(dev->priv_flags & IFF_FAILOVER_SLAVE))) > return -EBUSY; > > write_seqcount_begin(&devnet_rename_seq); > @@ -1232,6 +1246,15 @@ int dev_change_name(struct net_device *dev, const char *newname) > hlist_add_head_rcu(&dev->name_hlist, dev_name_hash(net, dev->name)); > write_unlock_bh(&dev_base_lock); > > + if (unlikely(dev->flags & IFF_UP)) { > + struc...

...out slave > + * name change, as they are only expected to operate > + * on master interface directly. > + */ > + if (dev->flags & IFF_UP && > + likely(!(dev->priv_flags & IFF_FAILOVER_SLAVE))) > return -EBUSY; > > write_seqcount_begin(&devnet_rename_seq); > @@ -1232,6 +1246,15 @@ int dev_change_name(struct net_device *dev, const char *newname) > hlist_add_head_rcu(&dev->name_hlist, dev_name_hash(net, dev->name)); > write_unlock_bh(&dev_base_lock); > > + if (unlikely(dev->flags & IFF_UP)) { > + struct n...

...slave > + * name change, as they are only expected to operate > + * on master interface directly. > + */ > + if (dev->flags & IFF_UP && > + likely(!(dev->priv_flags & IFF_FAILOVER_SLAVE))) > return -EBUSY; > > write_seqcount_begin(&devnet_rename_seq); > @@ -1227,6 +1241,14 @@ int dev_change_name(struct net_device *dev, const char *newname) > hlist_add_head_rcu(&dev->name_hlist, dev_name_hash(net, dev->name)); > write_unlock_bh(&dev_base_lock); > > + if (unlikely(dev->flags & IFF_UP)) { > + struc...

...rectly. > >> + */ > >> + if (dev->flags & IFF_UP) { > >> + if (likely(!(dev->priv_flags & IFF_FAILOVER_SLAVE))) > >> + return -EBUSY; > >> + reopen_needed = true; > >> + } > >> > >> write_seqcount_begin(&devnet_rename_seq); > >> > >> @@ -1198,6 +1215,9 @@ int dev_change_name(struct net_device *dev, const char *newname) > >> return err; > >> } > >> > >> + if (reopen_needed) > >> + dev_close(dev); > > Ugh. Don't dev_close/dev_open on name c...

...; > + * on master interface directly. > > > + */ > > > + if (dev->flags & IFF_UP && > > > + likely(!(dev->priv_flags & IFF_FAILOVER_SLAVE))) > > > return -EBUSY; > > > write_seqcount_begin(&devnet_rename_seq); > > > @@ -1227,6 +1241,14 @@ int dev_change_name(struct net_device *dev, > > > const char *newname) > > > hlist_add_head_rcu(&dev->name_hlist, dev_name_hash(net, > > > dev->name)); > > > write_unlock_bh(&dev_base_lock); > &...

...mp;& > + !(dev->priv_flags & IFF_SLAVE_RENAME_OK)) > return -EBUSY; Without the configurable module parameter, i think we don't even need the new SLAVE_RENAME_OK private flag. Can't we simply check for IFF_FAILOVER_SLAVE ? > > write_seqcount_begin(&devnet_rename_seq); > diff --git a/net/core/failover.c b/net/core/failover.c > index 4a92a98..34c5c87 100644 > --- a/net/core/failover.c > +++ b/net/core/failover.c > @@ -80,14 +80,14 @@ static int failover_slave_register(struct net_device *slave_dev) > goto err_upper_link; > } > &g...

...device *dev, const char *newname) > BUG_ON(!dev_net(dev)); > > net = dev_net(dev); >- if (dev->flags & IFF_UP) >+ if (dev->flags & IFF_UP && >+ !(dev->priv_flags & IFF_SLAVE_RENAME_OK)) > return -EBUSY; > > write_seqcount_begin(&devnet_rename_seq); >diff --git a/net/core/failover.c b/net/core/failover.c >index 4a92a98..1fd8bbb 100644 >--- a/net/core/failover.c >+++ b/net/core/failover.c >@@ -16,6 +16,11 @@ > > static LIST_HEAD(failover_list); > static DEFINE_SPINLOCK(failover_lock); >+static bool slave_rename_ok...

...ev, const char *newname) > BUG_ON(!dev_net(dev)); > > net = dev_net(dev); > - if (dev->flags & IFF_UP) > + if (dev->flags & IFF_UP && > + !(dev->priv_flags & IFF_SLAVE_RENAME_OK)) > return -EBUSY; > > write_seqcount_begin(&devnet_rename_seq); > diff --git a/net/core/failover.c b/net/core/failover.c > index 4a92a98..1fd8bbb 100644 > --- a/net/core/failover.c > +++ b/net/core/failover.c > @@ -16,6 +16,11 @@ > > static LIST_HEAD(failover_list); > static DEFINE_SPINLOCK(failover_lock); > +static bool slave_r...

...gt; BUG_ON(!dev_net(dev)); >> >> net = dev_net(dev); >> - if (dev->flags & IFF_UP) >> + if (dev->flags & IFF_UP && >> + !(dev->priv_flags & IFF_SLAVE_RENAME_OK)) >> return -EBUSY; >> >> write_seqcount_begin(&devnet_rename_seq); >> diff --git a/net/core/failover.c b/net/core/failover.c >> index 4a92a98..34c5c87 100644 >> --- a/net/core/failover.c >> +++ b/net/core/failover.c >> @@ -80,14 +80,14 @@ static int failover_slave_register(struct net_device *slave_dev) >> goto err_upper_link...

...hough without configurable >> module parameter. This has clear semantics that helps decouple >> behavior against specific link type, and may benefit other >> auto-enslaved netdevs as well. >> >> -Siwei >> >>> >>>> write_seqcount_begin(&devnet_rename_seq); >>>> diff --git a/net/core/failover.c b/net/core/failover.c >>>> index 4a92a98..34c5c87 100644 >>>> --- a/net/core/failover.c >>>> +++ b/net/core/failover.c >>>> @@ -80,14 +80,14 @@ static int failover_slave_register(struct >>>...

...; > >> net = dev_net(dev); > >> - if (dev->flags & IFF_UP) > >> + if (dev->flags & IFF_UP && > >> + !(dev->priv_flags & IFF_SLAVE_RENAME_OK)) > >> return -EBUSY; > >> > >> write_seqcount_begin(&devnet_rename_seq); > >> diff --git a/net/core/failover.c b/net/core/failover.c > >> index 4a92a98..34c5c87 100644 > >> --- a/net/core/failover.c > >> +++ b/net/core/failover.c > >> @@ -80,14 +80,14 @@ static int failover_slave_register(struct net_device *slave_dev) >...

...re about slave name change, as > + * they are supposed to operate on master interface > + * directly. > + */ > + if (dev->flags & IFF_UP && > + likely(!(dev->priv_flags & IFF_LIVE_RENAME_OK))) > return -EBUSY; > > write_seqcount_begin(&devnet_rename_seq); > diff --git a/net/core/failover.c b/net/core/failover.c > index 4a92a98..b5cd3c7 100644 > --- a/net/core/failover.c > +++ b/net/core/failover.c > @@ -80,14 +80,14 @@ static int failover_slave_register(struct net_device *slave_dev) > goto err_upper_link; > } > >...

...re about slave name change, as > + * they are supposed to operate on master interface > + * directly. > + */ > + if (dev->flags & IFF_UP && > + likely(!(dev->priv_flags & IFF_LIVE_RENAME_OK))) > return -EBUSY; > > write_seqcount_begin(&devnet_rename_seq); > diff --git a/net/core/failover.c b/net/core/failover.c > index 4a92a98..b5cd3c7 100644 > --- a/net/core/failover.c > +++ b/net/core/failover.c > @@ -80,14 +80,14 @@ static int failover_slave_register(struct net_device *slave_dev) > goto err_upper_link; > } > >...

...ev)); > > > net = dev_net(dev); > > > - if (dev->flags & IFF_UP) > > > + if (dev->flags & IFF_UP && > > > + !(dev->priv_flags & IFF_SLAVE_RENAME_OK)) > > > return -EBUSY; > > > write_seqcount_begin(&devnet_rename_seq); > > > diff --git a/net/core/failover.c b/net/core/failover.c > > > index 4a92a98..1fd8bbb 100644 > > > --- a/net/core/failover.c > > > +++ b/net/core/failover.c > > > @@ -16,6 +16,11 @@ > > > static LIST_HEAD(failover_list); > > >...

...about slave name change, as > + * they are supposed to operate on master interface > + * directly. > + */ > + if (dev->flags & IFF_UP && > + likely(!(dev->priv_flags & IFF_LIVE_NAME_CHANGE))) > return -EBUSY; > > write_seqcount_begin(&devnet_rename_seq); > @@ -1232,6 +1246,15 @@ int dev_change_name(struct net_device *dev, const char *newname) > hlist_add_head_rcu(&dev->name_hlist, dev_name_hash(net, dev->name)); > write_unlock_bh(&dev_base_lock); > > + if (unlikely(dev->flags & IFF_UP)) { > + struct n...