X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=linux_module%2Fpalacios.h;h=fc406bfa00bc513a5a457bd592985c84f2c52ccb;hp=c9cbb9672702e46fe2def9324f4d1c6145afe194;hb=c8b23e99efde3aa5a2c26d1b8e9bc7dc914e6113;hpb=b07dd4e35a37f1db04c4f52f9904ee7206673ac6 diff --git a/linux_module/palacios.h b/linux_module/palacios.h index c9cbb96..fc406bf 100644 --- a/linux_module/palacios.h +++ b/linux_module/palacios.h @@ -5,6 +5,7 @@ #include #include #include +#include /* Global Control IOCTLs */ @@ -18,6 +19,9 @@ #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 @@ -41,9 +45,15 @@ #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 @@ -55,10 +65,9 @@ struct v3_guest_img { char name[128]; } __attribute__((packed)); -typedef enum { PREALLOCATED=0, // user space-allocated (e.g. hot remove) +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 { @@ -84,6 +93,16 @@ struct v3_mem_move_cmd{ 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... */ @@ -134,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 ); @@ -144,12 +163,14 @@ 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__) // node_id=-1 => no node constraint -void *palacios_allocate_pages(int num_pages, unsigned int alignment, int node_id, int constraints); +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); // node_id=-1 => no node constraint @@ -159,13 +180,18 @@ 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_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 @@ -205,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