X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=78373bc415aa64d95369e83e61e5d45e63bb332c;hb=d3d6d09894dba66f4e2361bb2f903139a2d83684;hp=083644e2fe897559dc2801d0b13ec4d0314af0da;hpb=298a05652b5704f9881af0683e3f16fc4cd03959;p=palacios.git diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h index 083644e..78373bc 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; \ @@ -292,14 +313,18 @@ 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 +#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); void *(*malloc)(unsigned int size); @@ -326,8 +351,6 @@ 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); @@ -356,7 +379,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 +394,20 @@ 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; +}; + +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); @@ -386,17 +422,23 @@ int v3_pause_vm(struct v3_vm_info * vm); int v3_continue_vm(struct v3_vm_info * vm); int v3_simulate_vm(struct v3_vm_info * vm, unsigned int msecs); -int v3_save_vm(struct v3_vm_info * vm, char * store, char * url); -int v3_load_vm(struct v3_vm_info * vm, char * store, char * url); +int v3_save_vm(struct v3_vm_info * vm, char * store, char * url, unsigned long long opts); +int v3_load_vm(struct v3_vm_info * vm, char * store, char * url, unsigned long long opts); -int v3_send_vm(struct v3_vm_info * vm, char * store, char * url); -int v3_receive_vm(struct v3_vm_info * vm, char * store, char * url); +int v3_send_vm(struct v3_vm_info * vm, char * store, char * url, unsigned long long opts); +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);