Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 64593: [NTOSKRNL] Modify MiCreatePebOrTeb to use MiInsertVadEx instead of doing everything "by hand". No, this does not "change Windows behavior". The TEB creation works exactly as befor...
by tkreuzer＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: tkreuzer Date: Wed Oct 8 00:31:49 2014 New Revision: 64593 URL: http://svn.reactos.org/svn/reactos?rev=64593&view=rev Log: [NTOSKRNL] Modify MiCreatePebOrTeb to use MiInsertVadEx instead of doing everything "by hand". No, this does not "change Windows behavior". The TEB creation works exactly as before, and the only difference in the PEB creation is that if the first attempt fails, we will no longer try again from the top of the address space. But since this cannot fail in the first place, at least not due to the VA range not being free, another attempt would be pointless anyway! 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] Wed Oct 8 00:31:49 2014 @@ -50,14 +50,11 @@ IN ULONG Size, OUT PULONG_PTR BaseAddress) { - PETHREAD Thread = PsGetCurrentThread(); PMMVAD_LONG Vad; NTSTATUS Status; ULONG_PTR HighestAddress, RandomBase; ULONG AlignedSize; LARGE_INTEGER CurrentTime; - TABLE_SEARCH_RESULT Result = TableFoundNode; - PMMADDRESS_NODE Parent; /* Allocate a VAD */ Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD_LONG), 'ldaV'); @@ -70,6 +67,7 @@ Vad->u.VadFlags.PrivateMemory = TRUE; Vad->u.VadFlags.Protection = MM_READWRITE; Vad->u.VadFlags.NoChange = TRUE; + Vad->u1.Parent = NULL; /* Setup the secondary flags to make it a secured, writable, long VAD */ Vad->u2.LongFlags2 = 0; @@ -77,10 +75,11 @@ Vad->u2.VadFlags2.LongVad = TRUE; Vad->u2.VadFlags2.ReadOnly = FALSE; - /* Lock the process address space */ - KeAcquireGuardedMutex(&Process->AddressCreationLock); + Vad->ControlArea = NULL; // For Memory-Area hack + Vad->FirstPrototypePte = NULL; /* Check if this is a PEB creation */ + ASSERT(sizeof(TEB) != sizeof(PEB)); if (Size == sizeof(PEB)) { /* Create a random value to select one page in a 64k region */ @@ -100,68 +99,27 @@ /* Calculate the highest allowed address */ HighestAddress = RandomBase + AlignedSize - 1; - - /* Try to find something below the random upper margin */ - Result = MiFindEmptyAddressRangeDownTree(ROUND_TO_PAGES(Size), - HighestAddress, - PAGE_SIZE, - &Process->VadRoot, - BaseAddress, - &Parent); - } - - /* Check for success. TableFoundNode means nothing free. */ - if (Result == TableFoundNode) - { - /* For TEBs, or if a PEB location couldn't be found, scan the VAD root */ - Result = MiFindEmptyAddressRangeDownTree(ROUND_TO_PAGES(Size), - (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS, - PAGE_SIZE, - &Process->VadRoot, - BaseAddress, - &Parent); - /* Bail out, if still nothing free was found */ - if (Result == TableFoundNode) - { - KeReleaseGuardedMutex(&Process->AddressCreationLock); - ExFreePoolWithTag(Vad, 'ldaV'); - return STATUS_NO_MEMORY; - } - } - - /* Validate that it came from the VAD ranges */ - ASSERT(*BaseAddress >= (ULONG_PTR)MI_LOWEST_VAD_ADDRESS); - - /* Build the rest of the VAD now */ - Vad->StartingVpn = (*BaseAddress) >> PAGE_SHIFT; - Vad->EndingVpn = ((*BaseAddress) + Size - 1) >> PAGE_SHIFT; - Vad->u3.Secured.StartVpn = *BaseAddress; - Vad->u3.Secured.EndVpn = (Vad->EndingVpn << PAGE_SHIFT) | (PAGE_SIZE - 1); - Vad->u1.Parent = NULL; - - /* FIXME: Should setup VAD bitmap */ - Status = STATUS_SUCCESS; - - /* Pretend as if we own the working set */ - MiLockProcessWorkingSetUnsafe(Process, Thread); - - /* Insert the VAD */ - ASSERT(Vad->EndingVpn >= Vad->StartingVpn); - Process->VadRoot.NodeHint = Vad; - Vad->ControlArea = NULL; // For Memory-Area hack - Vad->FirstPrototypePte = NULL; - DPRINT("VAD: %p\n", Vad); - DPRINT("Allocated PEB/TEB at: 0x%p for %16s\n", *BaseAddress, Process->ImageFileName); - MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); - - /* Release the working set */ - MiUnlockProcessWorkingSetUnsafe(Process, Thread); - - /* Release the address space lock */ - KeReleaseGuardedMutex(&Process->AddressCreationLock); - - /* Return the status */ - return Status; + } + else + { + HighestAddress = (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS; + } + + *BaseAddress = 0; + Status = MiInsertVadEx((PMMVAD)Vad, + BaseAddress, + BYTES_TO_PAGES(Size), + HighestAddress, + PAGE_SIZE, + MEM_TOP_DOWN); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Vad, 'ldaV'); + return STATUS_NO_MEMORY; + } + + /* Success */ + return STATUS_SUCCESS; } VOID

1 0

[tkreuzer] 64592: [NTOSKRNL] Lock the workingset before inserting a node into the address space in MiInsertVad
by tkreuzer＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: tkreuzer Date: Wed Oct 8 00:31:43 2014 New Revision: 64592 URL: http://svn.reactos.org/svn/reactos?rev=64592&view=rev Log: [NTOSKRNL] Lock the workingset before inserting a node into the address space in MiInsertVad Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Wed Oct 8 00:31:43 2014 @@ -190,7 +190,9 @@ ASSERT((Parent != NULL) || (Result == TableEmptyTree)); /* Do the actual insert operation */ + MiLockProcessWorkingSetUnsafe(PsGetCurrentProcess(), PsGetCurrentThread()); MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); + MiUnlockProcessWorkingSetUnsafe(PsGetCurrentProcess(), PsGetCurrentThread()); } NTSTATUS

1 0

