<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> </head> <body dir="ltr"> <div style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 11pt; color: rgb(0, 0, 0);" class="elementToProof"> Nate,</div> <div style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 11pt; color: rgb(0, 0, 0);" class="elementToProof"> </div> <div style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 11pt; color: rgb(0, 0, 0);" class="elementToProof"> Thanks for the great patch! Minor comments:</div> <div style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 11pt; color: rgb(0, 0, 0);" class="elementToProof ContentPasted0"> <ol data-editing-info="{"orderedStyleType":1,"unorderedStyleType":1}" data-listchain="__List_Chain_188"> <li style="list-style-type: "1. ";">Regarding the DllEntryPoint, what's the difference between below line in your patch and the original code that calls GetProcAddress()?</li><ol style="list-style-type: lower-alpha;"> <li style="display: block;">DllEntryPoint = (VOID *) ((UINTN)Library + (UINTN)Hdr.Pe32Plus->OptionalHeader.AddressOfEntryPoint);</li></ol> <li style="display: block; list-style-type: "2. "; font-family: "Segoe UI", "Segoe UI Web (West European)", "Segoe UI", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", sans-serif; color: rgb(36, 36, 36);"> Does it avoid relying on each driver exporting its entrypoint with a fixed symbol name "<span style="font-family: "Segoe UI", "Segoe UI Web (West European)", "Segoe UI", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", sans-serif; text-align: start; display: inline !important; color: rgb(36, 36, 36); background-color: rgb(255, 255, 255);" class="ContentPasted1">InitializeDriver"? <div style="list-style-type: "2. "; font-family: "Segoe UI", "Segoe UI Web (West European)", "Segoe UI", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", sans-serif; color: rgb(36, 36, 36);"> <span style="font-family: "Segoe UI", "Segoe UI Web (West European)", "Segoe UI", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", sans-serif; text-align: start; display: inline !important; color: rgb(36, 36, 36); background-color: rgb(255, 255, 255);" class="ContentPasted1">Does the new DllEntryPoint equal to the original one retrieved from GetProcAddress()?</div> <div style="list-style-type: "2. "; font-family: "Segoe UI", "Segoe UI Web (West European)", "Segoe UI", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", sans-serif; color: rgb(36, 36, 36);"> <span style="font-family: "Segoe UI", "Segoe UI Web (West European)", "Segoe UI", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", sans-serif; text-align: start; display: inline !important; color: rgb(36, 36, 36); background-color: rgb(255, 255, 255);" class="ContentPasted1">What else benifits? (Just curious)</div> <div style="list-style-type: "2. "; font-family: "Segoe UI", "Segoe UI Web (West European)", "Segoe UI", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", sans-serif; color: rgb(36, 36, 36);"> Can it be in a separate patch so that future readers can easily understand the purpose of the change?</div> </li><li style="list-style-type: "2. ";">It seems the patch assumes the handle returned from LoadLibrary() is the address of the loaded DLL in memory. I tried to find in MSDN if any doc supports this assumption but failed. Can you provide any? <div style="list-style-type: "3. ";">I am ok if the assumption is based on the current LoadLibrary() implementation. But can you please explicitly mention that assumption in comments?</div> </li></ol> <div> </div> </div> <div style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 11pt; color: rgb(0, 0, 0);" class="elementToProof ContentPasted0"> Thanks, </div> <div class="elementToProof"> <div id="Signature"> <div style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 11pt; color: rgb(0, 0, 0);"> Ray</div> </div> </div> <div id="appendonsend"></div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr">From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com> Sent: Saturday, September 23, 2023 6:49 AM To: devel@edk2.groups.io <devel@edk2.groups.io> Cc: Andrew Fish <afish@apple.com>; Ni, Ray <ray.ni@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>; Chiu, Chasel <chasel.chiu@intel.com> Subject: [PATCH v1] EmulatorPkg: Fix Source Level Debug on Windows <div> </div> </div> <div class="BodyFragment"> <div class="PlainText">The Visual Studio Windows debugger will only load symbols for PE/COFF images that Windows is aware of. Therefore, to enable source level debugging, all PEI/DXE modules must be loaded via LoadLibrary() or LoadLibraryEx() and the the instance in memory created by LoadLibrary() must be the one that is actually executed. The current source level debug implementation in EmulatorPkg for Windows is inherited from the old Nt32Pkg. This implementation makes the assumption that all PEI/DXE modules have a DLL export tables with a symbol named InitializeDriver. Therefore, this source level debug implementation requires all modules to be linked in a non-PI spec defined manner. Support for adding the InitializeDriver symbol was removed in EmulatorPkg, which broke source level debugging. To fix this, the source level debugging implementation has been modified to use the PE/COFF entry point directly. This brings the implementation into compliance with the PI spec and should work with any PEIM/DXE driver. Implementing this requires parsing the in-memory instance of the PE/COFF image created by Windows to find the entrypoint and since PEIMs/DXE drivers are not garunteed to have 4KB aligned sections, it also requires explicit configuration of the page table using VirtualProtect(). With this fix, the debugging experience is now so good it is unprecedented! In Visual Studio Code, add the following to launch.json: { "version": "0.2.0", "configurations": [ { "name": "EmulatorPkg Launch", "type": "cppvsdbg", "request": "launch", "program": "${workspaceFolder}/<path_to_build>/Build/EmulatorX64/DEBUG_<tool_chain>/X64/WinHost", "args": [], "stopAtEntry": false, "cwd": "${workspaceFolder}/<path_to_build>/Build/EmulatorX64/DEBUG_<tool_chain>/X64/", "environment": [], "console": false, } ] } Make modifications to the above template as nessesary and build EmulatorPkg. Now, just add breakpoints directly in Visual Studio Code the way you would with any other software project. When you start the debugger, it will halt at the breakpoint automatically without any extra configuration required. Cc: Andrew Fish <afish@apple.com> Cc: Ray Ni <ray.ni@intel.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Cc: Chasel Chiu <chasel.chiu@intel.com> Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com> --- EmulatorPkg/Win/Host/WinHost.c | 206 +++++++++++++++++++++++++++++---- 1 file changed, 182 insertions(+), 24 deletions(-) diff --git a/EmulatorPkg/Win/Host/WinHost.c b/EmulatorPkg/Win/Host/WinHost.c index 193a947fbd..e414da6c55 100644 --- a/EmulatorPkg/Win/Host/WinHost.c +++ b/EmulatorPkg/Win/Host/WinHost.c @@ -8,7 +8,7 @@ This code produces 128 K of temporary memory for the SEC stack by directly allocate memory space with ReadWrite and Execute attribute. -Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved. +Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved. (C) Copyright 2016-2020 Hewlett Packard Enterprise Development LP SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -977,7 +977,7 @@ AddModHandle ( for (Index = 0; Index < mPdbNameModHandleArraySize; Index++, Array++) { if (Array->PdbPointer == NULL) { // - // Make a copy of the stirng and store the ModHandle + // Make a copy of the string and store the ModHandle // Handle = GetProcessHeap (); Size = AsciiStrLen (ImageContext->PdbPointer) + 1; @@ -1056,26 +1056,45 @@ RemoveModHandle ( return NULL; } +typedef struct { + UINTN Base; + UINT32 Size; + UINT32 Flags; +} IMAGE_SECTION_DATA; + VOID EFIAPI PeCoffLoaderRelocateImageExtraAction ( IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext ) { - EFI_STATUS Status; - VOID *DllEntryPoint; - CHAR16 *DllFileName; - HMODULE Library; - UINTN Index; + EFI_STATUS Status; + VOID *DllEntryPoint; + CHAR16 *DllFileName; + HMODULE Library; + UINTN Index; + PE_COFF_LOADER_IMAGE_CONTEXT PeCoffImageContext; + EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Hdr; + EFI_IMAGE_SECTION_HEADER *FirstSection; + EFI_IMAGE_SECTION_HEADER *Section; + IMAGE_SECTION_DATA *SectionData; + UINTN NumberOfSections; + UINTN Base; + UINTN End; + UINTN RegionBase; + UINTN RegionSize; + UINT32 Flags; + DWORD NewProtection; + DWORD OldProtection; ASSERT (ImageContext != NULL); // - // If we load our own PE COFF images the Windows debugger can not source - // level debug our code. If a valid PDB pointer exists use it to load - // the *.dll file as a library using Windows* APIs. This allows - // source level debug. The image is still loaded and relocated - // in the Framework memory space like on a real system (by the code above), - // but the entry point points into the DLL loaded by the code below. + // If we load our own PE/COFF images the Windows debugger can not source + // level debug our code. If a valid PDB pointer exists use it to load + // the *.dll file as a library using Windows* APIs. This allows + // source level debug. The image is still loaded and relocated + // in the Framework memory space like on a real system (by the code above), + // but the entry point points into the DLL loaded by the code below. // DllEntryPoint = NULL; @@ -1106,27 +1125,166 @@ PeCoffLoaderRelocateImageExtraAction ( } // - // Replace .PDB with .DLL on the filename + // Replace .PDB with .DLL in the filename // DllFileName[Index - 3] = 'D'; DllFileName[Index - 2] = 'L'; DllFileName[Index - 1] = 'L'; // - // Load the .DLL file into the user process's address space for source - // level debug + // Load the .DLL file into the process's address space for source level + // debug. + // + // EFI modules use the PE32 entry point for a different purpose than + // Windows. For Windows DLLs, the PE entry point is used for the DllMain() + // function. DllMain() has a very specific purpose; it initializes runtime + // libraries, instance data, and thread local storage. LoadLibrary()/ + // LoadLibraryEx() will run the PE32 entry point and assume it to be a + // DllMain() implementation by default. By passing the + // DONT_RESOLVE_DLL_REFERENCES argument to LoadLibraryEx(), the execution + // of the entry point as a DllMain() function will be suppressed. This + // also prevents other modules that are referenced by the DLL from being + // loaded. We use LoadLibraryEx() to create a copy of the PE32 + // image that the OS (and therefore the debugger) is aware of. + // Source level debugging is the only reason to do this. // Library = LoadLibraryEx (DllFileName, NULL, DONT_RESOLVE_DLL_REFERENCES); if (Library != NULL) { // - // InitializeDriver is the entry point we put in all our EFI DLL's. The - // DONT_RESOLVE_DLL_REFERENCES argument to LoadLIbraryEx() suppresses the - // normal DLL entry point of DllMain, and prevents other modules that are - // referenced in side the DllFileName from being loaded. There is no error - // checking as the we can point to the PE32 image loaded by Tiano. This - // step is only needed for source level debugging + // Parse the PE32 image loaded by the OS and find the entry point // - DllEntryPoint = (VOID *)(UINTN)GetProcAddress (Library, "InitializeDriver"); + ZeroMem (&PeCoffImageContext, sizeof (PeCoffImageContext)); + PeCoffImageContext.Handle = Library; + PeCoffImageContext.ImageRead = PeCoffLoaderImageReadFromMemory; + Status = PeCoffLoaderGetImageInfo (&PeCoffImageContext); + if (EFI_ERROR (Status) || (PeCoffImageContext.ImageError != IMAGE_ERROR_SUCCESS)) { + SecPrint ("DLL is not a valid PE/COFF image.\n\r"); + FreeLibrary (Library); + Library = NULL; + } else { + Hdr.Pe32 = (EFI_IMAGE_NT_HEADERS32 *)((UINTN)Library + (UINTN)PeCoffImageContext.PeCoffHeaderOffset); + if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) { + // + // Use PE32 offset + // + DllEntryPoint = (VOID *) ((UINTN)Library + (UINTN)Hdr.Pe32->OptionalHeader.AddressOfEntryPoint); + } else { + // + // Use PE32+ offset + // + DllEntryPoint = (VOID *) ((UINTN)Library + (UINTN)Hdr.Pe32Plus->OptionalHeader.AddressOfEntryPoint); + } + // + // Now we need to configure memory access for the copy of the PE32 image + // loaded by the OS. + // + // Most Windows DLLs are linked with sections 4KB aligned but EFI + // modules are not to reduce size. Because of this we need to compute + // the union of memory access attributes and explicitly configure + // each page. + // + FirstSection = (EFI_IMAGE_SECTION_HEADER *)( + (UINTN)Library + + PeCoffImageContext.PeCoffHeaderOffset + + sizeof (UINT32) + + sizeof (EFI_IMAGE_FILE_HEADER) + + Hdr.Pe32->FileHeader.SizeOfOptionalHeader + ); + NumberOfSections = (UINTN)(Hdr.Pe32->FileHeader.NumberOfSections); + Section = FirstSection; + SectionData = malloc (NumberOfSections * sizeof (IMAGE_SECTION_DATA)); + if (SectionData == NULL) { + FreeLibrary (Library); + Library = NULL; + DllEntryPoint = NULL; + } + ZeroMem (SectionData, NumberOfSections * sizeof (IMAGE_SECTION_DATA)); + // + // Extract the section data from the PE32 image + // + for (Index = 0; Index < NumberOfSections; Index++) { + SectionData[Index].Base = (UINTN)Library + Section->VirtualAddress; + SectionData[Index].Size = Section->Misc.VirtualSize; + if (SectionData[Index].Size == 0) { + SectionData[Index].Size = Section->SizeOfRawData; + } + SectionData[Index].Flags = (Section->Characteristics & + (EFI_IMAGE_SCN_MEM_EXECUTE | EFI_IMAGE_SCN_MEM_WRITE)); + Section += 1; + } + // + // Loop over every DWORD in memory and compute the union of the memory + // access bits. + // + End = (UINTN)Library + (UINTN)PeCoffImageContext.ImageSize; + RegionBase = (UINTN)Library; + RegionSize = 0; + Flags = 0; + for (Base = (UINTN)Library + sizeof (UINT32); Base < End; Base += sizeof (UINT32)) { + for (Index = 0; Index < NumberOfSections; Index++) { + if (SectionData[Index].Base <= Base && + (SectionData[Index].Base + SectionData[Index].Size) > Base) { + Flags |= SectionData[Index].Flags; + } + } + // + // When a new page is reached configure the memory access for the + // previous page. + // + if (Base % SIZE_4KB == 0) { + RegionSize += SIZE_4KB; + if ((Flags & EFI_IMAGE_SCN_MEM_WRITE) == EFI_IMAGE_SCN_MEM_WRITE) { + if ((Flags & EFI_IMAGE_SCN_MEM_EXECUTE) == EFI_IMAGE_SCN_MEM_EXECUTE) { + NewProtection = PAGE_EXECUTE_READWRITE; + } else { + NewProtection = PAGE_READWRITE; + } + } else { + if ((Flags & EFI_IMAGE_SCN_MEM_EXECUTE) == EFI_IMAGE_SCN_MEM_EXECUTE) { + NewProtection = PAGE_EXECUTE_READ; + } else { + NewProtection = PAGE_READONLY; + } + } + if (!VirtualProtect ((LPVOID)RegionBase, (SIZE_T) RegionSize, NewProtection, &OldProtection)) { + SecPrint ("Setting PE32 Section Access Failed\n\r"); + FreeLibrary (Library); + free (SectionData); + Library = NULL; + DllEntryPoint = NULL; + break; + } + Flags = 0; + RegionBase = Base; + RegionSize = 0; + } + } + free (SectionData); + // + // Configure the last partial page + // + if (Library != NULL && (End - RegionBase) > 0) { + if ((Flags & EFI_IMAGE_SCN_MEM_WRITE) == EFI_IMAGE_SCN_MEM_WRITE) { + if ((Flags & EFI_IMAGE_SCN_MEM_EXECUTE) == EFI_IMAGE_SCN_MEM_EXECUTE) { + NewProtection = PAGE_EXECUTE_READWRITE; + } else { + NewProtection = PAGE_READWRITE; + } + } else { + if ((Flags & EFI_IMAGE_SCN_MEM_EXECUTE) == EFI_IMAGE_SCN_MEM_EXECUTE) { + NewProtection = PAGE_EXECUTE_READ; + } else { + NewProtection = PAGE_READONLY; + } + } + if (!VirtualProtect ((LPVOID)RegionBase, (SIZE_T) (End - RegionBase), NewProtection, &OldProtection)) { + SecPrint ("Setting PE32 Section Access Failed\n\r"); + FreeLibrary (Library); + Library = NULL; + DllEntryPoint = NULL; + } + } + } } if ((Library != NULL) && (DllEntryPoint != NULL)) { @@ -1142,7 +1300,7 @@ PeCoffLoaderRelocateImageExtraAction ( // This DLL is not already loaded, so source level debugging is supported. // ImageContext->EntryPoint = (EFI_PHYSICAL_ADDRESS)(UINTN)DllEntryPoint; - SecPrint ("LoadLibraryEx (\n\r %S,\n\r NULL, DONT_RESOLVE_DLL_REFERENCES)\n\r", DllFileName); + SecPrint ("LoadLibraryEx (\n\r %S,\n\r NULL, DONT_RESOLVE_DLL_REFERENCES) @ 0x%X\n\r", DllFileName, (int) (UINTN) Library); } } else { SecPrint ("WARNING: No source level debug %S. \n\r", DllFileName); -- 2.39.2.windows.1 </div> </div> </body> </html> <div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links: You receive all messages sent to this group. <a target="_blank" href="https://edk2.groups.io/g/devel/message/109100">View/Reply Online (#109100)</a> | | <a target="_blank" href="https://groups.io/mt/101531560/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/leave/3943202/1813853/130120423/xyzzy">Unsubscribe</a> [edk2-devel-archive@redhat.com] <div width="1" style="color:white;clear:both">_._,_._,_</div>