Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 67801: [CREATE_NLS] Initialize line count before incrementing it
by pschweitzer＠svn.reactos.org 17 May '15

17 May '15

Author: pschweitzer Date: Sun May 17 09:38:32 2015 New Revision: 67801 URL: http://svn.reactos.org/svn/reactos?rev=67801&view=rev Log: [CREATE_NLS] Initialize line count before incrementing it Modified: trunk/reactos/tools/create_nls/create_nls.c Modified: trunk/reactos/tools/create_nls/create_nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/create_nls/create_nl… ============================================================================== --- trunk/reactos/tools/create_nls/create_nls.c [iso-8859-1] (original) +++ trunk/reactos/tools/create_nls/create_nls.c [iso-8859-1] Sun May 17 09:38:32 2015 @@ -423,6 +423,8 @@ free(table); return NULL; } + + line = 0; while(fgets(buf, sizeof(buf), file)) { line++;

1 0

[jimtabor] 67800: - Fix local build.
by jimtabor＠svn.reactos.org 17 May '15

17 May '15

Author: jimtabor Date: Sun May 17 08:37:00 2015 New Revision: 67800 URL: http://svn.reactos.org/svn/reactos?rev=67800&view=rev Log: - Fix local build. Modified: trunk/rosapps/applications/screensavers/mazescr/maze.c Modified: trunk/rosapps/applications/screensavers/mazescr/maze.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/maze.c [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/maze.c [iso-8859-1] Sun May 17 08:37:00 2015 @@ -58,7 +58,7 @@ #define APPNAME _T("Maze") -static BOOL InitInstance(HWND hParent); +//static BOOL InitInstance(HWND hParent); LRESULT CALLBACK ScreenSaverProc(HWND hWnd, UINT message, WPARAM uParam, LPARAM lParam); static int choose_door(); static long backup(); @@ -71,7 +71,7 @@ HBRUSH hBrushLiving; HPEN hPenWall; HDC hDC; -static BOOL waiting; +//static BOOL waiting; static int solve_delay, pre_solve_delay, post_solve_delay;

1 0

[tkreuzer] 67799: [NTOSKRNL] Kill all the code to remove memory areas from the old tree as well.
by tkreuzer＠svn.reactos.org 17 May '15

17 May '15