[tkreuzer] 64591: [NTOSKRNL] - Improve the random address base code in MiCreatePebOrTeb to actually make sense and not rely on retarded hacks implicitly hardcoding the PEB size in pages into the ra...
by tkreuzer＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: tkreuzer Date: Wed Oct 8 00:31:35 2014 New Revision: 64591 URL: http://svn.reactos.org/svn/reactos?rev=64591&view=rev Log: [NTOSKRNL] - Improve the random address base code in MiCreatePebOrTeb to actually make sense and not rely on retarded hacks implicitly hardcoding the PEB size in pages into the random value generation. 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] Wed Oct 8 00:31:35 2014 @@ -48,13 +48,13 @@ NTAPI MiCreatePebOrTeb(IN PEPROCESS Process, IN ULONG Size, - OUT PULONG_PTR Base) + OUT PULONG_PTR BaseAddress) { PETHREAD Thread = PsGetCurrentThread(); PMMVAD_LONG Vad; NTSTATUS Status; - ULONG RandomCoeff; - ULONG_PTR StartAddress, EndAddress; + ULONG_PTR HighestAddress, RandomBase; + ULONG AlignedSize; LARGE_INTEGER CurrentTime; TABLE_SEARCH_RESULT Result = TableFoundNode; PMMADDRESS_NODE Parent; @@ -83,25 +83,30 @@ /* Check if this is a PEB creation */ if (Size == sizeof(PEB)) { - /* Start at the highest valid address */ - StartAddress = (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1; - - /* Select the random coefficient */ + /* Create a random value to select one page in a 64k region */ KeQueryTickCount(&CurrentTime); - CurrentTime.LowPart &= ((64 * _1KB) >> PAGE_SHIFT) - 1; - if (CurrentTime.LowPart <= 1) CurrentTime.LowPart = 2; - RandomCoeff = CurrentTime.LowPart << PAGE_SHIFT; - - /* Select the highest valid address minus the random coefficient */ - StartAddress -= RandomCoeff; - EndAddress = StartAddress + ROUND_TO_PAGES(Size) - 1; + CurrentTime.LowPart &= (_64K / PAGE_SIZE) - 1; + + /* Calculate a random base address */ + RandomBase = (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1; + RandomBase -= CurrentTime.LowPart << PAGE_SHIFT; + + /* Make sure the base address is not too high */ + AlignedSize = ROUND_TO_PAGES(Size); + if ((RandomBase + AlignedSize) > (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1) + { + RandomBase = (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1 - AlignedSize; + } + + /* Calculate the highest allowed address */ + HighestAddress = RandomBase + AlignedSize - 1; /* Try to find something below the random upper margin */ Result = MiFindEmptyAddressRangeDownTree(ROUND_TO_PAGES(Size), - EndAddress, + HighestAddress, PAGE_SIZE, &Process->VadRoot, - Base, + BaseAddress, &Parent); } @@ -113,7 +118,7 @@ (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS, PAGE_SIZE, &Process->VadRoot, - Base, + BaseAddress, &Parent); /* Bail out, if still nothing free was found */ if (Result == TableFoundNode) @@ -125,12 +130,12 @@ } /* Validate that it came from the VAD ranges */ - ASSERT(*Base >= (ULONG_PTR)MI_LOWEST_VAD_ADDRESS); + ASSERT(*BaseAddress >= (ULONG_PTR)MI_LOWEST_VAD_ADDRESS); /* Build the rest of the VAD now */ - Vad->StartingVpn = (*Base) >> PAGE_SHIFT; - Vad->EndingVpn = ((*Base) + Size - 1) >> PAGE_SHIFT; - Vad->u3.Secured.StartVpn = *Base; + Vad->StartingVpn = (*BaseAddress) >> PAGE_SHIFT; + Vad->EndingVpn = ((*BaseAddress) + Size - 1) >> PAGE_SHIFT; + Vad->u3.Secured.StartVpn = *BaseAddress; Vad->u3.Secured.EndVpn = (Vad->EndingVpn << PAGE_SHIFT) | (PAGE_SIZE - 1); Vad->u1.Parent = NULL; @@ -146,7 +151,7 @@ Vad->ControlArea = NULL; // For Memory-Area hack Vad->FirstPrototypePte = NULL; DPRINT("VAD: %p\n", Vad); - DPRINT("Allocated PEB/TEB at: 0x%p for %16s\n", *Base, Process->ImageFileName); + DPRINT("Allocated PEB/TEB at: 0x%p for %16s\n", *BaseAddress, Process->ImageFileName); MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); /* Release the working set */

1 0

[tkreuzer] 64590: [NTOSKRNL] - Add missing dereference on failure in MiMapViewOfDataSection - Simplify some code
by tkreuzer＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: tkreuzer Date: Wed Oct 8 00:31:28 2014 New Revision: 64590 URL: http://svn.reactos.org/svn/reactos?rev=64590&view=rev Log: [NTOSKRNL] - Add missing dereference on failure in MiMapViewOfDataSection - Simplify some code Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Wed Oct 8 00:31:28 2014 @@ -1298,9 +1298,12 @@ /* We must be dealing with a 64KB aligned offset. This is a Windows ASSERT */ ASSERT((SectionOffset->LowPart & ((ULONG)_64K - 1)) == 0); - /* It's illegal to try to map more than 2GB */ - /* FIXME: Should dereference the control area */ - if (*ViewSize >= 0x80000000) return STATUS_INVALID_VIEW_SIZE; + /* It's illegal to try to map more than overflows a LONG_PTR */ + if (*ViewSize >= MAXLONG_PTR) + { + MiDereferenceControlArea(ControlArea); + return STATUS_INVALID_VIEW_SIZE; + } /* Windows ASSERTs for this flag */ ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); @@ -1331,9 +1334,8 @@ /* Compute how much commit space the segment will take */ if ((CommitSize) && (Segment->NumberOfCommittedPages < Segment->TotalNumberOfPtes)) { - PointerPte = &Subsection->SubsectionBase[PteOffset]; - LastPte = PointerPte + BYTES_TO_PAGES(CommitSize); - QuotaCharge = (ULONG)(LastPte - PointerPte); + /* Charge for the maximum pages */ + QuotaCharge = BYTES_TO_PAGES(CommitSize); } /* ARM3 does not currently support large pages */

1 0

