X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=linux_usr%2Fv3_mem.c;h=1d987fcdb8b5dfc48f48afa61342851f69dc5e9e;hp=b30b3447ab21f0280b6312fccd7b0cc2a40e0d4a;hb=f240f8a3c11478abe180bd906c746c68eb8c3a3c;hpb=f1c8d924817188c4f08a97205e97392ff304913f

diff --git a/linux_usr/v3_mem.c b/linux_usr/v3_mem.c
index b30b344..1d987fc 100644
--- a/linux_usr/v3_mem.c
+++ b/linux_usr/v3_mem.c
@@ -17,6 +17,12 @@
 
 #include "v3_ctrl.h"
 
+// set to zero to ignore, or set
+// to a level likely given the largest contiguous
+// page allocation outside of the base regions
+// note that the seed pools provide 2-4 MB chunks
+// to start
+#define PALACIOS_MIN_ALLOC (64*4096)
 
 #define SYS_PATH "/sys/devices/system/memory/"
 
@@ -153,24 +159,19 @@ int main(int argc, char * argv[]) {
     }
 
     if (op==ADD) {
-	mem_size_bytes = atoll(argv[optind]) * (1024 * 1024);
+	mem_size_bytes = (unsigned long long) (atof(argv[optind]) * (1024 * 1024));
 
-	if (mem_size_bytes > palacios_runtime_mem_block_size) { 
-	    EPRINTF("Trying to add a larger single chunk of memory than Palacios can manage\n"
+	if (mem_size_bytes < palacios_runtime_mem_block_size ||
+	    (PALACIOS_MIN_ALLOC!=0 && mem_size_bytes < PALACIOS_MIN_ALLOC)) {
+	    EPRINTF("Trying to add a smaller single chunk of memory than Palacios needs\n"
 		   "Your request:                        %llu bytes\n"
 		   "Palacios run-time memory block size: %llu bytes\n",
-		   mem_size_bytes, palacios_runtime_mem_block_size);
+		   "Palacios minimal contiguous alloc:   %llu bytes\n",
+		    mem_size_bytes, palacios_runtime_mem_block_size,
+		    PALACIOS_MIN_ALLOC);
 	    return -1;
 	}
 
-	if (mem_size_bytes < palacios_runtime_mem_block_size) { 
-	    EPRINTF("Trying to add a smaller single chunk of memory than Palacios can manage\n"
-		   "Your request:                        %llu bytes\n"
-		   "Palacios run-time memory block size: %llu bytes\n",
-		   mem_size_bytes, palacios_runtime_mem_block_size);
-	    return -1;
-	}
-	
 	if (request && mem_size_bytes > kernel_max_page_alloc_bytes) { 
 	    EPRINTF("Trying to request a larger single chunk of memory than the kernel can allocate\n"
 		   "Your request:                        %llu bytes\n"