feat: 增强 vCPU 调试信息，添加 CPU 运行时的 VM ID 追踪

Author: ZR233

src/arch/aarch64/cpu.rs

@@ -1,4 +1,7 @@
-use core::{fmt::Display, ops::Deref};
+use core::{
+    fmt::{self, Debug, Display},
+    ops::Deref,
+};
 
 use aarch64_cpu::registers::*;
 use arm_vcpu::{Aarch64PerCpu, Aarch64VCpuCreateConfig};
@@ -116,7 +119,9 @@ impl VCpuOp for VCpu {
 
     fn run(&mut self) -> Result<(), RunError> {
         info!("Starting vCPU {}", self.bind_id());
-
+        self.vcpu
+            .setup_current_cpu(self.vm_id().into())
+            .map_err(|e| anyhow!("{e}"))?;
         while self.is_active() {
             debug!("vCPU {} entering guest", self.bind_id());
             let exit_reason = self.vcpu.run().map_err(|e| anyhow!("{e}"))?;
@@ -150,6 +155,7 @@ impl VCpuOp for VCpu {
                         debug!("vCPU {} is bringing up CPU {}", self.bind_id(), target_cpu);
                         running.cpu_up(CpuHardId::new(target_cpu as _), entry_point, arg)
                     })??;
+                    self.vcpu.set_gpr(0, 0);
                 }
                 arm_vcpu::AxVCpuExitReason::CpuDown { _state } => todo!(),
                 arm_vcpu::AxVCpuExitReason::SystemDown => {
@@ -179,3 +185,13 @@ impl Deref for VCpu {
         &self.common
     }
 }
+
+impl Debug for VCpu {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("VCpu")
+            .field("bind_id", &self.bind_id())
+            .field("hard_id", &self.hard_id())
+            .field("vcpu", &self.vcpu)
+            .finish()
+    }
+}

src/arch/aarch64/vm/running.rs

@@ -27,7 +27,6 @@ impl VmMachineRunning {
 
         cpu.vcpu.set_entry(entry_point.as_usize().into()).unwrap();
         cpu.vcpu.set_gpr(0, arg as _);
-        debug!("{:?}", cpu.vcpu);
         self.common.run_cpu(cpu)?;
         Ok(())
     }

src/vcpu/mod.rs

@@ -1,11 +1,11 @@
 use crate::{
-    CpuId, RunError,
+    CpuId, RunError, VmId,
     arch::HCpu,
     data::{VmData, VmDataWeak},
     vhal::cpu::{CpuHardId, HCpuExclusive},
 };
 
-pub trait VCpuOp: Send + 'static{
+pub trait VCpuOp: core::fmt::Debug + Send + 'static {
     fn bind_id(&self) -> CpuId;
     fn hard_id(&self) -> CpuHardId;
     fn run(&mut self) -> Result<(), RunError>;
@@ -18,6 +18,10 @@ pub struct VCpuCommon {
 }
 
 impl VCpuCommon {
+    pub fn vm_id(&self) -> VmId {
+        self.vm.id()
+    }
+
     pub fn new_exclusive(bind: Option<CpuId>, vm: VmDataWeak) -> anyhow::Result<Self> {
         let hcpu = HCpuExclusive::try_new(bind)
             .ok_or_else(|| anyhow!("Failed to allocate cpu with id `{bind:?}`"))?;

src/vm/data.rs

@@ -182,6 +182,7 @@ impl VmData {
 
     pub fn downgrade(&self) -> VmDataWeak {
         VmDataWeak {
+            id: self.id(),
             inner: Arc::downgrade(&self.inner),
         }
     }
@@ -249,10 +250,15 @@ impl Deref for VmData {
 
 #[derive(Clone)]
 pub struct VmDataWeak {
+    id: VmId,
     inner: Weak<VmDataInner>,
 }
 
 impl VmDataWeak {
+    pub fn id(&self) -> VmId {
+        self.id
+    }
+
     pub fn upgrade(&self) -> Option<VmData> {
         Some(self.inner.upgrade()?.into())
     }

src/vm/machine/running.rs

@@ -68,6 +68,7 @@ impl VmMachineRunningCommon {
                 );
                 waiter.vm.wait_for_running();
                 info!("VCpu {} on {} run", cpu.hard_id(), bind_id);
+                // debug!("\n{:#x?}", cpu);
                 let res = cpu.run();
                 if let Err(e) = res {
                     info!("vCPU {} exited with error: {e}", bind_id);