[tkreuzer] 64589: [NTOSKRNL] Implement MiInsertVadEx, replacing duplicated code from NtAllocateVirtualMemory and MiMapViewOfDataSection
by tkreuzer＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: tkreuzer Date: Wed Oct 8 00:31:17 2014 New Revision: 64589 URL: http://svn.reactos.org/svn/reactos?rev=64589&view=rev Log: [NTOSKRNL] Implement MiInsertVadEx, replacing duplicated code from NtAllocateVirtualMemory and MiMapViewOfDataSection Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.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] Wed Oct 8 00:31:17 2014 @@ -2144,6 +2144,16 @@ IN PEPROCESS Process ); +NTSTATUS +NTAPI +MiInsertVadEx( + _Inout_ PMMVAD Vad, + _In_ ULONG_PTR *BaseAddress, + _In_ SIZE_T ViewSize, + _In_ ULONG_PTR HighestAddress, + _In_ ULONG_PTR Alignment, + _In_ ULONG AllocationType); + VOID NTAPI MiInsertBasedSection( Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Wed Oct 8 00:31:17 2014 @@ -1252,9 +1252,7 @@ IN ULONG AllocationType) { PMMVAD_LONG Vad; - PETHREAD Thread = PsGetCurrentThread(); - PMMSUPPORT AddressSpace; - ULONG_PTR StartAddress, EndingAddress; + ULONG_PTR StartAddress; ULONG_PTR ViewSizeInPages; PSUBSECTION Subsection; PSEGMENT Segment; @@ -1263,8 +1261,6 @@ ULONG QuotaCharge = 0, QuotaExcess = 0; PMMPTE PointerPte, LastPte; MMPTE TempPte; - PMMADDRESS_NODE Parent; - TABLE_SEARCH_RESULT Result; DPRINT("Mapping ARM3 data section\n"); /* Get the segment for this section */ @@ -1361,6 +1357,7 @@ /* Write all the data required in the VAD for handling a fault */ Vad->ControlArea = ControlArea; + Vad->u.VadFlags.CommitCharge = 0; Vad->u.VadFlags.Protection = ProtectionMask; Vad->u2.VadFlags2.FileOffset = (ULONG)(SectionOffset->QuadPart >> 16); Vad->u2.VadFlags2.Inherit = (InheritDisposition == ViewShare); @@ -1437,100 +1434,23 @@ StartAddress = 0; } - /* Lock the address space and make sure the process is alive */ - AddressSpace = MmGetCurrentAddressSpace(); - MmLockAddressSpace(AddressSpace); - if (Process->VmDeleted) - { - MmUnlockAddressSpace(AddressSpace); - ExFreePoolWithTag(Vad, 'ldaV'); - DPRINT1("The process is dying\n"); - return STATUS_PROCESS_IS_TERMINATING; - } - - /* Did the caller specify an address? */ - if (StartAddress == 0) - { - /* ARM3 does not support these flags yet */ - ASSERT(Process->VmTopDown == 0); - ASSERT(ZeroBits == 0); - - /* Which way should we search? */ - if (AllocationType & MEM_TOP_DOWN) - { - /* No, find an address top-down */ - Result = MiFindEmptyAddressRangeDownTree(*ViewSize, - (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS, - _64K, - &Process->VadRoot, - &StartAddress, - &Parent); - } - else - { - /* No, find an address bottom-up */ - Result = MiFindEmptyAddressRangeInTree(*ViewSize, - _64K, - &Process->VadRoot, - &Parent, - &StartAddress); - } - - /* Check if we found a suitable location */ - if (Result == TableFoundNode) - { - DPRINT1("Not enough free space to insert this section!\n"); - MmUnlockAddressSpace(AddressSpace); - MiDereferenceControlArea(ControlArea); - ExFreePoolWithTag(Vad, 'ldaV'); - return STATUS_CONFLICTING_ADDRESSES; - } - - /* Get the ending address, which is the last piece we need for the VAD */ - EndingAddress = StartAddress + (ViewSizeInPages * PAGE_SIZE) - 1; - } - else - { - /* Get the ending address, which is the last piece we need for the VAD */ - EndingAddress = StartAddress + (ViewSizeInPages * PAGE_SIZE) - 1; - - /* Make sure it doesn't conflict with an existing allocation */ - Result = MiCheckForConflictingNode(StartAddress >> PAGE_SHIFT, - EndingAddress >> PAGE_SHIFT, - &Process->VadRoot, - &Parent); - if (Result == TableFoundNode) - { - DPRINT1("Conflict with SEC_BASED or manually based section!\n"); - MmUnlockAddressSpace(AddressSpace); - MiDereferenceControlArea(ControlArea); - ExFreePoolWithTag(Vad, 'ldaV'); - return STATUS_CONFLICTING_ADDRESSES; - } - } - - /* Now set the VAD address */ - Vad->StartingVpn = StartAddress >> PAGE_SHIFT; - Vad->EndingVpn = EndingAddress >> PAGE_SHIFT; - - /* Pretend as if we own the working set */ - MiLockProcessWorkingSetUnsafe(Process, Thread); - /* Insert the VAD */ - Process->VadRoot.NodeHint = Vad; - MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); - - /* Release the working set */ - MiUnlockProcessWorkingSetUnsafe(Process, Thread); - - /* Unlock the address space */ - MmUnlockAddressSpace(AddressSpace); + Status = MiInsertVadEx((PMMVAD)Vad, + &StartAddress, + ViewSizeInPages * PAGE_SIZE, + MAXULONG_PTR >> ZeroBits, + MM_VIRTMEM_GRANULARITY, + AllocationType); + if (!NT_SUCCESS(Status)) + { + return Status; + } /* Windows stores this for accounting purposes, do so as well */ if (!Segment->u2.FirstMappedVa) Segment->u2.FirstMappedVa = (PVOID)StartAddress; /* Finally, let the caller know where, and for what size, the view was mapped */ - *ViewSize = (ULONG_PTR)EndingAddress - (ULONG_PTR)StartAddress + 1; + *ViewSize = ViewSizeInPages * PAGE_SIZE; *BaseAddress = (PVOID)StartAddress; DPRINT("Start and region: 0x%p, 0x%p\n", *BaseAddress, *ViewSize); return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Wed Oct 8 00:31:17 2014 @@ -193,6 +193,138 @@ MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); } +NTSTATUS +NTAPI +MiInsertVadEx( + _Inout_ PMMVAD Vad, + _In_ ULONG_PTR *BaseAddress, + _In_ SIZE_T ViewSize, + _In_ ULONG_PTR HighestAddress, + _In_ ULONG_PTR Alignment, + _In_ ULONG AllocationType) +{ + ULONG_PTR StartingAddress, EndingAddress; + PEPROCESS CurrentProcess; + PETHREAD CurrentThread; + TABLE_SEARCH_RESULT Result; + PMMADDRESS_NODE Parent; + + /* Align the view size to pages */ + ViewSize = ALIGN_UP_BY(ViewSize, PAGE_SIZE); + + /* Get the current process */ + CurrentProcess = PsGetCurrentProcess(); + + /* Acquire the address creation lock and make sure the process is alive */ + KeAcquireGuardedMutex(&CurrentProcess->AddressCreationLock); + if (CurrentProcess->VmDeleted) + { + KeReleaseGuardedMutex(&CurrentProcess->AddressCreationLock); + DPRINT1("The process is dying\n"); + return STATUS_PROCESS_IS_TERMINATING; + } + + /* Did the caller specify an address? */ + if (*BaseAddress == 0) + { + /* Make sure HighestAddress is not too large */ + HighestAddress = min(HighestAddress, (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS); + + /* Which way should we search? */ + if ((AllocationType & MEM_TOP_DOWN) || CurrentProcess->VmTopDown) + { + /* Find an address top-down */ + Result = MiFindEmptyAddressRangeDownTree(ViewSize, + HighestAddress, + Alignment, + &CurrentProcess->VadRoot, + &StartingAddress, + &Parent); + } + else + { + /* Find an address bottom-up */ + Result = MiFindEmptyAddressRangeInTree(ViewSize, + Alignment, + &CurrentProcess->VadRoot, + &Parent, + &StartingAddress); + } + + /* Get the ending address, which is the last piece we need for the VAD */ + EndingAddress = StartingAddress + ViewSize - 1; + + /* Check if we found a suitable location */ + if ((Result == TableFoundNode) || (EndingAddress > HighestAddress)) + { + DPRINT1("Not enough free space to insert this VAD node!\n"); + KeReleaseGuardedMutex(&CurrentProcess->AddressCreationLock); + return STATUS_CONFLICTING_ADDRESSES; + } + + ASSERT(StartingAddress != 0); + ASSERT(StartingAddress < (ULONG_PTR)HighestAddress); + ASSERT(EndingAddress > StartingAddress); + } + else + { + /* Calculate the starting and ending address */ + StartingAddress = ALIGN_DOWN_BY(*BaseAddress, Alignment); + EndingAddress = StartingAddress + ViewSize - 1; + + /* Make sure it doesn't conflict with an existing allocation */ + Result = MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, + EndingAddress >> PAGE_SHIFT, + &CurrentProcess->VadRoot, + &Parent); + if (Result == TableFoundNode) + { + DPRINT1("Given address conflicts with existing node\n"); + KeReleaseGuardedMutex(&CurrentProcess->AddressCreationLock); + return STATUS_CONFLICTING_ADDRESSES; + } + } + + /* Now set the VAD address */ + Vad->StartingVpn = StartingAddress >> PAGE_SHIFT; + Vad->EndingVpn = EndingAddress >> PAGE_SHIFT; + + /* Check if the VAD is to be secured */ + if (Vad->u2.VadFlags2.OneSecured) + { + /* This *must* be a long VAD! */ + ASSERT(Vad->u2.VadFlags2.LongVad); + + /* Yeah this is retarded, I didn't invent it! */ + ((PMMVAD_LONG)Vad)->u3.Secured.StartVpn = StartingAddress; + ((PMMVAD_LONG)Vad)->u3.Secured.EndVpn = EndingAddress; + } + + /* Lock the working set */ + CurrentThread = PsGetCurrentThread(); + MiLockProcessWorkingSetUnsafe(CurrentProcess, CurrentThread); + + /* Insert the VAD */ + CurrentProcess->VadRoot.NodeHint = Vad; + MiInsertNode(&CurrentProcess->VadRoot, (PVOID)Vad, Parent, Result); + + /* Release the working set */ + MiUnlockProcessWorkingSetUnsafe(CurrentProcess, CurrentThread); + + /* Update the process' virtual size, and peak virtual size */ + CurrentProcess->VirtualSize += ViewSize; + if (CurrentProcess->VirtualSize > CurrentProcess->PeakVirtualSize) + { + CurrentProcess->PeakVirtualSize = CurrentProcess->VirtualSize; + } + + /* Unlock the address space */ + KeReleaseGuardedMutex(&CurrentProcess->AddressCreationLock); + + *BaseAddress = StartingAddress; + return STATUS_SUCCESS; +} + VOID NTAPI MiInsertBasedSection(IN PSECTION Section) Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Wed Oct 8 00:31:17 2014 @@ -4304,12 +4304,12 @@ { PEPROCESS Process; PMEMORY_AREA MemoryArea; - PFN_NUMBER PageCount; PMMVAD Vad = NULL, FoundVad; NTSTATUS Status; PMMSUPPORT AddressSpace; PVOID PBaseAddress; - ULONG_PTR PRegionSize, StartingAddress, EndingAddress, HighestAddress; + ULONG_PTR PRegionSize, StartingAddress, EndingAddress; + ULONG_PTR HighestAddress = (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS; PEPROCESS CurrentProcess = PsGetCurrentProcess(); KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); PETHREAD CurrentThread = PsGetCurrentThread(); @@ -4319,7 +4319,6 @@ MMPTE TempPte; PMMPTE PointerPte, PointerPde, LastPte; TABLE_SEARCH_RESULT Result; - PMMADDRESS_NODE Parent; PAGED_CODE(); /* Check for valid Zero bits */ @@ -4544,7 +4543,6 @@ // This is a blind commit, all we need is the region size // PRegionSize = ROUND_TO_PAGES(PRegionSize); - PageCount = BYTES_TO_PAGES(PRegionSize); EndingAddress = 0; StartingAddress = 0; @@ -4563,13 +4561,6 @@ goto FailPathNoLock; } } - else - { - // - // Use the highest VAD address as maximum - // - HighestAddress = (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS; - } } else { @@ -4579,8 +4570,8 @@ // fall based on the aligned address and the passed in region size // EndingAddress = ((ULONG_PTR)PBaseAddress + PRegionSize - 1) | (PAGE_SIZE - 1); - StartingAddress = ROUND_DOWN((ULONG_PTR)PBaseAddress, _64K); - PageCount = BYTES_TO_PAGES(EndingAddress - StartingAddress); + PRegionSize = EndingAddress + 1 - ROUND_DOWN((ULONG_PTR)PBaseAddress, _64K); + StartingAddress = (ULONG_PTR)PBaseAddress; } // @@ -4594,7 +4585,7 @@ goto FailPathNoLock; } - Vad->u.LongFlags = 0; + RtlZeroMemory(Vad, sizeof(MMVAD_LONG)); if (AllocationType & MEM_COMMIT) Vad->u.VadFlags.MemCommit = 1; Vad->u.VadFlags.Protection = ProtectionMask; Vad->u.VadFlags.PrivateMemory = 1; @@ -4602,124 +4593,24 @@ Vad->ControlArea = NULL; // For Memory-Area hack // - // Lock the address space and make sure the process isn't already dead - // - AddressSpace = MmGetCurrentAddressSpace(); - MmLockAddressSpace(AddressSpace); - if (Process->VmDeleted) - { - Status = STATUS_PROCESS_IS_TERMINATING; - goto FailPath; - } - - // - // Did we have a base address? If no, find a valid address that is 64KB - // aligned in the VAD tree. Otherwise, make sure that the address range - // which was passed in isn't already conflicting with an existing address - // range. - // - if (!PBaseAddress) - { - /* Which way should we search? */ - if ((AllocationType & MEM_TOP_DOWN) || Process->VmTopDown) - { - /* Find an address top-down */ - Result = MiFindEmptyAddressRangeDownTree(PRegionSize, - HighestAddress, - _64K, - &Process->VadRoot, - &StartingAddress, - &Parent); - } - else - { - /* Find an address bottom-up */ - Result = MiFindEmptyAddressRangeInTree(PRegionSize, - _64K, - &Process->VadRoot, - &Parent, - &StartingAddress); - } - - if (Result == TableFoundNode) - { - Status = STATUS_NO_MEMORY; - goto FailPath; - } - - // - // Now we know where the allocation ends. Make sure it doesn't end up - // somewhere in kernel mode. - // - ASSERT(StartingAddress != 0); - ASSERT(StartingAddress < (ULONG_PTR)MM_HIGHEST_USER_ADDRESS); - EndingAddress = (StartingAddress + PRegionSize - 1) | (PAGE_SIZE - 1); - ASSERT(EndingAddress > StartingAddress); - if (EndingAddress > HighestAddress) - { - Status = STATUS_NO_MEMORY; - goto FailPath; - } - } - else - { - /* Make sure it doesn't conflict with an existing allocation */ - Result = MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, - EndingAddress >> PAGE_SHIFT, - &Process->VadRoot, - &Parent); - if (Result == TableFoundNode) - { - // - // The address specified is in conflict! - // - Status = STATUS_CONFLICTING_ADDRESSES; - goto FailPath; - } - } - - // - // Write out the VAD fields for this allocation - // - Vad->StartingVpn = StartingAddress >> PAGE_SHIFT; - Vad->EndingVpn = EndingAddress >> PAGE_SHIFT; - - // - // FIXME: Should setup VAD bitmap - // - Status = STATUS_SUCCESS; - - // - // Lock the working set and insert the VAD into the process VAD tree - // - MiLockProcessWorkingSetUnsafe(Process, CurrentThread); - Process->VadRoot.NodeHint = Vad; - MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); - MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); - - // - // Make sure the actual region size is at least as big as the - // requested region size and update the value - // - ASSERT(PRegionSize <= (EndingAddress + 1 - StartingAddress)); - PRegionSize = (EndingAddress + 1 - StartingAddress); - - // - // Update the virtual size of the process, and if this is now the highest - // virtual size we have ever seen, update the peak virtual size to reflect - // this. - // - Process->VirtualSize += PRegionSize; - if (Process->VirtualSize > Process->PeakVirtualSize) - { - Process->PeakVirtualSize = Process->VirtualSize; - } - - // - // Release address space and detach and dereference the target process if + // Insert the VAD + // + Status = MiInsertVadEx(Vad, + &StartingAddress, + PRegionSize, + HighestAddress, + MM_VIRTMEM_GRANULARITY, + AllocationType); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to insert the VAD!\n"); + goto FailPathNoLock; + } + + // + // Detach and dereference the target process if // it was different from the current process // - MmUnlockAddressSpace(AddressSpace); if (Attached) KeUnstackDetachProcess(&ApcState); if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process);

