Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[ros-arm-bringup] 43489: - Fix comments. - Fix reading the incorrect pool type when freeing pool. The PoolType in the entry is offset by 1, so it can be either 1 for NonPaged or 2 for paged. This used to give us index 0 for nonpaged (correct), and index -1 for paged (oops!). Mask by 3 instead, so we get 0 and 1.
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 21:19:40 2009 New Revision: 43489 URL: http://svn.reactos.org/svn/reactos?rev=43489&view=rev Log: - Fix comments. - Fix reading the incorrect pool type when freeing pool. The PoolType in the entry is offset by 1, so it can be either 1 for NonPaged or 2 for paged. This used to give us index 0 for nonpaged (correct), and index -1 for paged (oops!). Mask by 3 instead, so we get 0 and 1. Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Thu Oct 15 21:19:40 2009 @@ -241,7 +241,7 @@ if (!IsListEmpty(ListHead)) { // - // Acquire the nonpaged pool lock now + // Acquire the pool lock now // OldIrql = ExLockPool(PoolDesc); @@ -420,7 +420,7 @@ if (FragmentEntry->BlockSize != 1) { // - // Excellent -- acquire the nonpaged pool lock + // Excellent -- acquire the pool lock // OldIrql = ExLockPool(PoolDesc); @@ -431,7 +431,7 @@ (PLIST_ENTRY)FragmentEntry + 1); // - // Release the nonpaged pool lock + // Release the pool lock // ExUnlockPool(PoolDesc, OldIrql); } @@ -487,7 +487,7 @@ // for this pool type // BlockSize = Entry->BlockSize; - PoolType = (Entry->PoolType & BASE_POOL_TYPE_MASK) - 1; + PoolType = (Entry->PoolType & 3) - 1; PoolDesc = PoolVector[PoolType]; // @@ -496,7 +496,7 @@ NextEntry = Entry + BlockSize; // - // Acquire the nonpaged pool lock + // Acquire the pool lock // OldIrql = ExLockPool(PoolDesc); @@ -588,7 +588,7 @@ (PAGE_ALIGN(Entry + Entry->BlockSize) == Entry + Entry->BlockSize)) { // - // In this case, release the nonpaged pool lock, and free the page + // In this case, release the pool lock, and free the page // ExUnlockPool(PoolDesc, OldIrql); MiFreePoolPages(Entry); @@ -621,7 +621,7 @@ } // - // Insert this new free block, and release the nonpaged pool lock + // Insert this new free block, and release the pool lock // InsertHeadList(&PoolDesc->ListHeads[BlockSize - 1], (PLIST_ENTRY)Entry + 1); ExUnlockPool(PoolDesc, OldIrql);

1 0

[ros-arm-bringup] 43488: - Collapse MmInit1 into MmInitSystem. - Check for ARM3-owned memory areas during a page fault, and crash the system as this shouldn't happen yet. - Use portable PTE macro instead of setting the owner bit directly, fixing an ARM port build issue.
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 21:12:43 2009 New Revision: 43488 URL: http://svn.reactos.org/svn/reactos?rev=43488&view=rev Log: - Collapse MmInit1 into MmInitSystem. - Check for ARM3-owned memory areas during a page fault, and crash the system as this shouldn't happen yet. - Use portable PTE macro instead of setting the owner bit directly, fixing an ARM port build issue. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Oct 15 21:12:43 2009 @@ -157,6 +157,22 @@ extern ULONG MmSizeOfPagedPoolInBytes; extern PMMPTE MmSystemPagePtes; +NTSTATUS +NTAPI +MmArmInitSystem( + IN ULONG Phase, + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + +NTSTATUS +NTAPI +MmArmAccessFault( + IN BOOLEAN StoreInstruction, + IN PVOID Address, + IN KPROCESSOR_MODE Mode, + IN PVOID TrapInformation +); + VOID NTAPI MiInitializeArmPool( Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Thu Oct 15 21:12:43 2009 @@ -12,6 +12,9 @@ #define NDEBUG #include <debug.h> +#define MODULE_INVOLVED_IN_ARM3 +#include "ARM3/miarm.h" + /* PRIVATE FUNCTIONS **********************************************************/ VOID @@ -256,6 +259,8 @@ IN KPROCESSOR_MODE Mode, IN PVOID TrapInformation) { + PMEMORY_AREA MemoryArea; + /* Cute little hack for ROS */ if ((ULONG_PTR)Address >= (ULONG_PTR)MmSystemRangeStart) { @@ -268,6 +273,20 @@ } #endif } + + // + // Check if this is an ARM3 memory area + // + MemoryArea = MmLocateMemoryAreaByAddress(MmGetKernelAddressSpace(), Address); + if ((MemoryArea) && (MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3)) + { + // + // Hand it off to more competent hands... + // + UNIMPLEMENTED; + KeBugCheckEx(MEMORY_AREA_OWNED_BY_ARM3, Mode, (ULONG_PTR)Address, 0, 0); + //return MmArmAccessFault(StoreInstruction, Address, Mode, TrapInformation); + } /* Keep same old ReactOS Behaviour */ if (StoreInstruction) Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Thu Oct 15 21:12:43 2009 @@ -54,7 +54,6 @@ PMMPTE MmSharedUserDataPte; PMMSUPPORT MmKernelAddressSpace; extern KMUTANT MmSystemLoadLock; -extern ULONG MmBootImageSize; BOOLEAN MiDbgEnableMdDump = #ifdef _ARM_ TRUE; @@ -313,55 +312,6 @@ DPRINT1("Total: %08lX (%d MB)\n", TotalPages, (TotalPages * PAGE_SIZE) / 1024 / 1024); } -NTSTATUS -NTAPI -MmArmInitSystem(IN ULONG Phase, - IN PLOADER_PARAMETER_BLOCK LoaderBlock); - -VOID -INIT_FUNCTION -NTAPI -MmInit1(VOID) -{ - /* Initialize the kernel address space */ - KeInitializeGuardedMutex(&PsGetCurrentProcess()->AddressCreationLock); - MmKernelAddressSpace = MmGetCurrentAddressSpace(); - MmInitGlobalKernelPageDirectory(); - - /* Dump memory descriptors */ - if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); - - // - // Initialize ARMÂ³ in phase 0 - // - MmArmInitSystem(0, KeLoaderBlock); - - /* Initialize the page list */ - MmInitializePageList(); - - // - // Initialize ARMÂ³ in phase 1 - // - MmArmInitSystem(1, KeLoaderBlock); - - /* Put the paged pool after the loaded modules */ - MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MmSystemRangeStart + - MmBootImageSize); - MmPagedPoolSize = MM_PAGED_POOL_SIZE; - - /* Intialize system memory areas */ - MiInitSystemMemoryAreas(); - - /* Dump the address space */ - MiDbgDumpAddressSpace(); - - /* Initialize paged pool */ - MmInitializePagedPool(); - - /* Initialize working sets */ - MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); -} - BOOLEAN NTAPI MmInitSystem(IN ULONG Phase, @@ -374,8 +324,43 @@ if (Phase == 0) { - /* Initialize Mm bootstrap */ - MmInit1(); + /* Initialize the kernel address space */ + KeInitializeGuardedMutex(&PsGetCurrentProcess()->AddressCreationLock); + MmKernelAddressSpace = MmGetCurrentAddressSpace(); + MmInitGlobalKernelPageDirectory(); + + /* Dump memory descriptors */ + if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); + + // + // Initialize ARMÂ³ in phase 0 + // + MmArmInitSystem(0, KeLoaderBlock); + + /* Initialize the page list */ + MmInitializePageList(); + + // + // Initialize ARMÂ³ in phase 1 + // + MmArmInitSystem(1, KeLoaderBlock); + + /* Put the paged pool after the loaded modules */ + MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MmSystemRangeStart + + MmBootImageSize); + MmPagedPoolSize = MM_PAGED_POOL_SIZE; + + /* Intialize system memory areas */ + MiInitSystemMemoryAreas(); + + /* Dump the address space */ + MiDbgDumpAddressSpace(); + + /* Initialize paged pool */ + MmInitializePagedPool(); + + /* Initialize working sets */ + MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE); @@ -422,7 +407,7 @@ // // Now write a copy of it // - TempPte.u.Hard.Owner = 1; + MI_MAKE_OWNER_PAGE(&TempPte); TempPte.u.Hard.PageFrameNumber = PageFrameNumber; *MmSharedUserDataPte = TempPte;

1 0

[gschneider] 43487: [kernel32] IsBadStringPtrA/W: - Remove overflow failure case, this isn't checked for string validation - Adapt page check to let the full string be checked in case of overflow See issue #4861 for more details.
by gschneider＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: gschneider Date: Thu Oct 15 21:12:37 2009 New Revision: 43487 URL: http://svn.reactos.org/svn/reactos?rev=43487&view=rev Log: [kernel32] IsBadStringPtrA/W: - Remove overflow failure case, this isn't checked for string validation - Adapt page check to let the full string be checked in case of overflow See issue #4861 for more details. Modified: trunk/reactos/dll/win32/kernel32/mem/isbad.c Modified: trunk/reactos/dll/win32/kernel32/mem/isbad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/isb… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/isbad.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/isbad.c [iso-8859-1] Thu Oct 15 21:12:37 2009 @@ -171,9 +171,6 @@ /* Calculate the last page */ Last = (PWCHAR)((ULONG_PTR)lpsz + (ucchMax * 2) - 2); - /* Another quick failure case */ - if ((ULONG_PTR)Last < (ULONG_PTR)lpsz) return TRUE; - /* Enter SEH */ _SEH2_TRY { @@ -184,7 +181,7 @@ { Char = *Current; Current++; - } while (Char && (Current <= Last)); + } while (Char && (Current != Last)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -217,9 +214,6 @@ /* Calculate the last page */ Last = (PCHAR)((ULONG_PTR)lpsz + ucchMax - 1); - /* Another quick failure case */ - if ((ULONG_PTR)Last < (ULONG_PTR)lpsz) return TRUE; - /* Enter SEH */ _SEH2_TRY { @@ -230,7 +224,7 @@ { Char = *Current; Current++; - } while (Char && (Current <= Last)); + } while (Char && (Current != Last)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

1 0

