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,-1,0); \
+ ptr = (os_hooks)->allocate_pages(num_pages,PAGE_SIZE_4KB,-1,0,0); \
} \
ptr; \
})
-// Use 32 bit constraints if the vm uses 32bit shadow paging at any point
-// Should be used for shadow page tables and any physical memory
-// mapped into the vm
-#define V3_AllocShadowSafePages(vm,num_pages) \
- ({ \
- extern struct v3_os_hooks * os_hooks; \
- void * ptr = 0; \
- int c; int shadow=0; \
- for (c=0;c<(vm)->num_cores && !shadow;c++) { \
- shadow|=vm->cores[c].shdw_pg_mode==SHADOW_PAGING; \
- } \
- if ((os_hooks) && (os_hooks)->allocate_pages) { \
- ptr = (os_hooks)->allocate_pages(num_pages,PAGE_SIZE_4KB,-1,\
- shadow ? V3_ALLOC_PAGES_CONSTRAINT_4GB : 0); \
- } \
- 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,-1,0); \
+ ptr = (os_hooks)->allocate_pages(num_pages,align,-1,0,0); \
} \
ptr; \
})
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 = (os_hooks)->allocate_pages(num_pages, PAGE_SIZE_4KB, node_id,0,0); \
} \
ptr; \
})
-#define V3_AllocPagesExtended(num_pages, align, node_id, constraints) \
+#define V3_AllocPagesExtended(num_pages, align, node_id, filter_func, filter_state) \
({ \
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 = (os_hooks)->allocate_pages(num_pages, align, node_id, filter_func, filter_state); \
} \
ptr; \
})
} \
} while (0)
+#define V3_VMalloc(size) ({ \
+ extern struct v3_os_hooks * os_hooks; \
+ void * var = 0; \
+ if ((os_hooks) && (os_hooks)->vmalloc) { \
+ var = (os_hooks)->vmalloc(size); \
+ } \
+ if (!var) PrintError(VM_NONE,VCORE_NONE,"VMALLOC FAILURE. Memory LEAK!!\n"); \
+ var; \
+ })
+
+#define V3_VFree(addr) \
+ do { \
+ extern struct v3_os_hooks * os_hooks; \
+ if ((os_hooks) && (os_hooks)->vfree) { \
+ (os_hooks)->vfree(addr); \
+ } \
+ } while (0)
+
// uint_t V3_CPU_KHZ();
#define V3_CPU_KHZ() ({ \
unsigned int khz = 0; \
-#define V3_CREATE_THREAD(fn, arg, name) ({ \
+#define V3_CREATE_AND_START_THREAD(fn, arg, name) ({ \
void * thread = NULL; \
extern struct v3_os_hooks * os_hooks; \
if ((os_hooks) && (os_hooks)->start_kernel_thread) { \
#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); \
+ if ((os_hooks) && (os_hooks)->create_thread_on_cpu) { \
+ thread = (os_hooks)->create_thread_on_cpu(cpu, fn, arg, name); \
} \
thread; \
})
+#define V3_START_THREAD(thread) ({ \
+ extern struct v3_os_hooks * os_hooks; \
+ if((os_hooks) && (os_hooks)->start_thread){ \
+ (os_hooks)->start_thread(thread); \
+ } \
+ })
+
+#define V3_CREATE_AND_START_THREAD_ON_CPU(cpu, fn, arg, name) ({ \
+ void *thread = V3_CREATE_THREAD_ON_CPU(cpu,fn,arg,name); \
+ if (thread) { \
+ V3_START_THREAD(thread); \
+ } \
+ thread; \
+ })
+
#define V3_MOVE_THREAD_TO_CPU(pcpu, thread) ({ \
int ret = -1; \
extern struct v3_os_hooks * os_hooks; \
// 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);
+ // Allocates physically contiguous pages
+ // - with desired alignment
+ // - that the filter_func returns nonzero on (if filter_func is given)
+ void *(*allocate_pages)(int num_pages, unsigned int alignment, int node_id, int (*filter_func)(void *paddr, void *filter_state), void *filter_state);
void (*free_pages)(void * page, int num_pages);
+ // Allocates virtually contiguous memory
+ void *(*vmalloc)(unsigned int size);
+ void (*vfree)(void * addr);
+
+ // Allocates virtually and physically contiguous memory
void *(*malloc)(unsigned int size);
void (*free)(void * addr);
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);
- void * (*start_thread_on_cpu)(int cpu_id, int (*fn)(void * arg), void * arg, char * thread_name);
+ void * (*create_thread_on_cpu)(int cpu_id, int (*fn)(void * arg), void * arg, char * thread_name);
+ void (*start_thread)(void * core_thread);
int (*move_thread_to_cpu)(int cpu_id, void * thread);
};
};
-typedef enum {V3_VM_UNKNOWN, V3_VM_INVALID, V3_VM_RUNNING, V3_VM_STOPPED, V3_VM_PAUSED, V3_VM_ERROR, V3_VM_SIMULATING} v3_vm_state_t;
-typedef enum {V3_VCORE_UNKNOWN, V3_VCORE_INVALID, V3_VCORE_RUNNING, V3_VCORE_STOPPED} v3_vcore_state_t;
+typedef enum {V3_VM_UNKNOWN, V3_VM_INVALID, V3_VM_RUNNING, V3_VM_STOPPED, V3_VM_PAUSED, V3_VM_ERROR, V3_VM_SIMULATING, V3_VM_RESETTING} v3_vm_state_t;
+typedef enum {V3_VCORE_UNKNOWN, V3_VCORE_INVALID, V3_VCORE_RUNNING, V3_VCORE_STOPPED, V3_VCORE_RESETTING } v3_vcore_state_t;
typedef enum {V3_VCORE_CPU_UNKNOWN, V3_VCORE_CPU_REAL, V3_VCORE_CPU_PROTECTED, V3_VCORE_CPU_PROTECTED_PAE, V3_VCORE_CPU_LONG, V3_VCORE_CPU_LONG_32_COMPAT, V3_VCORE_CPU_LONG_16_COMPAT} v3_vcore_cpu_mode_t;
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;
+typedef enum {V3_VM_GENERAL, V3_VM_HVM} v3_vm_type_t;
+typedef enum {V3_VCORE_GENERAL, V3_VCORE_ROS, V3_VCORE_HRT} v3_vcore_type_t;
+
struct v3_vm_base_state {
v3_vm_state_t state;
+ v3_vm_type_t vm_type;
};
struct v3_vm_vcore_state {
v3_vcore_cpu_mode_t cpu_mode;
v3_vcore_mem_state_t mem_state;
v3_vcore_mem_mode_t mem_mode;
+ v3_vcore_type_t vcore_type;
unsigned long pcore;
void * last_rip;
unsigned long long num_exits;
};
struct v3_vm_core_state {
- unsigned long num_vcores;
+ unsigned long long num_vcores;
struct v3_vm_vcore_state vcore[];
};
struct v3_vm_mem_region {
+ void *guest_paddr;
void *host_paddr;
unsigned long long size;
+ int swapped:1;
+ int pinned:1;
};
struct v3_vm_mem_state {
unsigned long long mem_size;
- unsigned long num_regions;
+ unsigned long long ros_mem_size;
+ unsigned long long num_regions;
struct v3_vm_mem_region region[];
};
void Shutdown_V3( void );
-struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name);
+struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name, unsigned int cpu_mask);
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_reset_vm(struct v3_vm_info *vm);
+typedef enum {V3_VM_RESET_ALL,V3_VM_RESET_HRT,V3_VM_RESET_ROS,V3_VM_RESET_CORE_RANGE} v3_vm_reset_type;
+int v3_reset_vm_extended(struct v3_vm_info *vm, v3_vm_reset_type t, void *data);
+
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_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_sizes_vm(struct v3_vm_info *vm,
+ unsigned long long *num_vcores,
+ unsigned long long *num_regions);
+
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);
