Changeset 72500 in vbox

Timestamp:

Jun 11, 2018 11:05:32 AM (6 years ago)

Author:

vboxsync

Message:

EFI: Log EFI module relocations, such as when an OS switches to its own virtual memory map. Needed to know where run-time EFI modules end up.

Location:

trunk/src/VBox/Devices/EFI

Files:

• DevEFI.cpp (modified) (3 diffs)
• DevEFI.h (modified) (1 diff)
• Firmware/VBoxPkg/Library/VBoxPeCoffExtraActionLib/VBoxPeCoffExtraActionLib.c (modified) (1 diff)
• Firmware/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -1246 +1246 @@
         case EFI_IMAGE_EVT_CMD_START_UNLOAD32:
         case EFI_IMAGE_EVT_CMD_START_UNLOAD64:
+        case EFI_IMAGE_EVT_CMD_START_RELOC32:
+        case EFI_IMAGE_EVT_CMD_START_RELOC64:
             AssertBreak(EFI_IMAGE_EVT_GET_PAYLOAD(u32) == 0);
 
@@ -1293 +1295 @@
                         break;
                     }
+                case EFI_IMAGE_EVT_CMD_START_RELOC32:
+                case EFI_IMAGE_EVT_CMD_START_RELOC64:
+                {
+                    LogRel(("EFI: relocate module to %#llx from %#llx\n",
+                            pThis->ImageEvt.uAddr0, pThis->ImageEvt.uAddr1));
+                    break;
+                }
                 }
             }
@@ -1309 +1318 @@
         case EFI_IMAGE_EVT_CMD_ADDR1:
             AssertBreak(EFI_IMAGE_EVT_GET_PAYLOAD(u32) <= UINT16_MAX);
-            pThis->ImageEvt.uAddr0 <<= 16;
-            pThis->ImageEvt.uAddr0 |= EFI_IMAGE_EVT_GET_PAYLOAD_U16(u32);
+            pThis->ImageEvt.uAddr1 <<= 16;
+            pThis->ImageEvt.uAddr1 |= EFI_IMAGE_EVT_GET_PAYLOAD_U16(u32);
             return VINF_SUCCESS;
 

trunk/src/VBox/Devices/EFI/DevEFI.h

@@ -224 +224 @@
 /** Starts a 64-bit unload event. Requires name and address. */
 #define EFI_IMAGE_EVT_CMD_START_UNLOAD64        UINT32_C(0x00000005)
+/** Starts a 32-bit relocation event. RRequires new and old base address. */
+#define EFI_IMAGE_EVT_CMD_START_RELOC32         UINT32_C(0x0000000A)
+/** Starts a 64-bit relocation event. Requires new and old base address. */
+#define EFI_IMAGE_EVT_CMD_START_RELOC64         UINT32_C(0x0000000B)
 
 /** The command for writing to the second address register (64-bit).

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffExtraActionLib/VBoxPeCoffExtraActionLib.c

@@ -101 +101 @@
 }
 
+VOID
+EFIAPI
+VBoxPeCoffLoaderMoveImageExtraAction(
+  IN PHYSICAL_ADDRESS OldBase,
+  IN PHYSICAL_ADDRESS NewBase
+  )
+{
+    ASSERT(ImageContext != NULL);
+#if ARCH_BITS == 32
+    ASMOutU32(EFI_PORT_IMAGE_EVENT, EFI_IMAGE_EVT_CMD_START_RELOC32);
+#else
+    ASMOutU32(EFI_PORT_IMAGE_EVENT, EFI_IMAGE_EVT_CMD_START_RELOC64);
+#endif
+    vboxImageEvtU64(EFI_IMAGE_EVT_CMD_ADDR0, NewBase);
+    vboxImageEvtU64(EFI_IMAGE_EVT_CMD_ADDR1, OldBase);
+    ASMOutU32(EFI_PORT_IMAGE_EVENT, EFI_IMAGE_EVT_CMD_COMPLETE);
+}

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c

@@ -1332 +1332 @@
 }
 
+extern VOID EFIAPI VBoxPeCoffLoaderMoveImageExtraAction(IN PHYSICAL_ADDRESS OldBase, IN PHYSICAL_ADDRESS NewBase);
 
 /**
@@ -1388 +1389 @@
   EFI_FAT_IMAGE_HEADER                *Fat;
 
+  VBoxPeCoffLoaderMoveImageExtraAction(ImageBase, VirtImageBase);
+
   OldBase = (CHAR8 *)((UINTN)ImageBase);
   NewBase = (CHAR8 *)((UINTN)VirtImageBase);