aboutsummaryrefslogtreecommitdiffstats
path: root/src/svm
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2017-03-30 02:54:28 -0700
committerDave Barach <openvpp@barachs.net>2017-04-02 14:02:30 +0000
commit3e350af5d3e9744a4529a28dd293b2d4601442f7 (patch)
treee4b489ddd509fc96382d49592cfc5bafc412a216 /src/svm
parent799e26d5bdf6b74ab615644e0cd291de6e352989 (diff)
TCP cc/window management fixes and debugging
- added persist timer - update rcv_las whenever sending an ack - moved fifo size to its own cache line - improved session and builtin client debugging Change-Id: Ia649cf942cf0c061a713e8b67f0eb6974a6cd55b Signed-off-by: Florin Coras <fcoras@cisco.com> Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src/svm')
-rw-r--r--src/svm/svm_fifo.c37
-rw-r--r--src/svm/svm_fifo.h8
2 files changed, 26 insertions, 19 deletions
diff --git a/src/svm/svm_fifo.c b/src/svm/svm_fifo.c
index 07b0d2dfbe3..cc84feb9a6d 100644
--- a/src/svm/svm_fifo.c
+++ b/src/svm/svm_fifo.c
@@ -254,6 +254,10 @@ ooo_segment_try_collect (svm_fifo_t * f, u32 n_bytes_enqueued)
{
ooo_segment_t *s;
u32 index, bytes = 0, diff;
+ u32 cursize;
+
+ /* read cursize, which can only increase while we're working */
+ cursize = svm_fifo_max_dequeue (f);
s = pool_elt_at_index (f->ooo_segments, f->ooos_list_head);
@@ -286,8 +290,8 @@ ooo_segment_try_collect (svm_fifo_t * f, u32 n_bytes_enqueued)
/* If tail is adjacent to an ooo segment, 'consume' it */
if (diff == 0)
{
- bytes = ((f->nitems - f->cursize) >= s->length) ? s->length :
- f->nitems - f->cursize;
+ bytes = ((f->nitems - cursize) >= s->length) ? s->length :
+ f->nitems - cursize;
f->tail += bytes;
f->tail %= f->nitems;
@@ -305,11 +309,12 @@ svm_fifo_enqueue_internal (svm_fifo_t * f,
u32 total_copy_bytes, first_copy_bytes, second_copy_bytes;
u32 cursize, nitems;
- if (PREDICT_FALSE (f->cursize == f->nitems))
+ /* read cursize, which can only increase while we're working */
+ cursize = svm_fifo_max_dequeue (f);
+
+ if (PREDICT_FALSE (cursize == f->nitems))
return -2; /* fifo stuffed */
- /* read cursize, which can only decrease while we're working */
- cursize = f->cursize;
nitems = f->nitems;
/* Number of bytes we're going to copy */
@@ -382,8 +387,8 @@ svm_fifo_enqueue_with_offset_internal (svm_fifo_t * f,
ASSERT (offset > 0);
- /* read cursize, which can only decrease while we're working */
- cursize = f->cursize;
+ /* read cursize, which can only increase while we're working */
+ cursize = svm_fifo_max_dequeue (f);
nitems = f->nitems;
/* Will this request fit? */
@@ -437,11 +442,11 @@ svm_fifo_dequeue_internal (svm_fifo_t * f,
u32 total_copy_bytes, first_copy_bytes, second_copy_bytes;
u32 cursize, nitems;
- if (PREDICT_FALSE (f->cursize == 0))
+ /* read cursize, which can only increase while we're working */
+ cursize = svm_fifo_max_dequeue (f);
+ if (PREDICT_FALSE (cursize == 0))
return -2; /* nothing in the fifo */
- /* read cursize, which can only increase while we're working */
- cursize = f->cursize;
nitems = f->nitems;
/* Number of bytes we're going to copy */
@@ -495,11 +500,11 @@ svm_fifo_peek (svm_fifo_t * f, int pid, u32 offset, u32 max_bytes,
u32 total_copy_bytes, first_copy_bytes, second_copy_bytes;
u32 cursize, nitems, real_head;
- if (PREDICT_FALSE (f->cursize == 0))
+ /* read cursize, which can only increase while we're working */
+ cursize = svm_fifo_max_dequeue (f);
+ if (PREDICT_FALSE (cursize == 0))
return -2; /* nothing in the fifo */
- /* read cursize, which can only increase while we're working */
- cursize = f->cursize;
nitems = f->nitems;
real_head = f->head + offset;
real_head = real_head >= nitems ? real_head - nitems : real_head;
@@ -532,11 +537,11 @@ svm_fifo_dequeue_drop (svm_fifo_t * f, int pid, u32 max_bytes)
u32 total_drop_bytes, first_drop_bytes, second_drop_bytes;
u32 cursize, nitems;
- if (PREDICT_FALSE (f->cursize == 0))
+ /* read cursize, which can only increase while we're working */
+ cursize = svm_fifo_max_dequeue (f);
+ if (PREDICT_FALSE (cursize == 0))
return -2; /* nothing in the fifo */
- /* read cursize, which can only increase while we're working */
- cursize = f->cursize;
nitems = f->nitems;
/* Number of bytes we're going to drop */
diff --git a/src/svm/svm_fifo.h b/src/svm/svm_fifo.h
index 39556173e4d..80e5b0f2d39 100644
--- a/src/svm/svm_fifo.h
+++ b/src/svm/svm_fifo.h
@@ -44,14 +44,16 @@ typedef struct
typedef struct
{
+ volatile u32 cursize; /**< current fifo size */
+ u32 nitems;
+ CLIB_CACHE_LINE_ALIGN_MARK (end_cursize);
+
pthread_mutex_t mutex; /* 8 bytes */
pthread_cond_t condvar; /* 8 bytes */
svm_lock_tag_t tag;
- volatile u32 cursize; /**< current fifo size */
volatile u8 has_event; /**< non-zero if deq event exists */
u32 owner_pid;
- u32 nitems;
/* Backpointers */
u32 server_session_index;
@@ -105,7 +107,7 @@ svm_fifo_max_dequeue (svm_fifo_t * f)
static inline u32
svm_fifo_max_enqueue (svm_fifo_t * f)
{
- return f->nitems - f->cursize;
+ return f->nitems - svm_fifo_max_dequeue (f);
}
static inline u8