Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-30 00:00:15 +01:00
Code Issues Releases Wiki Activity

initialize irq controller after all vcpu

Browse source 
- this is required to support aarch64
This commit is contained in:
Stefan Lankes 2018-04-24 19:48:55 +00:00
parent 492cde7275
commit a7707f46e3
2 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/uhyve-aarch64.c
View file

@ -88,6 +88,7 @@ extern size_t guest_size;
extern uint64_t elf_entry; extern uint64_t elf_entry;
extern uint8_t* klog; extern uint8_t* klog;
extern bool verbose; extern bool verbose;
extern uint32_t ncores;
extern uint8_t* guest_mem; extern uint8_t* guest_mem;
extern size_t guest_size; extern size_t guest_size;
extern int kvm, vmfd, netfd, efd; extern int kvm, vmfd, netfd, efd;
@ -411,7 +412,7 @@ int load_kernel(uint8_t* mem, char* path)
*((uint64_t*) (mem+paddr-GUEST_OFFSET + 0x100)) = paddr; // physical start address *((uint64_t*) (mem+paddr-GUEST_OFFSET + 0x100)) = paddr; // physical start address
*((uint64_t*) (mem+paddr-GUEST_OFFSET + 0x108)) = guest_size - PAGE_SIZE; // physical limit *((uint64_t*) (mem+paddr-GUEST_OFFSET + 0x108)) = guest_size - PAGE_SIZE; // physical limit
*((uint32_t*) (mem+paddr-GUEST_OFFSET + 0x110)) = get_cpufreq(); *((uint32_t*) (mem+paddr-GUEST_OFFSET + 0x110)) = get_cpufreq();
*((uint32_t*) (mem+paddr-GUEST_OFFSET + 0x128)) = 1; // number of used cpus *((uint32_t*) (mem+paddr-GUEST_OFFSET + 0x128)) = ncores; // number of used cpus
*((uint32_t*) (mem+paddr-GUEST_OFFSET + 0x130)) = 0; // cpuid *((uint32_t*) (mem+paddr-GUEST_OFFSET + 0x130)) = 0; // cpuid
*((uint32_t*) (mem+paddr-GUEST_OFFSET + 0x148)) = 1; // announce uhyve *((uint32_t*) (mem+paddr-GUEST_OFFSET + 0x148)) = 1; // announce uhyve

51
tools/uhyve.c
View file

@ -74,6 +74,7 @@ static pthread_mutex_t kvm_lock = PTHREAD_MUTEX_INITIALIZER;
extern bool verbose; extern bool verbose;
static char* guest_path = NULL;
size_t guest_size = 0x20000000ULL; size_t guest_size = 0x20000000ULL;
bool full_checkpoint = false; bool full_checkpoint = false;
pthread_barrier_t barrier; pthread_barrier_t barrier;
@ -263,11 +264,15 @@ static int vcpu_loop(void)
{ {
int ret; int ret;
if (restart) { pthread_barrier_wait(&barrier);
pthread_barrier_wait(&barrier);
if (cpuid == 0) if (restart)
no_checkpoint++; restore_cpu_state();
} else
init_cpu_state(elf_entry);
if (restart && (cpuid == 0))
no_checkpoint++;
while (1) { while (1) {
ret = ioctl(vcpufd, KVM_RUN, NULL); ret = ioctl(vcpufd, KVM_RUN, NULL);
@ -288,7 +293,7 @@ static int vcpu_loop(void)
} }
default: default:
err(1, "KVM: ioctl KVM_RUN in vcpu_loop failed"); err(1, "KVM: ioctl KVM_RUN in vcpu_loop for cpuid %d failed", cpuid);
break; break;
} }
} }
@ -495,12 +500,6 @@ static int vcpu_init(void)
if (run == MAP_FAILED) if (run == MAP_FAILED)
err(1, "KVM: VCPU mmap failed"); err(1, "KVM: VCPU mmap failed");
if (restart) {
restore_cpu_state();
} else {
init_cpu_state(elf_entry);
}
return 0; return 0;
} }
@ -530,6 +529,8 @@ static void* uhyve_thread(void* arg)
// create new cpu // create new cpu
vcpu_init(); vcpu_init();
pthread_barrier_wait(&barrier);
// run cpu loop until thread gets killed // run cpu loop until thread gets killed
ret = vcpu_loop(); ret = vcpu_loop();
@ -545,6 +546,8 @@ void sigterm_handler(int signum)
int uhyve_init(char *path) int uhyve_init(char *path)
{ {
guest_path = path;
signal(SIGTERM, sigterm_handler); signal(SIGTERM, sigterm_handler);
// register routine to close the VM // register routine to close the VM
@ -599,15 +602,6 @@ int uhyve_init(char *path)
/* Create the virtual machine */ /* Create the virtual machine */
vmfd = kvm_ioctl(kvm, KVM_CREATE_VM, 0); vmfd = kvm_ioctl(kvm, KVM_CREATE_VM, 0);
init_kvm_arch();
if (restart) {
if (load_checkpoint(guest_mem, path) != 0)
exit(EXIT_FAILURE);
} else {
if (load_kernel(guest_mem, path) != 0)
exit(EXIT_FAILURE);
}
pthread_barrier_init(&barrier, NULL, ncores); pthread_barrier_init(&barrier, NULL, ncores);
cpuid = 0; cpuid = 0;
@ -660,8 +654,6 @@ int uhyve_loop(int argc, char **argv)
if (hermit_check) if (hermit_check)
ts = atoi(hermit_check); ts = atoi(hermit_check);
*((uint32_t*) (mboot+0x24)) = ncores;
// First CPU is special because it will boot the system. Other CPUs will // First CPU is special because it will boot the system. Other CPUs will
// be booted linearily after the first one. // be booted linearily after the first one.
vcpu_threads[0] = pthread_self(); vcpu_threads[0] = pthread_self();
@ -670,6 +662,19 @@ int uhyve_loop(int argc, char **argv)
for(size_t i = 1; i < ncores; i++) for(size_t i = 1; i < ncores; i++)
pthread_create(&vcpu_threads[i], NULL, uhyve_thread, (void*) i); pthread_create(&vcpu_threads[i], NULL, uhyve_thread, (void*) i);
pthread_barrier_wait(&barrier);
init_kvm_arch();
if (restart) {
if (load_checkpoint(guest_mem, guest_path) != 0)
exit(EXIT_FAILURE);
} else {
if (load_kernel(guest_mem, guest_path) != 0)
exit(EXIT_FAILURE);
}
*((uint32_t*) (mboot+0x24)) = ncores;
if (ts > 0) if (ts > 0)
{ {
struct sigaction sa; struct sigaction sa;