Author: tkreuzer Date: Sun May 17 00:35:56 2015 New Revision: 67799 URL: http://svn.reactos.org/svn/reactos?rev=67799&view=rev Log: [NTOSKRNL] Kill all the code to remove memory areas from the old tree as well. Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=67… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun May 17 00:35:56 2015 @@ -150,122 +150,6 @@ return MemoryArea; } - -/** - * @name MmCompressHelper - * - * This is helper of MmRebalanceTree. Performs a compression transformation - * count times, starting at root. - */ - -static VOID -MmCompressHelper( - PMMSUPPORT AddressSpace, - ULONG Count) -{ - PMEMORY_AREA Root = NULL; - PMEMORY_AREA Red = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; - PMEMORY_AREA Black = Red->LeftChild; - - while (Count--) - { - if (Root) - Root->LeftChild = Black; - else - AddressSpace->WorkingSetExpansionLinks.Flink = (PVOID)Black; - Black->Parent = Root; - Red->LeftChild = Black->RightChild; - if (Black->RightChild) - Black->RightChild->Parent = Red; - Black->RightChild = Red; - Red->Parent = Black; - Root = Black; - - if (Count) - { - Red = Root->LeftChild; - Black = Red->LeftChild; - } - } -} - -/** - * @name MmRebalanceTree - * - * Rebalance a memory area tree using the Tree->Vine->Balanced Tree - * method described in libavl documentation in chapter 4.12. - * (http://www.stanford.edu/~blp/avl/libavl.html/) - */ - -static VOID -MmRebalanceTree( - PMMSUPPORT AddressSpace) -{ - PMEMORY_AREA PreviousNode; - PMEMORY_AREA CurrentNode; - PMEMORY_AREA TempNode; - ULONG NodeCount = 0; - ULONG Vine; /* Number of nodes in main vine. */ - ULONG Leaves; /* Nodes in incomplete bottom level, if any. */ - INT Height; /* Height of produced balanced tree. */ - - /* Transform the tree into Vine. */ - - PreviousNode = NULL; - CurrentNode = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; - while (CurrentNode != NULL) - { - if (CurrentNode->RightChild == NULL) - { - PreviousNode = CurrentNode; - CurrentNode = CurrentNode->LeftChild; - NodeCount++; - } - else - { - TempNode = CurrentNode->RightChild; - - CurrentNode->RightChild = TempNode->LeftChild; - if (TempNode->LeftChild) - TempNode->LeftChild->Parent = CurrentNode; - - TempNode->LeftChild = CurrentNode; - CurrentNode->Parent = TempNode; - - CurrentNode = TempNode; - - if (PreviousNode != NULL) - PreviousNode->LeftChild = TempNode; - else - AddressSpace->WorkingSetExpansionLinks.Flink = (PVOID)TempNode; - TempNode->Parent = PreviousNode; - } - } - - /* Transform Vine back into a balanced tree. */ - - Leaves = NodeCount + 1; - for (;;) - { - ULONG Next = Leaves & (Leaves - 1); - if (Next == 0) - break; - Leaves = Next; - } - Leaves = NodeCount + 1 - Leaves; - - MmCompressHelper(AddressSpace, Leaves); - - Vine = NodeCount - Leaves; - Height = 1 + (Leaves > 0); - while (Vine > 1) - { - MmCompressHelper(AddressSpace, Vine / 2); - Vine /= 2; - Height++; - } -} - VOID NTAPI MiInsertVad(IN PMMVAD Vad, @@ -283,9 +167,6 @@ PMMSUPPORT AddressSpace, PMEMORY_AREA marea) { - PMEMORY_AREA Node; - PMEMORY_AREA PreviousNode; - ULONG Depth = 0; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); marea->VadNode.StartingVpn = marea->StartingVpn; @@ -325,50 +206,6 @@ MiUnlockWorkingSet(PsGetCurrentThread(), &MmSystemCacheWs); marea->Vad = NULL; } - - if (AddressSpace->WorkingSetExpansionLinks.Flink == NULL) - { - AddressSpace->WorkingSetExpansionLinks.Flink = (PVOID)marea; - marea->LeftChild = marea->RightChild = marea->Parent = NULL; - return; - } - - Node = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; - do - { - DPRINT("MA_GetEndingAddress(marea): %p Node->StartingAddress: %p\n", - MA_GetEndingAddress(marea), MA_GetStartingAddress(Node)); - DPRINT("marea->StartingAddress: %p MA_GetEndingAddress(Node): %p\n", - MA_GetStartingAddress(marea), MA_GetEndingAddress(Node)); - ASSERT(MA_GetEndingAddress(marea) <= MA_GetStartingAddress(Node) || - MA_GetStartingAddress(marea) >= MA_GetEndingAddress(Node)); - ASSERT(MA_GetStartingAddress(marea) != MA_GetStartingAddress(Node)); - - PreviousNode = Node; - - if (MA_GetStartingAddress(marea) < MA_GetStartingAddress(Node)) - Node = Node->LeftChild; - else - Node = Node->RightChild; - - if (Node) - { - Depth++; - if (Depth == 22) - { - MmRebalanceTree(AddressSpace); - PreviousNode = Node->Parent; - } - } - } - while (Node != NULL); - - marea->LeftChild = marea->RightChild = NULL; - marea->Parent = PreviousNode; - if (MA_GetStartingAddress(marea) < MA_GetStartingAddress(PreviousNode)) - PreviousNode->LeftChild = marea; - else - PreviousNode->RightChild = marea; } PVOID NTAPI @@ -396,12 +233,6 @@ VadRoot, &StartingAddress, &Parent); - if (Result == TableFoundNode) - { - return NULL; - } - - return (PVOID)StartingAddress; } else { @@ -410,13 +241,14 @@ VadRoot, &Parent, &StartingAddress); - if (Result == TableFoundNode) - { - return NULL; - } - - return (PVOID)StartingAddress; - } + } + + if (Result == TableFoundNode) + { + return NULL; + } + + return (PVOID)StartingAddress; } VOID @@ -424,99 +256,6 @@ MiRemoveNode(IN PMMADDRESS_NODE Node, IN PMM_AVL_TABLE Table); -#if DBG - -static -VOID -MiRosCheckMemoryAreasRecursive( - PMEMORY_AREA Node) -{ - /* Check if the allocation is ok */ - ExpCheckPoolAllocation(Node, NonPagedPool, 'ERAM'); - - /* Check some fields */ - ASSERT(Node->Magic == 'erAM'); - ASSERT(PAGE_ALIGN(MA_GetStartingAddress(Node)) == (PVOID)MA_GetStartingAddress(Node)); - ASSERT(MA_GetEndingAddress(Node) != 0); - ASSERT(PAGE_ALIGN(MA_GetEndingAddress(Node)) == (PVOID)MA_GetEndingAddress(Node)); - ASSERT(MA_GetStartingAddress(Node) < MA_GetEndingAddress(Node)); - ASSERT((Node->Type == 0) || - (Node->Type == MEMORY_AREA_CACHE) || - // (Node->Type == MEMORY_AREA_CACHE_SEGMENT) || - (Node->Type == MEMORY_AREA_SECTION_VIEW) || - (Node->Type == MEMORY_AREA_OWNED_BY_ARM3) || - (Node->Type == (MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC))); - - /* Recursively check children */ - if (Node->LeftChild != NULL) - MiRosCheckMemoryAreasRecursive(Node->LeftChild); - if (Node->RightChild != NULL) - MiRosCheckMemoryAreasRecursive(Node->RightChild); -} - -VOID -NTAPI -MiRosCheckMemoryAreas( - PMMSUPPORT AddressSpace) -{ - PMEMORY_AREA RootNode; - PEPROCESS AddressSpaceOwner; - BOOLEAN NeedReleaseLock; - - NeedReleaseLock = FALSE; - - /* Get the address space owner */ - AddressSpaceOwner = CONTAINING_RECORD(AddressSpace, EPROCESS, Vm); - - /* Check if we already own the address space lock */ - if (AddressSpaceOwner->AddressCreationLock.Owner != KeGetCurrentThread()) - { - /* We must own it! */ - MmLockAddressSpace(AddressSpace); - NeedReleaseLock = TRUE; - } - - /* Check all memory areas */ - RootNode = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; - MiRosCheckMemoryAreasRecursive(RootNode); - - /* Release the lock, if we acquired it */ - if (NeedReleaseLock) - { - MmUnlockAddressSpace(AddressSpace); - } -} - -extern KGUARDED_MUTEX PspActiveProcessMutex; - -VOID -NTAPI -MiCheckAllProcessMemoryAreas(VOID) -{ - PEPROCESS Process; - PLIST_ENTRY Entry; - - /* Acquire the Active Process Lock */ - KeAcquireGuardedMutex(&PspActiveProcessMutex); - - /* Loop the process list */ - Entry = PsActiveProcessHead.Flink; - while (Entry != &PsActiveProcessHead) - { - /* Get the process */ - Process = CONTAINING_RECORD(Entry, EPROCESS, ActiveProcessLinks); - - /* Check memory areas */ - MiRosCheckMemoryAreas(&Process->Vm); - - Entry = Entry->Flink; - } - - /* Release the lock */ - KeReleaseGuardedMutex(&PspActiveProcessMutex); -} - -#endif /** * @name MmFreeMemoryArea @@ -550,7 +289,6 @@ PMM_FREE_PAGE_FUNC FreePage, PVOID FreePageContext) { - PMEMORY_AREA *ParentReplace; ULONG_PTR Address; PVOID EndAddress; @@ -640,60 +378,6 @@ } } - /* Remove the tree item. */ - { - if (MemoryArea->Parent != NULL) - { - if (MemoryArea->Parent->LeftChild == MemoryArea) - ParentReplace = &MemoryArea->Parent->LeftChild; - else - ParentReplace = &MemoryArea->Parent->RightChild; - } - else - ParentReplace = (PMEMORY_AREA*)&AddressSpace->WorkingSetExpansionLinks.Flink; - - if (MemoryArea->RightChild == NULL) - { - *ParentReplace = MemoryArea->LeftChild; - if (MemoryArea->LeftChild) - MemoryArea->LeftChild->Parent = MemoryArea->Parent; - } - else - { - if (MemoryArea->RightChild->LeftChild == NULL) - { - MemoryArea->RightChild->LeftChild = MemoryArea->LeftChild; - if (MemoryArea->LeftChild) - MemoryArea->LeftChild->Parent = MemoryArea->RightChild; - - *ParentReplace = MemoryArea->RightChild; - MemoryArea->RightChild->Parent = MemoryArea->Parent; - } - else - { - PMEMORY_AREA LowestNode; - - LowestNode = MemoryArea->RightChild->LeftChild; - while (LowestNode->LeftChild != NULL) - LowestNode = LowestNode->LeftChild; - - LowestNode->Parent->LeftChild = LowestNode->RightChild; - if (LowestNode->RightChild) - LowestNode->RightChild->Parent = LowestNode->Parent; - - LowestNode->LeftChild = MemoryArea->LeftChild; - if (MemoryArea->LeftChild) - MemoryArea->LeftChild->Parent = LowestNode; - - LowestNode->RightChild = MemoryArea->RightChild; - MemoryArea->RightChild->Parent = LowestNode; - - *ParentReplace = LowestNode; - LowestNode->Parent = MemoryArea->Parent; - } - } - } - ExFreePoolWithTag(MemoryArea, TAG_MAREA); DPRINT("MmFreeMemoryAreaByNode() succeeded\n"); @@ -747,22 +431,16 @@ Type, BaseAddress, *BaseAddress, Length, AllocationFlags, Result); - // - // Is this a static memory area? - // + /* Is this a static memory area? */ if (Type & MEMORY_AREA_STATIC) { - // - // Use the static array instead of the pool - // + /* Use the static array instead of the pool */ ASSERT(MiStaticMemoryAreaCount < MI_STATIC_MEMORY_AREAS); MemoryArea = &MiStaticMemoryAreas[MiStaticMemoryAreaCount++]; } else { - // - // Allocate the memory area from nonpaged pool - // + /* Allocate the memory area from nonpaged pool */ MemoryArea = ExAllocatePoolWithTag(NonPagedPool, sizeof(MEMORY_AREA), TAG_MAREA); @@ -778,7 +456,6 @@ MemoryArea->Type = Type & ~MEMORY_AREA_STATIC; MemoryArea->Protect = Protect; MemoryArea->Flags = AllocationFlags; - //MemoryArea->LockCount = 0; MemoryArea->Magic = 'erAM'; MemoryArea->DeleteInProgress = FALSE;