[ros-arm-bringup] 43486: - Fix a bug in memory area creation: Static memory areas had the static flag embedded in their type, so code that was switch()ing on the type would fail to recognize the actual type, because MEMORY_AREA_STATIC was ORed in. - Add a new memory area type: MEMORY_AREA_OWNED_BY_ARM3. This will allow us to instruct the ReactOS Memory MAnager to "Back. The Fuck. Off." during page faults and such, so we can handle page faults inside ARM3-owned PTEs ourselves. - Right now, all AR
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 20:54:35 2009 New Revision: 43486 URL: http://svn.reactos.org/svn/reactos?rev=43486&view=rev Log: - Fix a bug in memory area creation: Static memory areas had the static flag embedded in their type, so code that was switch()ing on the type would fail to recognize the actual type, because MEMORY_AREA_STATIC was ORed in. - Add a new memory area type: MEMORY_AREA_OWNED_BY_ARM3. This will allow us to instruct the ReactOS Memory MAnager to "Back. The Fuck. Off." during page faults and such, so we can handle page faults inside ARM3-owned PTEs ourselves. - Right now, all ARM3 PTEs and data is nonpaged, so no page faults should happen, but this may change in the future. - Also will allow us to manage our own PDEs so we can do on-demand inpage instead of syncing with the ReactOS Mm hack cache. - Create all memory areas in one shot in MmCreateSystemMemoryAreas (get rid of MiInitPageDirectoryMap and MiInitPagedPool memory area creation). - Mark all of ours as owned by ARM3. - Make them all static. - The only non-ARM3 one right now is paged pool, we own all the other static areas. - Move this code into mm, instead of mm/ARM3, since memory areas are not an ARM3 concept. - Also create memory areas for session space, session view, and other ARM3 memory ranges, so nobody touches those ranges. - Dump the kernel address space after all this is done, in a MmDbg function in mm. - This cleans up ARM3 of some ROS-specific code, and also collapses Phase 1 and 2 into a single phase. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/ppool.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Thu Oct 15 20:54:35 2009 @@ -46,7 +46,7 @@ #define MMDBG_COPY_MAX_SIZE 0x8 -#define MI_STATIC_MEMORY_AREAS (8) +#define MI_STATIC_MEMORY_AREAS (12) #define MEMORY_AREA_INVALID (0) #define MEMORY_AREA_SECTION_VIEW (1) @@ -62,6 +62,7 @@ #define MEMORY_AREA_PAGED_POOL (12) #define MEMORY_AREA_NO_ACCESS (13) #define MEMORY_AREA_PEB_OR_TEB (14) +#define MEMORY_AREA_OWNED_BY_ARM3 (15) #define MEMORY_AREA_STATIC (0x80000000) #define MM_PHYSICAL_PAGE_MPW_PENDING (0x8) Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Thu Oct 15 20:54:35 2009 @@ -600,20 +600,16 @@ PLIST_ENTRY NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; ULONG FreePages = 0; - PMEMORY_AREA MArea; - PHYSICAL_ADDRESS BoundaryAddressMultiple; PFN_NUMBER PageFrameIndex; PMMPTE StartPde, EndPde, PointerPte, LastPte; MMPTE TempPde = HyperTemplatePte, TempPte = HyperTemplatePte; - PVOID NonPagedPoolExpansionVa, BaseAddress; - NTSTATUS Status; + PVOID NonPagedPoolExpansionVa; ULONG OldCount; BOOLEAN IncludeType[LoaderMaximum]; ULONG i; PVOID Bitmap; PPHYSICAL_MEMORY_RUN Run; PFN_NUMBER FreePage, FreePageCount, PagesLeft, BasePage, PageCount; - BoundaryAddressMultiple.QuadPart = 0; if (Phase == 0) { @@ -1083,37 +1079,6 @@ ASSERT(TempPte.u.Hard.Valid == 1); *PointerPte++ = TempPte; } - - // - // ReactOS requires a memory area to keep the initial NP area off-bounds - // - BaseAddress = MmNonPagedPoolStart; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, - &BaseAddress, - MmSizeOfNonPagedPoolInBytes, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - ASSERT(Status == STATUS_SUCCESS); - - // - // And we need one more for the system NP - // - BaseAddress = MmNonPagedSystemStart; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, - &BaseAddress, - (ULONG_PTR)MmNonPagedPoolEnd - - (ULONG_PTR)MmNonPagedSystemStart, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - ASSERT(Status == STATUS_SUCCESS); // // Sanity check: make sure we have properly defined the system PTE space @@ -1324,9 +1289,7 @@ MiSyncARM3WithROS(MmNonPagedSystemStart, (PVOID)((ULONG_PTR)MmNonPagedPoolEnd - 1)); MiSyncARM3WithROS(MmPfnDatabase, (PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); MiSyncARM3WithROS((PVOID)HYPER_SPACE, (PVOID)(HYPER_SPACE + PAGE_SIZE - 1)); - } - else // NOW WE HAVE NONPAGED POOL - { + // // Instantiate memory that we don't consider RAM/usable // We use the same exclusions that Windows does, in order to try to be @@ -1400,53 +1363,6 @@ // Size up paged pool and build the shadow system page directory // MiBuildPagedPool(); - - // - // Print the memory layout - // - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmSystemRangeStart, - (ULONG_PTR)MmSystemRangeStart + MmBootImageSize, - "Boot Loaded Image"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmPagedPoolBase, - (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize, - "Paged Pool"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmPfnDatabase, - (ULONG_PTR)MmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT), - "PFN Database"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmNonPagedPoolStart, - (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes, - "ARMÂ³ Non Paged Pool"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MiSystemViewStart, - (ULONG_PTR)MiSystemViewStart + MmSystemViewSize, - "System View Space"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmSessionBase, - MiSessionSpaceEnd, - "Session Space"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - PTE_BASE, PDE_BASE, - "Page Tables"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - PDE_BASE, HYPER_SPACE, - "Page Directories"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - HYPER_SPACE, HYPER_SPACE + (4 * 1024 * 1024), - "Hyperspace"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmPagedPoolStart, - (ULONG_PTR)MmPagedPoolStart + MmSizeOfPagedPoolInBytes, - "ARMÂ³ Paged Pool"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmNonPagedSystemStart, MmNonPagedPoolExpansionStart, - "System PTE Space"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmNonPagedPoolExpansionStart, MmNonPagedPoolEnd, - "Non Paged Pool Expansion PTE Space"); } // Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Oct 15 20:54:35 2009 @@ -147,6 +147,15 @@ extern MM_PAGED_POOL_INFO MmPagedPoolInfo; extern RTL_BITMAP MiPfnBitMap; extern KGUARDED_MUTEX MmPagedPoolMutex; +extern PVOID MmPagedPoolStart; +extern PVOID MmPagedPoolEnd; +extern PVOID MmNonPagedSystemStart; +extern PVOID MiSystemViewStart; +extern ULONG MmSystemViewSize; +extern PVOID MmSessionBase; +extern PVOID MiSessionSpaceEnd; +extern ULONG MmSizeOfPagedPoolInBytes; +extern PMMPTE MmSystemPagePtes; VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Thu Oct 15 20:54:35 2009 @@ -1034,48 +1034,4 @@ } } -VOID -INIT_FUNCTION -NTAPI -MiInitPageDirectoryMap(VOID) -{ - MEMORY_AREA* kernel_map_desc = NULL; - MEMORY_AREA* hyperspace_desc = NULL; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - PVOID BaseAddress; - NTSTATUS Status; - - DPRINT("MiInitPageDirectoryMap()\n"); - - BoundaryAddressMultiple.QuadPart = 0; - BaseAddress = (PVOID)PAGETABLE_MAP; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, - &BaseAddress, - 0x400000, - PAGE_READWRITE, - &kernel_map_desc, - TRUE, - 0, - BoundaryAddressMultiple); - if (!NT_SUCCESS(Status)) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - BaseAddress = (PVOID)HYPERSPACE; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, - &BaseAddress, - 0x400000, - PAGE_READWRITE, - &hyperspace_desc, - TRUE, - 0, - BoundaryAddressMultiple); - if (!NT_SUCCESS(Status)) - { - KeBugCheck(MEMORY_MANAGEMENT); - } -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Thu Oct 15 20:54:35 2009 @@ -996,6 +996,7 @@ // ASSERT(MiStaticMemoryAreaCount < MI_STATIC_MEMORY_AREAS); MemoryArea = &MiStaticMemoryAreas[MiStaticMemoryAreaCount++]; + Type &= ~MEMORY_AREA_STATIC; } else { Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Thu Oct 15 20:54:35 2009 @@ -11,6 +11,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +#define MODULE_INVOLVED_IN_ARM3 +#include "ARM3/miarm.h" /* GLOBALS *******************************************************************/ @@ -69,19 +72,151 @@ PVOID BaseAddress; PHYSICAL_ADDRESS BoundaryAddressMultiple; PMEMORY_AREA MArea; + NTSTATUS Status; BoundaryAddressMultiple.QuadPart = 0; // - // First initialize the page table and hyperspace memory areas - // - MiInitPageDirectoryMap(); + // Create the memory area to define the PTE base + // + BaseAddress = (PVOID)PTE_BASE; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + 4 * 1024 * 1024, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // Create the memory area to define Hyperspace + // + BaseAddress = (PVOID)HYPER_SPACE; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + 4 * 1024 * 1024, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // Protect the PFN database + // + BaseAddress = MmPfnDatabase; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + (MxPfnAllocation << PAGE_SHIFT), + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // ReactOS requires a memory area to keep the initial NP area off-bounds + // + BaseAddress = MmNonPagedPoolStart; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + MmSizeOfNonPagedPoolInBytes, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // And we need one more for the system NP + // + BaseAddress = MmNonPagedSystemStart; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + (ULONG_PTR)MmNonPagedPoolEnd - + (ULONG_PTR)MmNonPagedSystemStart, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // We also need one for system view space + // + BaseAddress = MiSystemViewStart; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + MmSystemViewSize, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // And another for session space + // + BaseAddress = MmSessionBase; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + (ULONG_PTR)MiSessionSpaceEnd - + (ULONG_PTR)MmSessionBase, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // One more for ARM paged pool + // + BaseAddress = MmPagedPoolStart; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + MmSizeOfPagedPoolInBytes, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // And now, ReactOS paged pool + // + BaseAddress = MmPagedPoolBase; + MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_PAGED_POOL | MEMORY_AREA_STATIC, + &BaseAddress, + MmPagedPoolSize, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); // // Next, the KPCR // BaseAddress = (PVOID)PCR; MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, &BaseAddress, PAGE_SIZE * KeNumberProcessors, PAGE_READWRITE, @@ -89,13 +224,13 @@ TRUE, 0, BoundaryAddressMultiple); - + // // Now the KUSER_SHARED_DATA // BaseAddress = (PVOID)KI_USER_SHARED_DATA; MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, &BaseAddress, PAGE_SIZE, PAGE_READWRITE, @@ -103,6 +238,58 @@ TRUE, 0, BoundaryAddressMultiple); +} + +VOID +NTAPI +MiDbgDumpAddressSpace(VOID) +{ + // + // Print the memory layout + // + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmSystemRangeStart, + (ULONG_PTR)MmSystemRangeStart + MmBootImageSize, + "Boot Loaded Image"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmPagedPoolBase, + (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize, + "Paged Pool"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmPfnDatabase, + (ULONG_PTR)MmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT), + "PFN Database"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmNonPagedPoolStart, + (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes, + "ARMÂ³ Non Paged Pool"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MiSystemViewStart, + (ULONG_PTR)MiSystemViewStart + MmSystemViewSize, + "System View Space"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmSessionBase, + MiSessionSpaceEnd, + "Session Space"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + PTE_BASE, PDE_BASE, + "Page Tables"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + PDE_BASE, HYPER_SPACE, + "Page Directories"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + HYPER_SPACE, HYPER_SPACE + (4 * 1024 * 1024), + "Hyperspace"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmPagedPoolStart, + (ULONG_PTR)MmPagedPoolStart + MmSizeOfPagedPoolInBytes, + "ARMÂ³ Paged Pool"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmNonPagedSystemStart, MmNonPagedPoolExpansionStart, + "System PTE Space"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmNonPagedPoolExpansionStart, MmNonPagedPoolEnd, + "Non Paged Pool Expansion PTE Space"); } VOID @@ -149,9 +336,6 @@ // MmArmInitSystem(0, KeLoaderBlock); - /* Intialize system memory areas */ - MiInitSystemMemoryAreas(); - /* Initialize the page list */ MmInitializePageList(); @@ -164,12 +348,13 @@ MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MmSystemRangeStart + MmBootImageSize); MmPagedPoolSize = MM_PAGED_POOL_SIZE; - - // - // Initialize ARMÂ³ in phase 2 - // - MmArmInitSystem(2, KeLoaderBlock); - + + /* Intialize system memory areas */ + MiInitSystemMemoryAreas(); + + /* Dump the address space */ + MiDbgDumpAddressSpace(); + /* Initialize paged pool */ MmInitializePagedPool(); Modified: trunk/reactos/ntoskrnl/mm/ppool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] Thu Oct 15 20:54:35 2009 @@ -51,23 +51,7 @@ INIT_FUNCTION NTAPI MmInitializePagedPool(VOID) -{ - PVOID BaseAddress; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - PMEMORY_AREA MArea; - BoundaryAddressMultiple.QuadPart = 0; - - BaseAddress = MmPagedPoolBase; - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_PAGED_POOL, - &BaseAddress, - MmPagedPoolSize, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - +{ /* * We are still at a high IRQL level at this point so explicitly commit * the first page of the paged pool before writing the first block header.

1 0

[fireball] 43485: [kernel32] - Initialize PreviousStackBase/Limit to NULL in BasepCreateStack. Previously this bug was hidden because those values were ignored by the kernel.
by fireball＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: fireball Date: Thu Oct 15 20:36:35 2009 New Revision: 43485 URL: http://svn.reactos.org/svn/reactos?rev=43485&view=rev Log: [kernel32] - Initialize PreviousStackBase/Limit to NULL in BasepCreateStack. Previously this bug was hidden because those values were ignored by the kernel. Modified: trunk/reactos/dll/win32/kernel32/misc/utils.c Modified: trunk/reactos/dll/win32/kernel32/misc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ut… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] Thu Oct 15 20:36:35 2009 @@ -257,6 +257,8 @@ /* Now set up some basic Initial TEB Parameters */ InitialTeb->AllocatedStackBase = (PVOID)Stack; InitialTeb->StackBase = (PVOID)(Stack + StackReserve); + InitialTeb->PreviousStackBase = NULL; + InitialTeb->PreviousStackLimit = NULL; /* Update the Stack Position */ Stack += StackReserve - StackCommit;

1 0

[sginsberg] 43484: - MiReserveAlignedSystemPtes: Add missing lock release, spotted by janderwald
by sginsberg＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: sginsberg Date: Thu Oct 15 20:34:21 2009 New Revision: 43484 URL: http://svn.reactos.org/svn/reactos?rev=43484&view=rev Log: - MiReserveAlignedSystemPtes: Add missing lock release, spotted by janderwald Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Thu Oct 15 20:34:21 2009 @@ -109,7 +109,6 @@ // Decrement the free count and move to the next starting PTE // MmTotalFreeSystemPtes[SystemPtePoolType] -= NumberOfPtes; - KeReleaseQueuedSpinLock(LockQueueSystemSpaceLock, OldIrql); PointerPte += (ClusterSize - NumberOfPtes); break; } @@ -158,8 +157,9 @@ } // - // Flush the TLB and return the first PTE - // + // Release the lock, flush the TLB and return the first PTE + // + KeReleaseQueuedSpinLock(LockQueueSystemSpaceLock, OldIrql); KeFlushProcessTb(); return PointerPte; }

1 0