1 0

[tkreuzer] 64588: [NTOSKRNL] Slightly refactor MiMapViewOfDataSection and NtAllocateVirtualMemory
by tkreuzer＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: tkreuzer Date: Wed Oct 8 00:31:09 2014 New Revision: 64588 URL: http://svn.reactos.org/svn/reactos?rev=64588&view=rev Log: [NTOSKRNL] Slightly refactor MiMapViewOfDataSection and NtAllocateVirtualMemory Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Wed Oct 8 00:31:09 2014 @@ -1253,7 +1253,9 @@ { PMMVAD_LONG Vad; PETHREAD Thread = PsGetCurrentThread(); + PMMSUPPORT AddressSpace; ULONG_PTR StartAddress, EndingAddress; + ULONG_PTR ViewSizeInPages; PSUBSECTION Subsection; PSEGMENT Segment; PFN_NUMBER PteOffset; @@ -1263,6 +1265,7 @@ MMPTE TempPte; PMMADDRESS_NODE Parent; TABLE_SEARCH_RESULT Result; + DPRINT("Mapping ARM3 data section\n"); /* Get the segment for this section */ Segment = ControlArea->Segment; @@ -1340,75 +1343,8 @@ /* ARM3 does not currently support large pages */ ASSERT(Segment->SegmentFlags.LargePages == 0); - /* Did the caller specify an address? */ - if (!(*BaseAddress) && !(Section->Address.StartingVpn)) - { - /* ARM3 does not support these flags yet */ - ASSERT(Process->VmTopDown == 0); - ASSERT(ZeroBits == 0); - - /* Which way should we search? */ - if (AllocationType & MEM_TOP_DOWN) - { - /* No, find an address top-down */ - Result = MiFindEmptyAddressRangeDownTree(*ViewSize, - (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS, - _64K, - &Process->VadRoot, - &StartAddress, - &Parent); - } - else - { - /* No, find an address bottom-up */ - Result = MiFindEmptyAddressRangeInTree(*ViewSize, - _64K, - &Process->VadRoot, - &Parent, - &StartAddress); - } - - /* Check if we found a suitable location */ - if (Result == TableFoundNode) - { - DPRINT1("Not enough free space to insert this section!\n"); - MiDereferenceControlArea(ControlArea); - return STATUS_CONFLICTING_ADDRESSES; - } - - /* Get the ending address, which is the last piece we need for the VAD */ - EndingAddress = (StartAddress + *ViewSize - 1) | (PAGE_SIZE - 1); - } - else - { - /* Is it SEC_BASED, or did the caller manually specify an address? */ - if (!(*BaseAddress)) - { - /* It is a SEC_BASED mapping, use the address that was generated */ - StartAddress = Section->Address.StartingVpn + SectionOffset->LowPart; - DPRINT("BASED: 0x%p\n", StartAddress); - } - else - { - /* Just align what the caller gave us */ - StartAddress = ROUND_UP((ULONG_PTR)*BaseAddress, _64K); - } - - /* Get the ending address, which is the last piece we need for the VAD */ - EndingAddress = (StartAddress + *ViewSize - 1) | (PAGE_SIZE - 1); - - /* Make sure it doesn't conflict with an existing allocation */ - Result = MiCheckForConflictingNode(StartAddress >> PAGE_SHIFT, - EndingAddress >> PAGE_SHIFT, - &Process->VadRoot, - &Parent); - if (Result == TableFoundNode) - { - DPRINT1("Conflict with SEC_BASED or manually based section!\n"); - MiDereferenceControlArea(ControlArea); - return STATUS_CONFLICTING_ADDRESSES; - } - } + /* Calculate how many pages the region spans */ + ViewSizeInPages = BYTES_TO_PAGES(*ViewSize); /* A VAD can now be allocated. Do so and zero it out */ /* FIXME: we are allocating a LONG VAD for ReactOS compatibility only */ @@ -1419,12 +1355,11 @@ MiDereferenceControlArea(ControlArea); return STATUS_INSUFFICIENT_RESOURCES; } + RtlZeroMemory(Vad, sizeof(MMVAD_LONG)); Vad->u4.Banked = (PVOID)0xDEADBABE; /* Write all the data required in the VAD for handling a fault */ - Vad->StartingVpn = StartAddress >> PAGE_SHIFT; - Vad->EndingVpn = EndingAddress >> PAGE_SHIFT; Vad->ControlArea = ControlArea; Vad->u.VadFlags.Protection = ProtectionMask; Vad->u2.VadFlags2.FileOffset = (ULONG)(SectionOffset->QuadPart >> 16); @@ -1438,7 +1373,7 @@ /* Finally, write down the first and last prototype PTE */ Vad->FirstPrototypePte = &Subsection->SubsectionBase[PteOffset]; - PteOffset += (Vad->EndingVpn - Vad->StartingVpn); + PteOffset += ViewSizeInPages - 1; ASSERT(PteOffset < Subsection->PtesInSubsection); Vad->LastContiguousPte = &Subsection->SubsectionBase[PteOffset]; @@ -1447,19 +1382,6 @@ /* FIXME: Should setup VAD bitmap */ Status = STATUS_SUCCESS; - - /* Pretend as if we own the working set */ - MiLockProcessWorkingSetUnsafe(Process, Thread); - - /* Insert the VAD */ - Process->VadRoot.NodeHint = Vad; - MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); - - /* Release the working set */ - MiUnlockProcessWorkingSetUnsafe(Process, Thread); - - /* Windows stores this for accounting purposes, do so as well */ - if (!Segment->u2.FirstMappedVa) Segment->u2.FirstMappedVa = (PVOID)StartAddress; /* Check if anything was committed */ if (QuotaCharge) @@ -1498,6 +1420,114 @@ /* Now that we're done, release the lock */ KeReleaseGuardedMutexUnsafe(&MmSectionCommitMutex); } + + /* Is it SEC_BASED, or did the caller manually specify an address? */ + if (*BaseAddress != NULL) + { + /* Just align what the caller gave us */ + StartAddress = ROUND_UP((ULONG_PTR)*BaseAddress, _64K); + } + else if (Section->Address.StartingVpn != 0) + { + /* It is a SEC_BASED mapping, use the address that was generated */ + StartAddress = Section->Address.StartingVpn + SectionOffset->LowPart; + } + else + { + StartAddress = 0; + } + + /* Lock the address space and make sure the process is alive */ + AddressSpace = MmGetCurrentAddressSpace(); + MmLockAddressSpace(AddressSpace); + if (Process->VmDeleted) + { + MmUnlockAddressSpace(AddressSpace); + ExFreePoolWithTag(Vad, 'ldaV'); + DPRINT1("The process is dying\n"); + return STATUS_PROCESS_IS_TERMINATING; + } + + /* Did the caller specify an address? */ + if (StartAddress == 0) + { + /* ARM3 does not support these flags yet */ + ASSERT(Process->VmTopDown == 0); + ASSERT(ZeroBits == 0); + + /* Which way should we search? */ + if (AllocationType & MEM_TOP_DOWN) + { + /* No, find an address top-down */ + Result = MiFindEmptyAddressRangeDownTree(*ViewSize, + (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS, + _64K, + &Process->VadRoot, + &StartAddress, + &Parent); + } + else + { + /* No, find an address bottom-up */ + Result = MiFindEmptyAddressRangeInTree(*ViewSize, + _64K, + &Process->VadRoot, + &Parent, + &StartAddress); + } + + /* Check if we found a suitable location */ + if (Result == TableFoundNode) + { + DPRINT1("Not enough free space to insert this section!\n"); + MmUnlockAddressSpace(AddressSpace); + MiDereferenceControlArea(ControlArea); + ExFreePoolWithTag(Vad, 'ldaV'); + return STATUS_CONFLICTING_ADDRESSES; + } + + /* Get the ending address, which is the last piece we need for the VAD */ + EndingAddress = StartAddress + (ViewSizeInPages * PAGE_SIZE) - 1; + } + else + { + /* Get the ending address, which is the last piece we need for the VAD */ + EndingAddress = StartAddress + (ViewSizeInPages * PAGE_SIZE) - 1; + + /* Make sure it doesn't conflict with an existing allocation */ + Result = MiCheckForConflictingNode(StartAddress >> PAGE_SHIFT, + EndingAddress >> PAGE_SHIFT, + &Process->VadRoot, + &Parent); + if (Result == TableFoundNode) + { + DPRINT1("Conflict with SEC_BASED or manually based section!\n"); + MmUnlockAddressSpace(AddressSpace); + MiDereferenceControlArea(ControlArea); + ExFreePoolWithTag(Vad, 'ldaV'); + return STATUS_CONFLICTING_ADDRESSES; + } + } + + /* Now set the VAD address */ + Vad->StartingVpn = StartAddress >> PAGE_SHIFT; + Vad->EndingVpn = EndingAddress >> PAGE_SHIFT; + + /* Pretend as if we own the working set */ + MiLockProcessWorkingSetUnsafe(Process, Thread); + + /* Insert the VAD */ + Process->VadRoot.NodeHint = Vad; + MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); + + /* Release the working set */ + MiUnlockProcessWorkingSetUnsafe(Process, Thread); + + /* Unlock the address space */ + MmUnlockAddressSpace(AddressSpace); + + /* Windows stores this for accounting purposes, do so as well */ + if (!Segment->u2.FirstMappedVa) Segment->u2.FirstMappedVa = (PVOID)StartAddress; /* Finally, let the caller know where, and for what size, the view was mapped */ *ViewSize = (ULONG_PTR)EndingAddress - (ULONG_PTR)StartAddress + 1; @@ -2786,33 +2816,20 @@ Attached = TRUE; } - /* Lock the address space and make sure the process is alive */ - MmLockAddressSpace(&Process->Vm); - if (!Process->VmDeleted) - { - /* Do the actual mapping */ - DPRINT("Mapping ARM3 data section\n"); - Status = MiMapViewOfDataSection(ControlArea, - Process, - BaseAddress, - SectionOffset, - ViewSize, - Section, - InheritDisposition, - ProtectionMask, - CommitSize, - ZeroBits, - AllocationType); - } - else - { - /* The process is being terminated, fail */ - DPRINT1("The process is dying\n"); - Status = STATUS_PROCESS_IS_TERMINATING; - } - - /* Unlock the address space and detatch if needed, then return status */ - MmUnlockAddressSpace(&Process->Vm); + /* Do the actual mapping */ + Status = MiMapViewOfDataSection(ControlArea, + Process, + BaseAddress, + SectionOffset, + ViewSize, + Section, + InheritDisposition, + ProtectionMask, + CommitSize, + ZeroBits, + AllocationType); + + /* Detatch if needed, then return status */ if (Attached) KeUnstackDetachProcess(&ApcState); return Status; } Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Wed Oct 8 00:31:09 2014 @@ -4599,6 +4599,7 @@ Vad->u.VadFlags.Protection = ProtectionMask; Vad->u.VadFlags.PrivateMemory = 1; Vad->u.VadFlags.CommitCharge = AllocationType & MEM_COMMIT ? PageCount : 0; + Vad->ControlArea = NULL; // For Memory-Area hack // // Lock the address space and make sure the process isn't already dead @@ -4692,7 +4693,6 @@ // Lock the working set and insert the VAD into the process VAD tree // MiLockProcessWorkingSetUnsafe(Process, CurrentThread); - Vad->ControlArea = NULL; // For Memory-Area hack Process->VadRoot.NodeHint = Vad; MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread);