1 0

[tkreuzer] 67798: [NTOSKRNL] Don't check if a AMR3 owned memory area can be inserted, since we already know it's ok. Delete the related memory area code.
by tkreuzer＠svn.reactos.org 17 May '15

17 May '15

Author: tkreuzer Date: Sun May 17 00:35:47 2015 New Revision: 67798 URL: http://svn.reactos.org/svn/reactos?rev=67798&view=rev Log: [NTOSKRNL] Don't check if a AMR3 owned memory area can be inserted, since we already know it's ok. Delete the related memory area code. Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=67… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun May 17 00:35:47 2015 @@ -56,112 +56,6 @@ /* FUNCTIONS *****************************************************************/ -/** - * @name MmIterateFirstNode - * - * @param Node - * Head node of the MEMORY_AREA tree. - * - * @return The leftmost MEMORY_AREA node (ie. the one with lowest - * address) - */ - -static PMEMORY_AREA MmIterateFirstNode(PMEMORY_AREA Node) -{ - while (Node->LeftChild != NULL) - Node = Node->LeftChild; - - return Node; -} - -/** - * @name MmIterateNextNode - * - * @param Node - * Current node in the tree. - * - * @return Next node in the tree (sorted by address). - */ - -static PMEMORY_AREA MmIterateNextNode(PMEMORY_AREA Node) -{ - if (Node->RightChild != NULL) - { - Node = Node->RightChild; - while (Node->LeftChild != NULL) - Node = Node->LeftChild; - } - else - { - PMEMORY_AREA TempNode = NULL; - - do - { - /* Check if we're at the end of tree. */ - if (Node->Parent == NULL) - return NULL; - - TempNode = Node; - Node = Node->Parent; - } - while (TempNode == Node->RightChild); - } - return Node; -} - -/** - * @name MmIterateLastNode - * - * @param Node - * Head node of the MEMORY_AREA tree. - * - * @return The rightmost MEMORY_AREA node (ie. the one with highest - * address) - */ - -static PMEMORY_AREA MmIterateLastNode(PMEMORY_AREA Node) -{ - while (Node->RightChild != NULL) - Node = Node->RightChild; - - return Node; -} - -/** - * @name MmIteratePreviousNode - * - * @param Node - * Current node in the tree. - * - * @return Previous node in the tree (sorted by address). - */ - -static PMEMORY_AREA MmIteratePrevNode(PMEMORY_AREA Node) -{ - if (Node->LeftChild != NULL) - { - Node = Node->LeftChild; - while (Node->RightChild != NULL) - Node = Node->RightChild; - } - else - { - PMEMORY_AREA TempNode = NULL; - - do - { - /* Check if we're at the end of tree. */ - if (Node->Parent == NULL) - return NULL; - - TempNode = Node; - Node = Node->Parent; - } - while (TempNode == Node->LeftChild); - } - return Node; -} - PMEMORY_AREA NTAPI MmLocateMemoryAreaByAddress( PMMSUPPORT AddressSpace, @@ -256,59 +150,6 @@ return MemoryArea; } -PMEMORY_AREA -NTAPI -MmLocateMemoryAreaByRegionOld( - PMMSUPPORT AddressSpace, - PVOID Address_, - ULONG_PTR Length) -{ - PMEMORY_AREA Node; - ULONG_PTR Address = (ULONG_PTR)Address_; - ULONG_PTR Extent = Address + Length; - - /* Special case for empty tree. */ - if (AddressSpace->WorkingSetExpansionLinks.Flink == NULL) - return NULL; - - /* Traverse the tree from left to right. */ - for (Node = MmIterateFirstNode((PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink); - Node != NULL; - Node = MmIterateNextNode(Node)) - { - if (MA_GetStartingAddress(Node) >= Address && - MA_GetStartingAddress(Node) < Extent) - { - DPRINT("MmLocateMemoryAreaByRegion(%p - %p): %p - %p\n", - Address, (ULONG_PTR)Address + Length, MA_GetStartingAddress(Node), - MA_GetEndingAddress(Node)); - return Node; - } - if (MA_GetEndingAddress(Node) > Address && - MA_GetEndingAddress(Node) < Extent) - { - DPRINT("MmLocateMemoryAreaByRegion(%p - %p): %p - %p\n", - Address, (ULONG_PTR)Address + Length, MA_GetStartingAddress(Node), - MA_GetEndingAddress(Node)); - return Node; - } - if (MA_GetStartingAddress(Node) <= Address && - MA_GetEndingAddress(Node) >= Extent) - { - DPRINT("MmLocateMemoryAreaByRegion(%p - %p): %p - %p\n", - Address, (ULONG_PTR)Address + Length, MA_GetStartingAddress(Node), - MA_GetEndingAddress(Node)); - return Node; - } - if (MA_GetStartingAddress(Node) >= Extent) - { - DPRINT("Finished MmLocateMemoryAreaByRegion() = NULL\n"); - return NULL; - } - } - - return NULL; -} /** * @name MmCompressHelper @@ -980,20 +821,8 @@ return STATUS_ACCESS_VIOLATION; } - /* Check if this is a region owned by ARM3 */ - if (MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3) - { - /* ARM3 is inserting this MA to synchronize the old tree, use the old tree */ - if (MmLocateMemoryAreaByRegionOld(AddressSpace, - *BaseAddress, - tmpLength) != NULL) - { - DPRINT("Memory area already occupied\n"); - if (!(Type & MEMORY_AREA_STATIC)) ExFreePoolWithTag(MemoryArea, TAG_MAREA); - return STATUS_CONFLICTING_ADDRESSES; - } - } - else + /* No need to check ARM3 owned memory areas, the range MUST be free */ + if (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3) { if (MmLocateMemoryAreaByRegion(AddressSpace, *BaseAddress,

