Changeset 5197 in vbox

Timestamp:

Oct 9, 2007 12:31:32 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

25124

Message:

Experiment with call recording for CSAM

Location:

trunk/src

Files:

• VBox/VMM/REMInternal.h (modified) (1 diff)
• recompiler/VBoxREMWrapper.cpp (modified) (2 diffs)
• recompiler/VBoxRecompiler.c (modified) (2 diffs)
• recompiler/target-i386/exec.h (modified) (1 diff)
• recompiler/target-i386/helper.c (modified) (2 diffs)
• recompiler/target-i386/op.c (modified) (1 diff)
• recompiler/target-i386/translate.c (modified) (3 diffs)

trunk/src/VBox/VMM/REMInternal.h

@@ -266 +266 @@
 void    remR3TrapStat(CPUState *env, uint32_t uTrap);
 void    remR3CpuId(CPUState *env, unsigned uOperator, void *pvEAX, void *pvEBX, void *pvECX, void *pvEDX);
+void    remR3RecordCall(CPUState *env);
 #endif
 void    remR3TrapClear(PVM pVM);

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -489 +489 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(CSAMTAG), NULL }
 };
+
+static const REMPARMDESC g_aArgsCSAMR3RecordCallAddress[] =
+{
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(RTGCPTR), NULL }
+};
+
 #if !(defined(RT_OS_WINDOWS) && defined(RT_ARCH_AMD64)) /* the callbacks are problematic */
 static const REMPARMDESC g_aArgsDBGCRegisterCommands[] =
@@ -990 +997 @@
     { "CPUMQueryGuestCtxPtr",                   (void *)(uintptr_t)&CPUMQueryGuestCtxPtr,           &g_aArgsCPUMQueryGuestCtxPtr[0],            ELEMENTS(g_aArgsCPUMQueryGuestCtxPtr),              REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "CSAMR3MonitorPage",                      (void *)(uintptr_t)&CSAMR3MonitorPage,              &g_aArgsCSAMR3MonitorPage[0],               ELEMENTS(g_aArgsCSAMR3MonitorPage),                 REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
+    { "CSAMR3RecordCallAddress",                (void *)(uintptr_t)&CSAMR3RecordCallAddress,        &g_aArgsCSAMR3RecordCallAddress[0],         ELEMENTS(g_aArgsCSAMR3RecordCallAddress),           REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
 #if !(defined(RT_OS_WINDOWS) && defined(RT_ARCH_AMD64)) /* the callbacks are problematic */
     { "DBGCRegisterCommands",                   (void *)(uintptr_t)&DBGCRegisterCommands,           &g_aArgsDBGCRegisterCommands[0],            ELEMENTS(g_aArgsDBGCRegisterCommands),              REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },

trunk/src/recompiler/VBoxRecompiler.c

@@ -427 +427 @@
     pVM->rem.s.cInvalidatedPages = 0;
     pVM->rem.s.fIgnoreAll = false;
+
+    /* Clear raw ring 0 init state */
+    pVM->rem.s.Env.state &= ~CPU_RAW_RING0;
 }
 
@@ -1546 +1549 @@
 }
 
+/*
+ * Record previous call instruction addresses
+ *
+ * @param   env             Pointer to the CPU environment.
+ */
+void remR3RecordCall(CPUState *env)
+{
+    CSAMR3RecordCallAddress((PVM)env->pVM, env->eip);
+}
 
 /**

trunk/src/recompiler/target-i386/exec.h

@@ -215 +215 @@
 #ifdef VBOX
 void helper_external_event(void);
+void helper_record_call(void);
 
 /* in helper.c */

trunk/src/recompiler/target-i386/helper.c

@@ -1222 +1222 @@
         remR3TimersRun(env);
     }
+}
+/* helper for recording call instruction addresses for later scanning */
+void helper_record_call()
+{
+    if (    !(env->state & CPU_RAW_RING0)
+        &&  (env->cr[0] & CR0_PG_MASK)
+        &&  !(env->eflags & X86_EFL_IF))
+        remR3RecordCall(env);
 }
 #endif /* VBOX */
@@ -2248 +2256 @@
     uint32_t val, limit, old_sp_mask;
     target_ulong ssp, old_ssp, next_eip, new_eip;
-    
+
     new_cs = T0;
     new_eip = T1;

trunk/src/recompiler/target-i386/op.c

@@ -821 +821 @@
     }
 }
+
+void OPPROTO op_record_call(void)
+{
+    helper_record_call();
+}
+
 #endif /* VBOX */
 

trunk/src/recompiler/target-i386/translate.c

@@ -123 +123 @@
 #ifdef VBOX
     int vme;    /* CR4.VME */
+    int record_call;    /* record calls for CSAM or not? */
 #endif
     int cpl;
@@ -3674 +3675 @@
         case 2: /* call Ev */
             /* XXX: optimize if memory (no 'and' is necessary) */
+#ifdef VBOX_WITH_CALL_RECORD
+            if (s->record_call)
+                gen_op_record_call();
+#endif
             if (s->dflag == 0)
                 gen_op_andl_T0_ffff();
@@ -6596 +6601 @@
     dc->f_st = 0;
     dc->vm86 = (flags >> VM_SHIFT) & 1;
-#ifdef VBOX
+#ifdef VBOX_WITH_CALL_RECORD
     dc->vme = !!(env->cr[4] & CR4_VME_MASK);
+    if (    !(env->state & CPU_RAW_RING0)
+        &&  (env->cr[0] & CR0_PG_MASK)
+        &&  !(env->eflags & X86_EFL_IF)
+        &&  dc->code32)
+        dc->record_call = 1;
+    else
+        dc->record_call = 0;
 #endif
     dc->cpl = (flags >> HF_CPL_SHIFT) & 3;