#include <vppinfra/rbtree.h>
#include <vppinfra/lock.h>
+#define FS_MIN_LOG2_CHUNK_SZ 12 /**< also min fifo size */
+#define FS_MAX_LOG2_CHUNK_SZ 22 /**< 4MB max chunk size */
+#define FS_CHUNK_VEC_LEN 11 /**< number of chunk sizes */
+
+STATIC_ASSERT ((FS_MAX_LOG2_CHUNK_SZ - FS_MIN_LOG2_CHUNK_SZ) ==
+ FS_CHUNK_VEC_LEN - 1,
+ "update chunk sizes");
+
#define SVM_FIFO_TRACE (0)
#define SVM_FIFO_MAX_EVT_SUBSCRIBERS 7
typedef struct fifo_segment_header_ fifo_segment_header_t;
+typedef uword fs_sptr_t;
typedef struct svm_fifo_chunk_
{
u32 start_byte; /**< chunk start byte */
u32 length; /**< length of chunk in bytes */
- struct svm_fifo_chunk_ *next; /**< pointer to next chunk in linked-lists */
+ fs_sptr_t next; /**< pointer to next chunk in linked-lists */
rb_node_index_t enq_rb_index; /**< enq node index if chunk in rbtree */
rb_node_index_t deq_rb_index; /**< deq node index if chunk in rbtree */
u8 data[0]; /**< start of chunk data */
u32 action;
} svm_fifo_trace_elem_t;
-typedef struct _svm_fifo
+typedef struct svm_fifo_shr_
{
- CLIB_CACHE_LINE_ALIGN_MARK (shared_first);
- fifo_segment_header_t *fs_hdr;/**< fifo segment header for fifo */
- svm_fifo_chunk_t *start_chunk;/**< first chunk in fifo chunk list */
- svm_fifo_chunk_t *end_chunk; /**< end chunk in fifo chunk list */
+ CLIB_CACHE_LINE_ALIGN_MARK (shared);
+ fs_sptr_t start_chunk; /**< first chunk in fifo chunk list */
+ fs_sptr_t end_chunk; /**< end chunk in fifo chunk list */
+ volatile u32 has_event; /**< non-zero if deq event exists */
u32 min_alloc; /**< min chunk alloc if space available */
u32 size; /**< size of the fifo in bytes */
- u8 flags; /**< fifo flags */
- u8 slice_index; /**< segment slice for fifo */
-
- CLIB_CACHE_LINE_ALIGN_MARK (shared_second);
- volatile u32 has_event; /**< non-zero if deq event exists */
u32 master_session_index; /**< session layer session index */
u32 client_session_index; /**< app session index */
- u8 master_thread_index; /**< session layer thread index */
- u8 client_thread_index; /**< app worker index */
- i8 refcnt; /**< reference count */
- u32 segment_manager; /**< session layer segment manager index */
- u32 segment_index; /**< segment index in segment manager */
- struct _svm_fifo *next; /**< next in freelist/active chain */
- struct _svm_fifo *prev; /**< prev in active chain */
-
- CLIB_CACHE_LINE_ALIGN_MARK (consumer);
- rb_tree_t ooo_deq_lookup; /**< rbtree for ooo deq chunk lookup */
- svm_fifo_chunk_t *head_chunk; /**< tracks chunk where head lands */
- svm_fifo_chunk_t *ooo_deq; /**< last chunk used for ooo dequeue */
+ u8 slice_index; /**< segment slice for fifo */
+ fs_sptr_t next; /**< next in freelist */
+
+ CLIB_CACHE_LINE_ALIGN_MARK (consumer);
+ fs_sptr_t head_chunk; /**< tracks chunk where head lands */
u32 head; /**< fifo head position/byte */
volatile u32 want_deq_ntf; /**< producer wants nudge */
volatile u32 has_deq_ntf;
+ u32 deq_thresh; /**< fifo threshold used for notifications */
- CLIB_CACHE_LINE_ALIGN_MARK (producer);
- rb_tree_t ooo_enq_lookup; /**< rbtree for ooo enq chunk lookup */
+ CLIB_CACHE_LINE_ALIGN_MARK (producer);
u32 tail; /**< fifo tail position/byte */
- u32 ooos_list_head; /**< Head of out-of-order linked-list */
- svm_fifo_chunk_t *tail_chunk; /**< tracks chunk where tail lands */
- svm_fifo_chunk_t *ooo_enq; /**< last chunk used for ooo enqueue */
- ooo_segment_t *ooo_segments; /**< Pool of ooo segments */
- u32 ooos_newest; /**< Last segment to have been updated */
+ fs_sptr_t tail_chunk; /**< tracks chunk where tail lands */
volatile u8 n_subscribers; /**< Number of subscribers for io events */
u8 subscribers[SVM_FIFO_MAX_EVT_SUBSCRIBERS];
+} svm_fifo_shared_t;
+
+typedef struct _svm_fifo
+{
+ CLIB_CACHE_LINE_ALIGN_MARK (cacheline);
+ svm_fifo_shared_t *shr; /**< shared fifo in fifo segment memory */
+ fifo_segment_header_t *fs_hdr; /**< fifo segment header for fifo */
+ rb_tree_t ooo_enq_lookup; /**< rbtree for ooo enq chunk lookup */
+ rb_tree_t ooo_deq_lookup; /**< rbtree for ooo deq chunk lookup */
+ svm_fifo_chunk_t *ooo_deq; /**< last chunk used for ooo dequeue */
+ svm_fifo_chunk_t *ooo_enq; /**< last chunk used for ooo enqueue */
+ ooo_segment_t *ooo_segments; /**< Pool of ooo segments */
+ u32 ooos_list_head; /**< Head of out-of-order linked-list */
+ u32 ooos_newest; /**< Last segment to have been updated */
+
+ u8 flags; /**< fifo flags */
+ u8 master_thread_index; /**< session layer thread index */
+ u8 client_thread_index; /**< app worker index */
+ i8 refcnt; /**< reference count */
+ u32 segment_manager; /**< session layer segment manager index */
+ u32 segment_index; /**< segment index in segment manager */
+
+ struct _svm_fifo *next; /**< prev in active chain */
+ struct _svm_fifo *prev; /**< prev in active chain */
+
+ svm_fifo_chunk_t *chunks_at_attach; /**< chunks to be accounted at detach */
+ svm_fifo_shared_t *hdr_at_attach; /**< hdr to be freed at detach */
#if SVM_FIFO_TRACE
svm_fifo_trace_elem_t *trace;
#endif
-
} svm_fifo_t;
typedef struct fifo_segment_slice_
{
- 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 */
+ CLIB_CACHE_LINE_ALIGN_MARK (cacheline);
+ fs_sptr_t free_chunks[FS_CHUNK_VEC_LEN]; /**< Free chunks by size */
+ fs_sptr_t free_fifos; /**< Freelists of fifo shared hdrs */
uword n_fl_chunk_bytes; /**< Chunk bytes on freelist */
- clib_spinlock_t chunk_lock;
+ uword virtual_mem; /**< Slice sum of all fifo sizes */
+ u32 num_chunks[FS_CHUNK_VEC_LEN]; /**< Allocated chunks by chunk size */
} fifo_segment_slice_t;
+typedef struct fifo_slice_private_
+{
+ clib_mem_bulk_handle_t fifos; /**< Bulk fifo allocator */
+ uword virtual_mem; /**< Slice sum of all fifo sizes */
+ svm_fifo_t *active_fifos; /**< Linked list of active RX fifos */
+} fifo_slice_private_t;
+
struct fifo_segment_header_
{
- 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 */
uword n_cached_bytes; /**< Cached 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 */
+ u32 max_log2_fifo_size; /**< Max log2(chunk size) for fs */
u8 n_slices; /**< Number of slices */
- u8 high_watermark; /**< Memory pressure watermark high */
- u8 low_watermark; /**< Memory pressure watermark low */
u8 pct_first_alloc; /**< Pct of fifo size to alloc */
+ u8 n_mqs; /**< Num mqs for mqs segment */
+ CLIB_CACHE_LINE_ALIGN_MARK (allocator);
+ uword byte_index;
+ uword max_byte_index;
+ uword start_byte_index;
+ CLIB_CACHE_LINE_ALIGN_MARK (slice);
+ fifo_segment_slice_t slices[0]; /** Fixed array of slices */
};
+void fsh_virtual_mem_update (fifo_segment_header_t * fsh, u32 slice_index,
+ int n_bytes);
+
+always_inline void *
+fs_ptr (fifo_segment_header_t *fsh, fs_sptr_t sp)
+{
+ return sp ? (void *) ((u8 *) fsh + sp) : 0;
+}
+
+always_inline fs_sptr_t
+fs_sptr (fifo_segment_header_t *fsh, void *p)
+{
+ return p ? (fs_sptr_t) ((u8 *) p - (u8 *) fsh) : 0;
+}
+
+always_inline svm_fifo_chunk_t *
+fs_chunk_ptr (fifo_segment_header_t *fsh, fs_sptr_t cp)
+{
+ return cp ? (svm_fifo_chunk_t *) ((u8 *) fsh + cp) : 0;
+}
+
+always_inline fs_sptr_t
+fs_chunk_sptr (fifo_segment_header_t *fsh, svm_fifo_chunk_t *c)
+{
+ return c ? (fs_sptr_t) ((u8 *) c - (u8 *) fsh) : 0;
+}
+
#endif /* SRC_SVM_FIFO_TYPES_H_ */
/*
Code Review / vpp.git / blobdiff