[ros-arm-bringup] 43483: - Add required globals for the ARM port.
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 19:41:09 2009 New Revision: 43483 URL: http://svn.reactos.org/svn/reactos?rev=43483&view=rev Log: - Add required globals for the ARM port. Modified: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/arm/init.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] Thu Oct 15 19:41:09 2009 @@ -24,9 +24,36 @@ PVOID MmNonPagedSystemStart; PVOID MmNonPagedPoolStart; PVOID MmNonPagedPoolExpansionStart; -PVOID MmNonPagedPoolEnd = (PVOID)0xFFBE0000; +PVOID MmNonPagedPoolEnd = MI_NONPAGED_POOL_END; +PVOID MmPagedPoolStart = MI_PAGED_POOL_START; +PVOID MmPagedPoolEnd; +ULONG MmSizeOfPagedPoolInBytes = MI_MIN_INIT_PAGED_POOLSIZE; +PVOID MiSessionSpaceEnd; +PVOID MiSessionImageEnd; +PVOID MiSessionImageStart; +PVOID MiSessionViewStart; +PVOID MiSessionPoolEnd; +PVOID MiSessionPoolStart; +PVOID MmSessionBase; +ULONG MmSessionSize; +ULONG MmSessionViewSize; +ULONG MmSessionPoolSize; +ULONG MmSessionImageSize; +PVOID MiSystemViewStart; +ULONG MmSystemViewSize; +PFN_NUMBER MmSystemPageDirectory; +PMMPTE MmSystemPagePtes; ULONG MmNumberOfSystemPtes; +ULONG MxPfnAllocation; +RTL_BITMAP MiPfnBitMap; PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; +PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; +MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; +ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage = -1; +ULONG MmBootImageSize; +ULONG MmUserProbeAddress; +PVOID MmHighestUserAddress; +PVOID MmSystemRangeStart; /* PRIVATE FUNCTIONS **********************************************************/

1 0

[ros-arm-bringup] 43482: - Fix calculations error in the setup of the paged pool bitmap. - Initialize the paged pool guarded mutex. - Add helper routines ExLock/UnlockPool to either acquire the NPP QSL or the PP GM depending on the pool descriptor, instead of hardcoding the NPP QSL. - Implement InitializePool for the PagedPool case. - Now call InitializePool for PagedPool as well.
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 19:23:21 2009 New Revision: 43482 URL: http://svn.reactos.org/svn/reactos?rev=43482&view=rev Log: - Fix calculations error in the setup of the paged pool bitmap. - Initialize the paged pool guarded mutex. - Add helper routines ExLock/UnlockPool to either acquire the NPP QSL or the PP GM depending on the pool descriptor, instead of hardcoding the NPP QSL. - Implement InitializePool for the PagedPool case. - Now call InitializePool for PagedPool as well. Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Thu Oct 15 19:23:21 2009 @@ -20,6 +20,7 @@ POOL_DESCRIPTOR NonPagedPoolDescriptor; PPOOL_DESCRIPTOR PoolVector[2]; +PKGUARDED_MUTEX ExpPagedPoolMutex; /* PRIVATE FUNCTIONS **********************************************************/ @@ -69,18 +70,107 @@ InitializePool(IN POOL_TYPE PoolType, IN ULONG Threshold) { - ASSERT(PoolType == NonPagedPool); - - // - // Initialize the nonpaged pool descirptor - // - PoolVector[PoolType] = &NonPagedPoolDescriptor; - ExInitializePoolDescriptor(PoolVector[PoolType], - PoolType, - 0, - Threshold, - NULL); -} + PPOOL_DESCRIPTOR Descriptor; + + // + // Check what kind of pool this is + // + if (PoolType == NonPagedPool) + { + // + // Initialize the nonpaged pool descriptor + // + PoolVector[NonPagedPool] = &NonPagedPoolDescriptor; + ExInitializePoolDescriptor(PoolVector[NonPagedPool], + NonPagedPool, + 0, + Threshold, + NULL); + } + else + { + // + // Allocate the pool descriptor + // + Descriptor = ExAllocatePoolWithTag(NonPagedPool, + sizeof(KGUARDED_MUTEX) + + sizeof(POOL_DESCRIPTOR), + 'looP'); + if (!Descriptor) + { + // + // This is really bad... + // + KeBugCheckEx(MUST_SUCCEED_POOL_EMPTY, + 0, + -1, + -1, + -1); + } + + // + // Setup the vector and guarded mutex for paged pool + // + PoolVector[PagedPool] = Descriptor; + ExpPagedPoolMutex = (PKGUARDED_MUTEX)(Descriptor + 1); + KeInitializeGuardedMutex(ExpPagedPoolMutex); + ExInitializePoolDescriptor(Descriptor, + PagedPool, + 0, + Threshold, + ExpPagedPoolMutex); + } +} + +FORCEINLINE +KIRQL +ExLockPool(IN PPOOL_DESCRIPTOR Descriptor) +{ + // + // Check if this is nonpaged pool + // + if ((Descriptor->PoolType & BASE_POOL_TYPE_MASK) == NonPagedPool) + { + // + // Use the queued spin lock + // + return KeAcquireQueuedSpinLock(LockQueueNonPagedPoolLock); + } + else + { + // + // Use the guarded mutex + // + KeAcquireGuardedMutex(Descriptor->LockAddress); + return APC_LEVEL; + } +} + +FORCEINLINE +VOID +ExUnlockPool(IN PPOOL_DESCRIPTOR Descriptor, + IN KIRQL OldIrql) +{ + // + // Check if this is nonpaged pool + // + if ((Descriptor->PoolType & BASE_POOL_TYPE_MASK) == NonPagedPool) + { + // + // Use the queued spin lock + // + KeReleaseQueuedSpinLock(LockQueueNonPagedPoolLock, OldIrql); + } + else + { + // + // Use the guarded mutex + // + KeReleaseGuardedMutex(Descriptor->LockAddress); + } +} + +/* PUBLIC FUNCTIONS ***********************************************************/ PVOID NTAPI @@ -153,7 +243,7 @@ // // Acquire the nonpaged pool lock now // - OldIrql = KeAcquireQueuedSpinLock(LockQueueNonPagedPoolLock); + OldIrql = ExLockPool(PoolDesc); // // And make sure the list still has entries @@ -166,7 +256,7 @@ // // Try again! // - KeReleaseQueuedSpinLock(LockQueueNonPagedPoolLock, OldIrql); + ExUnlockPool(PoolDesc, OldIrql); ListHead++; continue; } @@ -292,7 +382,7 @@ // and release the lock since we're done // Entry->PoolType = PoolType + 1; - KeReleaseQueuedSpinLock(LockQueueNonPagedPoolLock, OldIrql); + ExUnlockPool(PoolDesc, OldIrql); // // Return the pool allocation @@ -332,7 +422,7 @@ // // Excellent -- acquire the nonpaged pool lock // - OldIrql = KeAcquireQueuedSpinLock(LockQueueNonPagedPoolLock); + OldIrql = ExLockPool(PoolDesc); // // And insert the free entry into the free list for this block size @@ -343,7 +433,7 @@ // // Release the nonpaged pool lock // - KeReleaseQueuedSpinLock(LockQueueNonPagedPoolLock, OldIrql); + ExUnlockPool(PoolDesc, OldIrql); } // @@ -408,7 +498,7 @@ // // Acquire the nonpaged pool lock // - OldIrql = KeAcquireQueuedSpinLock(LockQueueNonPagedPoolLock); + OldIrql = ExLockPool(PoolDesc); // // Check if the next allocation is at the end of the page @@ -500,7 +590,7 @@ // // In this case, release the nonpaged pool lock, and free the page // - KeReleaseQueuedSpinLock(LockQueueNonPagedPoolLock, OldIrql); + ExUnlockPool(PoolDesc, OldIrql); MiFreePoolPages(Entry); return; } @@ -534,7 +624,7 @@ // Insert this new free block, and release the nonpaged pool lock // InsertHeadList(&PoolDesc->ListHeads[BlockSize - 1], (PLIST_ENTRY)Entry + 1); - KeReleaseQueuedSpinLock(LockQueueNonPagedPoolLock, OldIrql); + ExUnlockPool(PoolDesc, OldIrql); } VOID Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Thu Oct 15 19:23:21 2009 @@ -540,14 +540,15 @@ // Size = Size * 1024; ASSERT(Size == MmSizeOfPagedPoolInPages); - BitMapSize = sizeof(RTL_BITMAP) + (((Size + 31) / 32) * sizeof(ULONG)); + BitMapSize = Size; + Size = sizeof(RTL_BITMAP) + (((Size + 31) / 32) * sizeof(ULONG)); // // Allocate the allocation bitmap, which tells us which regions have not yet // been mapped into memory // MmPagedPoolInfo.PagedPoolAllocationMap = ExAllocatePoolWithTag(NonPagedPool, - BitMapSize, + Size, ' mM'); ASSERT(MmPagedPoolInfo.PagedPoolAllocationMap); @@ -568,7 +569,7 @@ // entire allocation is. // MmPagedPoolInfo.EndOfPagedPoolBitmap = ExAllocatePoolWithTag(NonPagedPool, - BitMapSize, + Size, ' mM'); ASSERT(MmPagedPoolInfo.EndOfPagedPoolBitmap); RtlInitializeBitMap(MmPagedPoolInfo.EndOfPagedPoolBitmap, @@ -583,7 +584,12 @@ // // Initialize paged pool. // - //InitializePool(PagedPool, 0); + InitializePool(PagedPool, 0); + + // + // Initialize the paged pool mutex + // + KeInitializeGuardedMutex(&MmPagedPoolMutex); } NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Oct 15 19:23:21 2009 @@ -146,6 +146,7 @@ extern ULONG MxPfnAllocation; extern MM_PAGED_POOL_INFO MmPagedPoolInfo; extern RTL_BITMAP MiPfnBitMap; +extern KGUARDED_MUTEX MmPagedPoolMutex; VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Thu Oct 15 19:23:21 2009 @@ -22,7 +22,7 @@ PFN_NUMBER MmNumberOfFreeNonPagedPool, MiExpansionPoolPagesInitialCharge; PVOID MmNonPagedPoolEnd0; PFN_NUMBER MiStartOfInitialPoolFrame, MiEndOfInitialPoolFrame; - +KGUARDED_MUTEX MmPagedPoolMutex; MM_PAGED_POOL_INFO MmPagedPoolInfo; /* PRIVATE FUNCTIONS **********************************************************/

1 0

