X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=8364325ca31de174b0e76d7e63676ca28cc012dc;hb=793f9cd53a472668dbeb16341085e5512484485c;hp=81bad2c7f3eacc49ac846acf8e8f5e21c71898e7;hpb=068d7e66db537f981fde19a098a12e4390fa3de4;p=palacios.git diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h index 81bad2c..8364325 100644 --- a/palacios/include/palacios/vmm.h +++ b/palacios/include/palacios/vmm.h @@ -21,19 +21,20 @@ #define __VMM_H__ -#include -#include -#include +/*#include */ +struct guest_info; #ifdef __V3VEE__ +#include +#include //#include #include -//#include + /* utility definitions */ @@ -66,22 +67,34 @@ -#define V3_AllocPages(num_pages) \ - ({ \ - extern struct v3_os_hooks * os_hooks; \ - void * ptr = 0; \ - if ((os_hooks) && (os_hooks)->allocate_pages) { \ - ptr = (os_hooks)->allocate_pages(num_pages); \ - } \ - ptr; \ +/* 4KB-aligned */ +#define V3_AllocPages(num_pages) \ + ({ \ + 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; \ + }) + + +#define V3_AllocAlignedPages(num_pages, align) \ + ({ \ + 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; \ }) -#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) @@ -113,6 +126,7 @@ if ((os_hooks) && (os_hooks)->malloc) { \ var = (os_hooks)->malloc(size); \ } \ + if (!var) PrintError("MALLOC FAILURE. Memory LEAK!!\n"); \ var; \ }) @@ -137,20 +151,12 @@ -#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_Hook_Interrupt(irq, opaque) ({ \ +#define V3_Hook_Interrupt(vm, irq) ({ \ int ret = 0; \ extern struct v3_os_hooks * os_hooks; \ if ((os_hooks) && (os_hooks)->hook_interrupt) { \ - ret = (os_hooks)->hook_interrupt(irq, opaque); \ + ret = (os_hooks)->hook_interrupt(vm, irq); \ } \ ret; \ }) \ @@ -166,68 +172,132 @@ +#define V3_Get_CPU() ({ \ + int ret = 0; \ + extern struct v3_os_hooks * os_hooks; \ + if ((os_hooks) && (os_hooks)->get_cpu) { \ + ret = (os_hooks)->get_cpu(); \ + } \ + ret; \ + }) + + +#ifdef V3_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_Call_On_CPU(cpu, fn, arg) \ + do { \ + extern struct v3_os_hooks * os_hooks; \ + if ((os_hooks) && (os_hooks)->call_on_cpu) { \ + (os_hooks)->call_on_cpu(cpu, fn, arg); \ + } \ + } while (0) + + + +#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); \ + } \ + thread; \ + }) +#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; \ + }) + +#endif /* ** */ + #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 VMM_INVALID_CPU 0 -#define VMM_VMX_CPU 1 -#define VMM_SVM_CPU 2 + +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_print_cond(const char * fmt, ...); -void v3_interrupt_cpu(struct guest_info * vm, int logical_cpu); +#ifdef V3_CONFIG_MULTITHREAD_OS +void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector); +#endif -#endif //!__V3VEE__ +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); -struct guest_info; + +#endif /*!__V3VEE__ */ + + + +struct v3_vm_info; /* This will contain function pointers that provide OS services */ struct v3_os_hooks { void (*print)(const char * format, ...) __attribute__ ((format (printf, 1, 2))); - void *(*allocate_pages)(int numPages); - 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); - - int (*hook_interrupt)(struct guest_info * vm, unsigned int irq); + 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); unsigned int (*get_cpu_khz)(void); - void (*start_kernel_thread)(int (*fn)(void * arg), void * arg, char * thread_name); void (*yield_cpu)(void); @@ -236,92 +306,51 @@ struct v3_os_hooks { void (*mutex_lock)(void * mutex, int must_spin); void (*mutex_unlock)(void * mutex); - void (*interrupt_cpu)(struct guest_info * vm, int logical_cpu); - void (*call_on_cpu)(int logical_cpu, void (*fn)(void * arg), void * arg); - void (*start_thread_on_cpu)(int logical_cpu, int (*fn)(void * arg), void * arg, char * thread_name); -}; - - - -typedef enum {NONE, HARDDRIVE, CDROM, VIRTIO} v3_disk_type_t; -typedef enum {RAM, NETWORK} v3_disk_connection_t; - -union v3_disk_info { - struct { - void * data_ptr; - int size; - } ram; - - struct { - char * ip_str; - int port; - char * disk_name; - } net; -}; - -struct v3_vm_config { - - unsigned long mem_size; // in bytes, var should be natural size of cpu - // so we can specify maximum physical address size - // (We're screwed if we want to do 32 bit host/64 bit guest) + unsigned int (*get_cpu)(void); - int enable_telemetry; - int enable_nested_paging; - int enable_pci; - int enable_swap; - - int guest_cpu; - - unsigned long schedule_freq; // in HZ - - v3_disk_type_t pri_disk_type; - v3_disk_connection_t pri_disk_con; - union v3_disk_info pri_disk_info; - - v3_disk_type_t sec_disk_type; - v3_disk_connection_t sec_disk_con; - union v3_disk_info sec_disk_info; + 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); + int (*move_thread_to_cpu)(int cpu_id, void * thread); }; +/* + * + * This is the interrupt state that the VMM's interrupt handlers need to see + */ +struct v3_interrupt { + unsigned int irq; + unsigned int error; -/* This will contain Function pointers that control the VMs */ -struct v3_ctrl_ops { - struct guest_info *(*allocate_guest)(void); - - int (*init_guest)(struct guest_info * info, struct v3_vm_config * config_ptr); - int (*start_guest)(struct guest_info * info); - // int (*stop_vm)(uint_t vm_id); - - int (*has_nested_paging)(void); - - // v3_cpu_arch_t (*get_cpu_arch)(); + unsigned int should_ack; /* Should the vmm ack this interrupt, or will + * the host OS do it? */ }; -// -// -// This is the interrupt state that the VMM's interrupt handlers need to see -// -struct v3_interrupt { - unsigned int irq; - unsigned int error; - - unsigned int should_ack; // Should the vmm ack this interrupt, or will - // the host OS do it? -}; +void Init_V3(struct v3_os_hooks * hooks, int num_cpus); +void Shutdown_V3( void ); +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_save_vm(struct v3_vm_info * vm, char * store, char * url); +int v3_load_vm(struct v3_vm_info * vm, char * store, char * url); -void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops, int num_cpus); +int v3_move_vm_core(struct v3_vm_info * vm, int vcore_id, int target_cpu); -int v3_deliver_irq(struct guest_info * vm, struct v3_interrupt * intr); +int v3_free_vm(struct v3_vm_info * vm); +int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr); #endif