aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2020-01-31 08:28:02 -0800
committerJohn Lo <loj@cisco.com>2020-01-31 21:40:16 +0000
commit36a0c4d65c50a63b57f6d217711bc2f6af931401 (patch)
treeb36aea7c1122878dbfc060578f82176ac4ca3f46
parent92de6b65be144c8108149c1a56327832edcd8ba6 (diff)
session: fix chunk batch alloc for large fifos
Type: fix Change-Id: Ibfac65b516f20d25d91f6d0cf86491353811b8be Signed-off-by: Florin Coras <fcoras@cisco.com>
-rw-r--r--src/svm/fifo_segment.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/svm/fifo_segment.c b/src/svm/fifo_segment.c
index 1d8d073a65b..43efbc336da 100644
--- a/src/svm/fifo_segment.c
+++ b/src/svm/fifo_segment.c
@@ -380,16 +380,17 @@ fs_try_alloc_fifo_batch (fifo_segment_header_t * fsh,
fifo_segment_slice_t * fss,
u32 fl_index, u32 batch_size)
{
- u32 size, hdrs, rounded_data_size;
+ u32 hdrs, rounded_data_size;
svm_fifo_chunk_t *c;
svm_fifo_t *f;
void *oldheap;
+ uword size;
u8 *fmem;
int i;
rounded_data_size = fs_freelist_index_to_size (fl_index);
hdrs = sizeof (*f) + sizeof (*c);
- size = (hdrs + rounded_data_size) * batch_size;
+ size = (uword) (hdrs + rounded_data_size) * batch_size;
oldheap = ssvm_push_heap (fsh->ssvm_sh);
fmem = clib_mem_alloc_aligned_at_offset (size, CLIB_CACHE_LINE_BYTES,
@@ -608,12 +609,12 @@ fifo_segment_prealloc_fifo_hdrs (fifo_segment_t * fs, u32 slice_index,
fifo_segment_slice_t *fss;
svm_fifo_t *f;
void *oldheap;
- u32 size;
+ uword size;
u8 *fmem;
int i;
fss = fsh_slice_get (fsh, slice_index);
- size = (sizeof (*f)) * batch_size;
+ size = (uword) (sizeof (*f)) * batch_size;
oldheap = ssvm_push_heap (fsh->ssvm_sh);
fmem = clib_mem_alloc_aligned_at_offset (size, CLIB_CACHE_LINE_BYTES,
@@ -644,11 +645,12 @@ int
fifo_segment_prealloc_fifo_chunks (fifo_segment_t * fs, u32 slice_index,
u32 chunk_size, u32 batch_size)
{
- u32 size, rounded_data_size, fl_index;
fifo_segment_header_t *fsh = fs->h;
+ u32 rounded_data_size, fl_index;
fifo_segment_slice_t *fss;
svm_fifo_chunk_t *c;
void *oldheap;
+ uword size;
u8 *cmem;
int i;
@@ -660,7 +662,7 @@ fifo_segment_prealloc_fifo_chunks (fifo_segment_t * fs, u32 slice_index,
fl_index = fs_freelist_for_size (chunk_size);
rounded_data_size = fs_freelist_index_to_size (fl_index);
- size = (sizeof (*c) + rounded_data_size) * batch_size;
+ size = (uword) (sizeof (*c) + rounded_data_size) * batch_size;
oldheap = ssvm_push_heap (fsh->ssvm_sh);
cmem = clib_mem_alloc_aligned_at_offset (size, CLIB_CACHE_LINE_BYTES,