[ros-arm-bringup] 43481: - Get rid of mm/mmsup.c and move some of the ROS-internal functions better where they belong. - Add ARM3/mmsup.c for miscellaneous function helper functions. - Implemented: - Move MmIsRecursiveIoFault, MmIsThisanNtAsSystem and MmQuerySystemSize. These belong here. - Unimplemented: - Move MmSetBankedSection and fix the prototype. This should probably go somewhere else later. - Move MmAdjustWorkingSetSize and fix the prototype. This should probably go in procsup.c later. -
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 19:01:31 2009 New Revision: 43481 URL: http://svn.reactos.org/svn/reactos?rev=43481&view=rev Log: - Get rid of mm/mmsup.c and move some of the ROS-internal functions better where they belong. - Add ARM3/mmsup.c for miscellaneous function helper functions. - Implemented: - Move MmIsRecursiveIoFault, MmIsThisanNtAsSystem and MmQuerySystemSize. These belong here. - Unimplemented: - Move MmSetBankedSection and fix the prototype. This should probably go somewhere else later. - Move MmAdjustWorkingSetSize and fix the prototype. This should probably go in procsup.c later. - Move MmMapUserAddressesToPage. This should also probably go in procsup.c later. - Move MmSetAddressrangeModified and MmIsNonPagedsystemAddressValid. These should probably go somewhere else later. Added: trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c (with props) Removed: trunk/reactos/ntoskrnl/mm/mmsup.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Added: trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c [iso-8859-1] Thu Oct 15 19:01:31 2009 @@ -1,0 +1,133 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/mmsup.c + * PURPOSE: ARM Memory Manager Support Routines + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#line 15 "ARMÂ³::MMSUP" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +/* GLOBALS ********************************************************************/ + +BOOLEAN IsThisAnNtAsSystem = FALSE; +MM_SYSTEMSIZE MmSystemSize = MmSmallSystem; + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +MmMapUserAddressesToPage(IN PVOID BaseAddress, + IN SIZE_T NumberOfBytes, + IN PVOID PageAddress) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +MmAdjustWorkingSetSize(IN SIZE_T WorkingSetMinimumInBytes, + IN SIZE_T WorkingSetMaximumInBytes, + IN ULONG SystemCache, + IN BOOLEAN IncreaseOkay) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +MmSetAddressRangeModified(IN PVOID Address, + IN SIZE_T Length) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +MmIsNonPagedSystemAddressValid(IN PVOID VirtualAddress) +{ + DPRINT1("WARNING: %s returns bogus result\n", __FUNCTION__); + return MmIsAddressValid(VirtualAddress); +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +MmSetBankedSection(IN HANDLE ProcessHandle, + IN PVOID VirtualAddress, + IN ULONG BankLength, + IN BOOLEAN ReadWriteBank, + IN PVOID BankRoutine, + IN PVOID Context) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +MmIsRecursiveIoFault(VOID) +{ + PETHREAD Thread = PsGetCurrentThread(); + + // + // If any of these is true, this is a recursive fault + // + return ((Thread->DisablePageFaultClustering) | (Thread->ForwardClusterOnly)); +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +MmIsThisAnNtAsSystem(VOID) +{ + // + // Return if this is a server system + // + return IsThisAnNtAsSystem; +} + +/* + * @implemented + */ +MM_SYSTEMSIZE +NTAPI +MmQuerySystemSize(VOID) +{ + // + // Return the low, medium or high memory system type + // + return MmSystemSize; +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Thu Oct 15 19:01:31 2009 @@ -1079,6 +1079,25 @@ NTSTATUS NTAPI +MiZeroPage(PFN_TYPE Page) +{ + KIRQL Irql; + PVOID TempAddress; + + Irql = KeRaiseIrqlToDpcLevel(); + TempAddress = MiMapPageToZeroInHyperSpace(Page); + if (TempAddress == NULL) + { + return(STATUS_NO_MEMORY); + } + memset(TempAddress, 0, PAGE_SIZE); + MiUnmapPagesInZeroSpace(TempAddress, 1); + KeLowerIrql(Irql); + return(STATUS_SUCCESS); +} + +NTSTATUS +NTAPI MmZeroPageThreadMain(PVOID Ignored) { NTSTATUS Status; Removed: trunk/reactos/ntoskrnl/mm/mmsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmsup.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmsup.c (removed) @@ -1,145 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/mmsup.c - * PURPOSE: Kernel memory managment functions - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES *******************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS ********************************************************************/ - -BOOLEAN IsThisAnNtAsSystem = FALSE; -MM_SYSTEMSIZE MmSystemSize = MmSmallSystem; - -/* PRIVATE FUNCTIONS **********************************************************/ - -NTSTATUS -NTAPI -MiZeroPage(PFN_TYPE Page) -{ - KIRQL Irql; - PVOID TempAddress; - - Irql = KeRaiseIrqlToDpcLevel(); - TempAddress = MiMapPageToZeroInHyperSpace(Page); - if (TempAddress == NULL) - { - return(STATUS_NO_MEMORY); - } - memset(TempAddress, 0, PAGE_SIZE); - MiUnmapPagesInZeroSpace(TempAddress, 1); - KeLowerIrql(Irql); - return(STATUS_SUCCESS); -} - -NTSTATUS -NTAPI -MiCopyFromUserPage(PFN_TYPE DestPage, PVOID SourceAddress) -{ - PEPROCESS Process; - KIRQL Irql; - PVOID TempAddress; - - Process = PsGetCurrentProcess(); - TempAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql); - if (TempAddress == NULL) - { - return(STATUS_NO_MEMORY); - } - memcpy(TempAddress, SourceAddress, PAGE_SIZE); - MiUnmapPageInHyperSpace(Process, TempAddress, Irql); - return(STATUS_SUCCESS); -} - -/* PRIVATE FUNCTIONS **********************************************************/ - -/* Miscellanea functions: they may fit somewhere else */ - -/* - * @implemented - */ -BOOLEAN -NTAPI -MmIsRecursiveIoFault (VOID) -{ - PETHREAD Thread = PsGetCurrentThread(); - - return (Thread->DisablePageFaultClustering | Thread->ForwardClusterOnly); -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -MmMapUserAddressesToPage(IN PVOID BaseAddress, - IN SIZE_T NumberOfBytes, - IN PVOID PageAddress) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -ULONG NTAPI -MmAdjustWorkingSetSize (ULONG Unknown0, - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3) -{ - UNIMPLEMENTED; - return (0); -} - -/* - * @unimplemented - */ -BOOLEAN -NTAPI -MmSetAddressRangeModified ( - IN PVOID Address, - IN ULONG Length -) -{ - UNIMPLEMENTED; - return (FALSE); -} - -/* - * @implemented - */ -BOOLEAN NTAPI MmIsNonPagedSystemAddressValid(PVOID VirtualAddress) -{ - DPRINT1("WARNING: %s returns bogus result\n", __FUNCTION__); - return MmIsAddressValid(VirtualAddress); -} - -/* - * @implemented - */ -BOOLEAN -NTAPI -MmIsThisAnNtAsSystem(VOID) -{ - return IsThisAnNtAsSystem; -} - -/* - * @implemented - */ -MM_SYSTEMSIZE -NTAPI -MmQuerySystemSize(VOID) -{ - return MmSystemSize; -} - -/* EOF */ Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Thu Oct 15 19:01:31 2009 @@ -572,6 +572,25 @@ } } return FALSE; +} + +NTSTATUS +NTAPI +MiCopyFromUserPage(PFN_TYPE DestPage, PVOID SourceAddress) +{ + PEPROCESS Process; + KIRQL Irql; + PVOID TempAddress; + + Process = PsGetCurrentProcess(); + TempAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql); + if (TempAddress == NULL) + { + return(STATUS_NO_MEMORY); + } + memcpy(TempAddress, SourceAddress, PAGE_SIZE); + MiUnmapPageInHyperSpace(Process, TempAddress, Irql); + return(STATUS_SUCCESS); } NTSTATUS @@ -4941,22 +4960,6 @@ return STATUS_NOT_IMPLEMENTED; } -/* - * @unimplemented - */ -NTSTATUS NTAPI -MmSetBankedSection (ULONG Unknown0, - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3, - ULONG Unknown4, - ULONG Unknown5) -{ - UNIMPLEMENTED; - return (STATUS_NOT_IMPLEMENTED); -} - - /********************************************************************** * NAME EXPORTED * MmCreateSection@ Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Thu Oct 15 19:01:31 2009 @@ -390,6 +390,7 @@ <file>hypermap.c</file> <file>iosup.c</file> <file>mdlsup.c</file> + <file>mmsup.c</file> <file>ncache.c</file> <file>pool.c</file> <file>procsup.c</file> @@ -402,7 +403,6 @@ <file>freelist.c</file> <file>marea.c</file> <file>mmfault.c</file> - <file>mmsup.c</file> <file>mminit.c</file> <file>mpw.c</file> <file>pagefile.c</file>

1 0

