vcl/session: tx notifications for cut-thru sessions

[vpp.git] / src / vnet / session / segment_manager.c

diff --git a/src/vnet/session/segment_manager.c b/src/vnet/session/segment_manager.c
index a0d9a09..c8d4be5 100644 (file)
--- a/src/vnet/session/segment_manager.c
+++ b/src/vnet/session/segment_manager.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -77,7 +77,18 @@ segment_manager_del_segment (segment_manager_t * sm,
   segment_manager_main_t *smm = &segment_manager_main;
 
   if (ssvm_type (&fs->ssvm) != SSVM_SEGMENT_PRIVATE)
-    clib_valloc_free (&smm->va_allocator, fs->ssvm.requested_va);
+    {
+      clib_valloc_free (&smm->va_allocator, fs->ssvm.requested_va);
+
+      if (sm->app_wrk_index != SEGMENT_MANAGER_INVALID_APP_INDEX)
+       {
+         app_worker_t *app_wrk;
+         u64 segment_handle;
+         app_wrk = app_worker_get (sm->app_wrk_index);
+         segment_handle = segment_manager_segment_handle (sm, fs);
+         app_worker_del_segment_notify (app_wrk, segment_handle);
+       }
+    }
 
   ssvm_delete (&fs->ssvm);
 
@@ -184,7 +195,7 @@ int
 segment_manager_add_segment (segment_manager_t * sm, u32 segment_size)
 {
   segment_manager_main_t *smm = &segment_manager_main;
-  u32 rnd_margin = 128 << 10, seg_index, page_size;
+  u32 rnd_margin = 128 << 10, seg_index = ~0, page_size;
   segment_manager_properties_t *props;
   uword baseva = (uword) ~ 0ULL, alloc_size;
   svm_fifo_segment_private_t *seg;
@@ -204,15 +215,9 @@ segment_manager_add_segment (segment_manager_t * sm, u32 segment_size)
    * Allocate fifo segment and lock if needed
    */
   if (vlib_num_workers ())
-    {
-      clib_rwlock_writer_lock (&sm->segments_rwlock);
-      pool_get (sm->segments, seg);
-    }
-  else
-    {
-      pool_get (sm->segments, seg);
-    }
-  clib_memset (seg, 0, sizeof (*seg));
+    clib_rwlock_writer_lock (&sm->segments_rwlock);
+
+  pool_get_zero (sm->segments, seg);
 
   /*
    * Initialize ssvm segment and svm fifo private header
@@ -228,7 +233,8 @@ segment_manager_add_segment (segment_manager_t * sm, u32 segment_size)
       if (!baseva)
        {
          clib_warning ("out of space for segments");
-         return -1;
+         pool_put (sm->segments, seg);
+         goto done;
        }
     }
   else
@@ -246,7 +252,7 @@ segment_manager_add_segment (segment_manager_t * sm, u32 segment_size)
       if (props->segment_type != SSVM_SEGMENT_PRIVATE)
        clib_valloc_free (&smm->va_allocator, baseva);
       pool_put (sm->segments, seg);
-      return (rv);
+      goto done;
     }
 
   svm_fifo_segment_init (seg);
@@ -256,6 +262,8 @@ segment_manager_add_segment (segment_manager_t * sm, u32 segment_size)
    */
   seg_index = seg - sm->segments;
 
+done:
+
   if (vlib_num_workers ())
     clib_rwlock_writer_unlock (&sm->segments_rwlock);
 
@@ -379,7 +387,8 @@ void
 segment_manager_del_sessions (segment_manager_t * sm)
 {
   svm_fifo_segment_private_t *fifo_segment;
-  stream_session_t *session;
+  session_handle_t *handles = 0, *handle;
+  session_t *session;
   svm_fifo_t *fifo;
 
   ASSERT (pool_elts (sm->segments) != 0);
@@ -396,17 +405,10 @@ segment_manager_del_sessions (segment_manager_t * sm)
      */
     while (fifo)
       {
-       if (fifo->ct_session_index != SVM_FIFO_INVALID_SESSION_INDEX)
-         {
-           svm_fifo_t *next = fifo->next;
-           application_local_session_disconnect_w_index (sm->app_wrk_index,
-                                                         fifo->ct_session_index);
-           fifo = next;
-           continue;
-         }
-       session = session_get (fifo->master_session_index,
-                              fifo->master_thread_index);
-       session_close (session);
+       session = session_get_if_valid (fifo->master_session_index,
+                                       fifo->master_thread_index);
+       if (session)
+         vec_add1 (handles, session_handle (session));
        fifo = fifo->next;
       }
 
@@ -415,6 +417,9 @@ segment_manager_del_sessions (segment_manager_t * sm)
      */
   }));
   /* *INDENT-ON* */
+
+  vec_foreach (handle, handles)
+    session_close (session_get_from_handle (*handle));
 }
 
 /**
@@ -552,9 +557,10 @@ alloc_check:
 
       if (added_a_segment)
        {
+         app_worker_t *app_wrk;
          segment_handle = segment_manager_segment_handle (sm, fifo_segment);
-         rv = app_worker_add_segment_notify (sm->app_wrk_index,
-                                             segment_handle);
+         app_wrk = app_worker_get (sm->app_wrk_index);
+         rv = app_worker_add_segment_notify (app_wrk, segment_handle);
        }
       /* Drop the lock after app is notified */
       segment_manager_segment_reader_unlock (sm);
@@ -593,11 +599,11 @@ alloc_check:
 }
 
 void
-segment_manager_dealloc_fifos (u32 segment_index, svm_fifo_t * rx_fifo,
-                              svm_fifo_t * tx_fifo)
+segment_manager_dealloc_fifos (svm_fifo_t * rx_fifo, svm_fifo_t * tx_fifo)
 {
   svm_fifo_segment_private_t *fifo_segment;
   segment_manager_t *sm;
+  u32 segment_index;
 
   if (!rx_fifo || !tx_fifo)
     return;
@@ -607,6 +613,7 @@ segment_manager_dealloc_fifos (u32 segment_index, svm_fifo_t * rx_fifo,
   if (!(sm = segment_manager_get_if_valid (rx_fifo->segment_manager)))
     return;
 
+  segment_index = rx_fifo->segment_index;
   fifo_segment = segment_manager_get_segment_w_lock (sm, segment_index);
   svm_fifo_segment_free_fifo (fifo_segment, rx_fifo,
                              FIFO_SEGMENT_RX_FREELIST);