1 0

[tkreuzer] 67797: [NTOSKRNL] Add a tiny hack to MiFindEmptyAddressRangeInTree and MiFindEmptyAddressRangeDownTree to support VADs in the kernel VA range. Make MmFindGap use those functions to look ...
by tkreuzer＠svn.reactos.org 17 May '15

17 May '15

Author: tkreuzer Date: Sun May 17 00:35:37 2015 New Revision: 67797 URL: http://svn.reactos.org/svn/reactos?rev=67797&view=rev Log: [NTOSKRNL] Add a tiny hack to MiFindEmptyAddressRangeInTree and MiFindEmptyAddressRangeDownTree to support VADs in the kernel VA range. Make MmFindGap use those functions to look for free space. Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/marea.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] Sun May 17 00:35:37 2015 @@ -506,13 +506,19 @@ OUT PULONG_PTR Base) { PMMADDRESS_NODE Node, PreviousNode; - ULONG_PTR PageCount, AlignmentVpn, LowVpn, HighVpn; + ULONG_PTR PageCount, AlignmentVpn, LowVpn, HighestVpn; ASSERT(Length != 0); /* Calculate page numbers for the length, alignment, and starting address */ PageCount = BYTES_TO_PAGES(Length); AlignmentVpn = Alignment >> PAGE_SHIFT; LowVpn = ALIGN_UP_BY((ULONG_PTR)MM_LOWEST_USER_ADDRESS >> PAGE_SHIFT, AlignmentVpn); + + /* Check for kernel mode table (memory areas) */ + if (Table->Unused == 1) + { + LowVpn = ALIGN_UP_BY((ULONG_PTR)MmSystemRangeStart >> PAGE_SHIFT, AlignmentVpn); + } /* Check if the table is empty */ if (Table->NumberGenericTableElements == 0) @@ -566,8 +572,15 @@ } /* We're up to the highest VAD, will this allocation fit above it? */ - HighVpn = ((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1) / PAGE_SIZE; - if (HighVpn >= LowVpn + PageCount) + HighestVpn = ((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1) / PAGE_SIZE; + + /* Check for kernel mode table (memory areas) */ + if (Table->Unused == 1) + { + HighestVpn = ALIGN_UP_BY((ULONG_PTR)(LONG_PTR)-1 >> PAGE_SHIFT, AlignmentVpn); + } + + if (HighestVpn >= LowVpn + PageCount) { /* Yes! Use this VAD to store the allocation */ *PreviousVad = PreviousNode; @@ -602,9 +615,18 @@ PageCount = Length >> PAGE_SHIFT; AlignmentVpn = Alignment / PAGE_SIZE; + /* Check for kernel mode table (memory areas) */ + if (Table->Unused == 1) + { + LowVpn = ALIGN_UP_BY((ULONG_PTR)MmSystemRangeStart >> PAGE_SHIFT, AlignmentVpn); + } + else + { + LowVpn = ALIGN_UP_BY((ULONG_PTR)MM_LOWEST_USER_ADDRESS, Alignment); + } + /* Check if there is enough space below the boundary */ - if ((ALIGN_UP_BY((ULONG_PTR)MM_LOWEST_USER_ADDRESS, Alignment) + Length) > - (BoundaryAddress + 1)) + if ((LowVpn + Length) > (BoundaryAddress + 1)) { return TableFoundNode; } Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=67… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun May 17 00:35:37 2015 @@ -455,6 +455,7 @@ /* Build a lame VAD if this is a user-space allocation */ if (MA_GetEndingAddress(marea) < (ULONG_PTR)MmSystemRangeStart) { + ASSERT(Process != NULL); if (marea->Type != MEMORY_AREA_OWNED_BY_ARM3) { ASSERT(marea->Type == MEMORY_AREA_SECTION_VIEW || marea->Type == MEMORY_AREA_CACHE); @@ -468,9 +469,12 @@ } else { + ASSERT(Process == NULL); + if (!MiRosKernelVadRootInitialized) { MiRosKernelVadRoot.BalancedRoot.u1.Parent = &MiRosKernelVadRoot.BalancedRoot; + MiRosKernelVadRoot.Unused = 1; MiRosKernelVadRootInitialized = TRUE; } @@ -526,148 +530,6 @@ PreviousNode->RightChild = marea; } -static PVOID -MmFindGapBottomUp( - PMMSUPPORT AddressSpace, - ULONG_PTR Length, - ULONG_PTR Granularity) -{ - ULONG_PTR LowestAddress, HighestAddress, Candidate; - PMEMORY_AREA Root, Node; - - /* Get the margins of the address space */ - if (MmGetAddressSpaceOwner(AddressSpace) != NULL) - { - LowestAddress = (ULONG_PTR)MM_LOWEST_USER_ADDRESS; - HighestAddress = (ULONG_PTR)MmHighestUserAddress; - } - else - { - LowestAddress = (ULONG_PTR)MmSystemRangeStart; - HighestAddress = MAXULONG_PTR; - } - - /* Start with the lowest address */ - Candidate = LowestAddress; - - /* Check for overflow */ - if ((Candidate + Length) < Candidate) return NULL; - - /* Get the root of the address space tree */ - Root = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; - - /* Go to the node with lowest address in the tree. */ - Node = Root ? MmIterateFirstNode(Root) : NULL; - while (Node && ((ULONG_PTR)MA_GetEndingAddress(Node) < LowestAddress)) - { - Node = MmIterateNextNode(Node); - } - - /* Traverse the tree from low to high addresses */ - while (Node && ((ULONG_PTR)MA_GetEndingAddress(Node) < HighestAddress)) - { - /* Check if the memory area fits before the current node */ - if (MA_GetStartingAddress(Node) >= (Candidate + Length)) - { - DPRINT("MmFindGapBottomUp: %p\n", Candidate); - ASSERT(Candidate >= LowestAddress); - return (PVOID)Candidate; - } - - /* Calculate next possible adress above this node */ - Candidate = ALIGN_UP_BY((ULONG_PTR)MA_GetEndingAddress(Node), Granularity); - - /* Check for overflow */ - if ((Candidate + Length) < (ULONG_PTR)MA_GetEndingAddress(Node)) return NULL; - - /* Go to the next higher node */ - Node = MmIterateNextNode(Node); - } - - /* Check if there is enough space after the last memory area. */ - if ((Candidate + Length) <= HighestAddress) - { - DPRINT("MmFindGapBottomUp: %p\n", Candidate); - ASSERT(Candidate >= LowestAddress); - return (PVOID)Candidate; - } - - DPRINT("MmFindGapBottomUp: 0\n"); - return NULL; -} - - -static PVOID -MmFindGapTopDown( - PMMSUPPORT AddressSpace, - ULONG_PTR Length, - ULONG_PTR Granularity) -{ - ULONG_PTR LowestAddress, HighestAddress, Candidate; - PMEMORY_AREA Root, Node; - - /* Get the margins of the address space */ - if (MmGetAddressSpaceOwner(AddressSpace) != NULL) - { - LowestAddress = (ULONG_PTR)MM_LOWEST_USER_ADDRESS; - HighestAddress = (ULONG_PTR)MmHighestUserAddress; - } - else - { - LowestAddress = (ULONG_PTR)MmSystemRangeStart; - HighestAddress = MAXULONG_PTR; - } - - /* Calculate the highest candidate */ - Candidate = ALIGN_DOWN_BY(HighestAddress + 1 - Length, Granularity); - - /* Check for overflow. */ - if (Candidate > HighestAddress) return NULL; - - /* Get the root of the address space tree */ - Root = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; - - /* Go to the node with highest address in the tree. */ - Node = Root ? MmIterateLastNode(Root) : NULL; - while (Node && (MA_GetStartingAddress(Node) > HighestAddress)) - { - Node = MmIteratePrevNode(Node); - } - - /* Traverse the tree from high to low addresses */ - while (Node && (MA_GetStartingAddress(Node) > LowestAddress)) - { - /* Check if the memory area fits after the current node */ - if ((ULONG_PTR)MA_GetEndingAddress(Node) <= Candidate) - { - DPRINT("MmFindGapTopDown: %p\n", Candidate); - return (PVOID)Candidate; - } - - /* Calculate next possible adress below this node */ - Candidate = ALIGN_DOWN_BY(MA_GetStartingAddress(Node) - Length, - Granularity); - - /* Check for overflow. */ - if (Candidate > MA_GetStartingAddress(Node)) - return NULL; - - /* Go to the next lower node */ - Node = MmIteratePrevNode(Node); - } - - /* Check if the last candidate is inside the given range */ - if (Candidate >= LowestAddress) - { - DPRINT("MmFindGapTopDown: %p\n", Candidate); - return (PVOID)Candidate; - } - - DPRINT("MmFindGapTopDown: 0\n"); - return NULL; -} - - PVOID NTAPI MmFindGap( PMMSUPPORT AddressSpace, @@ -675,10 +537,45 @@ ULONG_PTR Granularity, BOOLEAN TopDown) { + PEPROCESS Process; + PMM_AVL_TABLE VadRoot; + TABLE_SEARCH_RESULT Result; + PMMADDRESS_NODE Parent; + ULONG_PTR StartingAddress, HighestAddress; + + Process = MmGetAddressSpaceOwner(AddressSpace); + VadRoot = Process ? &Process->VadRoot : &MiRosKernelVadRoot; if (TopDown) - return MmFindGapTopDown(AddressSpace, Length, Granularity); - - return MmFindGapBottomUp(AddressSpace, Length, Granularity); + { + /* Find an address top-down */ + HighestAddress = Process ? (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS : (LONG_PTR)-1; + Result = MiFindEmptyAddressRangeDownTree(Length, + HighestAddress, + Granularity, + VadRoot, + &StartingAddress, + &Parent); + if (Result == TableFoundNode) + { + return NULL; + } + + return (PVOID)StartingAddress; + } + else + { + Result = MiFindEmptyAddressRangeInTree(Length, + Granularity, + VadRoot, + &Parent, + &StartingAddress); + if (Result == TableFoundNode) + { + return NULL; + } + + return (PVOID)StartingAddress; + } } VOID

