aboutsummaryrefslogtreecommitdiffstats
path: root/src/svm
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2017-07-13 01:24:57 -0400
committerFlorin Coras <florin.coras@gmail.com>2017-07-15 17:43:40 +0000
commit3eb5062b40feb3002de09a3caff86232d6e1adea (patch)
tree70eaa2d3c021a7b4bf067557a0d62c55dc447320 /src/svm
parent213b5aae860c2a9d5de8d4d070d0d2091af699f5 (diff)
Fixes and improved tcp/session debugging
- Fix rx sack option parsing - Add session sack scoreboard tracing and replaying - Add svm fifo tracing and replaying - Scoreboard/svm fifo ooo segment reception fixes - Improved overall debugging Change-Id: Ieae07eba355e66f5935253232bb00f2dfb7ece00 Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/svm')
-rw-r--r--src/svm/svm_fifo.c150
-rw-r--r--src/svm/svm_fifo.h41
2 files changed, 151 insertions, 40 deletions
diff --git a/src/svm/svm_fifo.c b/src/svm/svm_fifo.c
index da60fee51ec..fc2189c5176 100644
--- a/src/svm/svm_fifo.c
+++ b/src/svm/svm_fifo.c
@@ -61,6 +61,90 @@ format_ooo_segment (u8 * s, va_list * args)
}
u8 *
+svm_fifo_dump_trace (u8 * s, svm_fifo_t * f)
+{
+#if SVM_FIFO_TRACE
+ svm_fifo_trace_elem_t *seg = 0;
+ int i = 0;
+
+ if (f->trace)
+ {
+ vec_foreach (seg, f->trace)
+ {
+ s = format (s, "{%u, %u, %u}, ", seg->offset, seg->len, seg->action);
+ i++;
+ if (i % 5 == 0)
+ s = format (s, "\n");
+ }
+ s = format (s, "\n");
+ }
+ return s;
+#else
+ return 0;
+#endif
+}
+
+u8 *
+svm_fifo_replay (u8 * s, svm_fifo_t * f, u8 no_read, u8 verbose)
+{
+ int i, trace_len;
+ u8 *data = 0;
+ svm_fifo_trace_elem_t *trace;
+ u32 offset;
+ svm_fifo_t *dummy_fifo;
+
+ if (!f)
+ return s;
+
+#if SVM_FIFO_TRACE
+ trace = f->trace;
+ trace_len = vec_len (trace);
+#else
+ trace = 0;
+ trace_len = 0;
+#endif
+
+ dummy_fifo = svm_fifo_create (f->nitems);
+ memset (f->data, 0xFF, f->nitems);
+
+ vec_validate (data, f->nitems);
+ for (i = 0; i < vec_len (data); i++)
+ data[i] = i;
+
+ for (i = 0; i < trace_len; i++)
+ {
+ offset = trace[i].offset;
+ if (trace[i].action == 1)
+ {
+ if (verbose)
+ s = format (s, "adding [%u, %u]:", trace[i].offset,
+ (trace[i].offset +
+ trace[i].len) % dummy_fifo->nitems);
+ svm_fifo_enqueue_with_offset (dummy_fifo, trace[i].offset,
+ trace[i].len, &data[offset]);
+ }
+ else if (trace[i].action == 2)
+ {
+ if (verbose)
+ s = format (s, "adding [%u, %u]:", 0, trace[i].len);
+ svm_fifo_enqueue_nowait (dummy_fifo, trace[i].len, &data[offset]);
+ }
+ else if (!no_read)
+ {
+ if (verbose)
+ s = format (s, "read: %u", trace[i].len);
+ svm_fifo_dequeue_drop (dummy_fifo, trace[i].len);
+ }
+ if (verbose)
+ s = format (s, "%U", format_svm_fifo, dummy_fifo, 1);
+ }
+
+ s = format (s, "result: %U", format_svm_fifo, dummy_fifo, 1);
+
+ return s;
+}
+
+u8 *
format_ooo_list (u8 * s, va_list * args)
{
svm_fifo_t *f = va_arg (*args, svm_fifo_t *);
@@ -73,6 +157,7 @@ format_ooo_list (u8 * s, va_list * args)
s = format (s, " %U\n", format_ooo_segment, seg);
ooo_segment_index = seg->next;
}
+
return s;
}
@@ -94,10 +179,10 @@ format_svm_fifo (u8 * s, va_list * args)
if (verbose)
{
- s = format (s, " ooo pool %d active elts\n",
- pool_elts (f->ooo_segments));
+ s = format (s, " ooo pool %d active elts newest %u\n",
+ pool_elts (f->ooo_segments), f->ooos_newest);
if (svm_fifo_has_ooo_data (f))
- s = format (s, " %U", format_ooo_list, f);
+ s = format (s, " %U", format_ooo_list, f, verbose);
}
return s;
}
@@ -116,7 +201,6 @@ svm_fifo_create (u32 data_size_in_bytes)
memset (f, 0, sizeof (*f));
f->nitems = data_size_in_bytes;
f->ooos_list_head = OOO_SEGMENT_INVALID_INDEX;
-
return (f);
}
@@ -178,6 +262,7 @@ ooo_segment_add (svm_fifo_t * f, u32 offset, u32 length)
u32 new_index, s_end_pos, s_index;
u32 normalized_position, normalized_end_position;
+ ASSERT (offset + length <= ooo_segment_distance_from_tail (f, f->head));
normalized_position = (f->tail + offset) % f->nitems;
normalized_end_position = (f->tail + offset + length) % f->nitems;
@@ -205,17 +290,9 @@ ooo_segment_add (svm_fifo_t * f, u32 offset, u32 length)
s = prev;
s_end_pos = ooo_segment_end_pos (f, s);
- /* Check head and tail now since segment may be wider at both ends so
- * merge tests lower won't work */
- if (position_lt (f, normalized_position, s->start))
- {
- s->start = normalized_position;
- s->length = position_diff (f, s_end_pos, s->start);
- }
- if (position_gt (f, normalized_end_position, s_end_pos))
- {
- s->length = position_diff (f, normalized_end_position, s->start);
- }
+ /* Since we have previous, normalized start position cannot be smaller
+ * than prev->start. Check tail */
+ ASSERT (position_lt (f, s->start, normalized_position));
goto check_tail;
}
@@ -256,6 +333,7 @@ ooo_segment_add (svm_fifo_t * f, u32 offset, u32 length)
/* Pool might've moved, get segment again */
s = pool_elt_at_index (f->ooo_segments, s_index);
+ /* Needs to be last */
ASSERT (s->next == OOO_SEGMENT_INVALID_INDEX);
new_s->prev = s_index;
@@ -274,32 +352,22 @@ ooo_segment_add (svm_fifo_t * f, u32 offset, u32 length)
{
s->start = normalized_position;
s->length = position_diff (f, s_end_pos, s->start);
- }
- /* Overlapping tail */
- else if (position_gt (f, normalized_end_position, s_end_pos))
- {
- s->length = position_diff (f, normalized_end_position, s->start);
- }
- /* New segment completely covered by current one */
- else
- {
- /* Do Nothing */
- s = 0;
- goto done;
+ f->ooos_newest = s - f->ooo_segments;
}
check_tail:
- /* The new segment's tail may cover multiple smaller ones */
+
+ /* Overlapping tail */
if (position_gt (f, normalized_end_position, s_end_pos))
{
- /* Remove the completely overlapped segments */
- it = (s->next != OOO_SEGMENT_INVALID_INDEX) ?
- pool_elt_at_index (f->ooo_segments, s->next) : 0;
+ s->length = position_diff (f, normalized_end_position, s->start);
+
+ /* Remove the completely overlapped segments in the tail */
+ it = ooo_segment_next (f, s);
while (it && position_leq (f, ooo_segment_end_pos (f, it),
normalized_end_position))
{
- next = (it->next != OOO_SEGMENT_INVALID_INDEX) ?
- pool_elt_at_index (f->ooo_segments, it->next) : 0;
+ next = ooo_segment_next (f, it);
ooo_segment_del (f, it - f->ooo_segments);
it = next;
}
@@ -307,16 +375,12 @@ check_tail:
/* If partial overlap with last, merge */
if (it && position_leq (f, it->start, normalized_end_position))
{
- s->length =
- position_diff (f, ooo_segment_end_pos (f, it), s->start);
+ s->length = position_diff (f, ooo_segment_end_pos (f, it),
+ s->start);
ooo_segment_del (f, it - f->ooo_segments);
}
+ f->ooos_newest = s - f->ooo_segments;
}
-
-done:
- /* Most recently updated segment */
- if (s)
- f->ooos_newest = s - f->ooo_segments;
}
/**
@@ -422,6 +486,8 @@ svm_fifo_enqueue_internal (svm_fifo_t * f, u32 max_bytes, u8 * copy_from_here)
total_copy_bytes = max_bytes;
}
+ svm_fifo_trace_add (f, f->head, total_copy_bytes, 2);
+
/* Any out-of-order segments to collect? */
if (PREDICT_FALSE (f->ooos_list_head != OOO_SEGMENT_INVALID_INDEX))
total_copy_bytes += ooo_segment_try_collect (f, total_copy_bytes);
@@ -499,6 +565,8 @@ svm_fifo_enqueue_with_offset_internal (svm_fifo_t * f,
if ((required_bytes + offset_from_tail) > (nitems - cursize))
return -1;
+ svm_fifo_trace_add (f, offset, required_bytes, 1);
+
ooo_segment_add (f, offset, required_bytes);
/* Number of bytes we're going to copy */
@@ -707,6 +775,8 @@ svm_fifo_dequeue_drop (svm_fifo_t * f, u32 max_bytes)
/* Number of bytes we're going to drop */
total_drop_bytes = (cursize < max_bytes) ? cursize : max_bytes;
+ svm_fifo_trace_add (f, f->tail, total_drop_bytes, 3);
+
/* Number of bytes in first copy segment */
first_drop_bytes =
((nitems - f->head) < total_drop_bytes) ?
diff --git a/src/svm/svm_fifo.h b/src/svm/svm_fifo.h
index fe21de476d7..a83cd858f83 100644
--- a/src/svm/svm_fifo.h
+++ b/src/svm/svm_fifo.h
@@ -36,8 +36,16 @@ typedef struct
format_function_t format_ooo_segment;
format_function_t format_ooo_list;
+#define SVM_FIFO_TRACE (0)
#define OOO_SEGMENT_INVALID_INDEX ((u32)~0)
+typedef struct
+{
+ u32 offset;
+ u32 len;
+ u32 action;
+} svm_fifo_trace_elem_t;
+
typedef struct _svm_fifo
{
volatile u32 cursize; /**< current fifo size */
@@ -64,9 +72,28 @@ typedef struct _svm_fifo
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 */
+#if SVM_FIFO_TRACE
+ svm_fifo_trace_elem_t *trace;
+#endif
CLIB_CACHE_LINE_ALIGN_MARK (data);
} svm_fifo_t;
+#if SVM_FIFO_TRACE
+#define svm_fifo_trace_add(_f, _s, _l, _t) \
+{ \
+ svm_fifo_trace_elem_t *trace_elt; \
+ vec_add2(_f->trace, trace_elt, 1); \
+ trace_elt->offset = _s; \
+ trace_elt->len = _l; \
+ trace_elt->action = _t; \
+}
+#else
+#define svm_fifo_trace_add(_f, _s, _l, _t)
+#endif
+
+u8 *svm_fifo_dump_trace (u8 * s, svm_fifo_t * f);
+u8 *svm_fifo_replay (u8 * s, svm_fifo_t * f, u8 no_read, u8 verbose);
+
static inline u32
svm_fifo_max_dequeue (svm_fifo_t * f)
{
@@ -132,6 +159,12 @@ svm_fifo_newest_ooo_segment (svm_fifo_t * f)
return pool_elt_at_index (f->ooo_segments, f->ooos_newest);
}
+always_inline void
+svm_fifo_newest_ooo_segment_reset (svm_fifo_t * f)
+{
+ f->ooos_newest = OOO_SEGMENT_INVALID_INDEX;
+}
+
always_inline u32
ooo_segment_distance_from_tail (svm_fifo_t * f, u32 pos)
{
@@ -174,6 +207,14 @@ ooo_segment_get_prev (svm_fifo_t * f, ooo_segment_t * s)
return pool_elt_at_index (f->ooo_segments, s->prev);
}
+always_inline ooo_segment_t *
+ooo_segment_next (svm_fifo_t * f, ooo_segment_t * s)
+{
+ if (s->next == OOO_SEGMENT_INVALID_INDEX)
+ return 0;
+ return pool_elt_at_index (f->ooo_segments, s->next);
+}
+
#endif /* __included_ssvm_fifo_h__ */
/*