#include <palacios/vmm_instrument.h>
#include <palacios/vmm_ctrl_regs.h>
#include <palacios/vmm_lowlevel.h>
+#include <palacios/vmm_sprintf.h>
#ifdef CONFIG_SVM
#include <palacios/svm.h>
#include <palacios/vmx.h>
#endif
+#ifdef CONFIG_VNET
+#include <palacios/vmm_vnet.h>
+#endif
+
v3_cpu_arch_t v3_cpu_types[CONFIG_MAX_CPUS];
struct v3_os_hooks * os_hooks = NULL;
+int v3_dbg_enable = 0;
-
-
-static struct guest_info * allocate_guest() {
- void * info = V3_Malloc(sizeof(struct guest_info));
- memset(info, 0, sizeof(struct guest_info));
- return info;
-}
-
-
static void init_cpu(void * arg) {
uint32_t cpu_id = (uint32_t)(addr_t)arg;
} else
#endif
{
- PrintError("CPU has no virtualization Extensions\n");
+ PrintError("CPU has no virtualizationExtensions\n");
}
}
-
-
void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
int i;
+ V3_Print("V3 Print statement to fix a Kitten page fault bug\n");
+
// Set global variables.
os_hooks = hooks;
// Register all the possible device types
v3_init_devices();
-#ifdef INSTRUMENT_VMM
+ // Register all shadow paging handlers
+ V3_init_shdw_paging();
+
+
+#ifdef CONFIG_SYMMOD
+ V3_init_symmod();
+#endif
+
+#ifdef CONFIG_INSTRUMENT_VMM
v3_init_instrumentation();
#endif
+
+#ifdef CONFIG_VNET
+ V3_init_vnet();
+#endif
+
if ((hooks) && (hooks->call_on_cpu)) {
for (i = 0; i < num_cpus; i++) {
}
}
+
v3_cpu_arch_t v3_get_cpu_type(int cpu_id) {
return v3_cpu_types[cpu_id];
}
-struct guest_info * v3_create_vm(void * cfg) {
- struct guest_info * info = allocate_guest();
-
- if (!info) {
- PrintError("Could not allocate Guest\n");
- return NULL;
- }
+struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data) {
+ struct v3_vm_info * vm = v3_config_guest(cfg);
- if (v3_config_guest(info, cfg) == -1) {
+ if (vm == NULL) {
PrintError("Could not configure guest\n");
return NULL;
}
- return info;
+ vm->host_priv_data = priv_data;
+
+ return vm;
}
-int v3_start_vm(struct guest_info * info, unsigned int cpu_mask) {
+
+static int start_core(void * p)
+{
+ struct guest_info * info = (struct guest_info *)p;
+
+
+ PrintDebug("core %u: in start_core\n", info->cpu_id);
- info->cpu_id = v3_get_cpu_id();
+ // we assume here that the APs are in INIT mode
+ // and only the BSP is in REAL
+ // the per-architecture code will rely on this
+ // assumption
- V3_Print("V3 -- Starting VM\n");
switch (v3_cpu_types[info->cpu_id]) {
#ifdef CONFIG_SVM
break;
#endif
default:
- PrintError("Attemping to enter a guest on an invalid CPU\n");
+ PrintError("Attempting to enter a guest on an invalid CPU\n");
return -1;
}
+ // should not happen
+ return 0;
+}
+
+
+// For the moment very ugly. Eventually we will shift the cpu_mask to an arbitrary sized type...
+#define MAX_CORES 32
+
+int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
+ uint32_t i;
+ char tname[16];
+ int vcore_id = 0;
+ uint8_t * core_mask = (uint8_t *)&cpu_mask; // This is to make future expansion easier
+ uint32_t avail_cores = 0;
+
+
+
+ /// CHECK IF WE ARE MULTICORE ENABLED....
+
+ V3_Print("V3 -- Starting VM (%u cores)\n", vm->num_cores);
+
+ // Check that enough cores are present in the mask to handle vcores
+ for (i = 0; i < MAX_CORES; i++) {
+ int major = i / 8;
+ int minor = i % 8;
+
+ if (core_mask[major] & (0x1 << minor)) {
+ avail_cores++;
+ }
+
+ }
+
+ if (vm->num_cores > avail_cores) {
+ PrintError("Attempted to start a VM with too many cores (MAX=%d)\n", MAX_CORES);
+ return -1;
+ }
+
+
+ for (i = 0; (i < MAX_CORES) && (vcore_id < vm->num_cores); i++) {
+ int major = i / 8;
+ int minor = i % 8;
+ void * core_thread = NULL;
+ if ((core_mask[major] & (0x1 << minor)) == 0) {
+ // cpuid not set in cpu_mask
+ continue;
+ }
+
+ PrintDebug("Starting virtual core %u on logical core %u\n",
+ vcore_id, i);
+
+ sprintf(tname, "core%u", vcore_id);
+
+ PrintDebug("run: core=%u, func=0x%p, arg=0x%p, name=%s\n",
+ i, start_core, &(vm->cores[vcore_id]), tname);
+
+ // TODO: actually manage these threads instead of just launching them
+ core_thread = V3_CREATE_THREAD_ON_CPU(i, start_core,
+ &(vm->cores[vcore_id]), tname);
+
+ if (core_thread == NULL) {
+ PrintError("Thread launch failed\n");
+ return -1;
+ }
+
+ vcore_id++;
+ }
return 0;
+
}
} while (0) \
+
void v3_yield_cond(struct guest_info * info) {
uint64_t cur_cycle;
- rdtscll(cur_cycle);
+ cur_cycle = v3_get_host_time(&info->time_state);
- if (cur_cycle > (info->yield_start_cycle + info->yield_cycle_period)) {
+ if (cur_cycle > (info->yield_start_cycle + info->vm_info->yield_cycle_period)) {
/*
PrintDebug("Conditional Yield (cur_cyle=%p, start_cycle=%p, period=%p)\n",
(void *)cur_cycle, (void *)info->yield_start_cycle, (void *)info->yield_cycle_period);
*/
V3_Yield();
- rdtscll(info->yield_start_cycle);
+ info->yield_start_cycle = v3_get_host_time(&info->time_state);
}
}
+
/*
* unconditional cpu yield
* if the yielding thread is a guest context, the guest quantum is reset on resumption
V3_Yield();
if (info) {
- rdtscll(info->yield_start_cycle);
+ info->yield_start_cycle = v3_get_host_time(&info->time_state);
}
}
-void v3_interrupt_cpu(struct guest_info * info, int logical_cpu) {
+
+void v3_print_cond(const char * fmt, ...) {
+ if (v3_dbg_enable == 1) {
+ char buf[2048];
+ va_list ap;
+
+ va_start(ap, fmt);
+ vsnprintf(buf, 2048, fmt, ap);
+ va_end(ap);
+
+ V3_Print("%s", buf);
+ }
+}
+
+
+
+
+void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector) {
extern struct v3_os_hooks * os_hooks;
if ((os_hooks) && (os_hooks)->interrupt_cpu) {
- (os_hooks)->interrupt_cpu(info, logical_cpu);
+ (os_hooks)->interrupt_cpu(vm, logical_cpu, vector);
}
}
-
-
int v3_vm_enter(struct guest_info * info) {
switch (v3_cpu_types[info->cpu_id]) {
#ifdef CONFIG_SVM
return v3_svm_enter(info);
break;
#endif
-#if CONFIG_VMX && 0
+#if CONFIG_VMX
case V3_VMX_CPU:
case V3_VMX_EPT_CPU:
return v3_vmx_enter(info);
return -1;
}
}
-
-
-