From: Jack Lange Date: Mon, 8 Nov 2010 22:36:19 +0000 (-0600) Subject: Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=ee8666572bea1a9628d96ebc3e4d97f84b357134;hp=0956466aad020813d1e470df366d552fdabab2a9;p=palacios.git Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel Conflicts: palacios/include/palacios/vmm.h --- diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h index d9ccd54..9871d3a 100644 --- a/palacios/include/palacios/vm_guest.h +++ b/palacios/include/palacios/vm_guest.h @@ -56,6 +56,8 @@ struct v3_intr_state; /* per-core state */ struct guest_info { + char exec_name[256]; + uint64_t rip; uint_t cpl; @@ -129,6 +131,8 @@ struct guest_info { /* shared state across cores */ struct v3_vm_info { + char name[128]; + v3_vm_class_t vm_class; addr_t mem_size; /* In bytes for now */ diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h index ee70107..620761a 100644 --- a/palacios/include/palacios/vmm.h +++ b/palacios/include/palacios/vmm.h @@ -34,7 +34,7 @@ struct guest_info; #include -//#include + /* utility definitions */ @@ -214,6 +214,10 @@ struct guest_info; #endif +<<<<<<< HEAD:palacios/include/palacios/vmm.h + +======= +>>>>>>> 0956466aad020813d1e470df366d552fdabab2a9:palacios/include/palacios/vmm.h /* ** */ @@ -295,12 +299,12 @@ struct v3_os_hooks { unsigned int (*get_cpu)(void); -#ifdef CONFIG_MULTITHREAD_OS + 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); -#endif + }; @@ -322,7 +326,7 @@ struct v3_interrupt { void Init_V3(struct v3_os_hooks * hooks, int num_cpus); -struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data); +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); int v3_stop_vm(struct v3_vm_info * vm); diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index f459f6f..0dffb4c 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -123,16 +123,28 @@ v3_cpu_arch_t v3_get_cpu_type(int cpu_id) { } -struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data) { +struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name) { struct v3_vm_info * vm = v3_config_guest(cfg); V3_Print("CORE 0 RIP=%p\n", (void *)(addr_t)(vm->cores[0].rip)); + if (vm == NULL) { PrintError("Could not configure guest\n"); return NULL; } + + + if (name == NULL) { + name = "[V3_VM]"; + } else if (strlen(name) >= 128) { + PrintError("VM name is too long. Will be truncated to 128 chars.\n"); + } + + memset(vm->name, 0, 128); + strncpy(vm->name, name, 127); + vm->host_priv_data = priv_data; return vm; @@ -170,14 +182,13 @@ static int start_core(void * p) return 0; } -#ifdef CONFIG_MULTITHREAD_OS + // For the moment very ugly. Eventually we will shift the cpu_mask to an arbitrary sized type... #define MAX_CORES 32 -static int start_vm_multicore(struct v3_vm_info * vm, unsigned int cpu_mask) { +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; @@ -206,10 +217,18 @@ static int start_vm_multicore(struct v3_vm_info * vm, unsigned int cpu_mask) { } - for (i = 0; (i < MAX_CORES) && (vcore_id < vm->num_cores); i++) { + // spawn off new threads, for other cores + for (i = 0, vcore_id = 1; (i < MAX_CORES) && (vcore_id < vm->num_cores); i++) { int major = i / 8; int minor = i % 8; void * core_thread = NULL; + struct guest_info * core = &(vm->cores[vcore_id]); + + if (i == V3_Get_CPU()) { + // We skip the local CPU, because it is reserved for vcore 0 + continue; + } + if ((core_mask[major] & (0x1 << minor)) == 0) { // cpuid not set in cpu_mask @@ -219,14 +238,13 @@ static int start_vm_multicore(struct v3_vm_info * vm, unsigned int cpu_mask) { PrintDebug("Starting virtual core %u on logical core %u\n", vcore_id, i); - sprintf(tname, "core%u", vcore_id); + sprintf(core->exec_name, "%s-%u", vm->name, vcore_id); PrintDebug("run: core=%u, func=0x%p, arg=0x%p, name=%s\n", - i, start_core, &(vm->cores[vcore_id]), tname); + i, start_core, core, core->exec_name); // 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); + core_thread = V3_CREATE_THREAD_ON_CPU(i, start_core, core, core->exec_name); if (core_thread == NULL) { PrintError("Thread launch failed\n"); @@ -236,19 +254,19 @@ static int start_vm_multicore(struct v3_vm_info * vm, unsigned int cpu_mask) { vcore_id++; } + sprintf(vm->cores[0].exec_name, "%s", vm->name); + + if (start_core(&(vm->cores[0])) != 0) { + PrintError("Error starting VM core 0\n"); + return -1; + } + + return 0; } -#endif -int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { -#ifdef CONFIG_MULTITHREAD_OS - return start_vm_multicore(vm, cpu_mask); -#else - return start_core(&(vm->cores[0])); -#endif -} int v3_stop_vm(struct v3_vm_info * vm) { diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index 6ffa3e4..3f952cf 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -31,7 +31,7 @@ #include #include #include - +#include @@ -220,7 +220,8 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) { char * vm_class = v3_cfg_val(vm_cfg, "class"); char * align_str = v3_cfg_val(v3_cfg_subtree(vm_cfg, "memory"), "alignment"); uint32_t sched_hz = 100; // set the schedule frequency to 100 HZ - + + if (!memory_str) { PrintError("Memory is a required configuration parameter\n"); return -1;