#include <vppinfra/clib.h>
#include <vppinfra/vec.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
#include <vppinfra/pool.h>
#include <vppinfra/format.h>
-#include <pthread.h>
+#include <vppinfra/rbtree.h>
/** Out-of-order segment */
typedef struct
u32 length; /**< Length of segment */
} ooo_segment_t;
-format_function_t format_ooo_segment;
-format_function_t format_ooo_list;
-
#define SVM_FIFO_TRACE (0)
#define OOO_SEGMENT_INVALID_INDEX ((u32)~0)
#define SVM_FIFO_INVALID_SESSION_INDEX ((u32)~0)
#define SVM_FIFO_INVALID_INDEX ((u32)~0)
-#define SVM_FIFO_MAX_EVT_SUBSCRIBERS 8
+#define SVM_FIFO_MAX_EVT_SUBSCRIBERS 7
-enum
+enum svm_fifo_tx_ntf_
{
SVM_FIFO_NO_TX_NOTIF = 0,
SVM_FIFO_WANT_TX_NOTIF = 1,
u32 action;
} svm_fifo_trace_elem_t;
+typedef struct svm_fifo_chunk_
+{
+ u32 start_byte;
+ u32 length;
+ struct svm_fifo_chunk_ *next;
+ u8 data[0];
+} svm_fifo_chunk_t;
+
+typedef enum svm_fifo_flag_
+{
+ SVM_FIFO_F_SIZE_UPDATE = 1 << 0,
+ SVM_FIFO_F_MULTI_CHUNK = 1 << 1,
+ SVM_FIFO_F_LL_TRACKED = 1 << 2,
+} svm_fifo_flag_t;
+
typedef struct _svm_fifo
{
CLIB_CACHE_LINE_ALIGN_MARK (shared_first);
- u32 size; /**< size of the fifo(must be power of 2) */
+ u32 size; /**< size of the fifo */
u32 nitems; /**< usable size(size-1) */
+ u8 flags; /**< fifo flags */
+ svm_fifo_chunk_t *start_chunk;/**< first chunk in fifo chunk list */
+ svm_fifo_chunk_t *end_chunk; /**< end chunk in fifo chunk list */
+ svm_fifo_chunk_t *new_chunks; /**< chunks yet to be added to list */
+ rb_tree_t chunk_lookup;
CLIB_CACHE_LINE_ALIGN_MARK (shared_second);
volatile u32 has_event; /**< non-zero if deq event exists */
u32 ct_session_index; /**< Local session index for vpp */
u32 freelist_index; /**< aka log2(allocated_size) - const. */
i8 refcnt; /**< reference count */
+ struct _svm_fifo *next; /**< next in freelist/active chain */
+ struct _svm_fifo *prev; /**< prev in active chain */
CLIB_CACHE_LINE_ALIGN_MARK (consumer);
- u32 head;
+ u32 head; /**< fifo head position/byte */
+ svm_fifo_chunk_t *head_chunk; /**< tracks chunk where head lands */
+ svm_fifo_chunk_t *ooo_deq; /**< last chunk used for ooo dequeue */
volatile u32 want_tx_ntf; /**< producer wants nudge */
volatile u32 has_tx_ntf;
CLIB_CACHE_LINE_ALIGN_MARK (producer);
- u32 tail;
-
- ooo_segment_t *ooo_segments; /**< Pool of ooo segments */
+ 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 */
- struct _svm_fifo *next; /**< next in freelist/active chain */
- struct _svm_fifo *prev; /**< prev in active chain */
volatile u8 n_subscribers;
u8 subscribers[SVM_FIFO_MAX_EVT_SUBSCRIBERS];
svm_fifo_trace_elem_t *trace;
#endif
- CLIB_CACHE_LINE_ALIGN_MARK (data);
+ svm_fifo_chunk_t default_chunk;
} svm_fifo_t;
typedef enum
SVM_FIFO_FULL = -2,
} svm_fifo_err_t;
-typedef struct svm_fifo_segment_
+typedef struct svm_fifo_seg_
{
u8 *data;
u32 len;
-} svm_fifo_segment_t;
+} svm_fifo_seg_t;
#if SVM_FIFO_TRACE
#define svm_fifo_trace_add(_f, _s, _l, _t) \
return (svm_fifo_max_dequeue (f) == 0);
}
+static inline u8
+svm_fifo_is_wrapped (svm_fifo_t * f)
+{
+ u32 head, tail;
+ f_load_head_tail_all_acq (f, &head, &tail);
+ return head % f->size > tail % f->size;
+}
+
/* used by producer*/
static inline u32
svm_fifo_max_enqueue_prod (svm_fifo_t * f)
}
svm_fifo_t *svm_fifo_create (u32 data_size_in_bytes);
+void svm_fifo_init (svm_fifo_t * f, u32 size);
+
+/**
+ * Allocate a fifo chunk on heap
+ *
+ * If the chunk is allocated on a fifo segment, this should be called
+ * with the segment's heap pushed.
+ *
+ * @param size chunk size in bytes. Will be rounded to the next highest
+ * power-of-two
+ * @return new chunk or 0 if alloc failed
+ */
+svm_fifo_chunk_t *svm_fifo_chunk_alloc (u32 size);
+
+/**
+ * Grow fifo size by adding chunk to chunk list
+ *
+ * If fifos are allocated on a segment, this should be called with
+ * the segment's heap pushed.
+ *
+ * @param f fifo to be extended
+ * @param c chunk or linked list of chunks to be added
+ */
+void svm_fifo_add_chunk (svm_fifo_t * f, svm_fifo_chunk_t * c);
void svm_fifo_free (svm_fifo_t * f);
+/**
+ * Cleanup fifo chunk lookup rb tree
+ *
+ * The rb tree is allocated in segment heap so this should be called
+ * with it pushed.
+ *
+ * @param f fifo to cleanup
+ */
+void svm_fifo_free_chunk_lookup (svm_fifo_t * f);
+/**
+ * Cleanup fifo ooo data
+ *
+ * The ooo data is allocated in producer process memory. The fifo
+ * segment heap should not be pushed.
+ *
+ * @param f fifo to cleanup
+ */
+void svm_fifo_free_ooo_data (svm_fifo_t * f);
int svm_fifo_enqueue_nowait (svm_fifo_t * f, u32 max_bytes,
const u8 * copy_from_here);
int svm_fifo_peek (svm_fifo_t * f, u32 offset, u32 max_bytes, u8 * copy_here);
int svm_fifo_dequeue_drop (svm_fifo_t * f, u32 max_bytes);
void svm_fifo_dequeue_drop_all (svm_fifo_t * f);
-int svm_fifo_segments (svm_fifo_t * f, svm_fifo_segment_t * fs);
-void svm_fifo_segments_free (svm_fifo_t * f, svm_fifo_segment_t * fs);
-void svm_fifo_init_pointers (svm_fifo_t * f, u32 pointer);
+int svm_fifo_segments (svm_fifo_t * f, svm_fifo_seg_t * fs);
+void svm_fifo_segments_free (svm_fifo_t * f, svm_fifo_seg_t * fs);
+void svm_fifo_init_pointers (svm_fifo_t * f, u32 head, u32 tail);
void svm_fifo_clone (svm_fifo_t * df, svm_fifo_t * sf);
void svm_fifo_overwrite_head (svm_fifo_t * f, u8 * data, u32 len);
void svm_fifo_add_subscriber (svm_fifo_t * f, u8 subscriber);
svm_fifo_head (svm_fifo_t * f)
{
/* load-relaxed: consumer owned index */
- return (f->data + (f->head % f->size));
+ return (f->head_chunk->data
+ + ((f->head % f->size) - f->head_chunk->start_byte));
}
always_inline u8 *
svm_fifo_tail (svm_fifo_t * f)
{
/* load-relaxed: producer owned index */
- return (f->data + (f->tail % f->size));
+ return (f->tail_chunk->data
+ + ((f->tail % f->size) - f->tail_chunk->start_byte));
}
static inline void
Code Review / vpp.git / blobdiff