[feat] refactor the settings of ia32_sysenter_xx msrs

Author: hky1999

src/context.rs

@@ -43,6 +43,11 @@ pub struct LinuxContext {
     pub lstar: u64,
     pub cstar: u64,
     pub fmask: u64,
+
+    pub ia32_sysenter_cs: u64,
+    pub ia32_sysenter_esp: u64,
+    pub ia32_sysenter_eip: u64,
+
     pub kernel_gsbase: u64,
     pub pat: u64,
     pub mtrr_def_type: u64,
@@ -87,6 +92,9 @@ impl Default for LinuxContext {
             lstar: 0,
             cstar: 0,
             fmask: 0,
+            ia32_sysenter_cs: 0,
+            ia32_sysenter_esp: 0,
+            ia32_sysenter_eip: 0,
             kernel_gsbase: 0,
             pat: 0,
             mtrr_def_type: 0,
@@ -143,6 +151,9 @@ impl LinuxContext {
             lstar: Msr::IA32_LSTAR.read(),
             cstar: Msr::IA32_CSTAR.read(),
             fmask: Msr::IA32_FMASK.read(),
+            ia32_sysenter_cs: Msr::IA32_SYSENTER_CS.read(),
+            ia32_sysenter_esp: Msr::IA32_SYSENTER_ESP.read(),
+            ia32_sysenter_eip: Msr::IA32_SYSENTER_EIP.read(),
             kernel_gsbase: Msr::IA32_KERNEL_GSBASE.read(),
             pat: Msr::IA32_PAT.read(),
             mtrr_def_type: Msr::IA32_MTRR_DEF_TYPE.read(),
@@ -153,6 +164,10 @@ impl LinuxContext {
     /// Restore system registers.
     pub fn restore(&self) {
         unsafe {
+            Msr::IA32_SYSENTER_CS.write(self.ia32_sysenter_cs);
+            Msr::IA32_SYSENTER_ESP.write(self.ia32_sysenter_esp);
+            Msr::IA32_SYSENTER_EIP.write(self.ia32_sysenter_eip);
+
             Msr::IA32_EFER.write(self.efer);
             Msr::IA32_STAR.write(self.star);
             Msr::IA32_LSTAR.write(self.lstar);

src/regs.rs

@@ -167,6 +167,7 @@ impl GeneralRegisters {
 macro_rules! save_regs_to_stack {
     () => {
         "
+        .code64
         push r15
         push r14
         push r13

src/vmx/vcpu.rs

@@ -562,9 +562,9 @@ impl<H: AxVCpuHal> VmxVcpu<H> {
         VmcsGuestNW::RIP.write(linux.rip as _)?;
         VmcsGuestNW::RFLAGS.write(0x2)?;
 
-        VmcsGuest32::IA32_SYSENTER_CS.write(Msr::IA32_SYSENTER_CS.read() as _)?;
-        VmcsGuestNW::IA32_SYSENTER_ESP.write(Msr::IA32_SYSENTER_ESP.read() as _)?;
-        VmcsGuestNW::IA32_SYSENTER_EIP.write(Msr::IA32_SYSENTER_EIP.read() as _)?;
+        VmcsGuest32::IA32_SYSENTER_CS.write(linux.ia32_sysenter_cs as _)?;
+        VmcsGuestNW::IA32_SYSENTER_ESP.write(linux.ia32_sysenter_esp as _)?;
+        VmcsGuestNW::IA32_SYSENTER_EIP.write(linux.ia32_sysenter_eip as _)?;
 
         VmcsGuestNW::DR7.write(0x400)?;
         VmcsGuest64::IA32_DEBUGCTL.write(0)?;
@@ -787,13 +787,11 @@ impl<H: AxVCpuHal> VmxVcpu<H> {
         linux.idt.base = VirtAddr::new(VmcsGuestNW::IDTR_BASE.read().unwrap() as _);
         linux.idt.limit = VmcsGuest32::IDTR_LIMIT.read().unwrap() as _;
 
-        linux.load_guest_regs(self.regs());
+        linux.ia32_sysenter_cs = VmcsGuest32::IA32_SYSENTER_CS.read().unwrap() as _; // 0x174
+        linux.ia32_sysenter_esp = VmcsGuestNW::IA32_SYSENTER_ESP.read().unwrap() as _; // 0x178
+        linux.ia32_sysenter_eip = VmcsGuestNW::IA32_SYSENTER_EIP.read().unwrap() as _; // 0x17a
 
-        // unsafe {
-        //     Msr::IA32_SYSENTER_CS.write(VmcsGuest32::IA32_SYSENTER_CS.read().unwrap() as _);
-        //     Msr::IA32_SYSENTER_ESP.write(VmcsGuestNW::IA32_SYSENTER_ESP.read().unwrap() as _);
-        //     Msr::IA32_SYSENTER_EIP.write(VmcsGuestNW::IA32_SYSENTER_EIP.read().unwrap() as _);
-        // }
+        linux.load_guest_regs(self.regs());
     }
 
     fn get_paging_level(&self) -> usize {
@@ -1296,10 +1294,9 @@ impl<H: AxVCpuHal> AxArchVCpu for VmxVcpu<H> {
         Self::new(Some(config))
     }
 
-    fn load_host(&self) -> AxResult<Self::HostConfig> {
-        let mut linux = LinuxContext::default();
-        self.load_vmcs_guest(&mut linux);
-        Ok(linux)
+    fn load_host(&self, config: &mut Self::HostConfig) -> AxResult {
+        self.load_vmcs_guest(config);
+        Ok(())
     }
 
     fn set_entry(&mut self, entry: GuestPhysAddr) -> AxResult {