1 0

[tkreuzer] 67796: [NTOSKRNL] Get rid of MiRosTakeOverSharedUserPage. We don't need it anymore, since the user page is manually handled in the page fault handler and since it's outside the VAD regio...
by tkreuzer＠svn.reactos.org 17 May '15

17 May '15

Author: tkreuzer Date: Sun May 17 00:35:23 2015 New Revision: 67796 URL: http://svn.reactos.org/svn/reactos?rev=67796&view=rev Log: [NTOSKRNL] Get rid of MiRosTakeOverSharedUserPage. We don't need it anymore, since the user page is manually handled in the page fault handler and since it's outside the VAD region, we don't need to block that range. Now there should be no memory areas left at all in MmDeleteProcessAddressSpace. Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/marea.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] Sun May 17 00:35:23 2015 @@ -23,25 +23,6 @@ SLIST_HEADER MmDeadStackSListHead; /* PRIVATE FUNCTIONS **********************************************************/ - -VOID -NTAPI -MiRosTakeOverSharedUserPage(IN PEPROCESS Process) -{ - NTSTATUS Status; - PMEMORY_AREA MemoryArea; - PVOID AllocatedBase = (PVOID)MM_SHARED_USER_DATA_VA; - - Status = MmCreateMemoryArea(&Process->Vm, - MEMORY_AREA_OWNED_BY_ARM3, - &AllocatedBase, - PAGE_SIZE, - PAGE_READWRITE, - &MemoryArea, - 0, - PAGE_SIZE); - ASSERT(NT_SUCCESS(Status)); -} NTSTATUS NTAPI @@ -973,9 +954,6 @@ /* Release PFN lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - /* Lock the VAD, ARM3-owned ranges away */ - MiRosTakeOverSharedUserPage(Process); - /* Check if there's a Section Object */ if (SectionObject) { @@ -1077,7 +1055,6 @@ MmInitializeHandBuiltProcess2(IN PEPROCESS Process) { /* Lock the VAD, ARM3-owned ranges away */ - MiRosTakeOverSharedUserPage(Process); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=67… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun May 17 00:35:23 2015 @@ -1173,7 +1173,6 @@ MmDeleteProcessAddressSpace(PEPROCESS Process) { PVOID Address; - PMEMORY_AREA MemoryArea; DPRINT("MmDeleteProcessAddressSpace(Process %p (%s))\n", Process, Process->ImageFileName); @@ -1183,16 +1182,8 @@ #endif MmLockAddressSpace(&Process->Vm); - while ((MemoryArea = (PMEMORY_AREA)Process->Vm.WorkingSetExpansionLinks.Flink) != NULL) - { - /* There should be nothing else left */ - ASSERT(MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3); - - MmFreeMemoryArea(&Process->Vm, - MemoryArea, - NULL, - NULL); - } + /* There should not be any memory areas left! */ + ASSERT(Process->Vm.WorkingSetExpansionLinks.Flink == NULL); #if (_MI_PAGING_LEVELS == 2) {

