Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[khornicek] 55888: [KERNEL32_WINETEST] Disable tests that would hit asserts due to current work on VM. Requested functionality is missing and will be for some time.
by khornicek＠svn.reactos.org 27 Feb '12

27 Feb '12

Author: khornicek Date: Mon Feb 27 19:33:15 2012 New Revision: 55888 URL: http://svn.reactos.org/svn/reactos?rev=55888&view=rev Log: [KERNEL32_WINETEST] Disable tests that would hit asserts due to current work on VM. Requested functionality is missing and will be for some time. Modified: trunk/rostests/winetests/kernel32/virtual.c Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua… ============================================================================== --- trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] Mon Feb 27 19:33:15 2012 @@ -298,6 +298,8 @@ memset( addr1, 0x55, 20 ); ok( *(DWORD *)addr1 == 0x55555555, "wrong data %x\n", *(DWORD *)addr1 ); + skip("MEM_RESET is not currently supported\n"); +#if 0 addr2 = VirtualAlloc( addr1, 0x1000, MEM_RESET, PAGE_NOACCESS ); ok( addr2 == addr1 || broken( !addr2 && GetLastError() == ERROR_INVALID_PARAMETER), /* win9x */ "VirtualAlloc failed err %u\n", GetLastError() ); @@ -323,7 +325,7 @@ ok( !addr2, "VirtualAlloc failed\n" ); ok( GetLastError() == ERROR_INVALID_ADDRESS, "wrong error %u\n", GetLastError() ); } - +#endif /* invalid protection values */ SetLastError(0xdeadbeef); addr2 = VirtualAlloc(NULL, 0x1000, MEM_RESERVE, 0); @@ -740,6 +742,8 @@ ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); } + skip("MEM_RESET is not currently supported\n"); +#if 0 addr = VirtualAlloc( ptr, MAPPING_SIZE, MEM_RESET, PAGE_READONLY ); ok( addr == ptr || broken(!addr && GetLastError() == ERROR_INVALID_PARAMETER), /* win9x */ "VirtualAlloc failed with error %u\n", GetLastError() ); @@ -748,6 +752,7 @@ ok( !ret || broken(ret) /* win9x */, "VirtualFree succeeded\n" ); if (!ret) ok( GetLastError() == ERROR_INVALID_PARAMETER, "VirtualFree failed with %u\n", GetLastError() ); +#endif ret = UnmapViewOfFile(ptr2); ok(ret, "UnmapViewOfFile failed with error %d\n", GetLastError()); @@ -1084,6 +1089,8 @@ static void test_write_watch(void) { + skip("test_write_watch - MEM_WRITE_WATCH is currently not supported\n"); +#if 0 char *base; DWORD ret, size, old_prot; MEMORY_BASIC_INFORMATION info; @@ -1380,6 +1387,7 @@ if (count) ok( results[0] == base + 5*pagesize, "wrong result %p\n", results[0] ); VirtualFree( base, 0, MEM_FREE ); +#endif } START_TEST(virtual)

1 0

[cgutman] 55887: [NTOSKRNL] - Fix kernel memory corruption when a driver fails to initialize - Fix a handle leak in a failure case
by cgutman＠svn.reactos.org 27 Feb '12

27 Feb '12

Author: cgutman Date: Mon Feb 27 19:31:11 2012 New Revision: 55887 URL: http://svn.reactos.org/svn/reactos?rev=55887&view=rev Log: [NTOSKRNL] - Fix kernel memory corruption when a driver fails to initialize - Fix a handle leak in a failure case Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Mon Feb 27 19:31:11 2012 @@ -1538,6 +1538,10 @@ KernelMode, (PVOID*)&DriverObject, NULL); + + /* Close the extra handle */ + ZwClose(hDriver); + if (!NT_SUCCESS(Status)) { /* Fail */ @@ -1545,9 +1549,6 @@ ObDereferenceObject(DriverObject); return Status; } - - /* Close the extra handle */ - ZwClose(hDriver); DriverObject->HardwareDatabase = &IopHardwareDatabaseKey; DriverObject->DriverStart = ModuleObject ? ModuleObject->DllBase : 0; @@ -1564,6 +1565,7 @@ DriverObject->DriverSection = NULL; ObMakeTemporaryObject(DriverObject); ObDereferenceObject(DriverObject); + return Status; } else {

1 0

[ion] 55886: [NTOSKRNL]: Don't assert if there's no VAD found in NtFreeVirtualMemory... perhaps a wrong address was used on purpose (such as during a Winetest). Simply do what ROS does when a MAREA...
by ion＠svn.reactos.org 27 Feb '12

27 Feb '12

Author: ion Date: Mon Feb 27 17:17:31 2012 New Revision: 55886 URL: http://svn.reactos.org/svn/reactos?rev=55886&view=rev Log: [NTOSKRNL]: Don't assert if there's no VAD found in NtFreeVirtualMemory... perhaps a wrong address was used on purpose (such as during a Winetest). Simply do what ROS does when a MAREA is not found and return failure. However if a VAD *was* found, keep all the other ASSERTs... Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Mon Feb 27 17:17:31 2012 @@ -1149,6 +1149,12 @@ StartingAddress = (ULONG_PTR)PAGE_ALIGN(PBaseAddress); EndingAddress = ((ULONG_PTR)PBaseAddress + PRegionSize - 1) | (PAGE_SIZE - 1); Vad = MiLocateAddress((PVOID)StartingAddress); + if (!Vad) + { + DPRINT1("Unable to VAD for address 0x%p\n", BaseAddress); + Status = STATUS_UNABLE_TO_FREE_VM; + goto unlock_deref_and_return; + } /* This is the kind of VAD we expect right now */ ASSERT(Vad);

1 0

