aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2015-12-12 10:37:00 -0500
committerDave Barach <dave@barachs.net>2015-12-12 10:37:21 -0500
commit95bb883a62b5b4da53c5082ae93ccc3bfd867467 (patch)
tree701c3acf73700169009c90a36b261fd02f52a438
parentcb9cadad578297ffd78fa8a33670bdf1ab669e7e (diff)
Handle large user-mode page sizes, tested to 64k
Change-Id: Iccabc1be6e3a2822268c7b60e9c4e8250677c2ac Signed-off-by: Dave Barach <dave@barachs.net>
-rw-r--r--svm/svm.c5
-rw-r--r--svm/svm.h4
2 files changed, 6 insertions, 3 deletions
diff --git a/svm/svm.c b/svm/svm.c
index c629f932..4d45b297 100644
--- a/svm/svm.c
+++ b/svm/svm.c
@@ -632,7 +632,10 @@ static void svm_region_init_internal (char *root_path)
atexit(svm_mutex_cleanup);
/* Randomize the shared-VM base at init time */
- randomize_baseva = (ticks & 15) * 4096;
+ if (MMAP_PAGESIZE <= (4<<10))
+ randomize_baseva = (ticks & 15) * MMAP_PAGESIZE;
+ else
+ randomize_baseva = (ticks & 3) * MMAP_PAGESIZE;
vec_validate(a,0);
a->root_path = root_path;
diff --git a/svm/svm.h b/svm/svm.h
index 95c55001..5f112cb8 100644
--- a/svm/svm.h
+++ b/svm/svm.h
@@ -25,7 +25,7 @@
#include <vppinfra/clib.h>
#include <vppinfra/mem.h>
-#define MMAP_PAGESIZE (4<<10)
+#define MMAP_PAGESIZE (clib_mem_get_page_size())
#define SVM_VERSION ((1<<16) | 1) /* set to declare region ready. */
@@ -34,7 +34,7 @@
#define SVM_FLAGS_NODATA (1<<2) /* region will be further subdivided */
#define SVM_FLAGS_NEED_DATA_INIT (1<<3)
-#define SVM_PVT_MHEAP_SIZE (32<<10) /* region's private mheap (32k) */
+#define SVM_PVT_MHEAP_SIZE (128<<10) /* region's private mheap (128k) */
typedef struct svm_region_ {
volatile uword version;