[ros-arm-bringup] 43480: - Multiple Virtual Memory API fixes: - MiDoMappedcopy: The MDL should have 16 pages total, so MI_MAPPED_COPY_PAGES should be 14, not 16, to account for the MDL page itself, and the extra add-on page. - MiDoMappedCopy: Check for working set quota exception. - NtRead/WriteVirtualMemory: Do not attempt to do any work if the size is 0. - NtRead/WriteVirtualMemory: Do not return SEH status if we fail to write the number of bytes read/written -- return the function status. - N
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 18:50:49 2009 New Revision: 43480 URL: http://svn.reactos.org/svn/reactos?rev=43480&view=rev Log: - Multiple Virtual Memory API fixes: - MiDoMappedcopy: The MDL should have 16 pages total, so MI_MAPPED_COPY_PAGES should be 14, not 16, to account for the MDL page itself, and the extra add-on page. - MiDoMappedCopy: Check for working set quota exception. - NtRead/WriteVirtualMemory: Do not attempt to do any work if the size is 0. - NtRead/WriteVirtualMemory: Do not return SEH status if we fail to write the number of bytes read/written -- return the function status. - NtProtectVirtualMemory: Protect the memory while attached to the target process. - NtProtectVirtualMemory: Do not return SEH status if we fail to write the number of bytes protected -- return the function status. - NtLock/UnlockVirtualMemory: Fix incorrect function definition. The last parameter is a bitfield. The middle two parameters are pointers, not values. - VirtualLock/Unlock: Fix calling NtLock/UnlockVirtualMemory with new correct function definitions. Call with MAP_PROCESS. - NtLock/UnlockVirtualMemory: Apply SEH. Validate flags. Validate parameters. - NtLock/UnlockVirtualMemory: Attach to the process while doing the operation. Reference the process. - NtLock/UnlockVirtualMemory: Check for SE_LOCK_MEMORY_PRIVILEGE if MAP_SYSTEM is specified. - Move MAP_SYSTEM and MAP_PROCESS from ntifs.h to mmtypes.h in NDK. - NtLock/UnlockVirtualMemory: Return success and semi-legitimate return values saying nothing was actually done. - NtFlushVirtualMemory: Apply SEH. Validate flags. Validate parameters. Call MmFlushVirtualMemory. - NtFlushVirtualMemory: Reference the process. - NtFlushVirtualMemory: Return success and semi-legitimate return values indicating nothing was flushed. - NtGetWriteWatch: Fix function prototype. - NtGet/ResetWriteWatch: Apply SEH instead of hacked parameter checks. Validate parameters. - NtGet/ResetWriteWatch: Reference the process. - NtGet/ResetWriteWatch: Return semi-legitimate return values indicating nothing was written to. - These APIs are now owned by ARM3. Added: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c (with props) Modified: trunk/reactos/dll/win32/kernel32/mem/virtual.c trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ndk/mmfuncs.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/ntoskrnl/mm/virtual.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/dll/win32/kernel32/mem/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/vir… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/virtual.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/virtual.c [iso-8859-1] Thu Oct 15 18:50:49 2009 @@ -170,14 +170,15 @@ VirtualLock(IN LPVOID lpAddress, IN SIZE_T dwSize) { - ULONG BytesLocked; - NTSTATUS Status; + NTSTATUS Status; + ULONG RegionSize = dwSize; + PVOID BaseAddress = lpAddress; /* Lock the memory */ Status = NtLockVirtualMemory(NtCurrentProcess(), - lpAddress, - dwSize, - &BytesLocked); + &BaseAddress, + &RegionSize, + MAP_PROCESS); if (!NT_SUCCESS(Status)) { /* We failed */ @@ -244,14 +245,15 @@ VirtualUnlock(IN LPVOID lpAddress, IN SIZE_T dwSize) { - ULONG BytesLocked; - NTSTATUS Status; - - /* Unlock the memory */ + NTSTATUS Status; + ULONG RegionSize = dwSize; + PVOID BaseAddress = lpAddress; + + /* Lock the memory */ Status = NtUnlockVirtualMemory(NtCurrentProcess(), - lpAddress, - dwSize, - &BytesLocked); + &BaseAddress, + &RegionSize, + MAP_PROCESS); if (!NT_SUCCESS(Status)) { /* We failed */ Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=43… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Thu Oct 15 18:50:49 2009 @@ -329,8 +329,6 @@ #define MAILSLOT_SIZE_AUTO 0 -#define MAP_PROCESS 1L -#define MAP_SYSTEM 2L #define MEM_DOS_LIM 0x40000000 #define MCB_FLAG_RAISE_ON_ALLOCATION_FAILURE 1 Modified: trunk/reactos/include/ndk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmfuncs.h [iso-8859-1] Thu Oct 15 18:50:49 2009 @@ -173,10 +173,10 @@ NTSTATUS NTAPI NtLockVirtualMemory( - HANDLE ProcessHandle, - PVOID BaseAddress, - SIZE_T NumberOfBytesToLock, - PSIZE_T NumberOfBytesLocked + IN HANDLE ProcessHandle, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToLock, + IN ULONG MapType ); NTSTATUS @@ -278,9 +278,9 @@ NTAPI NtUnlockVirtualMemory( IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN SIZE_T NumberOfBytesToUnlock, - OUT PSIZE_T NumberOfBytesUnlocked OPTIONAL + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToUnlock, + IN ULONG MapType ); NTSYSCALLAPI @@ -367,10 +367,10 @@ NTSTATUS NTAPI ZwLockVirtualMemory( - HANDLE ProcessHandle, - PVOID BaseAddress, - SIZE_T NumberOfBytesToLock, - PSIZE_T NumberOfBytesLocked + IN HANDLE ProcessHandle, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToLock, + IN ULONG MapType ); NTSYSAPI @@ -448,9 +448,9 @@ NTAPI ZwUnlockVirtualMemory( IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN SIZE_T NumberOfBytesToUnlock, - OUT PSIZE_T NumberOfBytesUnlocked OPTIONAL + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToUnlock, + IN ULONG MapType ); NTSYSAPI Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Thu Oct 15 18:50:49 2009 @@ -56,6 +56,12 @@ #define MMPFNUSE_AWEPAGE 9 #define MMPFNUSE_DRIVERLOCKPAGE 10 #define MMPFNUSE_KERNELSTACK 11 + +// +// Lock/Unlock Virtuam Memory Flags +// +#define MAP_PROCESS 1 +#define MAP_SYSTEM 2 #ifndef NTOS_MODE_USER Added: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Thu Oct 15 18:50:49 2009 @@ -1,0 +1,1757 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/virtual.c + * PURPOSE: ARM Memory Manager Virtual Memory Management + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#line 15 "ARMÂ³::VIRTUAL" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +#define MI_MAPPED_COPY_PAGES 14 +#define MI_POOL_COPY_BYTES 512 +#define MI_MAX_TRANSFER_SIZE 64 * 1024 + +NTSTATUS NTAPI +MiProtectVirtualMemory(IN PEPROCESS Process, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToProtect, + IN ULONG NewAccessProtection, + OUT PULONG OldAccessProtection OPTIONAL); + +/* PRIVATE FUNCTIONS **********************************************************/ + +LONG +MiGetExceptionInfo(IN PEXCEPTION_POINTERS ExceptionInfo, + OUT PBOOLEAN HaveBadAddress, + OUT PULONG_PTR BadAddress) +{ + PEXCEPTION_RECORD ExceptionRecord; + PAGED_CODE(); + + // + // Assume default + // + *HaveBadAddress = FALSE; + + // + // Get the exception record + // + ExceptionRecord = ExceptionInfo->ExceptionRecord; + + // + // Look at the exception code + // + if ((ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) || + (ExceptionRecord->ExceptionCode == STATUS_GUARD_PAGE_VIOLATION) || + (ExceptionRecord->ExceptionCode == STATUS_IN_PAGE_ERROR)) + { + // + // We can tell the address if we have more than one parameter + // + if (ExceptionRecord->NumberParameters > 1) + { + // + // Return the address + // + *HaveBadAddress = TRUE; + *BadAddress = ExceptionRecord->ExceptionInformation[1]; + } + } + + // + // Continue executing the next handler + // + return EXCEPTION_EXECUTE_HANDLER; +} + +NTSTATUS +NTAPI +MiDoMappedCopy(IN PEPROCESS SourceProcess, + IN PVOID SourceAddress, + IN PEPROCESS TargetProcess, + OUT PVOID TargetAddress, + IN SIZE_T BufferSize, + IN KPROCESSOR_MODE PreviousMode, + OUT PSIZE_T ReturnSize) +{ + PFN_NUMBER MdlBuffer[(sizeof(MDL) / sizeof(PFN_NUMBER)) + MI_MAPPED_COPY_PAGES + 1]; + PMDL Mdl = (PMDL)MdlBuffer; + SIZE_T TotalSize, CurrentSize, RemainingSize; + volatile BOOLEAN FailedInProbe = FALSE, FailedInMapping = FALSE, FailedInMoving; + volatile BOOLEAN PagesLocked; + PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; + volatile PVOID MdlAddress; + KAPC_STATE ApcState; + BOOLEAN HaveBadAddress; + ULONG_PTR BadAddress; + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + // + // Calculate the maximum amount of data to move + // + TotalSize = MI_MAPPED_COPY_PAGES * PAGE_SIZE; + if (BufferSize <= TotalSize) TotalSize = BufferSize; + CurrentSize = TotalSize; + RemainingSize = BufferSize; + + // + // Loop as long as there is still data + // + while (RemainingSize > 0) + { + // + // Check if this transfer will finish everything off + // + if (RemainingSize < CurrentSize) CurrentSize = RemainingSize; + + // + // Attach to the source address space + // + KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); + + // + // Reset state for this pass + // + MdlAddress = NULL; + PagesLocked = FALSE; + FailedInMoving = FALSE; + ASSERT(FailedInProbe == FALSE); + + // + // Protect user-mode copy + // + _SEH2_TRY + { + // + // If this is our first time, probe the buffer + // + if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) + { + // + // Catch a failure here + // + FailedInProbe = TRUE; + + // + // Do the probe + // + ProbeForRead(SourceAddress, BufferSize, sizeof(CHAR)); + + // + // Passed + // + FailedInProbe = FALSE; + } + + // + // Initialize and probe and lock the MDL + // + MmInitializeMdl(Mdl, CurrentAddress, CurrentSize); + MmProbeAndLockPages(Mdl, PreviousMode, IoReadAccess); + PagesLocked = TRUE; + + // + // Now map the pages + // + MdlAddress = MmMapLockedPagesSpecifyCache(Mdl, + KernelMode, + MmCached, + NULL, + FALSE, + HighPagePriority); + if (!MdlAddress) + { + // + // Use our SEH handler to pick this up + // + FailedInMapping = TRUE; + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); + } + + // + // Now let go of the source and grab to the target process + // + KeUnstackDetachProcess(&ApcState); + KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); + + // + // Check if this is our first time through + // + if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) + { + // + // Catch a failure here + // + FailedInProbe = TRUE; + + // + // Do the probe + // + ProbeForWrite(TargetAddress, BufferSize, sizeof(CHAR)); + + // + // Passed + // + FailedInProbe = FALSE; + } + + // + // Now do the actual move + // + FailedInMoving = TRUE; + RtlCopyMemory(CurrentTargetAddress, MdlAddress, CurrentSize); + } + _SEH2_EXCEPT(MiGetExceptionInfo(_SEH2_GetExceptionInformation(), + &HaveBadAddress, + &BadAddress)) + { + // + // Detach from whoever we may be attached to + // + KeUnstackDetachProcess(&ApcState); + + // + // Check if we had mapped the pages + // + if (MdlAddress) MmUnmapLockedPages(MdlAddress, Mdl); + + // + // Check if we had locked the pages + // + if (PagesLocked) MmUnlockPages(Mdl); + + // + // Check if we hit working set quota + // + if (_SEH2_GetExceptionCode() == STATUS_WORKING_SET_QUOTA) + { + // + // Return the error + // + return STATUS_WORKING_SET_QUOTA; + } + + // + // Check if we failed during the probe or mapping + // + if ((FailedInProbe) || (FailedInMapping)) + { + // + // Exit + // + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(return Status); + } + + // + // Otherwise, we failed probably during the move + // + *ReturnSize = BufferSize - RemainingSize; + if (FailedInMoving) + { + // + // Check if we know exactly where we stopped copying + // + if (HaveBadAddress) + { + // + // Return the exact number of bytes copied + // + *ReturnSize = BadAddress - (ULONG_PTR)SourceAddress; + } + } + + // + // Return partial copy + // + Status = STATUS_PARTIAL_COPY; + } + _SEH2_END; + + // + // Check for SEH status + // + if (Status != STATUS_SUCCESS) return Status; + + // + // Detach from target + // + KeUnstackDetachProcess(&ApcState); + + // + // Unmap and unlock + // + MmUnmapLockedPages(MdlAddress, Mdl); + MmUnlockPages(Mdl); + + // + // Update location and size + // + RemainingSize -= CurrentSize; + CurrentAddress = (PVOID)((ULONG_PTR)CurrentAddress + CurrentSize); + CurrentTargetAddress = (PVOID)((ULONG_PTR)CurrentTargetAddress + CurrentSize); + } + + // + // All bytes read + // + *ReturnSize = BufferSize; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +MiDoPoolCopy(IN PEPROCESS SourceProcess, + IN PVOID SourceAddress, + IN PEPROCESS TargetProcess, + OUT PVOID TargetAddress, + IN SIZE_T BufferSize, + IN KPROCESSOR_MODE PreviousMode, + OUT PSIZE_T ReturnSize) +{ + UCHAR StackBuffer[MI_POOL_COPY_BYTES]; + SIZE_T TotalSize, CurrentSize, RemainingSize; + volatile BOOLEAN FailedInProbe = FALSE, FailedInMoving, HavePoolAddress = FALSE; + PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; + PVOID PoolAddress; + KAPC_STATE ApcState; + BOOLEAN HaveBadAddress; + ULONG_PTR BadAddress; + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + // + // Calculate the maximum amount of data to move + // + TotalSize = MI_MAX_TRANSFER_SIZE; + if (BufferSize <= MI_MAX_TRANSFER_SIZE) TotalSize = BufferSize; + CurrentSize = TotalSize; + RemainingSize = BufferSize; + + // + // Check if we can use the stack + // + if (BufferSize <= MI_POOL_COPY_BYTES) + { + // + // Use it + // + PoolAddress = (PVOID)StackBuffer; + } + else + { + // + // Allocate pool + // + PoolAddress = ExAllocatePoolWithTag(NonPagedPool, TotalSize, 'VmRw'); + if (!PoolAddress) ASSERT(FALSE); + HavePoolAddress = TRUE; + } + + // + // Loop as long as there is still data + // + while (RemainingSize > 0) + { + // + // Check if this transfer will finish everything off + // + if (RemainingSize < CurrentSize) CurrentSize = RemainingSize; + + // + // Attach to the source address space + // + KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); + + // + // Reset state for this pass + // + FailedInMoving = FALSE; + ASSERT(FailedInProbe == FALSE); + + // + // Protect user-mode copy + // + _SEH2_TRY + { + // + // If this is our first time, probe the buffer + // + if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) + { + // + // Catch a failure here + // + FailedInProbe = TRUE; + + // + // Do the probe + // + ProbeForRead(SourceAddress, BufferSize, sizeof(CHAR)); + + // + // Passed + // + FailedInProbe = FALSE; + } + + // + // Do the copy + // + RtlCopyMemory(PoolAddress, CurrentAddress, CurrentSize); + + // + // Now let go of the source and grab to the target process + // + KeUnstackDetachProcess(&ApcState); + KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); + + // + // Check if this is our first time through + // + if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) + { + // + // Catch a failure here + // + FailedInProbe = TRUE; + + // + // Do the probe + // + ProbeForWrite(TargetAddress, BufferSize, sizeof(CHAR)); + + // + // Passed + // + FailedInProbe = FALSE; + } + + // + // Now do the actual move + // + FailedInMoving = TRUE; + RtlCopyMemory(CurrentTargetAddress, PoolAddress, CurrentSize); + } + _SEH2_EXCEPT(MiGetExceptionInfo(_SEH2_GetExceptionInformation(), + &HaveBadAddress, + &BadAddress)) + { + // + // Detach from whoever we may be attached to + // + KeUnstackDetachProcess(&ApcState); + + // + // Check if we had allocated pool + // + if (HavePoolAddress) ExFreePool(PoolAddress); + + // + // Check if we failed during the probe + // + if (FailedInProbe) + { + // + // Exit + // + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(return Status); + } + + // + // Otherwise, we failed, probably during the move + // + *ReturnSize = BufferSize - RemainingSize; + if (FailedInMoving) + { + // + // Check if we know exactly where we stopped copying + // + if (HaveBadAddress) + { + // + // Return the exact number of bytes copied + // + *ReturnSize = BadAddress - (ULONG_PTR)SourceAddress; + } + } + + // + // Return partial copy + // + Status = STATUS_PARTIAL_COPY; + } + _SEH2_END; + + // + // Check for SEH status + // + if (Status != STATUS_SUCCESS) return Status; + + // + // Detach from target + // + KeUnstackDetachProcess(&ApcState); + + // + // Update location and size + // + RemainingSize -= CurrentSize; + CurrentAddress = (PVOID)((ULONG_PTR)CurrentAddress + CurrentSize); + CurrentTargetAddress = (PVOID)((ULONG_PTR)CurrentTargetAddress + + CurrentSize); + } + + // + // Check if we had allocated pool + // + if (HavePoolAddress) ExFreePool(PoolAddress); + + // + // All bytes read + // + *ReturnSize = BufferSize; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +MmCopyVirtualMemory(IN PEPROCESS SourceProcess, + IN PVOID SourceAddress, + IN PEPROCESS TargetProcess, + OUT PVOID TargetAddress, + IN SIZE_T BufferSize, + IN KPROCESSOR_MODE PreviousMode, + OUT PSIZE_T ReturnSize) +{ + NTSTATUS Status; + PEPROCESS Process = SourceProcess; + + // + // Don't accept zero-sized buffers + // + if (!BufferSize) return STATUS_SUCCESS; + + // + // If we are copying from ourselves, lock the target instead + // + if (SourceProcess == PsGetCurrentProcess()) Process = TargetProcess; + + // + // Acquire rundown protection + // + if (!ExAcquireRundownProtection(&Process->RundownProtect)) + { + // + // Fail + // + return STATUS_PROCESS_IS_TERMINATING; + } + + // + // See if we should use the pool copy + // + if (BufferSize > MI_POOL_COPY_BYTES) + { + // + // Use MDL-copy + // + Status = MiDoMappedCopy(SourceProcess, + SourceAddress, + TargetProcess, + TargetAddress, + BufferSize, + PreviousMode, + ReturnSize); + } + else + { + // + // Do pool copy + // + Status = MiDoPoolCopy(SourceProcess, + SourceAddress, + TargetProcess, + TargetAddress, + BufferSize, + PreviousMode, + ReturnSize); + } + + // + // Release the lock + // + ExReleaseRundownProtection(&Process->RundownProtect); + return Status; +} + +NTSTATUS +NTAPI +MmFlushVirtualMemory(IN PEPROCESS Process, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T RegionSize, + OUT PIO_STATUS_BLOCK IoStatusBlock) +{ + PAGED_CODE(); + UNIMPLEMENTED; + + // + // Fake success + // + return STATUS_SUCCESS; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @unimplemented + */ +PVOID +NTAPI +MmGetVirtualForPhysical(IN PHYSICAL_ADDRESS PhysicalAddress) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +PVOID +NTAPI +MmSecureVirtualMemory(IN PVOID Address, + IN SIZE_T Length, + IN ULONG Mode) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @unimplemented + */ +VOID +NTAPI +MmUnsecureVirtualMemory(IN PVOID SecureMem) +{ + UNIMPLEMENTED; +} + +/* SYSTEM CALLS ***************************************************************/ + +NTSTATUS +NTAPI +NtReadVirtualMemory(IN HANDLE ProcessHandle, + IN PVOID BaseAddress, + OUT PVOID Buffer, + IN SIZE_T NumberOfBytesToRead, + OUT PSIZE_T NumberOfBytesRead OPTIONAL) +{ + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PEPROCESS Process; + NTSTATUS Status = STATUS_SUCCESS; + SIZE_T BytesRead = 0; + PAGED_CODE(); + + // + // Check if we came from user mode + // + if (PreviousMode != KernelMode) + { + // + // Validate the read addresses + // + if ((((ULONG_PTR)BaseAddress + NumberOfBytesToRead) < (ULONG_PTR)BaseAddress) || + (((ULONG_PTR)Buffer + NumberOfBytesToRead) < (ULONG_PTR)Buffer) || + (((ULONG_PTR)BaseAddress + NumberOfBytesToRead) > MmUserProbeAddress) || + (((ULONG_PTR)Buffer + NumberOfBytesToRead) > MmUserProbeAddress)) + { + // + // Don't allow to write into kernel space + // + return STATUS_ACCESS_VIOLATION; + } + + // + // Enter SEH for probe + // + _SEH2_TRY + { + // + // Probe the output value + // + if (NumberOfBytesRead) ProbeForWriteSize_t(NumberOfBytesRead); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + + // + // Don't do zero-byte transfers + // + if (NumberOfBytesToRead) + { + // + // Reference the process + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_READ, + PsProcessType, + PreviousMode, + (PVOID*)(&Process), + NULL); + if (NT_SUCCESS(Status)) + { + // + // Do the copy + // + Status = MmCopyVirtualMemory(Process, + BaseAddress, + PsGetCurrentProcess(), + Buffer, + NumberOfBytesToRead, + PreviousMode, + &BytesRead); + + // + // Dereference the process + // + ObDereferenceObject(Process); + } + } + + // + // Check if the caller sent this parameter + // + if (NumberOfBytesRead) + { + // + // Enter SEH to guard write + // + _SEH2_TRY + { + // + // Return the number of bytes read + // + *NumberOfBytesRead = BytesRead; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + } + + // + // Return status + // + return Status; +} + +NTSTATUS +NTAPI +NtWriteVirtualMemory(IN HANDLE ProcessHandle, + IN PVOID BaseAddress, + IN PVOID Buffer, + IN SIZE_T NumberOfBytesToWrite, + OUT PSIZE_T NumberOfBytesWritten OPTIONAL) +{ + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PEPROCESS Process; + NTSTATUS Status = STATUS_SUCCESS; + ULONG BytesWritten = 0; + PAGED_CODE(); + + // + // Check if we came from user mode + // + if (PreviousMode != KernelMode) + { + // + // Validate the read addresses + // + if ((((ULONG_PTR)BaseAddress + NumberOfBytesToWrite) < (ULONG_PTR)BaseAddress) || + (((ULONG_PTR)Buffer + NumberOfBytesToWrite) < (ULONG_PTR)Buffer) || + (((ULONG_PTR)BaseAddress + NumberOfBytesToWrite) > MmUserProbeAddress) || + (((ULONG_PTR)Buffer + NumberOfBytesToWrite) > MmUserProbeAddress)) + { + // + // Don't allow to write into kernel space + // + return STATUS_ACCESS_VIOLATION; + } + + // + // Enter SEH for probe + // + _SEH2_TRY + { + // + // Probe the output value + // + if (NumberOfBytesWritten) ProbeForWriteSize_t(NumberOfBytesWritten); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + + // + // Don't do zero-byte transfers + // + if (NumberOfBytesToWrite) + { + // + // Reference the process + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_WRITE, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (NT_SUCCESS(Status)) + { + // + // Do the copy + // + Status = MmCopyVirtualMemory(PsGetCurrentProcess(), + Buffer, + Process, + BaseAddress, + NumberOfBytesToWrite, + PreviousMode, + &BytesWritten); + + // + // Dereference the process + // + ObDereferenceObject(Process); + } + } + + // + // Check if the caller sent this parameter + // + if (NumberOfBytesWritten) + { + // + // Enter SEH to guard write + // + _SEH2_TRY + { + // + // Return the number of bytes written + // + *NumberOfBytesWritten = BytesWritten; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + } + + // + // Return status + // + return Status; +} + +NTSTATUS +NTAPI +NtProtectVirtualMemory(IN HANDLE ProcessHandle, + IN OUT PVOID *UnsafeBaseAddress, + IN OUT SIZE_T *UnsafeNumberOfBytesToProtect, + IN ULONG NewAccessProtection, + OUT PULONG UnsafeOldAccessProtection) +{ + PEPROCESS Process; + ULONG OldAccessProtection; + ULONG Protection; + PEPROCESS CurrentProcess = PsGetCurrentProcess(); + PVOID BaseAddress = NULL; + SIZE_T NumberOfBytesToProtect = 0; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status; + BOOLEAN Attached = FALSE; + KAPC_STATE ApcState; + PAGED_CODE(); + + // + // Check for valid protection flags + // + Protection = NewAccessProtection & ~(PAGE_GUARD|PAGE_NOCACHE); + if (Protection != PAGE_NOACCESS && + Protection != PAGE_READONLY && + Protection != PAGE_READWRITE && + Protection != PAGE_WRITECOPY && + Protection != PAGE_EXECUTE && + Protection != PAGE_EXECUTE_READ && + Protection != PAGE_EXECUTE_READWRITE && + Protection != PAGE_EXECUTE_WRITECOPY) + { + // + // Fail + // + return STATUS_INVALID_PAGE_PROTECTION; + } + + // + // Check if we came from user mode + // + if (PreviousMode != KernelMode) + { + // + // Enter SEH for probing + // + _SEH2_TRY + { + // + // Validate all outputs + // + ProbeForWritePointer(UnsafeBaseAddress); + ProbeForWriteSize_t(UnsafeNumberOfBytesToProtect); + ProbeForWriteUlong(UnsafeOldAccessProtection); + + // + // Capture them + // + BaseAddress = *UnsafeBaseAddress; + NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + // + // Capture directly + // + BaseAddress = *UnsafeBaseAddress; + NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; + } + + // + // Catch illegal base address + // + if (BaseAddress > MM_HIGHEST_USER_ADDRESS) return STATUS_INVALID_PARAMETER_2; + + // + // Catch illegal region size + // + if ((MmUserProbeAddress - (ULONG_PTR)BaseAddress) < NumberOfBytesToProtect) + { + // + // Fail + // + return STATUS_INVALID_PARAMETER_3; + } + + // + // 0 is also illegal + // + if (!NumberOfBytesToProtect) return STATUS_INVALID_PARAMETER_3; + + // + // Get a reference to the process + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) return Status; + + // + // Check if we should attach + // + if (CurrentProcess != Process) + { + // + // Do it + // + KeStackAttachProcess(&Process->Pcb, &ApcState); + Attached = TRUE; + } + + // + // Do the actual work + // + Status = MiProtectVirtualMemory(Process, + &BaseAddress, + &NumberOfBytesToProtect, + NewAccessProtection, + &OldAccessProtection); + + // + // Detach if needed + // + if (Attached) KeUnstackDetachProcess(&ApcState); + + // + // Release reference + // + ObDereferenceObject(Process); + + // + // Enter SEH to return data + // + _SEH2_TRY + { + // + // Return data to user + // + *UnsafeOldAccessProtection = OldAccessProtection; + *UnsafeBaseAddress = BaseAddress; + *UnsafeNumberOfBytesToProtect = NumberOfBytesToProtect; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + // + // Return status + // + return Status; +} + +NTSTATUS +NTAPI +NtLockVirtualMemory(IN HANDLE ProcessHandle, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToLock, + IN ULONG MapType) +{ + PEPROCESS Process; + PEPROCESS CurrentProcess = PsGetCurrentProcess(); + NTSTATUS Status; + BOOLEAN Attached = FALSE; + KAPC_STATE ApcState; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PVOID CapturedBaseAddress; + SIZE_T CapturedBytesToLock; + PAGED_CODE(); + + // + // Validate flags + // + if ((MapType & ~(MAP_PROCESS | MAP_SYSTEM))) + { + // + // Invalid set of flags + // + return STATUS_INVALID_PARAMETER; + } + + // + // At least one flag must be specified + // + if (!(MapType & (MAP_PROCESS | MAP_SYSTEM))) + { + // + // No flag given + // + return STATUS_INVALID_PARAMETER; + } + + // + // Enter SEH for probing + // + _SEH2_TRY + { + // + // Validate output data + // + ProbeForWritePointer(BaseAddress); + ProbeForWriteSize_t(NumberOfBytesToLock); + + // + // Capture it + // + CapturedBaseAddress = *BaseAddress; + CapturedBytesToLock = *NumberOfBytesToLock; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + // + // Catch illegal base address + // + if (CapturedBaseAddress > MM_HIGHEST_USER_ADDRESS) return STATUS_INVALID_PARAMETER; + + // + // Catch illegal region size + // + if ((MmUserProbeAddress - (ULONG_PTR)CapturedBaseAddress) < CapturedBytesToLock) + { + // + // Fail + // + return STATUS_INVALID_PARAMETER; + } + + // + // 0 is also illegal + // + if (!CapturedBytesToLock) return STATUS_INVALID_PARAMETER; + + // + // Get a reference to the process + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) return Status; + + // + // Check if this is is system-mapped + // + if (MapType & MAP_SYSTEM) + { + // + // Check for required privilege + // + if (!SeSinglePrivilegeCheck(SeLockMemoryPrivilege, PreviousMode)) + { + // + // Fail: Don't have it + // + ObDereferenceObject(Process); + return STATUS_PRIVILEGE_NOT_HELD; + } + } + + // + // Check if we should attach + // + if (CurrentProcess != Process) + { + // + // Do it + // + KeStackAttachProcess(&Process->Pcb, &ApcState); + Attached = TRUE; + } + + // + // Oops :( + // + UNIMPLEMENTED; + + // + // Detach if needed + // + if (Attached) KeUnstackDetachProcess(&ApcState); + + // + // Release reference + // + ObDereferenceObject(Process); + + // + // Enter SEH to return data + // + _SEH2_TRY + { + // + // Return data to user + // + *BaseAddress = CapturedBaseAddress; + *NumberOfBytesToLock = 0; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + // + // Return status + // + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NtUnlockVirtualMemory(IN HANDLE ProcessHandle, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToUnlock, + IN ULONG MapType) +{ + PEPROCESS Process; + PEPROCESS CurrentProcess = PsGetCurrentProcess(); + NTSTATUS Status; + BOOLEAN Attached = FALSE; + KAPC_STATE ApcState; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PVOID CapturedBaseAddress; + SIZE_T CapturedBytesToUnlock; + PAGED_CODE(); + + // + // Validate flags + // + if ((MapType & ~(MAP_PROCESS | MAP_SYSTEM))) + { + // + // Invalid set of flags + // + return STATUS_INVALID_PARAMETER; + } + + // + // At least one flag must be specified + // + if (!(MapType & (MAP_PROCESS | MAP_SYSTEM))) + { + // + // No flag given + // + return STATUS_INVALID_PARAMETER; + } + + // + // Enter SEH for probing + // + _SEH2_TRY + { + // + // Validate output data + // + ProbeForWritePointer(BaseAddress); + ProbeForWriteSize_t(NumberOfBytesToUnlock); + + // + // Capture it + // + CapturedBaseAddress = *BaseAddress; + CapturedBytesToUnlock = *NumberOfBytesToUnlock; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + // + // Catch illegal base address + // + if (CapturedBaseAddress > MM_HIGHEST_USER_ADDRESS) return STATUS_INVALID_PARAMETER; + + // + // Catch illegal region size + // + if ((MmUserProbeAddress - (ULONG_PTR)CapturedBaseAddress) < CapturedBytesToUnlock) + { + // + // Fail + // + return STATUS_INVALID_PARAMETER; + } + + // + // 0 is also illegal + // + if (!CapturedBytesToUnlock) return STATUS_INVALID_PARAMETER; + + // + // Get a reference to the process + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) return Status; + + // + // Check if this is is system-mapped + // + if (MapType & MAP_SYSTEM) + { + // + // Check for required privilege + // + if (!SeSinglePrivilegeCheck(SeLockMemoryPrivilege, PreviousMode)) + { + // + // Fail: Don't have it + // + ObDereferenceObject(Process); + return STATUS_PRIVILEGE_NOT_HELD; + } + } + + // + // Check if we should attach + // + if (CurrentProcess != Process) + { + // + // Do it + // + KeStackAttachProcess(&Process->Pcb, &ApcState); + Attached = TRUE; + } + + // + // Oops :( + // + UNIMPLEMENTED; + + // + // Detach if needed + // + if (Attached) KeUnstackDetachProcess(&ApcState); + + // + // Release reference + // + ObDereferenceObject(Process); + + // + // Enter SEH to return data + // + _SEH2_TRY + { + // + // Return data to user + // + *BaseAddress = PAGE_ALIGN(CapturedBaseAddress); + *NumberOfBytesToUnlock = 0; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + // + // Return status + // + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NtFlushVirtualMemory(IN HANDLE ProcessHandle, + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToFlush, + OUT PIO_STATUS_BLOCK IoStatusBlock) +{ + PEPROCESS Process; + NTSTATUS Status; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PVOID CapturedBaseAddress; + SIZE_T CapturedBytesToFlush; + IO_STATUS_BLOCK LocalStatusBlock; + PAGED_CODE(); + + // + // Check if we came from user mode + // + if (PreviousMode != KernelMode) + { + // + // Enter SEH for probing + // + _SEH2_TRY + { + // + // Validate all outputs + // + ProbeForWritePointer(BaseAddress); + ProbeForWriteSize_t(NumberOfBytesToFlush); + ProbeForWriteIoStatusBlock(IoStatusBlock); + + // + // Capture them + // + CapturedBaseAddress = *BaseAddress; + CapturedBytesToFlush = *NumberOfBytesToFlush; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + // + // Capture directly + // + CapturedBaseAddress = *BaseAddress; + CapturedBytesToFlush = *NumberOfBytesToFlush; + } + + // + // Catch illegal base address + // + if (CapturedBaseAddress > MM_HIGHEST_USER_ADDRESS) return STATUS_INVALID_PARAMETER; + + // + // Catch illegal region size + // + if ((MmUserProbeAddress - (ULONG_PTR)CapturedBaseAddress) < CapturedBytesToFlush) + { + // + // Fail + // + return STATUS_INVALID_PARAMETER; + } + + // + // Get a reference to the process + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) return Status; + + // + // Do it + // + Status = MmFlushVirtualMemory(Process, + &CapturedBaseAddress, + &CapturedBytesToFlush, + &LocalStatusBlock); + + // + // Release reference + // + ObDereferenceObject(Process); + + // + // Enter SEH to return data + // + _SEH2_TRY + { + // + // Return data to user + // + *BaseAddress = PAGE_ALIGN(CapturedBaseAddress); + *NumberOfBytesToFlush = 0; + *IoStatusBlock = LocalStatusBlock; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + // + // Return status + // + return Status; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +NtGetWriteWatch(IN HANDLE ProcessHandle, + IN ULONG Flags, + IN PVOID BaseAddress, + IN SIZE_T RegionSize, + IN PVOID *UserAddressArray, + OUT PULONG_PTR EntriesInUserAddressArray, + OUT PULONG Granularity) +{ + PEPROCESS Process; + NTSTATUS Status; + PVOID EndAddress; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + ULONG_PTR CapturedEntryCount; + PAGED_CODE(); + + // + // Check if we came from user mode + // + if (PreviousMode != KernelMode) + { + // + // Enter SEH for probing + // + _SEH2_TRY + { + // + // Catch illegal base address + // + if (BaseAddress > MM_HIGHEST_USER_ADDRESS) return STATUS_INVALID_PARAMETER_2; + + // + // Catch illegal region size + // + if ((MmUserProbeAddress - (ULONG_PTR)BaseAddress) < RegionSize) + { + // + // Fail + // + return STATUS_INVALID_PARAMETER_3; + } + + // + // Validate all data + // + ProbeForWriteSize_t(EntriesInUserAddressArray); + ProbeForWriteUlong(Granularity); + + // + // Capture them + // + CapturedEntryCount = *EntriesInUserAddressArray; + + // + // Must have a count + // + if (CapturedEntryCount == 0) return STATUS_INVALID_PARAMETER_5; + + // + // Can't be larger than the maximum + // + if (CapturedEntryCount > (MAXULONG_PTR / sizeof(ULONG_PTR))) + { + // + // Fail + // + return STATUS_INVALID_PARAMETER_5; + } + + // + // Probe the actual array + // + ProbeForWrite(UserAddressArray, + CapturedEntryCount * sizeof(PVOID), + sizeof(PVOID)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + // + // Capture directly + // + CapturedEntryCount = *EntriesInUserAddressArray; + ASSERT(CapturedEntryCount != 0); + } + + // + // Check if this is a local request + // + if (ProcessHandle == NtCurrentProcess()) + { + // + // No need to reference the process + // + Process = PsGetCurrentProcess(); + } + else + { + // + // Reference the target + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID *)&Process, + NULL); + if (!NT_SUCCESS(Status)) return Status; + } + + // + // Compute the last address and validate it + // + EndAddress = (PVOID)((ULONG_PTR)BaseAddress + RegionSize - 1); + if (BaseAddress > EndAddress) + { + // + // Fail + // + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + return STATUS_INVALID_PARAMETER_4; + } + + // + // Oops :( + // + UNIMPLEMENTED; + + // + // Dereference if needed + // + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + + // + // Enter SEH to return data + // + _SEH2_TRY + { + // + // Return data to user + // + *EntriesInUserAddressArray = 0; + *Granularity = PAGE_SIZE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get exception code + // + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + // + // Return success + // + return STATUS_SUCCESS; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +NtResetWriteWatch(IN HANDLE ProcessHandle, + IN PVOID BaseAddress, + IN SIZE_T RegionSize) +{ + PVOID EndAddress; + PEPROCESS Process; + NTSTATUS Status; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + ASSERT (KeGetCurrentIrql() == PASSIVE_LEVEL); + + // + // Catch illegal base address + // + if (BaseAddress > MM_HIGHEST_USER_ADDRESS) return STATUS_INVALID_PARAMETER_2; + + // + // Catch illegal region size + // + if ((MmUserProbeAddress - (ULONG_PTR)BaseAddress) < RegionSize) + { + // + // Fail + // + return STATUS_INVALID_PARAMETER_3; + } + + // + // Check if this is a local request + // + if (ProcessHandle == NtCurrentProcess()) + { + // + // No need to reference the process + // + Process = PsGetCurrentProcess(); + } + else + { + // + // Reference the target + // + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID *)&Process, + NULL); + if (!NT_SUCCESS(Status)) return Status; + } + + // + // Compute the last address and validate it + // + EndAddress = (PVOID)((ULONG_PTR)BaseAddress + RegionSize - 1); + if (BaseAddress > EndAddress) + { + // + // Fail + // + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + return STATUS_INVALID_PARAMETER_3; + } + + // + // Oops :( + // + UNIMPLEMENTED; + + // + // Dereference if needed + // + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + + // + // Return success + // + return STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Thu Oct 15 18:50:49 2009 @@ -13,391 +13,7 @@ #define NDEBUG #include <debug.h> -#define MI_MAPPED_COPY_PAGES 16 -#define MI_POOL_COPY_BYTES 512 -#define MI_MAX_TRANSFER_SIZE 64 * 1024 -#define TAG_VM 'wRmV' - /* PRIVATE FUNCTIONS **********************************************************/ - -LONG -MiGetExceptionInfo(EXCEPTION_POINTERS *ExceptionInfo, BOOLEAN * HaveBadAddress, ULONG_PTR * BadAddress) -{ - PEXCEPTION_RECORD ExceptionRecord; - PAGED_CODE(); - - /* Assume default */ - *HaveBadAddress = FALSE; - - /* Get the exception record */ - ExceptionRecord = ExceptionInfo->ExceptionRecord; - - /* Look at the exception code */ - if ((ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) || - (ExceptionRecord->ExceptionCode == STATUS_GUARD_PAGE_VIOLATION) || - (ExceptionRecord->ExceptionCode == STATUS_IN_PAGE_ERROR)) - { - /* We can tell the address if we have more than one parameter */ - if (ExceptionRecord->NumberParameters > 1) - { - /* Return the address */ - *HaveBadAddress = TRUE; - *BadAddress = ExceptionRecord->ExceptionInformation[1]; - } - } - - /* Continue executing the next handler */ - return EXCEPTION_EXECUTE_HANDLER; -} - -NTSTATUS -NTAPI -MiDoMappedCopy(IN PEPROCESS SourceProcess, - IN PVOID SourceAddress, - IN PEPROCESS TargetProcess, - OUT PVOID TargetAddress, - IN SIZE_T BufferSize, - IN KPROCESSOR_MODE PreviousMode, - OUT PSIZE_T ReturnSize) -{ - PFN_NUMBER MdlBuffer[(sizeof(MDL) / sizeof(PFN_NUMBER)) + MI_MAPPED_COPY_PAGES + 1]; - PMDL Mdl = (PMDL)MdlBuffer; - SIZE_T TotalSize, CurrentSize, RemainingSize; - volatile BOOLEAN FailedInProbe = FALSE, FailedInMapping = FALSE, FailedInMoving; - volatile BOOLEAN PagesLocked; - PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; - volatile PVOID MdlAddress; - KAPC_STATE ApcState; - BOOLEAN HaveBadAddress; - ULONG_PTR BadAddress; - PAGED_CODE(); - - /* Calculate the maximum amount of data to move */ - TotalSize = (MI_MAPPED_COPY_PAGES - 2) * PAGE_SIZE; - if (BufferSize <= TotalSize) TotalSize = BufferSize; - CurrentSize = TotalSize; - RemainingSize = BufferSize; - - /* Loop as long as there is still data */ - while (RemainingSize > 0) - { - /* Check if this transfer will finish everything off */ - if (RemainingSize < CurrentSize) CurrentSize = RemainingSize; - - /* Attach to the source address space */ - KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); - - /* Reset state for this pass */ - MdlAddress = NULL; - PagesLocked = FALSE; - FailedInMoving = FALSE; - ASSERT(FailedInProbe == FALSE); - - /* Protect user-mode copy */ - _SEH2_TRY - { - /* If this is our first time, probe the buffer */ - if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) - { - /* Catch a failure here */ - FailedInProbe = TRUE; - - /* Do the probe */ - ProbeForRead(SourceAddress, BufferSize, sizeof(CHAR)); - - /* Passed */ - FailedInProbe = FALSE; - } - - /* Initialize and probe and lock the MDL */ - MmInitializeMdl (Mdl, CurrentAddress, CurrentSize); - MmProbeAndLockPages (Mdl, PreviousMode, IoReadAccess); - PagesLocked = TRUE; - - /* Now map the pages */ - MdlAddress = MmMapLockedPagesSpecifyCache(Mdl, - KernelMode, - MmCached, - NULL, - FALSE, - HighPagePriority); - if (!MdlAddress) - { - /* Use our SEH handler to pick this up */ - FailedInMapping = TRUE; - ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); - } - - /* Now let go of the source and grab to the target process */ - KeUnstackDetachProcess(&ApcState); - KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); - - /* Check if this is our first time through */ - if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) - { - /* Catch a failure here */ - FailedInProbe = TRUE; - - /* Do the probe */ - ProbeForWrite(TargetAddress, BufferSize, sizeof(CHAR)); - - /* Passed */ - FailedInProbe = FALSE; - } - - /* Now do the actual move */ - FailedInMoving = TRUE; - RtlCopyMemory(CurrentTargetAddress, MdlAddress, CurrentSize); - } - _SEH2_EXCEPT(MiGetExceptionInfo(_SEH2_GetExceptionInformation(), &HaveBadAddress, &BadAddress)) - { - /* Detach from whoever we may be attached to */ - KeUnstackDetachProcess(&ApcState); - - /* Check if we had mapped the pages */ - if (MdlAddress) MmUnmapLockedPages(MdlAddress, Mdl); - - /* Check if we had locked the pages */ - if (PagesLocked) MmUnlockPages(Mdl); - - /* Check if we failed during the probe or mapping */ - if ((FailedInProbe) || (FailedInMapping)) - { - /* Exit */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - - /* Otherwise, we failed probably during the move */ - *ReturnSize = BufferSize - RemainingSize; - if (FailedInMoving) - { - /* Check if we know exactly where we stopped copying */ - if (HaveBadAddress) - { - /* Return the exact number of bytes copied */ - *ReturnSize = BadAddress - (ULONG_PTR)SourceAddress; - } - } - - /* Return partial copy */ - _SEH2_YIELD(return STATUS_PARTIAL_COPY); - } - _SEH2_END; - - /* Detach from target */ - KeUnstackDetachProcess(&ApcState); - - /* Unmap and unlock */ - MmUnmapLockedPages(MdlAddress, Mdl); - MmUnlockPages(Mdl); - - /* Update location and size */ - RemainingSize -= CurrentSize; - CurrentAddress = (PVOID)((ULONG_PTR)CurrentAddress + CurrentSize); - CurrentTargetAddress = (PVOID)((ULONG_PTR)CurrentTargetAddress + CurrentSize); - } - - /* All bytes read */ - *ReturnSize = BufferSize; - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -MiDoPoolCopy(IN PEPROCESS SourceProcess, - IN PVOID SourceAddress, - IN PEPROCESS TargetProcess, - OUT PVOID TargetAddress, - IN SIZE_T BufferSize, - IN KPROCESSOR_MODE PreviousMode, - OUT PSIZE_T ReturnSize) -{ - UCHAR StackBuffer[MI_POOL_COPY_BYTES]; - SIZE_T TotalSize, CurrentSize, RemainingSize; - volatile BOOLEAN FailedInProbe = FALSE, FailedInMoving, HavePoolAddress = FALSE; - PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; - PVOID PoolAddress; - KAPC_STATE ApcState; - BOOLEAN HaveBadAddress; - ULONG_PTR BadAddress; - PAGED_CODE(); - - /* Calculate the maximum amount of data to move */ - TotalSize = MI_MAX_TRANSFER_SIZE; - if (BufferSize <= MI_MAX_TRANSFER_SIZE) TotalSize = BufferSize; - CurrentSize = TotalSize; - RemainingSize = BufferSize; - - /* Check if we can use the stack */ - if (BufferSize <= MI_POOL_COPY_BYTES) - { - /* Use it */ - PoolAddress = (PVOID)StackBuffer; - } - else - { - /* Allocate pool */ - PoolAddress = ExAllocatePoolWithTag(NonPagedPool, TotalSize, TAG_VM); - if (!PoolAddress) ASSERT(FALSE); - HavePoolAddress = TRUE; - } - - /* Loop as long as there is still data */ - while (RemainingSize > 0) - { - /* Check if this transfer will finish everything off */ - if (RemainingSize < CurrentSize) CurrentSize = RemainingSize; - - /* Attach to the source address space */ - KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); - - /* Reset state for this pass */ - FailedInMoving = FALSE; - ASSERT(FailedInProbe == FALSE); - - /* Protect user-mode copy */ - _SEH2_TRY - { - /* If this is our first time, probe the buffer */ - if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) - { - /* Catch a failure here */ - FailedInProbe = TRUE; - - /* Do the probe */ - ProbeForRead(SourceAddress, BufferSize, sizeof(CHAR)); - - /* Passed */ - FailedInProbe = FALSE; - } - - /* Do the copy */ - RtlCopyMemory(PoolAddress, CurrentAddress, CurrentSize); - - /* Now let go of the source and grab to the target process */ - KeUnstackDetachProcess(&ApcState); - KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); - - /* Check if this is our first time through */ - if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) - { - /* Catch a failure here */ - FailedInProbe = TRUE; - - /* Do the probe */ - ProbeForWrite(TargetAddress, BufferSize, sizeof(CHAR)); - - /* Passed */ - FailedInProbe = FALSE; - } - - /* Now do the actual move */ - FailedInMoving = TRUE; - RtlCopyMemory(CurrentTargetAddress, PoolAddress, CurrentSize); - } - _SEH2_EXCEPT(MiGetExceptionInfo(_SEH2_GetExceptionInformation(), &HaveBadAddress, &BadAddress)) - { - /* Detach from whoever we may be attached to */ - KeUnstackDetachProcess(&ApcState); - - /* Check if we had allocated pool */ - if (HavePoolAddress) ExFreePool(PoolAddress); - - /* Check if we failed during the probe */ - if (FailedInProbe) - { - /* Exit */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - - /* Otherwise, we failed probably during the move */ - *ReturnSize = BufferSize - RemainingSize; - if (FailedInMoving) - { - /* Check if we know exactly where we stopped copying */ - if (HaveBadAddress) - { - /* Return the exact number of bytes copied */ - *ReturnSize = BadAddress - (ULONG_PTR)SourceAddress; - } - } - - /* Return partial copy */ - _SEH2_YIELD(return STATUS_PARTIAL_COPY); - } - _SEH2_END; - - /* Detach from target */ - KeUnstackDetachProcess(&ApcState); - - /* Update location and size */ - RemainingSize -= CurrentSize; - CurrentAddress = (PVOID)((ULONG_PTR)CurrentAddress + CurrentSize); - CurrentTargetAddress = (PVOID)((ULONG_PTR)CurrentTargetAddress + CurrentSize); - } - - /* Check if we had allocated pool */ - if (HavePoolAddress) ExFreePool(PoolAddress); - - /* All bytes read */ - *ReturnSize = BufferSize; - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -MmCopyVirtualMemory(IN PEPROCESS SourceProcess, - IN PVOID SourceAddress, - IN PEPROCESS TargetProcess, - OUT PVOID TargetAddress, - IN SIZE_T BufferSize, - IN KPROCESSOR_MODE PreviousMode, - OUT PSIZE_T ReturnSize) -{ - NTSTATUS Status; - PEPROCESS Process = SourceProcess; - - /* Don't accept zero-sized buffers */ - if (!BufferSize) return STATUS_SUCCESS; - - /* If we are copying from ourselves, lock the target instead */ - if (SourceProcess == PsGetCurrentProcess()) Process = TargetProcess; - - /* Acquire rundown protection */ - if (!ExAcquireRundownProtection(&Process->RundownProtect)) - { - /* Fail */ - return STATUS_PROCESS_IS_TERMINATING; - } - - /* See if we should use the pool copy */ - if (BufferSize > MI_POOL_COPY_BYTES) - { - /* Use MDL-copy */ - Status = MiDoMappedCopy(SourceProcess, - SourceAddress, - TargetProcess, - TargetAddress, - BufferSize, - PreviousMode, - ReturnSize); - } - else - { - /* Do pool copy */ - Status = MiDoPoolCopy(SourceProcess, - SourceAddress, - TargetProcess, - TargetAddress, - BufferSize, - PreviousMode, - ReturnSize); - } - - /* Release the lock */ - ExReleaseRundownProtection(&Process->RundownProtect); - return Status; -} NTSTATUS FASTCALL MiQueryVirtualMemory(IN HANDLE ProcessHandle, @@ -721,322 +337,7 @@ NULL); } -/* PUBLIC FUNCTIONS ***********************************************************/ - -/* - * @unimplemented - */ -PVOID -NTAPI -MmGetVirtualForPhysical(IN PHYSICAL_ADDRESS PhysicalAddress) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -PVOID -NTAPI -MmSecureVirtualMemory(IN PVOID Address, - IN SIZE_T Length, - IN ULONG Mode) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ -VOID -NTAPI -MmUnsecureVirtualMemory(IN PVOID SecureMem) -{ - UNIMPLEMENTED; -} - /* SYSTEM CALLS ***************************************************************/ - -NTSTATUS -NTAPI -NtReadVirtualMemory(IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - OUT PVOID Buffer, - IN SIZE_T NumberOfBytesToRead, - OUT PSIZE_T NumberOfBytesRead OPTIONAL) -{ - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PEPROCESS Process; - NTSTATUS Status; - SIZE_T BytesRead = 0; - PAGED_CODE(); - - /* Check if we came from user mode */ - if (PreviousMode != KernelMode) - { - /* Validate the read addresses */ - if ((((ULONG_PTR)BaseAddress + NumberOfBytesToRead) < (ULONG_PTR)BaseAddress) || - (((ULONG_PTR)Buffer + NumberOfBytesToRead) < (ULONG_PTR)Buffer) || - (((ULONG_PTR)BaseAddress + NumberOfBytesToRead) > MmUserProbeAddress) || - (((ULONG_PTR)Buffer + NumberOfBytesToRead) > MmUserProbeAddress)) - { - /* Don't allow to write into kernel space */ - return STATUS_ACCESS_VIOLATION; - } - - /* Enter SEH for probe */ - _SEH2_TRY - { - /* Probe the output value */ - if (NumberOfBytesRead) ProbeForWriteSize_t(NumberOfBytesRead); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - } - - /* Reference the process */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_READ, - PsProcessType, - PreviousMode, - (PVOID*)(&Process), - NULL); - if (NT_SUCCESS(Status)) - { - /* Do the copy */ - Status = MmCopyVirtualMemory(Process, - BaseAddress, - PsGetCurrentProcess(), - Buffer, - NumberOfBytesToRead, - PreviousMode, - &BytesRead); - - /* Dereference the process */ - ObDereferenceObject(Process); - } - - /* Check if the caller sent this parameter */ - if (NumberOfBytesRead) - { - /* Enter SEH to guard write */ - _SEH2_TRY - { - /* Return the number of bytes read */ - *NumberOfBytesRead = BytesRead; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Handle exception */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - - /* Return status */ - return Status; -} - -NTSTATUS -NTAPI -NtWriteVirtualMemory(IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN PVOID Buffer, - IN SIZE_T NumberOfBytesToWrite, - OUT PSIZE_T NumberOfBytesWritten OPTIONAL) -{ - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PEPROCESS Process; - NTSTATUS Status; - ULONG BytesWritten = 0; - PAGED_CODE(); - - /* Check if we came from user mode */ - if (PreviousMode != KernelMode) - { - /* Validate the read addresses */ - if ((((ULONG_PTR)BaseAddress + NumberOfBytesToWrite) < (ULONG_PTR)BaseAddress) || - (((ULONG_PTR)Buffer + NumberOfBytesToWrite) < (ULONG_PTR)Buffer) || - (((ULONG_PTR)BaseAddress + NumberOfBytesToWrite) > MmUserProbeAddress) || - (((ULONG_PTR)Buffer + NumberOfBytesToWrite) > MmUserProbeAddress)) - { - /* Don't allow to write into kernel space */ - return STATUS_ACCESS_VIOLATION; - } - - /* Enter SEH for probe */ - _SEH2_TRY - { - /* Probe the output value */ - if (NumberOfBytesWritten) ProbeForWriteSize_t(NumberOfBytesWritten); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - } - - /* Reference the process */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_WRITE, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); - if (NT_SUCCESS(Status)) - { - /* Do the copy */ - Status = MmCopyVirtualMemory(PsGetCurrentProcess(), - Buffer, - Process, - BaseAddress, - NumberOfBytesToWrite, - PreviousMode, - &BytesWritten); - - /* Dereference the process */ - ObDereferenceObject(Process); - } - - /* Check if the caller sent this parameter */ - if (NumberOfBytesWritten) - { - /* Enter SEH to guard write */ - _SEH2_TRY - { - /* Return the number of bytes read */ - *NumberOfBytesWritten = BytesWritten; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Handle exception */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - - /* Return status */ - return Status; -} - -NTSTATUS -NTAPI -NtProtectVirtualMemory(IN HANDLE ProcessHandle, - IN OUT PVOID *UnsafeBaseAddress, - IN OUT SIZE_T *UnsafeNumberOfBytesToProtect, - IN ULONG NewAccessProtection, - OUT PULONG UnsafeOldAccessProtection) -{ - PEPROCESS Process; - ULONG OldAccessProtection; - ULONG Protection; - PVOID BaseAddress = NULL; - SIZE_T NumberOfBytesToProtect = 0; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status; - PAGED_CODE(); - - /* Check for valid protection flags */ - Protection = NewAccessProtection & ~(PAGE_GUARD|PAGE_NOCACHE); - if (Protection != PAGE_NOACCESS && - Protection != PAGE_READONLY && - Protection != PAGE_READWRITE && - Protection != PAGE_WRITECOPY && - Protection != PAGE_EXECUTE && - Protection != PAGE_EXECUTE_READ && - Protection != PAGE_EXECUTE_READWRITE && - Protection != PAGE_EXECUTE_WRITECOPY) - { - return STATUS_INVALID_PAGE_PROTECTION; - } - - /* Check if we came from user mode */ - if (PreviousMode != KernelMode) - { - /* Enter SEH for probing */ - _SEH2_TRY - { - /* Validate all outputs */ - ProbeForWritePointer(UnsafeBaseAddress); - ProbeForWriteSize_t(UnsafeNumberOfBytesToProtect); - ProbeForWriteUlong(UnsafeOldAccessProtection); - - /* Capture them */ - BaseAddress = *UnsafeBaseAddress; - NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - } - else - { - /* Capture directly */ - BaseAddress = *UnsafeBaseAddress; - NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; - } - - /* Catch illegal base address */ - if (BaseAddress > (PVOID)MmUserProbeAddress) return STATUS_INVALID_PARAMETER_2; - - /* Catch illegal region size */ - if ((MmUserProbeAddress - (ULONG_PTR)BaseAddress) < NumberOfBytesToProtect) - { - /* Fail */ - return STATUS_INVALID_PARAMETER_3; - } - - /* 0 is also illegal */ - if (!NumberOfBytesToProtect) return STATUS_INVALID_PARAMETER_3; - - /* Get a reference to the process */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - PreviousMode, - (PVOID*)(&Process), - NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* Do the actual work */ - Status = MiProtectVirtualMemory(Process, - &BaseAddress, - &NumberOfBytesToProtect, - NewAccessProtection, - &OldAccessProtection); - - /* Release reference */ - ObDereferenceObject(Process); - - /* Enter SEH to return data */ - _SEH2_TRY - { - /* Return data to user */ - *UnsafeOldAccessProtection = OldAccessProtection; - *UnsafeBaseAddress = BaseAddress; - *UnsafeNumberOfBytesToProtect = NumberOfBytesToProtect; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Catch exception */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - /* Return status */ - return Status; -} NTSTATUS NTAPI NtQueryVirtualMemory(IN HANDLE ProcessHandle, @@ -1202,92 +503,4 @@ return(Status); } -NTSTATUS -NTAPI -NtLockVirtualMemory(IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN SIZE_T NumberOfBytesToLock, - OUT PSIZE_T NumberOfBytesLocked OPTIONAL) -{ - UNIMPLEMENTED; - if (NumberOfBytesLocked) *NumberOfBytesLocked = 0; - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -NtUnlockVirtualMemory(IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN SIZE_T NumberOfBytesToUnlock, - OUT PSIZE_T NumberOfBytesUnlocked OPTIONAL) -{ - UNIMPLEMENTED; - if (NumberOfBytesUnlocked) *NumberOfBytesUnlocked = 0; - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -NtFlushVirtualMemory(IN HANDLE ProcessHandle, - IN OUT PVOID *BaseAddress, - IN OUT PSIZE_T NumberOfBytesToFlush, - OUT PIO_STATUS_BLOCK IoStatusBlock) -{ - UNIMPLEMENTED; - return STATUS_SUCCESS; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -NtGetWriteWatch(IN HANDLE ProcessHandle, - IN ULONG Flags, - IN PVOID BaseAddress, - IN ULONG RegionSize, - IN PVOID *UserAddressArray, - OUT PULONG EntriesInUserAddressArray, - OUT PULONG Granularity) -{ - if (!EntriesInUserAddressArray || !Granularity) - { - return STATUS_ACCESS_VIOLATION; - } - - if (!*EntriesInUserAddressArray || !RegionSize) - { - return STATUS_INVALID_PARAMETER; - } - - if (!UserAddressArray) - { - return STATUS_ACCESS_VIOLATION; - } - - /* HACK: Set granularity to PAGE_SIZE */ - *Granularity = PAGE_SIZE; - - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -NtResetWriteWatch(IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN ULONG RegionSize) -{ - if (!RegionSize) - { - return STATUS_INVALID_PARAMETER; - } - - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Thu Oct 15 18:50:49 2009 @@ -394,6 +394,7 @@ <file>pool.c</file> <file>procsup.c</file> <file>syspte.c</file> + <file>virtual.c</file> </directory> <file>anonmem.c</file> <file>balance.c</file>

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009