1 0

[tkreuzer] 64587: [NTOSKRNL] Release AddressCreationLock in MiCreatePebOrTeb on failure path
by tkreuzer＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: tkreuzer Date: Wed Oct 8 00:30:57 2014 New Revision: 64587 URL: http://svn.reactos.org/svn/reactos?rev=64587&view=rev Log: [NTOSKRNL] Release AddressCreationLock in MiCreatePebOrTeb on failure path 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] Wed Oct 8 00:30:57 2014 @@ -118,6 +118,7 @@ /* Bail out, if still nothing free was found */ if (Result == TableFoundNode) { + KeReleaseGuardedMutex(&Process->AddressCreationLock); ExFreePoolWithTag(Vad, 'ldaV'); return STATUS_NO_MEMORY; } @@ -333,7 +334,6 @@ // StackPtes = BYTES_TO_PAGES(KERNEL_LARGE_STACK_SIZE); StackPages = BYTES_TO_PAGES(KERNEL_LARGE_STACK_COMMIT); - } else {

1 0

[tkreuzer] 64586: [NTOSKRNL] Move acquisition of PFN lock into MmAllocPage and MmDereferencePage
by tkreuzer＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: tkreuzer Date: Wed Oct 8 00:30:50 2014 New Revision: 64586 URL: http://svn.reactos.org/svn/reactos?rev=64586&view=rev Log: [NTOSKRNL] Move acquisition of PFN lock into MmAllocPage and MmDereferencePage Modified: trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Wed Oct 8 00:30:50 2014 @@ -98,7 +98,6 @@ { PMM_ALLOCATION_REQUEST Request; PLIST_ENTRY Entry; - KIRQL OldIrql; if (Page == 0) { @@ -112,9 +111,7 @@ (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); if ((Entry = ExInterlockedRemoveHeadList(&AllocationListHead, &AllocationListLock)) == NULL) { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmDereferencePage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } else { @@ -126,9 +123,7 @@ } else { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmDereferencePage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } return(STATUS_SUCCESS); @@ -259,7 +254,6 @@ { ULONG PagesUsed; PFN_NUMBER Page; - KIRQL OldIrql; /* * Make sure we don't exceed our individual target. @@ -276,9 +270,7 @@ */ if ((Consumer == MC_SYSTEM) || MiIsBalancerThread()) { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MmAllocPage(Consumer); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); if (Page == 0) { KeBugCheck(NO_PAGES_AVAILABLE); @@ -337,9 +329,7 @@ /* * Actually allocate the page. */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MmAllocPage(Consumer); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); if (Page == 0) { KeBugCheck(NO_PAGES_AVAILABLE); 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] Wed Oct 8 00:30:50 2014 @@ -532,7 +532,10 @@ MmDereferencePage(PFN_NUMBER Pfn) { PMMPFN Pfn1; + KIRQL OldIrql; DPRINT("MmDereferencePage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); + + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Pfn1 = MiGetPfnEntry(Pfn); ASSERT(Pfn1); @@ -552,6 +555,8 @@ DPRINT("Legacy free: %lx\n", Pfn); MiInsertPageInFreeList(Pfn); } + + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } PFN_NUMBER @@ -560,13 +565,14 @@ { PFN_NUMBER PfnOffset; PMMPFN Pfn1; + KIRQL OldIrql; + + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); PfnOffset = MiRemoveZeroPage(MI_GET_NEXT_COLOR()); - if (!PfnOffset) { - DPRINT1("MmAllocPage(): Out of memory\n"); - return 0; + KeBugCheck(NO_PAGES_AVAILABLE); } DPRINT("Legacy allocate: %lx\n", PfnOffset); @@ -581,6 +587,7 @@ Pfn1->u1.SwapEntry = 0; Pfn1->RmapListHead = NULL; + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); return PfnOffset; }

