Merge branch 'equation' into invalid_ept

Author: hky1999

src/page_table.rs

@@ -125,6 +125,31 @@ impl<PTE: GenericPTE, H: PagingHandler, EPT: EPTTranslator> GuestPageTable64<PTE
         let off = size.align_offset(vaddr.into());
         Ok((entry.paddr().add(off).into(), entry.flags(), size))
     }
+
+    /// Queries the result of the mapping starts with `vaddr`.
+    ///
+    /// Returns the physical address of the target frame, mapping flags,
+    /// the page size, and the raw page table entry bits.
+    ///
+    /// Returns [`Err(PagingError::NotMapped)`](PagingError::NotMapped) if the
+    /// mapping is not present.
+    pub fn query_raw(
+        &self,
+        vaddr: GuestVirtAddr,
+    ) -> PagingResult<(GuestPhysAddr, MappingFlags, PageSize, usize)> {
+        let (entry, size) = self.get_entry(vaddr)?;
+        if entry.is_unused() {
+            error!("GuestPT64 query {:?} Entry is unused", vaddr);
+            return Err(PagingError::NotMapped);
+        }
+        let off = size.align_offset(vaddr.into());
+        Ok((
+            entry.paddr().add(off).into(),
+            entry.flags(),
+            size,
+            entry.bits(),
+        ))
+    }
 }
 
 // private implements

src/vmx/vcpu.rs

@@ -855,19 +855,31 @@ impl<H: AxVCpuHal> VmxVcpu<H> {
         vaddr + seg_base
     }
 
+    /// Query guest page table to get mapping info.
     pub fn guest_page_table_query(
         &self,
         gva: GuestVirtAddr,
     ) -> PagingResult<(GuestPhysAddr, MappingFlags, PageSize)> {
         let addr = self.gva_to_linear_addr(gva);
+        let guest_ptw_info = self.get_pagetable_walk_info();
+        let guest_page_table: GuestPageTable64<X64PTE, H::PagingHandler, H::EPTTranslator> =
+            GuestPageTable64::construct(&guest_ptw_info);
 
-        // debug!("guest_page_table_query: gva {:?} linear {:?}", gva, addr);
+        guest_page_table.query(addr)
+    }
 
+    /// Query guest page table to get mapping info,
+    /// alone with raw page table entry value.
+    pub fn guest_page_table_query_raw(
+        &self,
+        gva: GuestVirtAddr,
+    ) -> PagingResult<(GuestPhysAddr, MappingFlags, PageSize, usize)> {
+        let addr = self.gva_to_linear_addr(gva);
         let guest_ptw_info = self.get_pagetable_walk_info();
         let guest_page_table: GuestPageTable64<X64PTE, H::PagingHandler, H::EPTTranslator> =
             GuestPageTable64::construct(&guest_ptw_info);
 
-        guest_page_table.query(addr)
+        guest_page_table.query_raw(addr)
     }
 }