staging: hv: Fix GARP not sent after Quick Migration

commit c996edcf1c451b81740abbcca5257ed7e353fcc6 upstream.

After Quick Migration, the network is not immediately operational in the
current context when receiving RNDIS_STATUS_MEDIA_CONNECT event. So, I added
another netif_notify_peers() into a scheduled work, otherwise GARP packet will
not be sent after quick migration, and cause network disconnection.

Thanks to Mike Surcouf <mike@surcouf.co.uk> for reporting the bug and
testing the patch.

Reported-by: Mike Surcouf <mike@surcouf.co.uk>
Tested-by: Mike Surcouf <mike@surcouf.co.uk>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>

diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index a2b8c6d1f2e84f716b269bc49078d46bea742aa7..f1a7402f5d5b7e24e27f8ef6860b253ab5838e12 100644 (file)
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -46,6 +46,7 @@ struct net_device_context {
        /* point back to our device context */
        struct vm_device *device_ctx;
        unsigned long avail;
+       struct work_struct work;
 };
 
 struct netvsc_driver_context {
@@ -237,6 +238,7 @@ static void netvsc_linkstatus_callback(struct hv_device *device_obj,
 {
        struct vm_device *device_ctx = to_vm_device(device_obj);
        struct net_device *net = dev_get_drvdata(&device_ctx->device);
+       struct net_device_context *ndev_ctx;
 
        DPRINT_ENTER(NETVSC_DRV);
 
@@ -250,6 +252,8 @@ static void netvsc_linkstatus_callback(struct hv_device *device_obj,
                netif_carrier_on(net);
                netif_wake_queue(net);
                netif_notify_peers(net);
+               ndev_ctx = netdev_priv(net);
+               schedule_work(&ndev_ctx->work);
        } else {
                netif_carrier_off(net);
                netif_stop_queue(net);
@@ -354,6 +358,25 @@ static const struct net_device_ops device_ops = {
        .ndo_set_mac_address =          eth_mac_addr,
 };
 
+/*
+ * Send GARP packet to network peers after migrations.
+ * After Quick Migration, the network is not immediately operational in the
+ * current context when receiving RNDIS_STATUS_MEDIA_CONNECT event. So, add
+ * another netif_notify_peers() into a scheduled work, otherwise GARP packet
+ * will not be sent after quick migration, and cause network disconnection.
+ */
+static void netvsc_send_garp(struct work_struct *w)
+{
+       struct net_device_context *ndev_ctx;
+       struct net_device *net;
+
+       msleep(20);
+       ndev_ctx = container_of(w, struct net_device_context, work);
+       net = dev_get_drvdata(&ndev_ctx->device_ctx->device);
+       netif_notify_peers(net);
+}
+
+
 static int netvsc_probe(struct device *device)
 {
        struct driver_context *driver_ctx =
@@ -385,6 +408,7 @@ static int netvsc_probe(struct device *device)
        net_device_ctx->device_ctx = device_ctx;
        net_device_ctx->avail = ring_size;
        dev_set_drvdata(device, net);
+       INIT_WORK(&net_device_ctx->work, netvsc_send_garp);
 
        /* Notify the netvsc driver of the new device */
        ret = net_drv_obj->Base.OnDeviceAdd(device_obj, &device_info);