[sir_richard] 55885: [NTOS]: Continued preparations for VAD-based Virtual Memory. ASSERT in NtAllocateVirtualMemory any functionality that will not be supported by the VAD-based system (and is not ...
by sir_richard＠svn.reactos.org 27 Feb '12

27 Feb '12

Author: sir_richard Date: Mon Feb 27 17:10:44 2012 New Revision: 55885 URL: http://svn.reactos.org/svn/reactos?rev=55885&view=rev Log: [NTOS]: Continued preparations for VAD-based Virtual Memory. ASSERT in NtAllocateVirtualMemory any functionality that will not be supported by the VAD-based system (and is not really supported right now either). Make NtFreeVirtualMemory ASSERT that a correct VAD has been found when freeing memory -- which we always expect at this point. Also ASSERT that the VAD has a valid range and flags. [NTOS]: Do a more stringent check to refuse COPY_ON_WRITE flag sent through NtAllocateVirtualMemory. [NTOS]: For VM-based Memory Areas, acquire and then release the process working set lock while inserting the VAD, to simulate what the VAD-based Virtual Memory behavior will look like. [NTOS]: Disable paging for VM-based Memory Areas since this will not be supported with VADs. [KERNEL32]: CopyLoop was requesting 2 zero bits when calling NtAllocateVirtualMemory. Not sure if this was really the intent or not, but both the new as well as the old NtAllocateVirtualMemory do not support this (the new one will ASSERT). Since this functionality never worked, request 0 bits instead to avoid hitting the ASSERT. Any problems with what the VAD system will introduce should be revealed by now. From this build until the one which will have the VAD-based system in place, no further VM-related issues should crop up. Modified: trunk/reactos/dll/win32/kernel32/client/file/copy.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/rmap.c Modified: trunk/reactos/dll/win32/kernel32/client/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] Mon Feb 27 17:10:44 2012 @@ -46,7 +46,7 @@ *KeepDest = FALSE; errCode = NtAllocateVirtualMemory(NtCurrentProcess(), (PVOID *)&lpBuffer, - 2, + 0, &RegionSize, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Mon Feb 27 17:10:44 2012 @@ -750,23 +750,27 @@ } } + /* Now it's for real... assert on the things we don't yet support */ + ASSERT(ZeroBits == 0); + ASSERT((AllocationType & MEM_LARGE_PAGES) == 0); + ASSERT((AllocationType & MEM_PHYSICAL) == 0); + ASSERT((AllocationType & MEM_WRITE_WATCH) == 0); + ASSERT((AllocationType & MEM_TOP_DOWN) == 0); + ASSERT((AllocationType & MEM_RESET) == 0); + ASSERT(Process->VmTopDown == 0); + + /* Do not allow COPY_ON_WRITE through this API */ + if ((Protect & PAGE_WRITECOPY) || (Protect & PAGE_EXECUTE_WRITECOPY)) + { + DPRINT1("Illegal use of CopyOnWrite\n"); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + return STATUS_INVALID_PAGE_PROTECTION; + } + BaseAddress = (PVOID)PAGE_ROUND_DOWN(PBaseAddress); RegionSize = PAGE_ROUND_UP((ULONG_PTR)PBaseAddress + PRegionSize) - PAGE_ROUND_DOWN(PBaseAddress); - - - /* - * Copy on Write is reserved for system use. This case is a certain failure - * but there may be other cases...needs more testing - */ - if ((!BaseAddress || (AllocationType & MEM_RESERVE)) && - (Protect & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY))) - { - DPRINT1("Copy on write is not supported by VirtualAlloc\n"); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - return STATUS_INVALID_PAGE_PROTECTION; - } Type = (AllocationType & MEM_COMMIT) ? MEM_COMMIT : MEM_RESERVE; DPRINT("Type %x\n", Type); @@ -1053,6 +1057,8 @@ KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); KAPC_STATE ApcState; BOOLEAN Attached = FALSE; + ULONG_PTR StartingAddress, EndingAddress; + PMMVAD Vad; PAGED_CODE(); /* Only two flags are supported */ @@ -1134,9 +1140,23 @@ BaseAddress = (PVOID)PAGE_ROUND_DOWN((PBaseAddress)); - AddressSpace = &Process->Vm; - + /* Lock address space */ + AddressSpace = MmGetCurrentAddressSpace(); MmLockAddressSpace(AddressSpace); + ASSERT(Process->VmDeleted == 0); + + /* Compute start and end addresses, and locate the VAD */ + StartingAddress = (ULONG_PTR)PAGE_ALIGN(PBaseAddress); + EndingAddress = ((ULONG_PTR)PBaseAddress + PRegionSize - 1) | (PAGE_SIZE - 1); + Vad = MiLocateAddress((PVOID)StartingAddress); + + /* This is the kind of VAD we expect right now */ + ASSERT(Vad); + ASSERT(Vad->EndingVpn >= (EndingAddress >> PAGE_SHIFT)); + ASSERT(Vad->u.VadFlags.PrivateMemory == 1); + ASSERT(Vad->u.VadFlags.NoChange == 0); + ASSERT(Vad->u.VadFlags.VadType == VadNone); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); if (MemoryArea == NULL) { Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Mon Feb 27 17:10:44 2012 @@ -373,6 +373,8 @@ PMEMORY_AREA Node; PMEMORY_AREA PreviousNode; ULONG Depth = 0; + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + PETHREAD CurrentThread = PsGetCurrentThread(); /* Build a lame VAD if this is a user-space allocation */ if ((marea->EndingAddress < MmSystemRangeStart) && (marea->Type != MEMORY_AREA_OWNED_BY_ARM3)) @@ -400,8 +402,16 @@ Vad->u.VadFlags.Spare = 1; Vad->u.VadFlags.PrivateMemory = 1; Vad->u.VadFlags.Protection = MiMakeProtectionMask(marea->Protect); - MiInsertVad(Vad, MmGetAddressSpaceOwner(AddressSpace)); + + /* Pretend as if we own the working set */ + if (marea->Type == MEMORY_AREA_VIRTUAL_MEMORY) MiLockProcessWorkingSet(Process, CurrentThread); + + /* Insert the VAD */ + MiInsertVad(Vad, Process); marea->Vad = Vad; + + /* Release the working set */ + if (marea->Type == MEMORY_AREA_VIRTUAL_MEMORY) MiUnlockProcessWorkingSet(Process, CurrentThread); } else { Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=558… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Mon Feb 27 17:10:44 2012 @@ -159,29 +159,8 @@ } else if (Type == MEMORY_AREA_VIRTUAL_MEMORY) { - PageOp = MmGetPageOp(MemoryArea, Address < MmSystemRangeStart ? Process->UniqueProcessId : NULL, - Address, NULL, 0, MM_PAGEOP_PAGEOUT, TRUE); - if (PageOp == NULL) - { - MmUnlockAddressSpace(AddressSpace); - if (Address < MmSystemRangeStart) - { - ExReleaseRundownProtection(&Process->RundownProtect); - ObDereferenceObject(Process); - } - return(STATUS_UNSUCCESSFUL); - } - - /* - * Release locks now we have a page op. - */ - MmUnlockAddressSpace(AddressSpace); - - /* - * Do the actual page out work. - */ - Status = MmPageOutVirtualMemory(AddressSpace, MemoryArea, - Address, PageOp); + /* Do not page out virtual memory during ARM3 transition */ + Status = STATUS_SUCCESS; } else {

1 0

[spetreolle] 55884: [USETUP] Fix installation directories set into unattend.inf, they were ignored and installed always into \ReactOS.
by spetreolle＠svn.reactos.org 27 Feb '12

27 Feb '12

Author: spetreolle Date: Mon Feb 27 16:37:48 2012 New Revision: 55884 URL: http://svn.reactos.org/svn/reactos?rev=55884&view=rev Log: [USETUP] Fix installation directories set into unattend.inf, they were ignored and installed always into \ReactOS. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Feb 27 16:37:48 2012 @@ -506,10 +506,10 @@ UnattendDestinationPartitionNumber = IntValue; - /* Search for 'DestinationPartitionNumber' in the 'Unattend' section */ - if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"DestinationPartitionNumber", &Context)) - { - DPRINT("SetupFindFirstLine() failed for key 'DestinationPartitionNumber'\n"); + /* Search for 'InstallationDirectory' in the 'Unattend' section */ + if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"InstallationDirectory", &Context)) + { + DPRINT("SetupFindFirstLine() failed for key 'InstallationDirectory'\n"); SetupCloseInfFile(UnattendInf); return; } @@ -2594,8 +2594,6 @@ PDISKENTRY DiskEntry; PPARTENTRY PartEntry; WCHAR InstallDir[51]; - PWCHAR DefaultPath; - INFCONTEXT Context; ULONG Length; if (PartitionList == NULL || @@ -2609,22 +2607,10 @@ DiskEntry = PartitionList->CurrentDisk; PartEntry = PartitionList->CurrentPartition; - /* Search for 'DefaultPath' in the 'SetupData' section */ - if (!SetupFindFirstLineW(SetupInf, L"SetupData", L"DefaultPath", &Context)) - { - MUIDisplayError(ERROR_FIND_SETUPDATA, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - - /* Read the 'DefaultPath' data */ - if (INF_GetData(&Context, NULL, &DefaultPath)) - { - wcscpy(InstallDir, DefaultPath); - } + if (IsUnattendedSetup) + wcscpy(InstallDir, UnattendInstallationDirectory); else - { wcscpy(InstallDir, L"\\ReactOS"); - } Length = wcslen(InstallDir); CONSOLE_SetInputTextXY(8, 11, 51, InstallDir);

1 0

[sir_richard] 55883: [NTOS]: Preparations for the VAD-based Virtual Memory system begin. Disable changing protection on Virtual Memory pages, and make all pages PAGE_EXECUTE_READWRITE for now. In t...
by sir_richard＠svn.reactos.org 27 Feb '12

27 Feb '12

Author: sir_richard Date: Mon Feb 27 16:12:11 2012 New Revision: 55883 URL: http://svn.reactos.org/svn/reactos?rev=55883&view=rev Log: [NTOS]: Preparations for the VAD-based Virtual Memory system begin. Disable changing protection on Virtual Memory pages, and make all pages PAGE_EXECUTE_READWRITE for now. In theory, this should not cause any real problems, and sets the stage for the initial functionality regressions that the VAD-based system will introduce. I will eventually plan on fixing them. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Mon Feb 27 16:12:11 2012 @@ -527,9 +527,7 @@ if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY) { - Status = MmProtectAnonMem(AddressSpace, MemoryArea, *BaseAddress, - *NumberOfBytesToProtect, NewAccessProtection, - OldAccessProtection); + Status = STATUS_SUCCESS; } else if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) { @@ -775,6 +773,11 @@ AddressSpace = &Process->Vm; MmLockAddressSpace(AddressSpace); + + // + // Force PAGE_EXECUTE_READWRITE for everything, for now + // + Protect = PAGE_EXECUTE_READWRITE; if (PBaseAddress != 0) { @@ -1249,84 +1252,4 @@ return(Status); } -NTSTATUS -NTAPI -MmProtectAnonMem(PMMSUPPORT AddressSpace, - PMEMORY_AREA MemoryArea, - PVOID BaseAddress, - SIZE_T Length, - ULONG Protect, - PULONG OldProtect) -{ - PMM_REGION Region; - NTSTATUS Status = STATUS_SUCCESS; - ULONG_PTR LengthCount = 0; - - /* Search all Regions in MemoryArea up to Length */ - /* Every Region up to Length must be committed for success */ - for (;;) - { - Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - (PVOID)((ULONG_PTR)BaseAddress + LengthCount), NULL); - - /* If a Region was found and it is committed */ - if ((Region) && (Region->Type == MEM_COMMIT)) - { - LengthCount += Region->Length; - if (Length <= LengthCount) break; - continue; - } - /* If Region was found and it is not commited */ - else if (Region) - { - Status = STATUS_NOT_COMMITTED; - break; - } - /* If no Region was found at all */ - else if (LengthCount == 0) - { - Status = STATUS_INVALID_ADDRESS; - break; - } - } - - if (NT_SUCCESS(Status)) - { - *OldProtect = Region->Protect; - Status = MmAlterRegion(AddressSpace, MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, Length, Region->Type, Protect, - MmModifyAttributes); - } - - return (Status); -} - -NTSTATUS NTAPI -MmQueryAnonMem(PMEMORY_AREA MemoryArea, - PVOID Address, - PMEMORY_BASIC_INFORMATION Info, - PSIZE_T ResultLength) -{ - PMM_REGION Region; - PVOID RegionBase = NULL; - - Info->BaseAddress = (PVOID)PAGE_ROUND_DOWN(Address); - - Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - Address, &RegionBase); - Info->BaseAddress = RegionBase; - Info->AllocationBase = MemoryArea->StartingAddress; - Info->AllocationProtect = MemoryArea->Protect; - Info->RegionSize = Region->Length; - Info->State = Region->Type; - Info->Protect = Region->Protect; - Info->Type = MEM_PRIVATE; - - *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - return(STATUS_SUCCESS); -} - /* EOF */

1 0

[ion] 55882: [NTOSKRNL]: Drop the reference on the PDE for kernel stack pages being deleted, now that zekflop has made all PDEs ARM3-owned.
by ion＠svn.reactos.org 27 Feb '12

27 Feb '12

Author: ion Date: Mon Feb 27 16:10:30 2012 New Revision: 55882 URL: http://svn.reactos.org/svn/reactos?rev=55882&view=rev Log: [NTOSKRNL]: Drop the reference on the PDE for kernel stack pages being deleted, now that zekflop has made all PDEs ARM3-owned. Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Mon Feb 27 16:10:30 2012 @@ -201,7 +201,7 @@ /* Delete the pages */ MiDeleteVirtualAddresses((ULONG_PTR)Teb, TebEnd, NULL); - + /* Release the working set */ MiUnlockProcessWorkingSet(Process, Thread); @@ -224,7 +224,7 @@ PMMPTE PointerPte; PFN_NUMBER PageFrameNumber, PageTableFrameNumber; PFN_COUNT StackPages; - PMMPFN Pfn1;//, Pfn2; + PMMPFN Pfn1, Pfn2; ULONG i; KIRQL OldIrql; @@ -256,15 +256,14 @@ /* Get the PTE's page */ PageFrameNumber = PFN_FROM_PTE(PointerPte); Pfn1 = MiGetPfnEntry(PageFrameNumber); -#if 1 // ARM3 might not own the page table, so don't take this risk. Leak it instead! + /* Now get the page of the page table mapping it */ PageTableFrameNumber = Pfn1->u4.PteFrame; - //Pfn2 = MiGetPfnEntry(PageTableFrameNumber); + Pfn2 = MiGetPfnEntry(PageTableFrameNumber); /* Remove a shared reference, since the page is going away */ - DPRINT("SystemPTE PDE: %lx\n", PageTableFrameNumber); - //MiDecrementShareCount(Pfn2, PageTableFrameNumber); -#endif + MiDecrementShareCount(Pfn2, PageTableFrameNumber); + /* Set the special pending delete marker */ MI_SET_PFN_DELETED(Pfn1); @@ -925,7 +924,7 @@ Pfn1 = MiGetPfnEntry(CurrentProcess->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT); ASSERT(Pfn1->u4.PteFrame == MiGetPfnEntryIndex(Pfn1)); Pfn1->u1.Event = (PKEVENT)CurrentProcess; - + /* Map the process working set in kernel space */ sysPte = MiReserveSystemPtes(1, SystemPteSpace); MI_MAKE_HARDWARE_PTE_KERNEL(&tempPte, sysPte, MM_READWRITE, CurrentProcess->WorkingSetPage); @@ -1365,7 +1364,7 @@ PFN_NUMBER PageFrameIndex; //ASSERT(Process->CommitCharge == 0); - + /* Acquire the PFN lock */ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); @@ -1382,7 +1381,7 @@ MiDecrementShareCount(Pfn1, Process->WorkingSetPage); ASSERT((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress)); MiReleaseSystemPtes(MiAddressToPte(Process->Vm.VmWorkingSetList), 1, SystemPteSpace); - + /* Now map hyperspace and its page table */ PageFrameIndex = Process->Pcb.DirectoryTableBase[1] >> PAGE_SHIFT; Pfn1 = MiGetPfnEntry(PageFrameIndex); @@ -1393,14 +1392,14 @@ MiDecrementShareCount(Pfn2, Pfn1->u4.PteFrame); MiDecrementShareCount(Pfn1, PageFrameIndex); ASSERT((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress)); - + /* Finally, nuke the PDE itself */ PageFrameIndex = Process->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT; Pfn1 = MiGetPfnEntry(PageFrameIndex); MI_SET_PFN_DELETED(Pfn1); MiDecrementShareCount(Pfn1, PageFrameIndex); MiDecrementShareCount(Pfn1, PageFrameIndex); - + /* Page table is now dead. Bye bye... */ ASSERT((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress)); } @@ -1415,7 +1414,7 @@ /* No support for sessions yet */ ASSERT(Process->Session == 0); - + /* Clear out the PDE pages */ Process->Pcb.DirectoryTableBase[0] = 0; Process->Pcb.DirectoryTableBase[1] = 0;

1 0

[ion] 55881: [NTOSKRNL]: This should not fix anything.
by ion＠svn.reactos.org 27 Feb '12

27 Feb '12

Author: ion Date: Mon Feb 27 15:50:25 2012 New Revision: 55881 URL: http://svn.reactos.org/svn/reactos?rev=55881&view=rev Log: [NTOSKRNL]: This should not fix anything. 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] Mon Feb 27 15:50:25 2012 @@ -40,7 +40,7 @@ PPOOL_TRACKER_TABLE PoolTrackTable; PPOOL_TRACKER_BIG_PAGES PoolBigPageTable; KSPIN_LOCK ExpTaggedPoolLock; -ULONG PoolHitTag = 'ht '; +ULONG PoolHitTag; BOOLEAN ExStopBadTags; KSPIN_LOCK ExpLargePoolTableLock; LONG ExpPoolBigEntriesInUse;

1 0

[ion] 55880: [CMLIB]: Great job -- crashing trunk on a pool tag just so people can be forced to know what it is. Change the registry pool tag from "th" (wtf?) to "CM25" which is a bit closer to Win...
by ion＠svn.reactos.org 27 Feb '12

27 Feb '12

Author: ion Date: Mon Feb 27 15:28:06 2012 New Revision: 55880 URL: http://svn.reactos.org/svn/reactos?rev=55880&view=rev Log: [CMLIB]: Great job -- crashing trunk on a pool tag just so people can be forced to know what it is. Change the registry pool tag from "th" (wtf?) to "CM25" which is a bit closer to Windows. In reality all of TAG_CM should be broken out in many more pieces. Fixes boot breakpoint. Modified: trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=5588… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Mon Feb 27 15:28:06 2012 @@ -113,7 +113,7 @@ #endif #endif -#define TAG_CM 0x68742020 +#define TAG_CM 'CM25' #define CMAPI NTAPI

1 0

[sir_richard] 55879: [NTOS]: Handle memory allocation failures correctly, supporting all the required debug and caller flags (such as RAISE_ON_FAILURE). We no longer simply just return "NULL" in fa...
by sir_richard＠svn.reactos.org 27 Feb '12

27 Feb '12

Author: sir_richard Date: Mon Feb 27 08:21:15 2012 New Revision: 55879 URL: http://svn.reactos.org/svn/reactos?rev=55879&view=rev Log: [NTOS]: Handle memory allocation failures correctly, supporting all the required debug and caller flags (such as RAISE_ON_FAILURE). We no longer simply just return "NULL" in failure cases. [NTOS]: Implement counters for paged and nonpaged pool. First-stage setup now shows Kernel Pool values again, as does Task Manager. Fixes the regression introduced when pool/non-paged pool was no longer managed through "memory consumer" API. [NTOS]: Add more debugging paths and flags that were sent over from the "Aleksey Pool Patch". Most of them are not implemented. [NTOS]: Fix a missing case when a pool header check was not being done. [NTOS]: Check IRQL levels during pool allocation and free. With tags and the counters, pool leaks should be massively more debuggable now. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Mon Feb 27 08:21:15 2012 @@ -456,7 +456,17 @@ #define SSI_DEF(n) \ static NTSTATUS SSI_USE(n) (PVOID Buffer, ULONG Size) - +VOID +NTAPI +ExQueryPoolUsage(OUT PULONG PagedPoolPages, + OUT PULONG NonPagedPoolPages, + OUT PULONG PagedPoolAllocs, + OUT PULONG PagedPoolFrees, + OUT PULONG PagedPoolLookasideHits, + OUT PULONG NonPagedPoolAllocs, + OUT PULONG NonPagedPoolFrees, + OUT PULONG NonPagedPoolLookasideHits); + /* Class 0 - Basic Information */ QSI_DEF(SystemBasicInformation) { @@ -571,21 +581,27 @@ Spi->MappedPagesWriteCount = 0; /* FIXME */ Spi->MappedWriteIoCount = 0; /* FIXME */ - Spi->PagedPoolPages = 0; /* FIXME */ - Spi->PagedPoolAllocs = 0; /* FIXME */ - Spi->PagedPoolFrees = 0; /* FIXME */ - Spi->NonPagedPoolPages = 0; /* FIXME */ - Spi->NonPagedPoolAllocs = 0; /* FIXME */ - Spi->NonPagedPoolFrees = 0; /* FIXME */ - + Spi->PagedPoolPages = 0; + Spi->NonPagedPoolPages = 0; + Spi->PagedPoolAllocs = 0; + Spi->PagedPoolFrees = 0; + Spi->PagedPoolLookasideHits = 0; + Spi->NonPagedPoolAllocs = 0; + Spi->NonPagedPoolFrees = 0; + Spi->NonPagedPoolLookasideHits = 0; + ExQueryPoolUsage(&Spi->PagedPoolPages, + &Spi->NonPagedPoolPages, + &Spi->PagedPoolAllocs, + &Spi->PagedPoolFrees, + &Spi->PagedPoolLookasideHits, + &Spi->NonPagedPoolAllocs, + &Spi->NonPagedPoolFrees, + &Spi->NonPagedPoolLookasideHits); Spi->FreeSystemPtes = 0; /* FIXME */ Spi->ResidentSystemCodePage = 0; /* FIXME */ Spi->TotalSystemDriverPages = 0; /* FIXME */ - Spi->TotalSystemCodePages = 0; /* FIXME */ - Spi->NonPagedPoolLookasideHits = 0; /* FIXME */ - Spi->PagedPoolLookasideHits = 0; /* FIXME */ Spi->Spare3Count = 0; /* FIXME */ Spi->ResidentSystemCachePage = MiMemoryConsumers[MC_CACHE].PagesUsed; 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] Mon Feb 27 08:21:15 2012 @@ -40,10 +40,12 @@ PPOOL_TRACKER_TABLE PoolTrackTable; PPOOL_TRACKER_BIG_PAGES PoolBigPageTable; KSPIN_LOCK ExpTaggedPoolLock; -ULONG PoolHitTag; +ULONG PoolHitTag = 'ht '; BOOLEAN ExStopBadTags; KSPIN_LOCK ExpLargePoolTableLock; LONG ExpPoolBigEntriesInUse; +ULONG ExpPoolFlags; +ULONG ExPoolFailures; /* Pool block/header/list access macros */ #define POOL_ENTRY(x) (PPOOL_HEADER)((ULONG_PTR)(x) - sizeof(POOL_HEADER)) @@ -298,6 +300,31 @@ { /* Otherwise, the blocks are messed up */ KeBugCheckEx(BAD_POOL_HEADER, 10, (ULONG_PTR)Block, __LINE__, (ULONG_PTR)Entry); + } +} + +FORCEINLINE +VOID +ExpCheckPoolIrqlLevel(IN POOL_TYPE PoolType, + IN ULONG NumberOfBytes, + IN PVOID Entry) +{ + // + // Validate IRQL: It must be APC_LEVEL or lower for Paged Pool, and it must + // be DISPATCH_LEVEL or lower for Non Paged Pool + // + if (((PoolType & BASE_POOL_TYPE_MASK) == PagedPool) ? + (KeGetCurrentIrql() > APC_LEVEL) : + (KeGetCurrentIrql() > DISPATCH_LEVEL)) + { + // + // Take the system down + // + KeBugCheckEx(BAD_POOL_CALLER, + !Entry ? POOL_ALLOC_IRQL_INVALID : POOL_FREE_IRQL_INVALID, + KeGetCurrentIrql(), + PoolType, + !Entry ? NumberOfBytes : (ULONG_PTR)Entry); } } @@ -938,6 +965,7 @@ // PoolVector[PagedPool] = Descriptor; ExpPagedPoolMutex = (PKGUARDED_MUTEX)(Descriptor + 1); + ExpPagedPoolDescriptor[0] = Descriptor; KeInitializeGuardedMutex(ExpPagedPoolMutex); ExInitializePoolDescriptor(Descriptor, PagedPool, @@ -1305,6 +1333,70 @@ return PoolTag; } +VOID +NTAPI +ExQueryPoolUsage(OUT PULONG PagedPoolPages, + OUT PULONG NonPagedPoolPages, + OUT PULONG PagedPoolAllocs, + OUT PULONG PagedPoolFrees, + OUT PULONG PagedPoolLookasideHits, + OUT PULONG NonPagedPoolAllocs, + OUT PULONG NonPagedPoolFrees, + OUT PULONG NonPagedPoolLookasideHits) +{ + ULONG i; + PPOOL_DESCRIPTOR PoolDesc; + + // + // Assume all failures + // + *PagedPoolPages = 0; + *PagedPoolAllocs = 0; + *PagedPoolFrees = 0; + + // + // Tally up the totals for all the apged pool + // + for (i = 0; i < ExpNumberOfPagedPools + 1; i++) + { + PoolDesc = ExpPagedPoolDescriptor[i]; + *PagedPoolPages += PoolDesc->TotalPages + PoolDesc->TotalBigPages; + *PagedPoolAllocs += PoolDesc->RunningAllocs; + *PagedPoolFrees += PoolDesc->RunningDeAllocs; + } + + // + // The first non-paged pool has a hardcoded well-known descriptor name + // + PoolDesc = &NonPagedPoolDescriptor; + *NonPagedPoolPages = PoolDesc->TotalPages + PoolDesc->TotalBigPages; + *NonPagedPoolAllocs = PoolDesc->RunningAllocs; + *NonPagedPoolFrees = PoolDesc->RunningDeAllocs; + + // + // If the system has more than one non-paged pool, copy the other descriptor + // totals as well + // +#if 0 + if (ExpNumberOfNonPagedPools > 1) + { + for (i = 0; i < ExpNumberOfNonPagedPools; i++) + { + PoolDesc = ExpNonPagedPoolDescriptor[i]; + *NonPagedPoolPages += PoolDesc->TotalPages + PoolDesc->TotalBigPages; + *NonPagedPoolAllocs += PoolDesc->RunningAllocs; + *NonPagedPoolFrees += PoolDesc->RunningDeAllocs; + } + } +#endif + + // + // FIXME: Not yet supported + // + *NonPagedPoolLookasideHits += 0; + *PagedPoolLookasideHits += 0; +} + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -1321,6 +1413,7 @@ PPOOL_HEADER Entry, NextEntry, FragmentEntry; KIRQL OldIrql; USHORT BlockSize, i; + ULONG OriginalType; // // Some sanity checks @@ -1328,27 +1421,55 @@ ASSERT(Tag != 0); ASSERT(Tag != ' GIB'); ASSERT(NumberOfBytes != 0); + ExpCheckPoolIrqlLevel(PoolType, NumberOfBytes, NULL); + + // + // Not supported in ReactOS + // + ASSERT(!(PoolType & SESSION_POOL_MASK)); + + // + // Check if verifier or special pool is enabled + // + if (ExpPoolFlags & (POOL_FLAG_VERIFIER | POOL_FLAG_SPECIAL_POOL)) + { + // + // For verifier, we should call the verification routine + // + if (ExpPoolFlags & POOL_FLAG_VERIFIER) + { + DPRINT1("Driver Verifier is not yet supported\n"); + } + + // + // For special pool, we check if this is a suitable allocation and do + // the special allocation if needed + // + if (ExpPoolFlags & POOL_FLAG_SPECIAL_POOL) + { + // + // Check if this is a special pool allocation + // + if (MmUseSpecialPool(NumberOfBytes, Tag)) + { + // + // Try to allocate using special pool + // + Entry = MmAllocateSpecialPool(NumberOfBytes, Tag, PoolType, 2); + if (Entry) return Entry; + } + } + } // // Get the pool type and its corresponding vector for this request // + OriginalType = PoolType; PoolType = PoolType & BASE_POOL_TYPE_MASK; PoolDesc = PoolVector[PoolType]; ASSERT(PoolDesc != NULL); // - // Check if this is a special pool allocation - // - if (MmUseSpecialPool(NumberOfBytes, Tag)) - { - // - // Try to allocate using special pool - // - Entry = MmAllocateSpecialPool(NumberOfBytes, Tag, PoolType, 2); - if (Entry) return Entry; - } - - // // Check if this is a big page allocation // if (NumberOfBytes > POOL_MAX_ALLOC) @@ -1356,15 +1477,68 @@ // // Allocate pages for it // - Entry = MiAllocatePoolPages(PoolType, NumberOfBytes); - if (!Entry) return NULL; - + Entry = MiAllocatePoolPages(OriginalType, NumberOfBytes); + if (!Entry) + { + // + // Must succeed pool is deprecated, but still supported. These allocation + // failures must cause an immediate bugcheck + // + if (OriginalType & MUST_SUCCEED_POOL_MASK) + { + KeBugCheckEx(MUST_SUCCEED_POOL_EMPTY, + NumberOfBytes, + NonPagedPoolDescriptor.TotalPages, + NonPagedPoolDescriptor.TotalBigPages, + 0); + } + + // + // Internal debugging + // + ExPoolFailures++; + + // + // This flag requests printing failures, and can also further specify + // breaking on failures + // + if (ExpPoolFlags & POOL_FLAG_DBGPRINT_ON_FAILURE) + { + DPRINT1("EX: ExAllocatePool (%p, 0x%x) returning NULL\n", + NumberOfBytes, + OriginalType); + if (ExpPoolFlags & POOL_FLAG_CRASH_ON_FAILURE) DbgBreakPoint(); + } + + // + // Finally, this flag requests an exception, which we are more than + // happy to raise! + // + if (OriginalType & POOL_RAISE_IF_ALLOCATION_FAILURE) + { + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); + } + } + + // + // Increment required counters + // + InterlockedExchangeAdd((PLONG)&PoolDesc->TotalBigPages, BYTES_TO_PAGES(NumberOfBytes)); + InterlockedExchangeAddSizeT(&PoolDesc->TotalBytes, NumberOfBytes); + InterlockedIncrement((PLONG)&PoolDesc->RunningAllocs); + // // Add a tag for the big page allocation and switch to the generic "BIG" // tag if we failed to do so, then insert a tracker for this alloation. // - if (!ExpAddTagForBigPages(Entry, Tag, BYTES_TO_PAGES(NumberOfBytes), PoolType)) Tag = ' GIB'; - ExpInsertPoolTracker(Tag, ROUND_TO_PAGES(NumberOfBytes), PoolType); + if (!ExpAddTagForBigPages(Entry, + Tag, + BYTES_TO_PAGES(NumberOfBytes), + OriginalType)) + { + Tag = ' GIB'; + } + ExpInsertPoolTracker(Tag, ROUND_TO_PAGES(NumberOfBytes), OriginalType); return Entry; } @@ -1550,11 +1724,17 @@ ExUnlockPool(PoolDesc, OldIrql); // + // Increment required counters + // + InterlockedExchangeAddSizeT(&PoolDesc->TotalBytes, Entry->BlockSize * POOL_BLOCK_SIZE); + InterlockedIncrement((PLONG)&PoolDesc->RunningAllocs); + + // // Track this allocation // ExpInsertPoolTracker(Tag, Entry->BlockSize * POOL_BLOCK_SIZE, - PoolType); + OriginalType); // // Return the pool allocation @@ -1570,8 +1750,56 @@ // There were no free entries left, so we have to allocate a new fresh page // Entry = MiAllocatePoolPages(PoolType, PAGE_SIZE); - if (Entry == NULL) return NULL; - + if (!Entry) + { + // + // Must succeed pool is deprecated, but still supported. These allocation + // failures must cause an immediate bugcheck + // + if (OriginalType & MUST_SUCCEED_POOL_MASK) + { + KeBugCheckEx(MUST_SUCCEED_POOL_EMPTY, + PAGE_SIZE, + NonPagedPoolDescriptor.TotalPages, + NonPagedPoolDescriptor.TotalBigPages, + 0); + } + + // + // Internal debugging + // + ExPoolFailures++; + + // + // This flag requests printing failures, and can also further specify + // breaking on failures + // + if (ExpPoolFlags & POOL_FLAG_DBGPRINT_ON_FAILURE) + { + DPRINT1("EX: ExAllocatePool (%p, 0x%x) returning NULL\n", + NumberOfBytes, + OriginalType); + if (ExpPoolFlags & POOL_FLAG_CRASH_ON_FAILURE) DbgBreakPoint(); + } + + // + // Finally, this flag requests an exception, which we are more than + // happy to raise! + // + if (OriginalType & POOL_RAISE_IF_ALLOCATION_FAILURE) + { + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); + } + + // + // Return NULL to the caller in all other cases + // + return NULL; + } + + // + // Setup the entry data + // Entry->Ulong1 = 0; Entry->BlockSize = i; Entry->PoolType = PoolType + 1; @@ -1589,6 +1817,12 @@ FragmentEntry->PreviousSize = i; // + // Increment required counters + // + InterlockedIncrement((PLONG)&PoolDesc->TotalPages); + InterlockedExchangeAddSizeT(&PoolDesc->TotalBytes, Entry->BlockSize * POOL_BLOCK_SIZE); + + // // Now check if enough free bytes remained for us to have a "full" entry, // which contains enough bytes for a linked list and thus can be used for // allocations (up to 8 bytes...) @@ -1614,10 +1848,18 @@ ExpCheckPoolBlocks(Entry); ExUnlockPool(PoolDesc, OldIrql); } - - // - // Track this allocation - // + else + { + // + // Simply do a sanity check + // + ExpCheckPoolBlocks(Entry); + } + + // + // Increment performance counters and track this allocation + // + InterlockedIncrement((PLONG)&PoolDesc->RunningAllocs); ExpInsertPoolTracker(Tag, Entry->BlockSize * POOL_BLOCK_SIZE, PoolType); @@ -1659,18 +1901,67 @@ PPOOL_DESCRIPTOR PoolDesc; ULONG Tag; BOOLEAN Combined = FALSE; - PFN_NUMBER PageCount; - - // - // Check if it was allocated from a special pool - // - if (MmIsSpecialPoolAddress(P)) - { - // - // It is, so handle it via special pool free routine - // - MmFreeSpecialPool(P); - return; + PFN_NUMBER PageCount, RealPageCount; + + // + // Check if any of the debug flags are enabled + // + if (ExpPoolFlags & (POOL_FLAG_CHECK_TIMERS | + POOL_FLAG_CHECK_WORKERS | + POOL_FLAG_CHECK_RESOURCES | + POOL_FLAG_VERIFIER | + POOL_FLAG_CHECK_DEADLOCK | + POOL_FLAG_SPECIAL_POOL)) + { + // + // Check if special pool is enabled + // + if (ExpPoolFlags & POOL_FLAG_SPECIAL_POOL) + { + // + // Check if it was allocated from a special pool + // + if (MmIsSpecialPoolAddress(P)) + { + // + // Was deadlock verification also enabled? We can do some extra + // checks at this point + // + if (ExpPoolFlags & POOL_FLAG_CHECK_DEADLOCK) + { + DPRINT1("Verifier not yet supported\n"); + } + + // + // It is, so handle it via special pool free routine + // + MmFreeSpecialPool(P); + return; + } + } + + // + // For non-big page allocations, we'll do a bunch of checks in here + // + if (PAGE_ALIGN(P) != P) + { + // + // Get the entry for this pool allocation + // The pointer math here may look wrong or confusing, but it is quite right + // + Entry = P; + Entry--; + + // + // Get the pool type + // + PoolType = (Entry->PoolType - 1) & BASE_POOL_TYPE_MASK; + + // + // FIXME: Many other debugging checks go here + // + ExpCheckPoolIrqlLevel(PoolType, 0, P); + } } // @@ -1691,6 +1982,7 @@ // the PFN database. // PoolType = MmDeterminePoolType(P); + ExpCheckPoolIrqlLevel(PoolType, 0, P); Tag = ExpFindAndRemoveTagBigPages(P, &PageCount, PoolType); if (!Tag) { @@ -1708,7 +2000,42 @@ // tracker now // ExpRemovePoolTracker(Tag, PageCount << PAGE_SHIFT, PoolType); - MiFreePoolPages(P); + + // + // Check if any of the debug flags are enabled + // + if (ExpPoolFlags & (POOL_FLAG_CHECK_TIMERS | + POOL_FLAG_CHECK_WORKERS | + POOL_FLAG_CHECK_RESOURCES | + POOL_FLAG_CHECK_DEADLOCK)) + { + // + // Was deadlock verification also enabled? We can do some extra + // checks at this point + // + if (ExpPoolFlags & POOL_FLAG_CHECK_DEADLOCK) + { + DPRINT1("Verifier not yet supported\n"); + } + + // + // FIXME: Many debugging checks go here + // + } + + // + // Update counters + // + PoolDesc = PoolVector[PoolType]; + InterlockedIncrement((PLONG)&PoolDesc->RunningDeAllocs); + InterlockedExchangeAddSizeT(&PoolDesc->TotalBytes, -PageCount << PAGE_SHIFT); + + // + // Do the real free now and update the last counter with the big page count + // + RealPageCount = MiFreePoolPages(P); + ASSERT(RealPageCount == PageCount); + InterlockedExchangeAdd((PLONG)&PoolDesc->TotalBigPages, -RealPageCount); return; } @@ -1728,6 +2055,11 @@ PoolDesc = PoolVector[PoolType]; // + // Make sure that the IRQL makes sense + // + ExpCheckPoolIrqlLevel(PoolType, 0, P); + + // // Get the pool tag and get rid of the PROTECTED_POOL flag // Tag = Entry->PoolTag; @@ -1744,6 +2076,12 @@ // Get the pointer to the next entry // NextEntry = POOL_BLOCK(Entry, BlockSize); + + // + // Update performance counters + // + InterlockedIncrement((PLONG)&PoolDesc->RunningDeAllocs); + InterlockedExchangeAddSizeT(&PoolDesc->TotalBytes, -BlockSize * sizeof(POOL_BLOCK_SIZE)); // // Acquire the pool lock @@ -1854,9 +2192,11 @@ (PAGE_ALIGN(POOL_NEXT_BLOCK(Entry)) == POOL_NEXT_BLOCK(Entry))) { // - // In this case, release the pool lock, and free the page + // In this case, release the pool lock, update the performance counter, + // and free the page // ExUnlockPool(PoolDesc, OldIrql); + InterlockedExchangeAdd((PLONG)&PoolDesc->TotalPages, -1); MiFreePoolPages(Entry); return; } 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] Mon Feb 27 08:21:15 2012 @@ -286,6 +286,40 @@ #define POOL_LISTS_PER_PAGE (PAGE_SIZE / POOL_BLOCK_SIZE) #define BASE_POOL_TYPE_MASK 1 #define POOL_MAX_ALLOC (PAGE_SIZE - (sizeof(POOL_HEADER) + POOL_BLOCK_SIZE)) + +// +// Pool debugging/analysis/tracing flags +// +#define POOL_FLAG_CHECK_TIMERS 0x1 +#define POOL_FLAG_CHECK_WORKERS 0x2 +#define POOL_FLAG_CHECK_RESOURCES 0x4 +#define POOL_FLAG_VERIFIER 0x8 +#define POOL_FLAG_CHECK_DEADLOCK 0x10 +#define POOL_FLAG_SPECIAL_POOL 0x20 +#define POOL_FLAG_DBGPRINT_ON_FAILURE 0x40 +#define POOL_FLAG_CRASH_ON_FAILURE 0x80 + +// +// BAD_POOL_HEADER codes during pool bugcheck +// +#define POOL_CORRUPTED_LIST 3 +#define POOL_SIZE_OR_INDEX_MISMATCH 5 +#define POOL_ENTRIES_NOT_ALIGNED_PREVIOUS 6 +#define POOL_HEADER_NOT_ALIGNED 7 +#define POOL_HEADER_IS_ZERO 8 +#define POOL_ENTRIES_NOT_ALIGNED_NEXT 9 +#define POOL_ENTRY_NOT_FOUND 10 + +// +// BAD_POOL_CALLER codes during pool bugcheck +// +#define POOL_ENTRY_CORRUPTED 1 +#define POOL_ENTRY_ALREADY_FREE 6 +#define POOL_ENTRY_NOT_ALLOCATED 7 +#define POOL_ALLOC_IRQL_INVALID 8 +#define POOL_FREE_IRQL_INVALID 9 +#define POOL_BILLED_PROCESS_INVALID 13 +#define POOL_HEADER_SIZE_INVALID 32 typedef struct _POOL_DESCRIPTOR {

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
58
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2012