netvsc: delay setup of VF device

When VF device is discovered, delay bring it automatically up in
order to allow userspace to some simple changes (like renaming).

Reported-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 98b25f6900c843eb61e1fa9736a7726457f54908..a57e37641dc5cf1fb37aa0a5b5d389017f57e84a 100644 (file)
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -723,7 +723,7 @@ struct net_device_context {
        /* State to manage the associated VF interface. */
        struct net_device __rcu *vf_netdev;
        struct netvsc_vf_pcpu_stats __percpu *vf_stats;
-       struct work_struct vf_takeover;
+       struct delayed_work vf_takeover;
 
        /* 1: allocated, serial number is valid. 0: not allocated */
        u32 vf_alloc;

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index eb0023f55fe1b3f67c39313e47697f834ee373e3..e059375a6d8cd801fe4ff1e6bf6858bb5ba6be64 100644 (file)
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -47,6 +47,7 @@
 
 #define RING_SIZE_MIN 64
 #define LINKCHANGE_INT (2 * HZ)
+#define VF_TAKEOVER_INT (HZ / 10)
 
 static int ring_size = 128;
 module_param(ring_size, int, S_IRUGO);
@@ -1559,7 +1560,9 @@ static int netvsc_vf_join(struct net_device *vf_netdev,
        /* set slave flag before open to prevent IPv6 addrconf */
        vf_netdev->flags |= IFF_SLAVE;
 
-       schedule_work(&ndev_ctx->vf_takeover);
+       schedule_delayed_work(&ndev_ctx->vf_takeover, VF_TAKEOVER_INT);
+
+       call_netdevice_notifiers(NETDEV_JOIN, vf_netdev);
 
        netdev_info(vf_netdev, "joined to %s\n", ndev->name);
        return 0;
@@ -1575,8 +1578,6 @@ static void __netvsc_vf_setup(struct net_device *ndev,
 {
        int ret;
 
-       call_netdevice_notifiers(NETDEV_JOIN, vf_netdev);
-
        /* Align MTU of VF with master */
        ret = dev_set_mtu(vf_netdev, ndev->mtu);
        if (ret)
@@ -1597,12 +1598,12 @@ static void __netvsc_vf_setup(struct net_device *ndev,
 static void netvsc_vf_setup(struct work_struct *w)
 {
        struct net_device_context *ndev_ctx
-               = container_of(w, struct net_device_context, vf_takeover);
+               = container_of(w, struct net_device_context, vf_takeover.work);
        struct net_device *ndev = hv_get_drvdata(ndev_ctx->device_ctx);
        struct net_device *vf_netdev;
 
        if (!rtnl_trylock()) {
-               schedule_work(w);
+               schedule_delayed_work(&ndev_ctx->vf_takeover, 0);
                return;
        }
 
@@ -1706,7 +1707,7 @@ static int netvsc_unregister_vf(struct net_device *vf_netdev)
                return NOTIFY_DONE;
 
        net_device_ctx = netdev_priv(ndev);
-       cancel_work_sync(&net_device_ctx->vf_takeover);
+       cancel_delayed_work_sync(&net_device_ctx->vf_takeover);
 
        netdev_info(ndev, "VF unregistering: %s\n", vf_netdev->name);
 
@@ -1748,7 +1749,7 @@ static int netvsc_probe(struct hv_device *dev,
 
        spin_lock_init(&net_device_ctx->lock);
        INIT_LIST_HEAD(&net_device_ctx->reconfig_events);
-       INIT_WORK(&net_device_ctx->vf_takeover, netvsc_vf_setup);
+       INIT_DELAYED_WORK(&net_device_ctx->vf_takeover, netvsc_vf_setup);
 
        net_device_ctx->vf_stats
                = netdev_alloc_pcpu_stats(struct netvsc_vf_pcpu_stats);