libsel4vm: start a vcpu even if assigned a pcpu

Previously the target_cpu member was being used to determine if a vcpu was started in conjunction with the is_vcpu_online function. This is unneccessary and has been repurposed to keep track of whether or not the vcpu has been previously assigned a pcpu or not. Signed-off-by: Alex Pavey <[email protected]>
seL4 · Nov 17, 2022 · f3d10f7 · f3d10f7
1 parent 0efa6ac
commit f3d10f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/libsel4vm/src/boot.c b/libsel4vm/src/boot.c
@@ -88,7 +88,7 @@ int vm_assign_vcpu_target(vm_vcpu_t *vcpu, int target_cpu)
         return -1;
     }
     vm_vcpu_t *target_vcpu = vm_vcpu_for_target_cpu(vcpu->vm, target_cpu);
-    if (target_vcpu) {
+    if (target_vcpu && (target_vcpu != vcpu)) {
         ZF_LOGE("Failed to assign target cpu - A VCPU is already assigned to core %d", target_cpu);
         return -1;
     }

diff --git a/libsel4vmmplatsupport/src/arch/arm/psci.c b/libsel4vmmplatsupport/src/arch/arm/psci.c
@@ -70,12 +70,19 @@ int handle_psci(vm_vcpu_t *vcpu, seL4_Word fn_number, bool convention)
                 ZF_LOGE("[vCPU %u] no unused physical core left", vcpu->vcpu_id);
                 smc_set_return_value(&regs, PSCI_INTERNAL_FAILURE);
             }
-        } else {
+        } else if ((target_vcpu->target_cpu >= 0) && (target_vcpu->target_cpu < CONFIG_MAX_NUM_NODES)) {
+            /* Assign vcpu to physical cpu specified in config */
             if (is_vcpu_online(target_vcpu)) {
                 smc_set_return_value(&regs, PSCI_ALREADY_ON);
+            } else if (start_new_vcpu(target_vcpu, entry_point_address, context_id, target_vcpu->target_cpu) == 0) {
+                smc_set_return_value(&regs, PSCI_SUCCESS);
             } else {
+                ZF_LOGE("[vCPU %u] could not start vCPU", vcpu->vcpu_id);
                 smc_set_return_value(&regs, PSCI_INTERNAL_FAILURE);
             }
+        } else {
+            ZF_LOGE("[vCPU %u] invalid target CPU %d", vcpu->vcpu_id, target_vcpu->target_cpu);
+            smc_set_return_value(&regs, PSCI_INTERNAL_FAILURE);
         }
 
         break;