feat: add vm reset

Signed-off-by: Jose Martins <[email protected]>

Author: josecm

src/arch/armv8/vm.c

@@ -45,13 +45,16 @@ static unsigned long vm_cpuid_to_mpidr(struct vm* vm, vcpuid_t cpuid)
     return mpidr;
 }
 
+void vm_arch_reset(struct vm* vm)
+{
+    vgic_reset(vm);
+}
+
 void vcpu_arch_init(struct vcpu* vcpu, struct vm* vm)
 {
     vcpu->arch.vmpidr = vm_cpuid_to_mpidr(vm, vcpu->id);
     sysreg_vmpidr_el2_write(vcpu->arch.vmpidr);
 
-    vcpu->arch.psci_ctx.state = vcpu->id == 0 ? ON : OFF;
-
     vcpu_arch_profile_init(vcpu, vm);
 
     vgic_cpu_init(vcpu);
@@ -78,6 +81,10 @@ void vcpu_arch_reset(struct vcpu* vcpu, vaddr_t entry)
      *  TODO: ARMv8-A ARM mentions another implementation optional registers that reset to a known
      * value.
      */
+
+    vcpu->arch.psci_ctx.state = vcpu->id == 0 ? ON : OFF;
+
+    vgic_cpu_reset(vcpu);
 }
 
 static inline bool vcpu_psci_state_on(struct vcpu* vcpu)

src/arch/riscv/vm.c

@@ -29,7 +29,6 @@ void vcpu_arch_init(struct vcpu* vcpu, struct vm* vm)
     UNUSED_ARG(vm);
 
     vcpu->arch.sbi_ctx.lock = SPINLOCK_INITVAL;
-    vcpu->arch.sbi_ctx.state = vcpu->id == 0 ? STARTED : STOPPED;
 }
 
 void vcpu_arch_reset(struct vcpu* vcpu, vaddr_t entry)
@@ -59,6 +58,8 @@ void vcpu_arch_reset(struct vcpu* vcpu, vaddr_t entry)
     csrs_vstval_write(0);
     csrs_hvip_write(0);
     csrs_vsatp_write(0);
+
+    vcpu->arch.sbi_ctx.state = vcpu->id == 0 ? STARTED : STOPPED;
 }
 
 unsigned long vcpu_readreg(struct vcpu* vcpu, unsigned long reg)
@@ -95,3 +96,8 @@ void vcpu_arch_run(struct vcpu* vcpu)
         cpu_idle();
     }
 }
+
+void vm_arch_reset(struct vm* vm)
+{
+    virqc_reset(vm);
+}

src/core/inc/vm.h

@@ -117,6 +117,7 @@ void vcpu_init(struct vcpu* vcpu, struct vm* vm, vaddr_t entry);
 void vm_msg_broadcast(struct vm* vm, struct cpu_msg* msg);
 cpumap_t vm_translate_to_pcpu_mask(struct vm* vm, cpumap_t mask, size_t len);
 cpumap_t vm_translate_to_vcpu_mask(struct vm* vm, cpumap_t mask, size_t len);
+bool vm_reset(struct vm* vm);
 
 static inline struct vcpu* vm_get_vcpu(struct vm* vm, vcpuid_t vcpuid)
 {
@@ -176,5 +177,6 @@ unsigned long vcpu_readpc(struct vcpu* vcpu);
 void vcpu_writepc(struct vcpu* vcpu, unsigned long pc);
 void vcpu_arch_run(struct vcpu* vcpu);
 void vcpu_arch_reset(struct vcpu* vcpu, vaddr_t entry);
+void vm_arch_reset(struct vm* vm);
 
 #endif /* __VM_H__ */

src/core/vm.c

@@ -349,6 +349,73 @@ __attribute__((weak)) cpumap_t vm_translate_to_vcpu_mask(struct vm* vm, cpumap_t
 
 void vcpu_run(struct vcpu* vcpu)
 {
-    cpu()->vcpu->active = true;
     vcpu_arch_run(vcpu);
 }
+
+static void vm_vcpu_reset(struct vm* vm)
+{
+    struct vcpu* vcpu = cpu()->vcpu;
+
+    if (vcpu->vm->id != vm->id) {
+        ERROR("Trying to reset vm not hosted in this cpu");
+    }
+
+    cpu_sync_and_clear_msgs(&vm->sync);
+
+    if (vm->master == cpu()->id) {
+        vm_arch_reset(vm);
+        for (size_t i = 0; i < vm->config->platform.region_num; i++) {
+            struct vm_mem_region* reg = &vm->config->platform.regions[i];
+            bool img_is_in_rgn = range_in_range(vm->config->image.base_addr, vm->config->image.size,
+                reg->base, reg->size);
+            if (img_is_in_rgn) {
+                vm_install_image(vm, reg);
+                break;
+            }
+        }
+    }
+
+    cpu_sync_barrier(&vcpu->vm->sync);
+
+    vcpu_arch_reset(vcpu, vm->config->entry);
+
+    vcpu_arch_run(vcpu);
+}
+
+enum VM_EVENTS { VM_RESET };
+
+static void vm_msg_handler(uint32_t event, uint64_t data)
+{
+    UNUSED_ARG(data);
+
+    switch (event) {
+        case VM_RESET:
+            vm_vcpu_reset(cpu()->vcpu->vm);
+            break;
+        default:
+            break;
+    }
+}
+
+CPU_MSG_HANDLER(vm_msg_handler, VM_IPI_ID)
+
+bool vm_reset(struct vm* vm)
+{
+    bool res;
+
+    if (vm->config->image.inplace) {
+        res = false;
+    } else {
+        struct cpu_msg msg;
+        msg.handler = (uint32_t)VM_IPI_ID;
+        msg.event = VM_RESET;
+
+        vm_msg_broadcast(vm, &msg);
+
+        vm_vcpu_reset(vm);
+
+        res = true;
+    }
+
+    return res;
+}