1 0

[tkreuzer] 67795: [NTOSKRNL] Modify MmLocateMemoryAreaByAddress as well to use the VAD table. Since the page fault handler uses it to find ARM3-Fault pages and the shared user page does have a memo...
by tkreuzer＠svn.reactos.org 17 May '15

17 May '15

Author: tkreuzer Date: Sun May 17 00:35:09 2015 New Revision: 67795 URL: http://svn.reactos.org/svn/reactos?rev=67795&view=rev Log: [NTOSKRNL] Modify MmLocateMemoryAreaByAddress as well to use the VAD table. Since the page fault handler uses it to find ARM3-Fault pages and the shared user page does have a memory area, but not a VAD, add a check for the shared user page in the old fault handler. Modified: trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mmfault.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=67… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun May 17 00:35:09 2015 @@ -167,28 +167,44 @@ PMMSUPPORT AddressSpace, PVOID Address_) { - PMEMORY_AREA Node = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; - ULONG_PTR Address = (ULONG_PTR)Address_; - - DPRINT("MmLocateMemoryAreaByAddress(AddressSpace %p, Address %p)\n", - AddressSpace, Address); - - while (Node != NULL) - { - if (Address < MA_GetStartingAddress(Node)) - Node = Node->LeftChild; - else if (Address >= MA_GetEndingAddress(Node)) - Node = Node->RightChild; + ULONG_PTR StartVpn = (ULONG_PTR)Address_ / PAGE_SIZE; + PEPROCESS Process; + PMM_AVL_TABLE Table; + PMMADDRESS_NODE Node; + PMEMORY_AREA MemoryArea; + TABLE_SEARCH_RESULT Result; + PMMVAD_LONG Vad; + + Process = MmGetAddressSpaceOwner(AddressSpace); + Table = (Process != NULL) ? &Process->VadRoot : &MiRosKernelVadRoot; + + Result = MiCheckForConflictingNode(StartVpn, StartVpn, Table, &Node); + if (Result != TableFoundNode) + { + return NULL; + } + + Vad = (PMMVAD_LONG)Node; + if (Vad->u.VadFlags.Spare == 0) + { + /* Check if this is VM VAD */ + if (Vad->ControlArea == NULL) + { + /* We store the reactos MEMORY_AREA here */ + MemoryArea = (PMEMORY_AREA)Vad->FirstPrototypePte; + } else { - DPRINT("MmLocateMemoryAreaByAddress(%p): %p [%p - %p]\n", - Address, Node, MA_GetStartingAddress(Node), MA_GetEndingAddress(Node)); - return Node; - } - } - - DPRINT("MmLocateMemoryAreaByAddress(%p): 0\n", Address); - return NULL; + /* This is a section VAD. Store the MAREA here for now */ + MemoryArea = (PMEMORY_AREA)Vad->u4.Banked; + } + } + else + { + MemoryArea = (PMEMORY_AREA)Node; + } + + return MemoryArea; } PMEMORY_AREA 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] Sun May 17 00:35:09 2015 @@ -221,6 +221,14 @@ #endif } + /* Handle shared user page, which doesn't have a VAD / MemoryArea */ + if (PAGE_ALIGN(Address) == (PVOID)MM_SHARED_USER_DATA_VA) + { + /* This is an ARM3 fault */ + DPRINT("ARM3 fault %p\n", MemoryArea); + return MmArmAccessFault(StoreInstruction, Address, Mode, TrapInformation); + } + /* Is there a ReactOS address space yet? */ if (MmGetKernelAddressSpace()) {

1 0

[tkreuzer] 67794: [NTOSKRNL] Implement MiRosCleanupMemoryArea to cleanup memory areas from MmCleanProcessAddressSpace, since later when we remove the old-style memory area links, we will not be abl...
by tkreuzer＠svn.reactos.org 17 May '15

17 May '15

Author: tkreuzer Date: Sun May 17 00:34:59 2015 New Revision: 67794 URL: http://svn.reactos.org/svn/reactos?rev=67794&view=rev Log: [NTOSKRNL] Implement MiRosCleanupMemoryArea to cleanup memory areas from MmCleanProcessAddressSpace, since later when we remove the old-style memory area links, we will not be able to retrieve those. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/marea.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] Sun May 17 00:34:59 2015 @@ -507,6 +507,12 @@ PVOID FreePageContext ); +VOID +NTAPI +MiRosCleanupMemoryArea( + PEPROCESS Process, + PMMVAD Vad); + NTSTATUS NTAPI MmFreeMemoryAreaByPtr( 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] Sun May 17 00:34:59 2015 @@ -1279,6 +1279,14 @@ /* Grab the current VAD */ Vad = (PMMVAD)VadTree->BalancedRoot.RightChild; + /* Check for old-style memory areas */ + if (Vad->u.VadFlags.Spare == 1) + { + /* Let RosMm handle this */ + MiRosCleanupMemoryArea(Process, Vad); + continue; + } + /* Lock the working set */ MiLockProcessWorkingSetUnsafe(Process, Thread); @@ -1306,7 +1314,7 @@ MiUnlockProcessWorkingSetUnsafe(Process, Thread); } - /* Skip ARM3 fake VADs, they'll be freed by MmDeleteProcessAddresSpace */ + /* Skip ARM3 fake VADs, they'll be freed by MmDeleteProcessAddresSpace */ if (Vad->u.VadFlags.Spare == 1) { /* Set a flag so MmDeleteMemoryArea knows to free, but not to remove */ Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=67… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun May 17 00:34:59 2015 @@ -1103,6 +1103,50 @@ return STATUS_SUCCESS; } +VOID +NTAPI +MiRosCleanupMemoryArea( + PEPROCESS Process, + PMMVAD Vad) +{ + PMEMORY_AREA MemoryArea; + PVOID BaseAddress; + NTSTATUS Status; + + /* We must be called from MmCleanupAddressSpace and nowhere else! + Make sure things are as expected... */ + ASSERT(Process == PsGetCurrentProcess()); + ASSERT(Process->VmDeleted == TRUE); + ASSERT(((PsGetCurrentThread()->ThreadsProcess == Process) && + (Process->ActiveThreads == 1)) || + (Process->ActiveThreads == 0)); + + /* We are in cleanup, we don't need to synchronize */ + MmUnlockAddressSpace(&Process->Vm); + + MemoryArea = (PMEMORY_AREA)Vad; + BaseAddress = (PVOID)MA_GetStartingAddress(MemoryArea); + + if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) + { + Status = MiRosUnmapViewOfSection(Process, BaseAddress, 0); + } + else if (MemoryArea->Type == MEMORY_AREA_CACHE) + { + Status = MmUnmapViewOfCacheSegment(&Process->Vm, BaseAddress); + } + else + { + /* There shouldn't be anything else! */ + ASSERT(FALSE); + } + + /* Make sure this worked! */ + ASSERT(NT_SUCCESS(Status)); + + /* Lock the address space again */ + MmLockAddressSpace(&Process->Vm); +} VOID NTAPI @@ -1125,32 +1169,13 @@ while ((MemoryArea = (PMEMORY_AREA)Process->Vm.WorkingSetExpansionLinks.Flink) != NULL) { - switch (MemoryArea->Type) - { - case MEMORY_AREA_SECTION_VIEW: - Address = (PVOID)MA_GetStartingAddress(MemoryArea); - MmUnlockAddressSpace(&Process->Vm); - MmUnmapViewOfSection(Process, Address); - MmLockAddressSpace(&Process->Vm); - break; - - case MEMORY_AREA_CACHE: - Address = (PVOID)MA_GetStartingAddress(MemoryArea); - MmUnlockAddressSpace(&Process->Vm); - MmUnmapViewOfCacheSegment(&Process->Vm, Address); - MmLockAddressSpace(&Process->Vm); - break; - - case MEMORY_AREA_OWNED_BY_ARM3: - MmFreeMemoryArea(&Process->Vm, - MemoryArea, - NULL, - NULL); - break; - - default: - KeBugCheck(MEMORY_MANAGEMENT); - } + /* There should be nothing else left */ + ASSERT(MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3); + + MmFreeMemoryArea(&Process->Vm, + MemoryArea, + NULL, + NULL); } #if (_MI_PAGING_LEVELS == 2) @@ -1176,6 +1201,7 @@ MiQueryPageTableReferences(Address)); ASSERT(MiQueryPageTableReferences(Address) == 0); } + pointerPde = MiAddressToPde(Address); /* Unlike in ARM3, we don't necesarrily free the PDE page as soon as reference reaches 0, * so we must clean up a bit when process closes */ @@ -1183,6 +1209,7 @@ MiDeletePte(pointerPde, MiPdeToPte(pointerPde), Process, NULL); ASSERT(pointerPde->u.Hard.Valid == 0); } + /* Release lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql);

