#define __VMM_H__
-//#include <palacios/vm_guest.h>
-#include <palacios/vmm_mem.h>
-#include <palacios/vmm_types.h>
+/*#include <palacios/vm_guest.h>*/
struct guest_info;
#ifdef __V3VEE__
+#include <palacios/vmm_mem.h>
+#include <palacios/vmm_types.h>
//#include <palacios/vmm_types.h>
#include <palacios/vmm_string.h>
-//#include <palacios/vmm_paging.h>
+
/* utility definitions */
-#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)
-#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(vm, irq) ({ \
int ret = 0; \
}) \
+#define V3_ACK_IRQ(irq) \
+ do { \
+ extern struct v3_os_hooks * os_hooks; \
+ if ((os_hooks) && (os_hooks)->ack_irq) { \
+ (os_hooks)->ack_irq(irq); \
+ } \
+ } while (0)
+
+
+
#define V3_Get_CPU() ({ \
int ret = 0; \
extern struct v3_os_hooks * os_hooks; \
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; \
} while (0)
-#define V3_ACK_IRQ(irq) \
- do { \
- extern struct v3_os_hooks * os_hooks; \
- if ((os_hooks) && (os_hooks)->ack_irq) { \
- (os_hooks)->ack_irq(irq); \
- } \
- } 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) \
// 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_print_cond(const char * fmt, ...);
-void v3_interrupt_cpu(struct v3_vm_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
-unsigned int v3_get_cpu_id();
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__
+#endif /*!__V3VEE__ */
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);
+ 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);
void (*mutex_unlock)(void * mutex);
unsigned int (*get_cpu)(void);
- void (*interrupt_cpu)(struct v3_vm_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);
-};
-
-
+ 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
-//
+/*
+ *
+ * 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?
+ 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);
-struct v3_vm_info * v3_create_vm(void * cfg);
+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_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr);
+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