X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=linux_module%2Fpalacios.h;h=fc406bfa00bc513a5a457bd592985c84f2c52ccb;hp=3562165d43c506c0331652699782b9e6b0597493;hb=c8b23e99efde3aa5a2c26d1b8e9bc7dc914e6113;hpb=8070d5e87ee3b92cc95bdcb65b2906b0a55d2ea9 diff --git a/linux_module/palacios.h b/linux_module/palacios.h index 3562165..fc406bf 100644 --- a/linux_module/palacios.h +++ b/linux_module/palacios.h @@ -5,18 +5,23 @@ #include #include #include +#include /* Global Control IOCTLs */ #define V3_CREATE_GUEST 12 #define V3_FREE_GUEST 13 -#define V3_ADD_MEMORY 50 -#define V3_RESET_MEMORY 51 +#define V3_ADD_MEMORY 50 +#define V3_RESET_MEMORY 51 +#define V3_REMOVE_MEMORY 52 #define V3_ADD_PCI_HW_DEV 55 #define V3_ADD_PCI_USER_DEV 56 +#define V3_DVFS_CTRL 60 + + /* VM Specific IOCTLs */ #define V3_VM_CONSOLE_CONNECT 20 #define V3_VM_STREAM_CONNECT 21 @@ -38,9 +43,17 @@ #define V3_VM_SEND 34 #define V3_VM_RECEIVE 35 +#define V3_VM_MOVE_MEM 36 + +#define V3_VM_RESET 40 + #define V3_VM_FB_INPUT 257 #define V3_VM_FB_QUERY 258 +#define V3_VM_MEM_TRACK_SIZE 300 +#define V3_VM_MEM_TRACK_CMD 301 +#define V3_VM_MEM_TRACK_SNAP 302 + #define V3_VM_HOST_DEV_CONNECT 10245 #define V3_VM_KSTREAM_USER_CONNECT 11245 @@ -52,9 +65,17 @@ struct v3_guest_img { char name[128]; } __attribute__((packed)); +typedef enum { PREALLOCATED=0, // user space-allocated (e.g. hot remove) + REQUESTED, // kernel will attempt allocation (anywhere) + REQUESTED32, // kernel will attempt allocation (<4GB) +} v3_mem_region_type_t; + struct v3_mem_region { - unsigned long long base_addr; - unsigned long long num_pages; + v3_mem_region_type_t type; // + int node; // numa node for REQUESTED (-1 = any) + unsigned long long base_addr; // region start (hpa) for PREALLOCATED + unsigned long long num_pages; // size for PREALLOCATED or request size for REQUESTED + // should be power of 2 and > V3_CONFIG_MEM_BLOCK } __attribute__((packed)); struct v3_debug_cmd { @@ -67,6 +88,21 @@ struct v3_core_move_cmd { unsigned short pcore_id; } __attribute__((packed)); +struct v3_mem_move_cmd{ + unsigned long long gpa; + unsigned short pcore_id; +} __attribute__((packed)); + +struct v3_reset_cmd { +#define V3_RESET_VM_ALL 0 +#define V3_RESET_VM_HRT 1 +#define V3_RESET_VM_ROS 2 +#define V3_RESET_VM_CORE_RANGE 3 + unsigned int type; + unsigned int first_core; // for CORE_RANGE + unsigned int num_cores; // for CORE_RANGE +} __attribute__((packed)); + struct v3_chkpt_info { char store[128]; char url[256]; /* This might need to be bigger... */ @@ -117,7 +153,7 @@ struct v3_guest { // For now MAX_VMS must be a multiple of 8 // This is due to the minor number bitmap #define MAX_VMS 32 - +#define MAX_THREADS (MAX_VMS*64) int palacios_vmm_init( char *options ); @@ -127,30 +163,35 @@ int palacios_vmm_exit( void ); // This is how a component finds the proc dir we are using for global state struct proc_dir_entry *palacios_get_procdir(void); +struct v3_resource_control; + // Selected exported stubs, for use in other palacios components, like vnet // The idea is that everything uses the same stubs void palacios_print_scoped(void *vm, int vcore, const char *fmt, ...); #define palacios_print(...) palacios_print_scoped(0,-1, __VA_ARGS__) -void *palacios_allocate_pages(int num_pages, unsigned int alignment); +// node_id=-1 => no node constraint +void *palacios_allocate_pages(int num_pages, unsigned int alignment, int node_id, int (*filter_func)(void *paddr, void *filter_state), void *filter_state); void palacios_free_pages(void *page_addr, int num_pages); void *palacios_alloc(unsigned int size); -void *palacios_alloc_extended(unsigned int size, unsigned int flags); -// FIX -// NEED A palacios_alloc_node wrapper -// -#define palacios_alloc_node_extended(size, flags, node) kmalloc_node(size,flags,node) +// node_id=-1 => no node constraint +void *palacios_alloc_extended(unsigned int size, unsigned int flags, int node_id); void palacios_free(void *); void *palacios_valloc(unsigned int size); // use instead of vmalloc void palacios_vfree(void *); // use instead of vfree void *palacios_vaddr_to_paddr(void *vaddr); void *palacios_paddr_to_vaddr(void *paddr); -void *palacios_start_kernel_thread(int (*fn)(void * arg), void *arg, char *thread_name); -void *palacios_start_thread_on_cpu(int cpu_id, int (*fn)(void * arg), void *arg, char *thread_name); +void palacios_xcall(int cpu_id, void (*fn)(void *arg), void *arg); +void *palacios_create_and_start_kernel_thread(int (*fn)(void * arg), void *arg, char *thread_name, struct v3_resource_control *rc); +void *palacios_create_thread_on_cpu(int cpu_id, int (*fn)(void * arg), void *arg, char *thread_name, struct v3_resource_control *rc); +void palacios_start_thread(void *thread_ptr); +void *palacios_creeate_and_start_thread_on_cpu(int cpu_id, int (*fn)(void * arg), void *arg, char *thread_name, struct v3_resource_control *rc); int palacios_move_thread_to_cpu(int new_cpu_id, void *thread_ptr); void palacios_yield_cpu(void); -void palacios_yield_cpu_timed(unsigned int us); +void palacios_sleep_cpu(unsigned int us); unsigned int palacios_get_cpu(void); unsigned int palacios_get_cpu_khz(void); +void palacios_used_fpu(void); +void palacios_need_fpu(void); void *palacios_mutex_alloc(void); // allocates and inits a lock void palacios_mutex_init(void *mutex); // only inits a lock void palacios_mutex_deinit(void *mutex); // only deinits a lock @@ -190,5 +231,39 @@ void palacios_mutex_unlock_irqrestore(void *mutex, void *flags); #define INFO(fmt, args...) printk((KERN_INFO "palacios (pcore %u): " fmt), palacios_get_cpu(), ##args) #define DEBUG(fmt, args...) printk((KERN_DEBUG "palacios (pcore %u): " fmt), palacios_get_cpu(), ##args) +/* Linux proc versioning */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) + +#define PAL_PROC_CREATE(ent, fname, perm, parent, fops) \ + ent = proc_create(fname, perm, parent, fops); + +#define PAL_PROC_CREATE_DATA(ent, fname, perm, parent, fops, data) \ + ent = proc_create_data(fname, perm, parent, fops, data); + +#define PAL_PDE(inode) NULL +#define PAL_PROC_GETDATA(inode) PDE_DATA((inode)) + +#else + +#define PAL_PROC_CREATE(ent, fname, perm, parent, fops) \ + ent = create_proc_entry(fname, perm, parent); \ + if (ent) { \ + ent->proc_fops = fops; \ + } + +#define PAL_PROC_CREATE_DATA(ent, fname, perm, parent, fops, data) \ + ent = proc_create_data(fname, perm, parent, fops, data); + +#define PAL_PDE(inode) PDE((inode)) +#define PAL_PROC_GETDATA(inode) PDE((inode))->data + +#endif + + +#if LINUX_VERSION_CODE > KERNEL_VERSION(3,9,0) +#define strict_strtoull(s,b,r) kstrtoull(s,b,r) +#endif + + #endif