1 0

[tkreuzer] 67793: [NTOSKRNL] Use the VAD tree to search for MEMORY_AREAS, except when inserting an ARM3 based MA. In this case we still need to use the old tables, since the related VAD is already ...
by tkreuzer＠svn.reactos.org 17 May '15

17 May '15

Author: tkreuzer Date: Sun May 17 00:34:45 2015 New Revision: 67793 URL: http://svn.reactos.org/svn/reactos?rev=67793&view=rev Log: [NTOSKRNL] Use the VAD tree to search for MEMORY_AREAS, except when inserting an ARM3 based MA. In this case we still need to use the old tables, since the related VAD is already inserted into the VAD tree. Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=67… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun May 17 00:34:45 2015 @@ -51,6 +51,9 @@ MEMORY_AREA MiStaticMemoryAreas[MI_STATIC_MEMORY_AREAS]; ULONG MiStaticMemoryAreaCount; +MM_AVL_TABLE MiRosKernelVadRoot; +BOOLEAN MiRosKernelVadRootInitialized; + /* FUNCTIONS *****************************************************************/ /** @@ -188,8 +191,58 @@ return NULL; } -PMEMORY_AREA NTAPI +PMEMORY_AREA +NTAPI MmLocateMemoryAreaByRegion( + PMMSUPPORT AddressSpace, + PVOID Address_, + ULONG_PTR Length) +{ + ULONG_PTR StartVpn = (ULONG_PTR)Address_ / PAGE_SIZE; + ULONG_PTR EndVpn = ((ULONG_PTR)Address_ + Length - 1) / PAGE_SIZE; + PEPROCESS Process; + PMM_AVL_TABLE Table; + PMMADDRESS_NODE Node; + PMEMORY_AREA MemoryArea; + TABLE_SEARCH_RESULT Result; + PMMVAD_LONG Vad; + + Process = MmGetAddressSpaceOwner(AddressSpace); + Table = (Process != NULL) ? &Process->VadRoot : &MiRosKernelVadRoot; + + Result = MiCheckForConflictingNode(StartVpn, EndVpn, Table, &Node); + if (Result != TableFoundNode) + { + return NULL; + } + + Vad = (PMMVAD_LONG)Node; + if (Vad->u.VadFlags.Spare == 0) + { + /* Check if this is VM VAD */ + if (Vad->ControlArea == NULL) + { + /* We store the reactos MEMORY_AREA here */ + MemoryArea = (PMEMORY_AREA)Vad->FirstPrototypePte; + } + else + { + /* This is a section VAD. Store the MAREA here for now */ + MemoryArea = (PMEMORY_AREA)Vad->u4.Banked; + } + } + else + { + MemoryArea = (PMEMORY_AREA)Node; + } + + ASSERT(MemoryArea != NULL); + return MemoryArea; +} + +PMEMORY_AREA +NTAPI +MmLocateMemoryAreaByRegionOld( PMMSUPPORT AddressSpace, PVOID Address_, ULONG_PTR Length) @@ -367,8 +420,6 @@ IN ULONG Protect ); -MM_AVL_TABLE MiRosKernelVadRoot; -BOOLEAN MiRosKernelVadRootInitialized; static VOID MmInsertMemoryArea( @@ -1016,13 +1067,29 @@ return STATUS_ACCESS_VIOLATION; } - if (MmLocateMemoryAreaByRegion(AddressSpace, - *BaseAddress, - tmpLength) != NULL) - { - DPRINT("Memory area already occupied\n"); - if (!(Type & MEMORY_AREA_STATIC)) ExFreePoolWithTag(MemoryArea, TAG_MAREA); - return STATUS_CONFLICTING_ADDRESSES; + /* Check if this is a region owned by ARM3 */ + if (MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3) + { + /* ARM3 is inserting this MA to synchronize the old tree, use the old tree */ + if (MmLocateMemoryAreaByRegionOld(AddressSpace, + *BaseAddress, + tmpLength) != NULL) + { + DPRINT("Memory area already occupied\n"); + if (!(Type & MEMORY_AREA_STATIC)) ExFreePoolWithTag(MemoryArea, TAG_MAREA); + return STATUS_CONFLICTING_ADDRESSES; + } + } + else + { + if (MmLocateMemoryAreaByRegion(AddressSpace, + *BaseAddress, + tmpLength) != NULL) + { + DPRINT("Memory area already occupied\n"); + if (!(Type & MEMORY_AREA_STATIC)) ExFreePoolWithTag(MemoryArea, TAG_MAREA); + return STATUS_CONFLICTING_ADDRESSES; + } } MemoryArea->StartingVpn = (ULONG_PTR)*BaseAddress >> PAGE_SHIFT;