1 0

[tkreuzer] 64585: [NTOSKRNL] Small impovement to NtFreeVirtualMemory to make things clearer
by tkreuzer＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: tkreuzer Date: Wed Oct 8 00:30:37 2014 New Revision: 64585 URL: http://svn.reactos.org/svn/reactos?rev=64585&view=rev Log: [NTOSKRNL] Small impovement to NtFreeVirtualMemory to make things clearer Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Wed Oct 8 00:30:37 2014 @@ -5134,7 +5134,7 @@ PMEMORY_AREA MemoryArea; SIZE_T PRegionSize; PVOID PBaseAddress; - LONG_PTR CommitReduction = 0; + LONG_PTR AlreadyDecommitted, CommitReduction = 0; ULONG_PTR StartingAddress, EndingAddress; PMMVAD Vad; NTSTATUS Status; @@ -5530,13 +5530,15 @@ // Decommit the PTEs for the range plus the actual backing pages for the // range, then reduce that amount from the commit charge in the VAD // + AlreadyDecommitted = MiDecommitPages((PVOID)StartingAddress, + MiAddressToPte(EndingAddress), + Process, + Vad); CommitReduction = MiAddressToPte(EndingAddress) - MiAddressToPte(StartingAddress) + 1 - - MiDecommitPages((PVOID)StartingAddress, - MiAddressToPte(EndingAddress), - Process, - Vad); + AlreadyDecommitted; + ASSERT(CommitReduction >= 0); Vad->u.VadFlags.CommitCharge -= CommitReduction; ASSERT(Vad->u.VadFlags.CommitCharge >= 0);

