aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoît Ganne <bganne@cisco.com>2020-06-15 12:24:36 +0200
committerDamjan Marion <dmarion@me.com>2020-06-15 14:52:04 +0000
commitc16fe4689055242c64c71d83e41908a8fb6c2726 (patch)
tree902da3f5a63a447491c57ae9cf716eeec0a9390c
parentb43677fe2d449fa1dadd47710ca8c9057da58e2a (diff)
buffers: fix non-default sized buffers initialization
Type: fix Change-Id: I4a93e1d9936414c514cb237a22624986b3ef5b3d Signed-off-by: Benoît Ganne <bganne@cisco.com>
-rw-r--r--src/vlib/buffer.c26
1 files changed, 21 insertions, 5 deletions
diff --git a/src/vlib/buffer.c b/src/vlib/buffer.c
index f5b813793a3..a645438640a 100644
--- a/src/vlib/buffer.c
+++ b/src/vlib/buffer.c
@@ -504,6 +504,13 @@ vlib_buffer_chain_append_data_with_alloc (vlib_main_t * vm,
return copied;
}
+static uword
+vlib_buffer_alloc_size (uword ext_hdr_size, uword data_size)
+{
+ return CLIB_CACHE_LINE_ROUND (ext_hdr_size + sizeof (vlib_buffer_t) +
+ data_size);
+}
+
u8
vlib_buffer_pool_create (vlib_main_t * vm, char *name, u32 data_size,
u32 physmem_map_index)
@@ -559,7 +566,7 @@ vlib_buffer_pool_create (vlib_main_t * vm, char *name, u32 data_size,
vec_validate_aligned (bp->threads, vec_len (vlib_mains) - 1,
CLIB_CACHE_LINE_BYTES);
- alloc_size = data_size + sizeof (vlib_buffer_t) + bm->ext_hdr_size;
+ alloc_size = vlib_buffer_alloc_size (bm->ext_hdr_size, data_size);
n_alloc_per_page = (1ULL << m->log2_page_size) / alloc_size;
/* preallocate buffer indices memory */
@@ -680,10 +687,9 @@ vlib_buffer_main_init_numa_node (struct vlib_main_t *vm, u32 numa_node,
u32 physmem_map_index;
uword n_pages, pagesize;
u32 buffers_per_numa;
- u32 buffer_size = CLIB_CACHE_LINE_ROUND (bm->ext_hdr_size +
- sizeof (vlib_buffer_t) +
- vlib_buffer_get_default_data_size
- (vm));
+ u32 buffer_size = vlib_buffer_alloc_size (bm->ext_hdr_size,
+ vlib_buffer_get_default_data_size
+ (vm));
u8 *name;
pagesize = clib_mem_get_default_hugepage_size ();
@@ -693,6 +699,16 @@ vlib_buffer_main_init_numa_node (struct vlib_main_t *vm, u32 numa_node,
VLIB_BUFFER_DEFAULT_BUFFERS_PER_NUMA;
retry:
+
+ if (buffer_size > pagesize)
+ {
+ error =
+ clib_error_return (0,
+ "buffer size (%llu) is greater than page size (%llu)",
+ buffer_size, pagesize);
+ goto done;
+ }
+
n_pages = (buffers_per_numa - 1) / (pagesize / buffer_size) + 1;
error = vlib_physmem_shared_map_create (vm, (char *) name,
n_pages * pagesize,