X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fsvm%2Ffifo_segment.h;h=ee5c24d04bbd7d5f20ee370b331a2c568d19c7e1;hb=37b445468e45b537621269fc1e375f26ca2100ee;hp=02d45d3244d6520b5289836e4d80a9e25cd0312e;hpb=8122cc2ac5c9968c14a2570b8870a4ff7a4893c4;p=vpp.git

diff --git a/src/svm/fifo_segment.h b/src/svm/fifo_segment.h
index 02d45d3244d..ee5c24d04bb 100644
--- a/src/svm/fifo_segment.h
+++ b/src/svm/fifo_segment.h
@@ -16,6 +16,7 @@
 #define __included_fifo_segment_h__
 
 #include <svm/ssvm.h>
+#include <svm/fifo_types.h>
 #include <svm/svm_fifo.h>
 
 typedef enum
@@ -38,25 +39,29 @@ typedef enum fifo_segment_flags_
   FIFO_SEGMENT_F_MEM_LIMIT = 1 << 2,
 } fifo_segment_flags_t;
 
-typedef struct fifo_segment_slice_
+#define foreach_segment_mem_status	\
+_(NO_PRESSURE, "No pressure")		\
+_(LOW_PRESSURE, "Low pressure")		\
+_(HIGH_PRESSURE, "High pressure")	\
+_(NO_MEMORY, "No memory")
+
+typedef enum
 {
-  svm_fifo_t *fifos;			/**< Linked list of active RX fifos */
-  svm_fifo_t *free_fifos;		/**< Freelists by fifo size  */
-  svm_fifo_chunk_t **free_chunks;	/**< Freelists by chunk size */
-  uword n_fl_chunk_bytes;		/**< Chunk bytes on freelist */
-} fifo_segment_slice_t;
+#define _(sym,str)  MEMORY_PRESSURE_##sym,
+  foreach_segment_mem_status
+#undef _
+    MEMORY_N_PRESSURE,
+} fifo_segment_mem_status_t;
 
-typedef struct
+#if 0
+typedef enum fifo_segment_mem_status_
 {
-  fifo_segment_slice_t *slices;		/** Fixed array of slices */
-  ssvm_shared_header_t *ssvm_sh;	/**< Pointer to fs ssvm shared hdr */
-  uword n_free_bytes;			/**< Segment free bytes */
-  u32 n_active_fifos;			/**< Number of active fifos */
-  u32 n_reserved_bytes;			/**< Bytes not to be allocated */
-  u32 max_log2_chunk_size;		/**< Max log2(chunk size) for fs */
-  u8 flags;				/**< Segment flags */
-  u8 n_slices;				/**< Number of slices */
-} fifo_segment_header_t;
+  MEMORY_PRESSURE_NO_PRESSURE,
+  MEMORY_PRESSURE_LOW_PRESSURE,
+  MEMORY_PRESSURE_HIGH_PRESSURE,
+  MEMORY_PRESSURE_NO_MEMORY,
+} fifo_segment_mem_status_t;
+#endif
 
 typedef struct
 {
@@ -115,6 +120,10 @@ svm_fifo_t *fifo_segment_alloc_fifo_w_slice (fifo_segment_t * fs,
  */
 void fifo_segment_free_fifo (fifo_segment_t * fs, svm_fifo_t * f);
 
+void fifo_segment_detach_fifo (fifo_segment_t * fs, svm_fifo_t * f);
+void fifo_segment_attach_fifo (fifo_segment_t * fs, svm_fifo_t * f,
+			       u32 slice_index);
+
 /**
  * Try to preallocate fifo headers
  *
@@ -158,25 +167,53 @@ void fifo_segment_preallocate_fifo_pairs (fifo_segment_t * fs,
 					  u32 rx_fifo_size,
 					  u32 tx_fifo_size,
 					  u32 * n_fifo_pairs);
+
 /**
- * Grow fifo size by adding an additional chunk of memory
+ * Allocate chunks in fifo segment
  *
- * @param fs		fifo segment for fifo
- * @param f		fifo to be grown
- * @param chunk_size	number of bytes to be added to fifo
- * @return		0 on success or a negative number otherwise
+ * @param fsh		fifo segment header
+ * @param slice_index	slice where chunks should be alocated
+ * @param chunk_size	chunk size needed
+ * @return		chunk (or chunks) that cover at least chunk_size bytes
+ * 			on success, 0 on failure.
  */
-int fifo_segment_grow_fifo (fifo_segment_t * fs, svm_fifo_t * f,
-			    u32 chunk_size);
+svm_fifo_chunk_t *fsh_alloc_chunk (fifo_segment_header_t * fsh,
+				   u32 slice_index, u32 chunk_size);
 
 /**
- * Collect unused chunks for fifo
+ * Return chunks to fifo segment
  *
- * @param fs		fifo segment for fifo
- * @param f		fifo whose chunks are to be collected
- * @return		0 on success, error otherwise
+ * @param fsh		fifo segment header
+ * @param slice_index	slice where chunks should be returned
+ * @param c		pointer to first chunk in 0 terminated linked list
  */
-int fifo_segment_collect_fifo_chunks (fifo_segment_t * fs, svm_fifo_t * f);
+void fsh_collect_chunks (fifo_segment_header_t * fsh, u32 slice_index,
+			 svm_fifo_chunk_t * c);
+
+/**
+ * Fifo segment has reached mem limit
+ *
+ * @param fsh           fifo segment header
+ * @return              1 (if reached) or 0 (otherwise)
+ */
+u8 fsh_has_reached_mem_limit (fifo_segment_header_t * fsh);
+
+/**
+ * Fifo segment reset mem limit flag
+ *
+ * @param fs            fifo segment
+ */
+void fsh_reset_mem_limit (fifo_segment_header_t * fsh);
+
+/**
+ * Fifo segment allocated size
+ *
+ * Returns fifo segment's allocated size
+ *
+ * @param fs            fifo segment
+ * @return              allocated size in bytes
+ */
+uword fifo_segment_size (fifo_segment_t * fs);
 
 /**
  * Fifo segment estimate of number of free bytes
@@ -200,6 +237,18 @@ uword fifo_segment_free_bytes (fifo_segment_t * fs);
  */
 void fifo_segment_update_free_bytes (fifo_segment_t * fs);
 
+/**
+ * Fifo segment number of cached bytes
+ *
+ * Returns fifo segment's number of cached bytes.
+ *
+ * @param fs            fifo segment
+ * @return              cached bytes
+ */
+uword fifo_segment_cached_bytes (fifo_segment_t * fs);
+
+uword fifo_segment_available_bytes (fifo_segment_t * fs);
+
 /**
  * Number of bytes on chunk free lists
  *
@@ -221,6 +270,11 @@ u32 fifo_segment_num_free_fifos (fifo_segment_t * fs);
  */
 u32 fifo_segment_num_free_chunks (fifo_segment_t * fs, u32 size);
 
+u8 fifo_segment_get_mem_usage (fifo_segment_t * fs);
+fifo_segment_mem_status_t fifo_segment_determine_status
+  (fifo_segment_header_t * fsh, u8 usage);
+fifo_segment_mem_status_t fifo_segment_get_mem_status (fifo_segment_t * fs);
+
 void fifo_segment_main_init (fifo_segment_main_t * sm, u64 baseva,
 			     u32 timeout_in_seconds);