1 0

[tkreuzer] 67792: [NTOSKRNL] Insert kernel memory areas into a "kernel VAD table".
by tkreuzer＠svn.reactos.org 16 May '15

16 May '15

Author: tkreuzer Date: Sat May 16 23:36:42 2015 New Revision: 67792 URL: http://svn.reactos.org/svn/reactos?rev=67792&view=rev Log: [NTOSKRNL] Insert kernel memory areas into a "kernel VAD table". Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/marea.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] Sat May 16 23:36:42 2015 @@ -2039,13 +2039,6 @@ IN ULONG ProtectionMask ); -VOID -NTAPI -MiInsertVad( - IN PMMVAD Vad, - IN PEPROCESS Process -); - NTSTATUS NTAPI MiInsertVadEx( 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] Sat May 16 23:36:42 2015 @@ -181,24 +181,22 @@ VOID NTAPI MiInsertVad(IN PMMVAD Vad, - IN PEPROCESS Process) + IN PMM_AVL_TABLE VadRoot) { TABLE_SEARCH_RESULT Result; PMMADDRESS_NODE Parent = NULL; /* Validate the VAD and set it as the current hint */ ASSERT(Vad->EndingVpn >= Vad->StartingVpn); - Process->VadRoot.NodeHint = Vad; + VadRoot->NodeHint = Vad; /* Find the parent VAD and where this child should be inserted */ - Result = RtlpFindAvlTableNodeOrParent(&Process->VadRoot, (PVOID)Vad->StartingVpn, &Parent); + Result = RtlpFindAvlTableNodeOrParent(VadRoot, (PVOID)Vad->StartingVpn, &Parent); ASSERT(Result != TableFoundNode); ASSERT((Parent != NULL) || (Result == TableEmptyTree)); /* Do the actual insert operation */ - MiLockProcessWorkingSetUnsafe(PsGetCurrentProcess(), PsGetCurrentThread()); - MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); - MiUnlockProcessWorkingSetUnsafe(PsGetCurrentProcess(), PsGetCurrentThread()); + MiInsertNode(VadRoot, (PVOID)Vad, Parent, Result); } NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=67… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sat May 16 23:36:42 2015 @@ -359,7 +359,7 @@ VOID NTAPI MiInsertVad(IN PMMVAD Vad, - IN PEPROCESS Process); + IN PMM_AVL_TABLE VadRoot); ULONG NTAPI @@ -367,6 +367,9 @@ IN ULONG Protect ); +MM_AVL_TABLE MiRosKernelVadRoot; +BOOLEAN MiRosKernelVadRootInitialized; + static VOID MmInsertMemoryArea( PMMSUPPORT AddressSpace, @@ -377,23 +380,37 @@ ULONG Depth = 0; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + marea->VadNode.StartingVpn = marea->StartingVpn; + marea->VadNode.EndingVpn = marea->EndingVpn; + marea->VadNode.u.VadFlags.Spare = 1; + marea->VadNode.u.VadFlags.Protection = MiMakeProtectionMask(marea->Protect); + /* Build a lame VAD if this is a user-space allocation */ - if ((MA_GetEndingAddress(marea) < (ULONG_PTR)MmSystemRangeStart) && - (marea->Type != MEMORY_AREA_OWNED_BY_ARM3)) - { - ASSERT(marea->Type == MEMORY_AREA_SECTION_VIEW || marea->Type == MEMORY_AREA_CACHE); - - marea->VadNode.StartingVpn = marea->StartingVpn; - marea->VadNode.EndingVpn = marea->EndingVpn; - marea->VadNode.u.VadFlags.Spare = 1; - marea->VadNode.u.VadFlags.Protection = MiMakeProtectionMask(marea->Protect); + if (MA_GetEndingAddress(marea) < (ULONG_PTR)MmSystemRangeStart) + { + if (marea->Type != MEMORY_AREA_OWNED_BY_ARM3) + { + ASSERT(marea->Type == MEMORY_AREA_SECTION_VIEW || marea->Type == MEMORY_AREA_CACHE); + + /* Insert the VAD */ + MiLockProcessWorkingSetUnsafe(PsGetCurrentProcess(), PsGetCurrentThread()); + MiInsertVad(&marea->VadNode, &Process->VadRoot); + MiUnlockProcessWorkingSetUnsafe(PsGetCurrentProcess(), PsGetCurrentThread()); + marea->Vad = &marea->VadNode; + } + } + else + { + if (!MiRosKernelVadRootInitialized) + { + MiRosKernelVadRoot.BalancedRoot.u1.Parent = &MiRosKernelVadRoot.BalancedRoot; + MiRosKernelVadRootInitialized = TRUE; + } /* Insert the VAD */ - MiInsertVad(&marea->VadNode, Process); - marea->Vad = &marea->VadNode; - } - else - { + MiLockWorkingSet(PsGetCurrentThread(), &MmSystemCacheWs); + MiInsertVad(&marea->VadNode, &MiRosKernelVadRoot); + MiUnlockWorkingSet(PsGetCurrentThread(), &MmSystemCacheWs); marea->Vad = NULL; } @@ -797,19 +814,24 @@ KeDetachProcess(); } + //if (MemoryArea->VadNode.StartingVpn < (ULONG_PTR)MmSystemRangeStart >> PAGE_SHIFT if (MemoryArea->Vad) { ASSERT(MA_GetEndingAddress(MemoryArea) < (ULONG_PTR)MmSystemRangeStart); ASSERT(MemoryArea->Type == MEMORY_AREA_SECTION_VIEW || MemoryArea->Type == MEMORY_AREA_CACHE); /* MmCleanProcessAddressSpace might have removed it (and this would be MmDeleteProcessAdressSpace) */ - ASSERT(((PMMVAD)MemoryArea->Vad)->u.VadFlags.Spare != 0); + ASSERT(MemoryArea->VadNode.u.VadFlags.Spare != 0); if (((PMMVAD)MemoryArea->Vad)->u.VadFlags.Spare == 1) { - MiRemoveNode(MemoryArea->Vad, &Process->VadRoot); + MiRemoveNode((PMMADDRESS_NODE)&MemoryArea->VadNode, &Process->VadRoot); } MemoryArea->Vad = NULL; + } + else + { + MiRemoveNode((PMMADDRESS_NODE)&MemoryArea->VadNode, &MiRosKernelVadRoot); } }

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