Merge "Waiting for completion of asynchronous events as part of soft …

…reset" into R2.21.x

dp-core/vrouter.c

@@ -337,9 +337,13 @@ vrouter_exit(bool soft_reset)
         if (modules[i].shut)
             modules[i].shut(&router);
 
-    /* After all the modules are shut: Vrouter is really not ready */
+    /* Mark that vrouter is no more ready as shut is already done */
     vr_not_ready = true;
 
+    /* Flush the previous ashynchronous events, before init */
+    if (vr_soft_reset)
+        vr_soft_reset(&router);
+
     for (i = VR_NUM_MODULES - 1; i >= 0; --i) {
         modules[i].exit(&router, soft_reset);
     }

include/vrouter.h

@@ -115,6 +115,7 @@ struct host_os {
     void (*hos_del_mpls)(struct vrouter *, unsigned);
     int (*hos_enqueue_to_assembler)(struct vrouter *, struct vr_packet *,
             struct vr_forwarding_md *);
+     void (*hos_soft_reset)(struct vrouter *);
 };
 
 #define vr_printf                       vrouter_host->hos_printf
@@ -157,6 +158,7 @@ struct host_os {
 #define vr_pkt_may_pull                 vrouter_host->hos_pkt_may_pull
 #define vr_gro_process                  vrouter_host->hos_gro_process
 #define vr_enqueue_to_assembler         vrouter_host->hos_enqueue_to_assembler
+#define vr_soft_reset                   vrouter_host->hos_soft_reset
 
 struct vrouter {
     unsigned char vr_vrrp_mac[VR_ETHER_ALEN];

linux/vrouter_mod.c

@@ -2354,6 +2354,15 @@ lh_create_timer(struct vr_timer *vtimer)
     return 0;
 }
 
+static void
+lh_soft_reset(struct vrouter *router)
+{
+    flush_scheduled_work();
+    rcu_barrier();
+
+    return;
+}
+
 struct host_os linux_host = {
     .hos_printf                     =       lh_printk,
     .hos_malloc                     =       lh_malloc,
@@ -2398,6 +2407,7 @@ struct host_os linux_host = {
     .hos_pkt_may_pull               =       lh_pkt_may_pull,
     .hos_gro_process                =       lh_gro_process,
     .hos_enqueue_to_assembler       =       lh_enqueue_to_assembler,
+    .hos_soft_reset                 =       lh_soft_reset,
 };
 
 struct host_os *