X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsegment_manager.h;h=1e99c4605a6bef6c15104f102c9f2cfad8a71626;hb=HEAD;hp=1e6b14d25862f9a139209607224ff896022ff4ba;hpb=c8e812f6fb88dcd537e4de9333b5acf32e6f1ca0;p=vpp.git

diff --git a/src/vnet/session/segment_manager.h b/src/vnet/session/segment_manager.h
index 1e6b14d2586..1e99c4605a6 100644
--- a/src/vnet/session/segment_manager.h
+++ b/src/vnet/session/segment_manager.h
@@ -40,6 +40,7 @@ typedef struct _segment_manager_props
   u8 high_watermark;			/**< memory usage high watermark % */
   u8 low_watermark;			/**< memory usage low watermark % */
   u8 pct_first_alloc;			/**< pct of fifo size to alloc */
+  u8 huge_page;				/**< use hugepage */
 } segment_manager_props_t;
 
 typedef enum seg_manager_flag_
@@ -78,16 +79,11 @@ typedef struct _segment_manager
   u8 low_watermark;
 } segment_manager_t;
 
-typedef struct segment_manager_main_init_args_
-{
-  u64 baseva;
-  u64 size;
-} segment_manager_main_init_args_t;
-
 #define SEGMENT_MANAGER_INVALID_APP_INDEX ((u32) ~0)
 
 segment_manager_t *segment_manager_alloc (void);
 int segment_manager_init (segment_manager_t * sm);
+int segment_manager_init_first (segment_manager_t * sm);
 
 /**
  * Cleanup segment manager
@@ -95,6 +91,7 @@ int segment_manager_init (segment_manager_t * sm);
  * @param sm	segment manager to be freed
  */
 void segment_manager_free (segment_manager_t * sm);
+void segment_manager_free_safe (segment_manager_t *sm);
 
 /**
  * Initiate segment manager cleanup
@@ -106,9 +103,29 @@ segment_manager_t *segment_manager_get (u32 index);
 segment_manager_t *segment_manager_get_if_valid (u32 index);
 u32 segment_manager_index (segment_manager_t * sm);
 
-int segment_manager_add_segment (segment_manager_t * sm, uword segment_size);
+/**
+ * Add segment without lock
+ *
+ * @param sm		Segment manager
+ * @param segment_size	Size of segment to be added
+ * @param notify_app	Flag set if app notification requested
+ */
+int segment_manager_add_segment (segment_manager_t *sm, uword segment_size,
+				 u8 notify_app);
+
+/**
+ * Add segment with lock
+ *
+ * @param sm		Segment manager
+ * @param segment_size	Size of segment to be added
+ * @param flags		Flags to be set on segment
+ */
+int segment_manager_add_segment2 (segment_manager_t *sm, uword segment_size,
+				  u8 flags);
 void segment_manager_del_segment (segment_manager_t * sm,
 				  fifo_segment_t * fs);
+void segment_manager_lock_and_del_segment (segment_manager_t * sm,
+					   u32 fs_index);
 fifo_segment_t *segment_manager_get_segment (segment_manager_t * sm,
 					     u32 segment_index);
 fifo_segment_t *segment_manager_get_segment_w_handle (u64 sh);
@@ -121,7 +138,6 @@ u64 segment_manager_make_segment_handle (u32 segment_manager_index,
 u64 segment_manager_segment_handle (segment_manager_t * sm,
 				    fifo_segment_t * segment);
 void segment_manager_segment_reader_unlock (segment_manager_t * sm);
-void segment_manager_segment_writer_unlock (segment_manager_t * sm);
 
 int segment_manager_alloc_session_fifos (segment_manager_t * sm,
 					 u32 thread_index,
@@ -134,9 +150,9 @@ int segment_manager_try_alloc_fifos (fifo_segment_t * fs,
 				     svm_fifo_t ** tx_fifo);
 void segment_manager_dealloc_fifos (svm_fifo_t * rx_fifo,
 				    svm_fifo_t * tx_fifo);
-void segment_manager_detach_fifo (segment_manager_t * sm, svm_fifo_t * f);
-void segment_manager_attach_fifo (segment_manager_t * sm, svm_fifo_t * f,
-				  session_t * s);
+void segment_manager_detach_fifo (segment_manager_t *sm, svm_fifo_t **f);
+void segment_manager_attach_fifo (segment_manager_t *sm, svm_fifo_t **f,
+				  session_t *s);
 
 void segment_manager_set_watermarks (segment_manager_t * sm,
 				     u8 high_watermark, u8 low_watermark);
@@ -161,9 +177,11 @@ void segment_manager_app_detach (segment_manager_t * sm);
  * @param sm	segment manager whose sessions are to be disconnected
  */
 void segment_manager_del_sessions (segment_manager_t * sm);
+void segment_manager_del_sessions_filter (segment_manager_t *sm,
+					  session_state_t *states);
 void segment_manager_format_sessions (segment_manager_t * sm, int verbose);
 
-void segment_manager_main_init (segment_manager_main_init_args_t * a);
+void segment_manager_main_init (void);
 
 segment_manager_props_t *segment_manager_props_init (segment_manager_props_t *
 						     sm);
@@ -172,7 +190,9 @@ static inline void
 segment_manager_parse_segment_handle (u64 segment_handle, u32 * sm_index,
 				      u32 * segment_index)
 {
-  *sm_index = segment_handle >> 32;
+  /* Upper 8 bits zeroed out as they may be used for cut-through segments.
+   * See @ref ct_alloc_segment */
+  *sm_index = (segment_handle >> 32) & 0xFFFFFF;
   *segment_index = segment_handle & 0xFFFFFFFF;
 }