Message ID | 20100917132219.GA2363813@jupiter.n2.diac24.net |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: David Lamparter <equinox@diac24.net> Date: Fri, 17 Sep 2010 15:22:19 +0200 > previously, if a vlan master device was moved from one network namespace > to another, all 802.1q and macvlan slaves were deleted. > > we can use dev->reg_state to figure out whether dev_change_net_namespace > is happening, since that won't set dev->reg_state NETREG_UNREGISTERING. > so, this changes 8021q and macvlan to ignore NETDEV_UNREGISTER when > reg_state is not NETREG_UNREGISTERING. > > Signed-off-by: David Lamparter <equinox@diac24.net> > Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com> > Acked-by: Daniel Lezcano <daniel.lezcano@free.fr> > Acked-by: Patrick McHardy <kaber@trash.net> > --- > Hi David, > > Q)ueue, F)eedback, A)pply? I'll apply this when I get a chance, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index f15fe2c..f43f8e4 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -754,6 +754,10 @@ static int macvlan_device_event(struct notifier_block *unused, } break; case NETDEV_UNREGISTER: + /* twiddle thumbs on netns device moves */ + if (dev->reg_state != NETREG_UNREGISTERING) + break; + list_for_each_entry_safe(vlan, next, &port->vlans, list) vlan->dev->rtnl_link_ops->dellink(vlan->dev, NULL); break; diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 3c1c8c1..cdc37e8 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -516,6 +516,10 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event, break; case NETDEV_UNREGISTER: + /* twiddle thumbs on netns device moves */ + if (dev->reg_state != NETREG_UNREGISTERING) + break; + /* Delete all VLANs for this dev. */ grp->killall = 1; diff --git a/net/core/dev.c b/net/core/dev.c index 1f466e8..b1589bc 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5618,6 +5618,10 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char /* Notify protocols, that we are about to destroy this device. They should clean all the things. + + Note that dev->reg_state stays at NETREG_REGISTERED. + This is wanted because this way 8021q and macvlan know + the device is just moving and can keep their slaves up. */ call_netdevice_notifiers(NETDEV_UNREGISTER, dev); call_netdevice_notifiers(NETDEV_UNREGISTER_BATCH, dev);