1 0

[tkreuzer] 64584: [NTOSKRNL] Refactor CcRosMapVacb a bit
by tkreuzer＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: tkreuzer Date: Wed Oct 8 00:30:30 2014 New Revision: 64584 URL: http://svn.reactos.org/svn/reactos?rev=64584&view=rev Log: [NTOSKRNL] Refactor CcRosMapVacb a bit Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=645… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Wed Oct 8 00:30:30 2014 @@ -579,38 +579,60 @@ } static -VOID -CcRosMapVacb(PVOID BaseAddress, - SIZE_T Length, - ULONG Consumer, - ULONG Protection) +NTSTATUS +CcRosMapVacb( + PROS_VACB Vacb) { ULONG i; NTSTATUS Status; - - ASSERT(((ULONG_PTR)BaseAddress % PAGE_SIZE) == 0); - - for (i = 0; i < PAGE_ROUND_UP(Length) / PAGE_SIZE; i++) - { - PFN_NUMBER Page; - - Status = MmRequestPageMemoryConsumer(Consumer, TRUE, &Page); - if (!NT_SUCCESS(Status)) + ULONG_PTR NumberOfPages; + + /* Create a memory area. */ + MmLockAddressSpace(MmGetKernelAddressSpace()); + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + 0, // nothing checks for VACB mareas, so set to 0 + &Vacb->BaseAddress, + VACB_MAPPING_GRANULARITY, + PAGE_READWRITE, + (PMEMORY_AREA*)&Vacb->MemoryArea, + FALSE, + 0, + PAGE_SIZE); + MmUnlockAddressSpace(MmGetKernelAddressSpace()); + if (!NT_SUCCESS(Status)) + { + KeBugCheck(CACHE_MANAGER); + } + + ASSERT(((ULONG_PTR)Vacb->BaseAddress % PAGE_SIZE) == 0); + ASSERT((ULONG_PTR)Vacb->BaseAddress > (ULONG_PTR)MmSystemRangeStart); + + /* Create a virtual mapping for this memory area */ + NumberOfPages = BYTES_TO_PAGES(VACB_MAPPING_GRANULARITY); + for (i = 0; i < NumberOfPages; i++) + { + PFN_NUMBER PageFrameNumber; + + Status = MmRequestPageMemoryConsumer(MC_CACHE, TRUE, &PageFrameNumber); + if (PageFrameNumber == 0) { DPRINT1("Unable to allocate page\n"); KeBugCheck(MEMORY_MANAGEMENT); } - Status = MmCreateVirtualMapping (NULL, - (PVOID)((ULONG_PTR)BaseAddress + (i * PAGE_SIZE)), - Protection, - &Page, - 1); + + Status = MmCreateVirtualMapping(NULL, + (PVOID)((ULONG_PTR)Vacb->BaseAddress + (i * PAGE_SIZE)), + PAGE_READWRITE, + &PageFrameNumber, + 1); if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); KeBugCheck(MEMORY_MANAGEMENT); } } + + return STATUS_SUCCESS; } static @@ -637,6 +659,7 @@ } current = ExAllocateFromNPagedLookasideList(&VacbLookasideList); + current->BaseAddress = NULL; current->Valid = FALSE; current->Dirty = FALSE; current->PageOut = FALSE; @@ -724,24 +747,6 @@ InsertTailList(&VacbLruListHead, &current->VacbLruListEntry); KeReleaseGuardedMutex(&ViewLock); - MmLockAddressSpace(MmGetKernelAddressSpace()); - current->BaseAddress = NULL; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - 0, // nothing checks for VACB mareas, so set to 0 - &current->BaseAddress, - VACB_MAPPING_GRANULARITY, - PAGE_READWRITE, - (PMEMORY_AREA*)&current->MemoryArea, - FALSE, - 0, - PAGE_SIZE); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - if (!NT_SUCCESS(Status)) - { - KeBugCheck(CACHE_MANAGER); - } - - /* Create a virtual mapping for this memory area */ MI_SET_USAGE(MI_USAGE_CACHE); #if MI_TRACE_PFNS if ((SharedCacheMap->FileObject) && (SharedCacheMap->FileObject->FileName.Buffer)) @@ -754,10 +759,9 @@ } #endif - CcRosMapVacb(current->BaseAddress, VACB_MAPPING_GRANULARITY, - MC_CACHE, PAGE_READWRITE); - - return STATUS_SUCCESS; + Status = CcRosMapVacb(current); + + return Status; } NTSTATUS

1 0

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