2 files changed, 21 insertions, 0 deletions
diff --git a/src/vnet/session/session.h b/src/vnet/session/session.h
index cf1bc9d87fc..2a0b0cc47bd 100644
--- a/src/vnet/session/session.h
+++ b/src/vnet/session/session.h
@@ -538,6 +538,8 @@ do {									\
       return clib_error_return(0, "session layer is not enabled");	\
 } while (0)
 
+void session_node_enable_disable (u8 is_en);
+
 #endif /* __included_session_h__ */
 
 /*
diff --git a/src/vnet/session/session_node.c b/src/vnet/session/session_node.c
index ce460e9a94c..f647360ea5b 100644
--- a/src/vnet/session/session_node.c
+++ b/src/vnet/session/session_node.c
@@ -705,6 +705,25 @@ VLIB_REGISTER_NODE (session_queue_node) =
 };
 /* *INDENT-ON* */
 
+static clib_error_t *
+session_queue_exit (vlib_main_t * vm)
+{
+  if (vec_len (vlib_mains) < 2)
+    return 0;
+
+  /*
+   * Shut off (especially) worker-thread session nodes.
+   * Otherwise, vpp can crash as the main thread unmaps the
+   * API segment.
+   */
+  vlib_worker_thread_barrier_sync (vm);
+  session_node_enable_disable (0 /* is_enable */ );
+  vlib_worker_thread_barrier_release (vm);
+  return 0;
+}
+
+VLIB_MAIN_LOOP_EXIT_FUNCTION (session_queue_exit);
+
 /*
  * fd.io coding-style-patch-verification: ON
  *