commit 5da96a77a84ae5414debbc46d390464d51010113
author Florin Coras <fcoras@cisco.com> Thu Jul 12 01:45:13 2018 -0700
committer Damjan Marion <dmarion@me.com> Tue Jul 17 09:01:46 2018 +0000
tree 5895f437c915ea7a5db7288afa2f2c68820ed0b8
parent 208c29aac523231af2420a95ba7e5d361698780b

session: make sure segment sizes are page aligned

Change-Id: Ibbba75d069ca1bbf9e5a1b8bd2f405d32021c656
Signed-off-by: Florin Coras <fcoras@cisco.com>

src/vnet/session/segment_manager.c

diff --git a/src/vnet/session/segment_manager.c b/src/vnet/session/segment_manager.c
index 9dade6e..31bb0c3 100644
--- a/src/vnet/session/segment_manager.c
+++ b/src/vnet/session/segment_manager.c
@@ -153,7 +153,7 @@
 segment_manager_add_segment (segment_manager_t * sm, u32 segment_size)
 {
   segment_manager_main_t *smm = &segment_manager_main;
-  u32 rnd_margin = 128 << 10, seg_index;
+  u32 rnd_margin = 128 << 10, seg_index, page_size;
   segment_manager_properties_t *props;
   uword baseva = (u64) ~ 0, alloc_size;
   svm_fifo_segment_private_t *seg;
@@ -187,6 +187,8 @@
    * Initialize ssvm segment and svm fifo private header
    */
   segment_size = segment_size ? segment_size : props->add_segment_size;
+  page_size = clib_mem_get_page_size ();
+  segment_size = (segment_size + page_size - 1) & ~(page_size - 1);
   if (props->segment_type != SSVM_SEGMENT_PRIVATE)
     {
       seg_name = format (0, "%d-%d%c", getpid (), segment_name_counter++, 0);