Generalization of constraints on page allocation and implementation/use

[palacios.git] / palacios / include / palacios / vmm.h

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 7aba5de..c00e10f 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -59,7 +59,7 @@ int      v3_get_vcore(struct guest_info *);
        extern struct v3_os_hooks * os_hooks;                           \
        void * ptr = 0;                                                 \
        if ((os_hooks) && (os_hooks)->allocate_pages) {                 \
-           ptr = (os_hooks)->allocate_pages(num_pages,PAGE_SIZE_4KB,-1,0); \
+           ptr = (os_hooks)->allocate_pages(num_pages,PAGE_SIZE_4KB,-1,0,0); \
        }                                                               \
        ptr;                                                            \
     })
@@ -70,7 +70,7 @@ int      v3_get_vcore(struct guest_info *);
        extern struct v3_os_hooks * os_hooks;                           \
        void * ptr = 0;                                                 \
        if ((os_hooks) && (os_hooks)->allocate_pages) {                 \
-           ptr = (os_hooks)->allocate_pages(num_pages,align,-1,0);     \
+           ptr = (os_hooks)->allocate_pages(num_pages,align,-1,0,0);   \
        }                                                               \
        ptr;                                                            \
     })
@@ -81,17 +81,17 @@ int      v3_get_vcore(struct guest_info *);
         extern struct v3_os_hooks * os_hooks;                           \
         void * ptr = 0;                                                 \
         if ((os_hooks) && (os_hooks)->allocate_pages) {                 \
-            ptr = (os_hooks)->allocate_pages(num_pages, PAGE_SIZE_4KB, node_id,0); \
+            ptr = (os_hooks)->allocate_pages(num_pages, PAGE_SIZE_4KB, node_id,0,0); \
         }                                                               \
         ptr;                                                            \
     })
 
-#define V3_AllocPagesExtended(num_pages, align, node_id, constraints)                  \
+#define V3_AllocPagesExtended(num_pages, align, node_id, filter_func, filter_state) \
     ({                                                                  \
         extern struct v3_os_hooks * os_hooks;                           \
         void * ptr = 0;                                                 \
         if ((os_hooks) && (os_hooks)->allocate_pages) {                 \
-            ptr = (os_hooks)->allocate_pages(num_pages, align, node_id,constraints); \
+            ptr = (os_hooks)->allocate_pages(num_pages, align, node_id, filter_func, filter_state); \
         }                                                               \
         ptr;                                                            \
     })
@@ -147,6 +147,24 @@ int      v3_get_vcore(struct guest_info *);
        }                                       \
     } while (0)
 
+#define V3_VMalloc(size) ({                            \
+           extern struct v3_os_hooks * os_hooks;       \
+           void * var = 0;                             \
+           if ((os_hooks) && (os_hooks)->vmalloc) {    \
+               var = (os_hooks)->vmalloc(size);                \
+           }                                           \
+           if (!var) PrintError(VM_NONE,VCORE_NONE,"VMALLOC FAILURE. Memory LEAK!!\n"); \
+           var;                                        \
+       })
+
+#define V3_VFree(addr)                         \
+    do {                                       \
+       extern struct v3_os_hooks * os_hooks;   \
+       if ((os_hooks) && (os_hooks)->vfree) {  \
+           (os_hooks)->vfree(addr);            \
+       }                                       \
+    } while (0)
+
 // uint_t V3_CPU_KHZ();
 #define V3_CPU_KHZ() ({                                                        \
            unsigned int khz = 0;                                       \
@@ -192,7 +210,7 @@ int      v3_get_vcore(struct guest_info *);
 
 
 
-#define V3_CREATE_THREAD(fn, arg, name)        ({                              \
+#define V3_CREATE_AND_START_THREAD(fn, arg, name)      ({              \
            void * thread = NULL;                                       \
            extern struct v3_os_hooks * os_hooks;                       \
            if ((os_hooks) && (os_hooks)->start_kernel_thread) {        \
@@ -217,12 +235,27 @@ int      v3_get_vcore(struct guest_info *);
 #define V3_CREATE_THREAD_ON_CPU(cpu, fn, arg, name) ({                 \
            void * thread = NULL;                                       \
            extern struct v3_os_hooks * os_hooks;                       \
-           if ((os_hooks) && (os_hooks)->start_thread_on_cpu) {        \
-               thread = (os_hooks)->start_thread_on_cpu(cpu, fn, arg, name); \
+           if ((os_hooks) && (os_hooks)->create_thread_on_cpu) {       \
+               thread = (os_hooks)->create_thread_on_cpu(cpu, fn, arg, name); \
            }                                                           \
            thread;                                                     \
        })
 
+#define V3_START_THREAD(thread) ({                                     \
+       extern struct v3_os_hooks * os_hooks;                           \
+       if((os_hooks) && (os_hooks)->start_thread){                     \
+           (os_hooks)->start_thread(thread);                           \
+       }                                                               \
+  })
+
+#define V3_CREATE_AND_START_THREAD_ON_CPU(cpu, fn, arg, name) ({        \
+           void *thread = V3_CREATE_THREAD_ON_CPU(cpu,fn,arg,name);    \
+           if (thread) {                                               \
+               V3_START_THREAD(thread);                                \
+            }                                                           \
+            thread;                                                     \
+       })
+
 #define V3_MOVE_THREAD_TO_CPU(pcpu, thread) ({                         \
        int ret = -1;                                                   \
        extern struct v3_os_hooks * os_hooks;                           \
@@ -323,10 +356,17 @@ struct v3_os_hooks {
     // For page allocation:
     //   - node_id -1 => any node, otherwise the numa node we want to alloc from
     //   - constraint = 0 => no constraints, otherwise a bitwise-or of the following flags
-#define V3_ALLOC_PAGES_CONSTRAINT_4GB  1
-    void *(*allocate_pages)(int num_pages, unsigned int alignment, int node_id, int constraint);
+    // Allocates physically contiguous pages
+    //   - with desired alignment
+    //   - that the filter_func returns nonzero on (if filter_func is given)
+    void *(*allocate_pages)(int num_pages, unsigned int alignment, int node_id, int (*filter_func)(void *paddr, void *filter_state), void *filter_state);
     void (*free_pages)(void * page, int num_pages);
 
+    // Allocates virtually contiguous memory
+    void *(*vmalloc)(unsigned int size);
+    void (*vfree)(void * addr);
+
+    // Allocates virtually and physically contiguous memory
     void *(*malloc)(unsigned int size);
     void (*free)(void * addr);
 
@@ -354,7 +394,8 @@ struct v3_os_hooks {
     void * (*start_kernel_thread)(int (*fn)(void * arg), void * arg, char * thread_name); 
     void (*interrupt_cpu)(struct v3_vm_info * vm, int logical_cpu, int vector);
     void (*call_on_cpu)(int logical_cpu, void (*fn)(void * arg), void * arg);
-    void * (*start_thread_on_cpu)(int cpu_id, int (*fn)(void * arg), void * arg, char * thread_name);
+    void * (*create_thread_on_cpu)(int cpu_id, int (*fn)(void * arg), void * arg, char * thread_name);
+    void (*start_thread)(void * core_thread);
     int (*move_thread_to_cpu)(int cpu_id,  void * thread);
 };
 
@@ -417,7 +458,7 @@ void Init_V3(struct v3_os_hooks * hooks, char * cpus, int num_cpus, char *option
 void Shutdown_V3( void );
 
 
-struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name);
+struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name, unsigned int cpu_mask);
 int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask);
 int v3_stop_vm(struct v3_vm_info * vm);
 int v3_pause_vm(struct v3_vm_info * vm);