summaryrefslogtreecommitdiffstats
path: root/src/svm
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2021-01-09 14:34:01 -0800
committerFlorin Coras <fcoras@cisco.com>2021-01-09 18:50:08 -0800
commit0bc78d80363efc22d07171473933d1b0016440e4 (patch)
tree702dbe373faf878da86d5016f28f287175d692f5 /src/svm
parentb716e3836c90bc90642076b6d895ad7c9c00fa9a (diff)
session svm: fix fifo migration
Allocate and attach a new pair of private fifos in the right private slice when a session is cloned. This ensures that private fifos are not shared between workers. Type: fix Signed-off-by: Florin Coras <fcoras@cisco.com> Change-Id: Ib700d18104d2ca79aa8a07434cdcdcab0bef13a5
Diffstat (limited to 'src/svm')
-rw-r--r--src/svm/fifo_segment.c62
-rw-r--r--src/svm/fifo_segment.h4
-rw-r--r--src/svm/fifo_types.h2
3 files changed, 41 insertions, 27 deletions
diff --git a/src/svm/fifo_segment.c b/src/svm/fifo_segment.c
index fdcf84ea8d7..d30932448c6 100644
--- a/src/svm/fifo_segment.c
+++ b/src/svm/fifo_segment.c
@@ -901,8 +901,6 @@ fifo_segment_free_fifo (fifo_segment_t * fs, svm_fifo_t * f)
/* Add to free list */
fss_fifo_free_list_push (fsh, fss, sf);
- // sf->next = fss->free_fifos;
- // fss->free_fifos = fs_sptr (fsh, sf);
fss->virtual_mem -= svm_fifo_size (f);
@@ -935,53 +933,67 @@ 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)
+fifo_segment_detach_fifo (fifo_segment_t *fs, svm_fifo_t **f)
{
fifo_slice_private_t *pfss;
fifo_segment_slice_t *fss;
- svm_fifo_chunk_t *c;
- u32 fl_index;
+ u32 fl_index, slice_index;
+ svm_fifo_chunk_t **c;
+ svm_fifo_t *of = *f;
- ASSERT (f->refcnt == 1);
-
- fss = fsh_slice_get (fs->h, f->shr->slice_index);
- pfss = fs_slice_private_get (fs, f->shr->slice_index);
- fss->virtual_mem -= svm_fifo_size (f);
- if (f->flags & SVM_FIFO_F_LL_TRACKED)
- pfss_fifo_del_active_list (pfss, f);
+ slice_index = of->master_thread_index;
+ fss = fsh_slice_get (fs->h, slice_index);
+ pfss = fs_slice_private_get (fs, slice_index);
+ fss->virtual_mem -= svm_fifo_size (of);
+ if (of->flags & SVM_FIFO_F_LL_TRACKED)
+ pfss_fifo_del_active_list (pfss, of);
- c = fs_chunk_ptr (fs->h, f->shr->start_chunk);
- while (c)
+ /* Update slice counts for chunks that were detached */
+ vec_foreach (c, of->chunks_at_attach)
{
- fl_index = fs_freelist_for_size (c->length);
+ fl_index = fs_freelist_for_size ((*c)->length);
clib_atomic_fetch_sub_rel (&fss->num_chunks[fl_index], 1);
- c = fs_chunk_ptr (fs->h, c->next);
}
+ vec_free (of->chunks_at_attach);
+
+ clib_mem_bulk_free (pfss->fifos, *f);
+ *f = 0;
}
void
-fifo_segment_attach_fifo (fifo_segment_t * fs, svm_fifo_t * f,
- u32 slice_index)
+fifo_segment_attach_fifo (fifo_segment_t *fs, svm_fifo_t **f, u32 slice_index)
{
fifo_slice_private_t *pfss;
fifo_segment_slice_t *fss;
svm_fifo_chunk_t *c;
+ svm_fifo_t *nf, *of;
u32 fl_index;
- f->shr->slice_index = slice_index;
- fss = fsh_slice_get (fs->h, f->shr->slice_index);
- pfss = fs_slice_private_get (fs, f->shr->slice_index);
- fss->virtual_mem += svm_fifo_size (f);
- if (f->flags & SVM_FIFO_F_LL_TRACKED)
- pfss_fifo_add_active_list (pfss, f);
+ nf = fs_fifo_alloc (fs, slice_index);
+ clib_memcpy_fast (nf, *f, sizeof (*nf));
- c = fs_chunk_ptr (fs->h, f->shr->start_chunk);
+ fss = fsh_slice_get (fs->h, slice_index);
+ pfss = fs_slice_private_get (fs, slice_index);
+ fss->virtual_mem += svm_fifo_size (nf);
+ if (nf->flags & SVM_FIFO_F_LL_TRACKED)
+ pfss_fifo_add_active_list (pfss, nf);
+
+ /* Update allocated chunks for fifo segment and build list
+ * of chunks to be freed at detach */
+ of = *f;
+ of->chunks_at_attach = 0;
+
+ c = fs_chunk_ptr (fs->h, nf->shr->start_chunk);
while (c)
{
fl_index = fs_freelist_for_size (c->length);
clib_atomic_fetch_add_rel (&fss->num_chunks[fl_index], 1);
+ vec_add1 (of->chunks_at_attach, c);
c = fs_chunk_ptr (fs->h, c->next);
}
+
+ nf->shr->slice_index = slice_index;
+ *f = nf;
}
uword
diff --git a/src/svm/fifo_segment.h b/src/svm/fifo_segment.h
index 8266690d4ed..268b48b39f6 100644
--- a/src/svm/fifo_segment.h
+++ b/src/svm/fifo_segment.h
@@ -139,8 +139,8 @@ svm_fifo_t *fifo_segment_alloc_fifo_w_offset (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,
+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);
uword fifo_segment_fifo_offset (svm_fifo_t *f);
diff --git a/src/svm/fifo_types.h b/src/svm/fifo_types.h
index 592a7007c7d..03adbd33c2c 100644
--- a/src/svm/fifo_types.h
+++ b/src/svm/fifo_types.h
@@ -109,6 +109,8 @@ typedef struct _svm_fifo
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 */
+
#if SVM_FIFO_TRACE
svm_fifo_trace_elem_t *trace;
#endif