Changeset 6231 in vbox

Timestamp:

Jan 3, 2008 3:28:30 PM (17 years ago)

Author:

vboxsync

Message:

Guest Additions: add R3 backdoor logging for Linux guests

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp (modified) (3 diffs)
• Additions/linux/module/vboxmod.c (modified) (2 diffs)
• Runtime/Makefile.kmk (modified) (1 diff)
• Runtime/VBox/logbackdoor.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp

@@ -97 +97 @@
     g_File = hf;
 
-#elif defined(RT_OS_SOLARIS)
+#elif defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX)
     RTFILE File;
     int rc = RTFileOpen(&File, VBOXGUEST_DEVICE_NAME, RTFILE_O_READWRITE);
@@ -105 +105 @@
 
 #else 
+# error port me  /** @note isn't it nicer to put a todo error here than to
+                     put in a flag which will assert where no-one sees it? */
     /* the default implemenation. */
     RTFILE File;
@@ -242 +244 @@
     return vbglR3DoIOCtl(VBOXGUEST_IOCTL_WAITEVENT_INTERRUPT_ALL, 0, 0);
 }
+
+/**
+ * Write to the backdoor logger from ring 3 guest code.
+ * @note this currently does not accept more than 255 bytes of data at
+ * one time.  It should probably be rewritten to use pass a pointer
+ * in the IOCtl.
+ *
+ * @returns IPRT status code
+ */
+VBGLR3DECL(int) VbglR3WriteLog(const char *pch, size_t cb)
+{
+    int rc = VINF_SUCCESS;
+
+    /* Solaris does not accept more than 255 bytes of data. */
+#define STEP 128
+    for (size_t iOffs = 0; (iOffs < cb) && (RT_SUCCESS(rc)); iOffs += STEP)
+    {
+        rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_LOG(cb), (void *) (pch + iOffs),
+                           iOffs + STEP < cb ? STEP : cb - iOffs);
+    }
+#undef STEP
+    return rc;
+}

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -362 +362 @@
         int rc = 0;
 
-        switch (cmd) {
-        case IOCTL_VBOXGUEST_WAITEVENT:
-                rc = vboxadd_wait_event((void *) arg);
-                break;
-
-        case VBOXGUEST_IOCTL_WAITEVENT_INTERRUPT_ALL:
-                ++vboxDev->u32GuestInterruptions;
-                break;
-
-        case IOCTL_VBOXGUEST_VMMREQUEST: {
+        /* Deal with variable size ioctls first. */
+        if (VBOXGUEST_IOCTL_NUMBER(VBOXGUEST_IOCTL_LOG(0)) == VBOXGUEST_IOCTL_NUMBER(cmd)) {
+                char *pszMessage = kmalloc(VBOXGUEST_IOCTL_SIZE(cmd), GFP_KERNEL);
+                if (NULL == pszMessage) {
+                        LogRelFunc(("VBOXGUEST_IOCTL_LOG: cannot allocate %d bytes of memory!\n",
+                                    VBOXGUEST_IOCTL_SIZE(cmd)));
+                        rc = -ENOMEM;
+                }
+                if (   (0 == rc)
+                    && copy_from_user(pszMessage, (void*)arg, VBOXGUEST_IOCTL_SIZE(cmd))) {
+                        LogRelFunc(("VBOXGUEST_IOCTL_LOG: copy_from_user failed!\n"));
+                        rc = -EFAULT;
+                }
+                if (0 == rc) {
+                    Log(("%.*s", VBOXGUEST_IOCTL_SIZE(cmd), pszMessage));
+                }
+                if (NULL != pszMessage) {
+                    kfree(pszMessage);
+                }
+                return rc;
+        }
+
+        if (   VBOXGUEST_IOCTL_NUMBER(VBOXGUEST_IOCTL_VMMREQUEST(0))
+            == VBOXGUEST_IOCTL_NUMBER(cmd))  {
             VMMDevRequestHeader reqHeader;
             VMMDevRequestHeader *reqFull = NULL;
@@ -446 +460 @@
             }
             VbglGRFree(reqFull);
-            break;
-        }
+            return rc;
+        }
+
+        switch (cmd) {
+        case IOCTL_VBOXGUEST_WAITEVENT:
+                rc = vboxadd_wait_event((void *) arg);
+                break;
+
+        case VBOXGUEST_IOCTL_WAITEVENT_INTERRUPT_ALL:
+                ++vboxDev->u32GuestInterruptions;
+                break;
 
         case IOCTL_VBOXGUEST_HGCM_CALL:

trunk/src/VBox/Runtime/Makefile.kmk

@@ -540 +540 @@
 endif
 RuntimeLnx32GuestR3_SOURCES    = $(RuntimeR3_SOURCES.linux) $(RuntimeR3_SOURCES)
+RuntimeLnx32GuestR3_SOURCES   += VBox/logbackdoor.cpp
 RuntimeLnx32GuestR3_INCS       = $(RuntimeR3_INCS.linux)    $(RuntimeR3_INCS)
 

trunk/src/VBox/Runtime/VBox/logbackdoor.cpp

@@ -68 +68 @@
 }
 
+#ifdef IN_GUEST_R0
 
 RTDECL(void) RTLogWriteUser(const char *pch, size_t cb)
@@ -86 +87 @@
 }
 
+#elif defined(RT_OS_LINUX) && defined(IN_GUEST_R3)
+
+#include <VBox/VBoxGuest.h>
+
+RTDECL(void) RTLogWriteUser(const char *pch, size_t cb)
+{
+    VbglR3WriteLog(pch, cb);
+}
+
+#else
+# error Port me!
+#endif
 
 #if defined(RT_OS_LINUX) && defined(IN_MODULE)