[refactor] remove redundant eptp related apis

Author: hky1999

src/vmx/structs.rs

@@ -271,8 +271,6 @@ impl EPTPointer {
     }
 }
 
-pub const EPTP_LIST_SIZE: usize = 512;
-
 /// EPTP list, the 4-KByte structure,
 /// The EPTP list comprises 512 8-Byte entries (each an EPTP value)
 /// and is used by the EPTP-switching VM function (see Section 26.5.6.3).
@@ -290,33 +288,4 @@ impl<H: AxVCpuHal> EptpList<H> {
     pub fn phys_addr(&self) -> HostPhysAddr {
         self.frame.start_paddr()
     }
-
-    pub fn set_entry(&mut self, idx: usize, eptp: EPTPointer) {
-        assert!(idx < EPTP_LIST_SIZE);
-        // Todo: validate eptp refer to 26.5.6.3 EPTP Switching.
-        let ptr = self.frame.as_mut_ptr() as *mut u64;
-        unsafe {
-            ptr.add(idx).write(eptp.bits());
-        }
-    }
-
-    pub fn entry_is_set(&self, idx: usize) -> bool {
-        assert!(idx < EPTP_LIST_SIZE);
-        let ptr = self.frame.as_mut_ptr() as *const u64;
-        unsafe { ptr.add(idx).read() != 0 }
-    }
-
-    pub fn get_entry(&self, idx: usize) -> EPTPointer {
-        assert!(idx < EPTP_LIST_SIZE);
-        let ptr = self.frame.as_mut_ptr() as *const u64;
-        unsafe { EPTPointer::from_bits_truncate(ptr.add(idx).read()) }
-    }
-
-    pub fn remove_entry(&mut self, idx: usize) {
-        assert!(idx < EPTP_LIST_SIZE);
-        let ptr = self.frame.as_mut_ptr() as *mut u64;
-        unsafe {
-            ptr.add(idx).write(0);
-        }
-    }
 }

src/vmx/vcpu.rs

@@ -24,7 +24,7 @@ use super::VmxExitInfo;
 use super::as_axerr;
 use super::definitions::VmxExitReason;
 use super::read_vmcs_revision_id;
-use super::structs::{EPTP_LIST_SIZE, EPTPointer, EptpList, IOBitmap, MsrBitmap, VmxRegion};
+use super::structs::{EptpList, IOBitmap, MsrBitmap, VmxRegion};
 use super::vmcs::{
     self, VmcsControl32, VmcsControl64, VmcsControlNW, VmcsGuest16, VmcsGuest32, VmcsGuest64,
     VmcsGuestNW, VmcsHost16, VmcsHost32, VmcsHost64, VmcsHostNW, interrupt_exit_info,
@@ -755,11 +755,6 @@ impl<H: AxVCpuHal> VmxVcpu<H> {
         // Bit 0: EPTP switching
         VmcsControl64::VM_FUNCTION_CONTROLS.write(0b1)?;
 
-        assert!(
-            self.eptp_list.entry_is_set(0),
-            "The First EPTP list entry must be set as initial EPTP."
-        );
-
         VmcsControl64::EPTP_LIST_ADDR.write(self.eptp_list.phys_addr().as_usize() as _)?;
 
         // Pass-through exceptions (except #UD(6)), don't use I/O bitmap, set MSR bitmaps.
@@ -1369,7 +1364,6 @@ impl<H: AxVCpuHal> AxArchVCpu for VmxVcpu<H> {
 
     fn set_ept_root(&mut self, ept_root: HostPhysAddr) -> AxResult {
         self.ept_root = Some(ept_root);
-        self.append_eptp_list(0, ept_root)?;
         Ok(())
     }
 
@@ -1383,10 +1377,6 @@ impl<H: AxVCpuHal> AxArchVCpu for VmxVcpu<H> {
     }
 
     fn run(&mut self) -> AxResult<AxVCpuExitReason> {
-        if self.id == 3 {
-            warn!("Instance vcpu run {:#x?}", self);
-        }
-
         match self.inner_run() {
             Some(exit_info) => Ok(if exit_info.entry_failure {
                 match exit_info.exit_reason {
@@ -1399,6 +1389,7 @@ impl<H: AxVCpuHal> AxArchVCpu for VmxVcpu<H> {
                 };
 
                 warn!("VMX entry failure: {:#x?}", exit_info);
+                warn!("VCpu {:#x?}", self);
 
                 AxVCpuExitReason::FailEntry {
                     // Todo: get `hardware_entry_failure_reason` somehow.
@@ -1576,44 +1567,11 @@ impl<H: AxVCpuHal> AxVcpuAccessGuestState for VmxVcpu<H> {
         self.guest_page_table_query(gva).ok()
     }
 
-    fn append_eptp_list(&mut self, idx: usize, eptp: HostPhysAddr) -> AxResult {
-        if idx >= EPTP_LIST_SIZE {
-            return ax_err!(InvalidInput);
-        }
-
-        if self.eptp_list.entry_is_set(idx) {
-            return ax_err!(InvalidInput);
-        }
-
-        self.eptp_list
-            .set_entry(idx, EPTPointer::from_table_phys(eptp));
-        Ok(())
+    fn current_ept_root(&self) -> HostPhysAddr {
+        vmcs::get_ept_pointer()
     }
 
-    fn remove_eptp_list_entry(&mut self, idx: usize) -> AxResult {
-        if idx >= EPTP_LIST_SIZE {
-            return ax_err!(InvalidInput);
-        }
-        if !self.eptp_list.entry_is_set(idx) {
-            return ax_err!(InvalidInput);
-        }
-
-        self.eptp_list.remove_entry(idx);
-
-        Ok(())
-    }
-
-    fn get_eptp_list_entry(&self, idx: usize) -> AxResult<HostPhysAddr> {
-        if idx >= EPTP_LIST_SIZE {
-            return ax_err!(InvalidInput);
-        }
-        if !self.eptp_list.entry_is_set(idx) {
-            return ax_err!(InvalidInput);
-        }
-        let entry = self.eptp_list.get_entry(idx);
-
-        Ok(HostPhysAddr::from_usize(memory_addr::align_down_4k(
-            entry.bits() as _,
-        )))
+    fn eptp_list_region(&self) -> HostPhysAddr {
+        self.eptp_list.phys_addr()
     }
 }

src/vmx/vmcs.rs

@@ -638,6 +638,10 @@ pub fn set_ept_pointer(pml4_paddr: HostPhysAddr) -> AxResult {
     Ok(())
 }
 
+pub fn get_ept_pointer() -> HostPhysAddr {
+    HostPhysAddr::from(VmcsControl64::EPTP.read().expect("Failed to read EPTP") as usize)
+}
+
 pub fn instruction_error() -> VmxInstructionError {
     VmcsReadOnly32::VM_INSTRUCTION_ERROR.read().unwrap().into()
 }