X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=37a10731db41caf36d32af3dbe401d0019946942;hb=b22b76bd788a2dbdc23c6957b7e8488858cf2ef4;hp=0d958218682efc2c7bdd38d49e70db379b85e397;hpb=07a12ade201ee7c2fe2358084ca079d2facac500;p=palacios.git diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h index 0d95821..37a1073 100644 --- a/palacios/include/palacios/vmm.h +++ b/palacios/include/palacios/vmm.h @@ -22,19 +22,19 @@ /*#include */ -#include -#include struct guest_info; #ifdef __V3VEE__ +#include +#include //#include #include -//#include + /* utility definitions */ @@ -90,11 +90,11 @@ struct guest_info; }) -#define V3_FreePage(page) \ +#define V3_FreePages(page, num_pages) \ do { \ extern struct v3_os_hooks * os_hooks; \ - if ((os_hooks) && (os_hooks)->free_page) { \ - (os_hooks)->free_page(page); \ + if ((os_hooks) && (os_hooks)->free_pages) { \ + (os_hooks)->free_pages(page, num_pages); \ } \ } while(0) @@ -182,17 +182,16 @@ struct guest_info; }) -#ifdef CONFIG_MULTITHREAD_OS - -#define V3_CREATE_THREAD(fn, arg, name) \ - do { \ - extern struct v3_os_hooks * os_hooks; \ - if ((os_hooks) && (os_hooks)->start_kernel_thread) { \ - (os_hooks)->start_kernel_thread(fn, arg, name); \ - } \ - } while (0) +#define V3_CREATE_THREAD(fn, arg, name) ({ \ + void * thread = NULL; \ + extern struct v3_os_hooks * os_hooks; \ + if ((os_hooks) && (os_hooks)->start_kernel_thread) { \ + thread = (os_hooks)->start_kernel_thread(fn, arg, name); \ + } \ + thread; \ + }) @@ -216,51 +215,79 @@ struct guest_info; thread; \ }) - -#endif - - - - - +#define V3_MOVE_THREAD_TO_CPU(pcpu, thread) ({ \ + int ret = -1; \ + extern struct v3_os_hooks * os_hooks; \ + if((os_hooks) && (os_hooks)->move_thread_to_cpu) { \ + ret = (os_hooks)->move_thread_to_cpu(pcpu, thread); \ + } \ + ret; \ + }) + /* ** */ + #define V3_ASSERT(x) \ do { \ + extern struct v3_os_hooks * os_hooks; \ if (!(x)) { \ PrintDebug("Failed assertion in %s: %s at %s, line %d, RA=%lx\n", \ __func__, #x, __FILE__, __LINE__, \ (ulong_t) __builtin_return_address(0)); \ - while(1); \ + while(1){ \ + if ((os_hooks) && (os_hooks)->yield_cpu) { \ + (os_hooks)->yield_cpu(); \ + } \ + } \ } \ } while(0) \ +#define V3_Yield() \ + do { \ + extern struct v3_os_hooks * os_hooks; \ + if ((os_hooks) && (os_hooks)->yield_cpu) { \ + (os_hooks)->yield_cpu(); \ + } \ + } while (0) \ + + +#define V3_Yield_Timed(usec) \ + do { \ + extern struct v3_os_hooks * os_hooks; \ + if ((os_hooks) && (os_hooks)->yield_cpu_timed) {\ + (os_hooks)->yield_cpu_timed(usec); \ + } else { \ + V3_Yield(); \ + } \ + } while (0) \ + typedef enum v3_vm_class {V3_INVALID_VM, V3_PC_VM, V3_CRAY_VM} v3_vm_class_t; // Maybe make this a define.... -typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CPU, V3_VMX_EPT_CPU} v3_cpu_arch_t; +typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CPU, V3_VMX_EPT_CPU, V3_VMX_EPT_UG_CPU} v3_cpu_arch_t; v3_cpu_mode_t v3_get_host_cpu_mode(); -void v3_yield(struct guest_info * info); -void v3_yield_cond(struct guest_info * info); +void v3_yield(struct guest_info * info, int usec); +void v3_yield_cond(struct guest_info * info, int usec); void v3_print_cond(const char * fmt, ...); - void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector); + v3_cpu_arch_t v3_get_cpu_type(int cpu_id); int v3_vm_enter(struct guest_info * info); +int v3_reset_vm_core(struct guest_info * core, addr_t rip); #endif /*!__V3VEE__ */ @@ -274,14 +301,14 @@ struct v3_os_hooks { void (*print)(const char * format, ...) __attribute__ ((format (printf, 1, 2))); - void *(*allocate_pages)(int numPages, unsigned int alignment); - void (*free_page)(void * page); + void *(*allocate_pages)(int num_pages, unsigned int alignment); + void (*free_pages)(void * page, int num_pages); void *(*malloc)(unsigned int size); void (*free)(void * addr); - void *(*paddr_to_vaddr)(void *addr); - void *(*vaddr_to_paddr)(void *addr); + void *(*paddr_to_vaddr)(void * addr); + void *(*vaddr_to_paddr)(void * addr); int (*hook_interrupt)(struct v3_vm_info * vm, unsigned int irq); int (*ack_irq)(int irq); @@ -291,20 +318,24 @@ struct v3_os_hooks { void (*yield_cpu)(void); + void (*yield_cpu_timed)(unsigned int usec); + void *(*mutex_alloc)(void); void (*mutex_free)(void * mutex); void (*mutex_lock)(void * mutex, int must_spin); void (*mutex_unlock)(void * mutex); + void *(*mutex_lock_irqsave)(void * mutex, int must_spin); + void (*mutex_unlock_irqrestore)(void * mutex, void *flags); unsigned int (*get_cpu)(void); -#ifdef CONFIG_MULTITHREAD_OS - void (*start_kernel_thread)(int (*fn)(void * arg), void * arg, char * thread_name); + + 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); -#endif + int (*move_thread_to_cpu)(int cpu_id, void * thread); }; @@ -323,15 +354,30 @@ struct v3_interrupt { -void Init_V3(struct v3_os_hooks * hooks, int num_cpus); +void Init_V3(struct v3_os_hooks * hooks, char * cpus, int num_cpus); +void Shutdown_V3( void ); -struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data); +struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name); 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); +int v3_continue_vm(struct v3_vm_info * vm); +int v3_simulate_vm(struct v3_vm_info * vm, unsigned int msecs); -int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr); +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_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_move_vm_core(struct v3_vm_info * vm, int vcore_id, int target_cpu); + + +int v3_free_vm(struct v3_vm_info * vm); + +int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr); #endif