singlestep support added

Author: arnabcs17b006

src/lib.rs

@@ -28,8 +28,9 @@ use xenctrl_sys::{xc_error_code, xc_interface, xenmem_access_t, xentoollog_logge
 use xenvmevent_sys::{
     vm_event_back_ring, vm_event_request_t, vm_event_response_t, vm_event_sring, MEM_ACCESS_R,
     MEM_ACCESS_RW, MEM_ACCESS_RWX, MEM_ACCESS_RX, MEM_ACCESS_W, MEM_ACCESS_WX, MEM_ACCESS_X,
-    VM_EVENT_REASON_MEM_ACCESS, VM_EVENT_REASON_MOV_TO_MSR, VM_EVENT_REASON_SOFTWARE_BREAKPOINT,
-    VM_EVENT_REASON_WRITE_CTRLREG, VM_EVENT_X86_CR0, VM_EVENT_X86_CR3, VM_EVENT_X86_CR4,
+    VM_EVENT_REASON_MEM_ACCESS, VM_EVENT_REASON_MOV_TO_MSR, VM_EVENT_REASON_SINGLESTEP,
+    VM_EVENT_REASON_SOFTWARE_BREAKPOINT, VM_EVENT_REASON_WRITE_CTRLREG, VM_EVENT_X86_CR0,
+    VM_EVENT_X86_CR3, VM_EVENT_X86_CR4,
 };
 
 #[derive(Copy, Clone, Debug)]
@@ -122,6 +123,9 @@ pub enum XenEventType {
         gpa: u64,
         access: XenPageAccess,
     },
+    Singlestep {
+        gpa: u64,
+    },
 }
 
 #[derive(Debug)]
@@ -325,6 +329,9 @@ impl XenControl {
                         flag.try_into().unwrap()
                     },
                 },
+                VM_EVENT_REASON_SINGLESTEP => XenEventType::Singlestep {
+                    gpa: req.u.singlestep.gfn << PAGE_SHIFT,
+                },
                 _ => unimplemented!(),
             };
         }
@@ -362,6 +369,16 @@ impl XenControl {
         last_error!(self, ())
     }
 
+    pub fn monitor_singlestep(&self, domid: u32, enable: bool) -> Result<(), XcError> {
+        let xc = self.handle.as_ptr();
+        (self.libxenctrl.clear_last_error)(xc);
+        let rc = (self.libxenctrl.monitor_singlestep)(xc, domid, enable);
+        if rc < 0 {
+            println!("last OS error: {:?}", Error::last_os_error());
+        }
+        last_error!(self, ())
+    }
+
     pub fn monitor_mov_to_msr(&self, domid: u32, msr: u32, enable: bool) -> Result<(), XcError> {
         let xc = self.handle.as_ptr();
         (self.libxenctrl.clear_last_error)(xc);

src/libxenctrl.rs

@@ -52,6 +52,8 @@ type FnMonitorSoftwareBreakpoint = fn(xch: *mut xc_interface, domid: u32, enable
 //xc_monitor_mov_to_msr
 type FnMonitorMovToMsr =
     fn(xch: *mut xc_interface, domain_id: domid_t, msr: u32, enable: bool) -> c_int;
+//xc_monitor_singlestep
+type FnMonitorSinglestep = fn(xch: *mut xc_interface, domid: u32, enable: bool) -> c_int;
 //xc_monitor_write_ctrlreg
 type FnMonitorWriteCtrlreg = fn(
     xch: *mut xc_interface,
@@ -94,6 +96,7 @@ pub struct LibXenCtrl {
     pub monitor_write_ctrlreg: RawSymbol<FnMonitorWriteCtrlreg>,
     pub get_mem_access: RawSymbol<FnGetMemAccess>,
     pub set_mem_access: RawSymbol<FnSetMemAccess>,
+    pub monitor_singlestep: RawSymbol<FnMonitorSinglestep>,
 }
 
 impl LibXenCtrl {
@@ -149,6 +152,10 @@ impl LibXenCtrl {
             lib.get(b"xc_monitor_write_ctrlreg\0").unwrap();
         let monitor_write_ctrlreg = monitor_write_ctrlreg_sym.into_raw();
 
+        let monitor_singlestep_sym: Symbol<FnMonitorSinglestep> =
+            lib.get(b"xc_monitor_singlestep\0").unwrap();
+        let monitor_singlestep = monitor_singlestep_sym.into_raw();
+
         let get_mem_access_sym: Symbol<FnGetMemAccess> = lib.get(b"xc_get_mem_access\0").unwrap();
         let get_mem_access = get_mem_access_sym.into_raw();
 
@@ -182,6 +189,7 @@ impl LibXenCtrl {
             monitor_write_ctrlreg,
             get_mem_access,
             set_mem_access,
+            monitor_singlestep,
             domain_pause,
             domain_unpause,
             domain_maximum_gpfn,