X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=14bbb2b48d791355f6e8de67f1cb745ae9cf0d5c;hb=659151a0b655c619f3acbb98a45e9eeb8002a4b3;hp=5379928e0866881e31b97fd13f9147804a9fae35;hpb=6b055801f5e04e134b779ad49bc4826179ebf6bb;p=palacios.git diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h index 5379928..14bbb2b 100644 --- a/palacios/include/palacios/vmm.h +++ b/palacios/include/palacios/vmm.h @@ -22,7 +22,6 @@ - #ifdef __V3VEE__ #include #include @@ -60,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); \ + ptr = (os_hooks)->allocate_pages(num_pages,PAGE_SIZE_4KB,-1,0); \ } \ ptr; \ }) @@ -71,12 +70,34 @@ 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); \ + ptr = (os_hooks)->allocate_pages(num_pages,align,-1,0); \ } \ ptr; \ }) +#define V3_AllocPagesNode(num_pages, node_id) \ + ({ \ + 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; \ + }) + +#define V3_AllocPagesExtended(num_pages, align, node_id, constraints) \ + ({ \ + 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; \ + }) + + + #define V3_FreePages(page, num_pages) \ do { \ extern struct v3_os_hooks * os_hooks; \ @@ -126,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; \ @@ -171,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) { \ @@ -196,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; \ @@ -292,16 +346,26 @@ struct v3_vm_info; /* This will contain function pointers that provide OS services */ struct v3_os_hooks { - // the vm pointer is the host os's "priv_data" from v3_create_vm - // if vm is null, this is a general palacios printout - // if vm is not null, and vcore is negative, this is a general print form the vm - // if vm is not null, and vcore is non-negative, this is a print from a specific vcore + // the vm pointer is the host os's "priv_data" from v3_create_vm + // if vm is null, this is a general palacios printout + // if vm is not null, and vcore is negative, this is a general print form the vm + // if vm is not null, and vcore is non-negative, this is a print from a specific vcore void (*print)(void *vm, int vcore, const char * format, ...) __attribute__ ((format (printf, 3, 4))); - - void *(*allocate_pages)(int num_pages, unsigned int alignment); + + // 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 + // Allocates physically contiguous pages +#define V3_ALLOC_PAGES_CONSTRAINT_4GB 1 + void *(*allocate_pages)(int num_pages, unsigned int alignment, int node_id, int constraint); 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); @@ -326,12 +390,11 @@ struct v3_os_hooks { unsigned int (*get_cpu)(void); - - 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); }; @@ -356,7 +419,12 @@ typedef enum {V3_VCORE_CPU_UNKNOWN, V3_VCORE_CPU_REAL, V3_VCORE_CPU_PROTECTED, V typedef enum {V3_VCORE_MEM_STATE_UNKNOWN, V3_VCORE_MEM_STATE_SHADOW, V3_VCORE_MEM_STATE_NESTED} v3_vcore_mem_state_t; typedef enum {V3_VCORE_MEM_MODE_UNKNOWN, V3_VCORE_MEM_MODE_PHYSICAL, V3_VCORE_MEM_MODE_VIRTUAL} v3_vcore_mem_mode_t; -struct v3_vcore_state { + +struct v3_vm_base_state { + v3_vm_state_t state; +}; + +struct v3_vm_vcore_state { v3_vcore_state_t state; v3_vcore_cpu_mode_t cpu_mode; v3_vcore_mem_state_t mem_state; @@ -366,12 +434,22 @@ struct v3_vcore_state { unsigned long long num_exits; }; -struct v3_vm_state { - v3_vm_state_t state; - void * mem_base_paddr; - unsigned long long mem_size; - unsigned long num_vcores; - struct v3_vcore_state vcore[0]; +struct v3_vm_core_state { + unsigned long num_vcores; + struct v3_vm_vcore_state vcore[]; +}; + +struct v3_vm_mem_region { + void *host_paddr; + unsigned long long size; + int swapped; + int pinned; +}; + +struct v3_vm_mem_state { + unsigned long long mem_size; + unsigned long num_regions; + struct v3_vm_mem_region region[]; }; char *v3_lookup_option(char *name); @@ -379,7 +457,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); @@ -393,10 +471,16 @@ int v3_send_vm(struct v3_vm_info * vm, char * store, char * url, unsigned long l int v3_receive_vm(struct v3_vm_info * vm, char * store, char * url, unsigned long long opts); int v3_move_vm_core(struct v3_vm_info * vm, int vcore_id, int target_cpu); +int v3_move_vm_mem(struct v3_vm_info * vm, void *gpa, int target_cpu); int v3_free_vm(struct v3_vm_info * vm); -int v3_get_state_vm(struct v3_vm_info *vm, struct v3_vm_state *out); +int v3_get_state_vm(struct v3_vm_info *vm, + struct v3_vm_base_state *base, + struct v3_vm_core_state *core, + struct v3_vm_mem_state *mem); + +char *v3_lookup_option(char *key); int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr);