Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-12 22:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Save original value of the free descriptor we're using to alloc early pages from.

Browse source 
- Fix handling of PFN database pages inside PFN: largest free descriptor does not always end with the highest usable physical page (MmPageArraySize). This removes the need for a "good hack" introduced in revision 32405. As a result, the memory above the largest free descriptor (if it exists) is now correctly marked in the PFN database as free and added to the unzeroed list.

svn path=/trunk/; revision=32463
This commit is contained in:
Aleksey Bragin 2008-02-24 10:43:56 +00:00
parent a68d895e4d
commit fae9aa5c48
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/ntoskrnl/include/internal/mm.h
View file

@ -19,6 +19,7 @@ extern PVOID MmPagedPoolBase;
extern ULONG MmPagedPoolSize; extern ULONG MmPagedPoolSize;
extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor;
extern MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg;
extern ULONG MmHighestPhysicalPage; extern ULONG MmHighestPhysicalPage;
extern PVOID MmPfnDatabase; extern PVOID MmPfnDatabase;

12
reactos/ntoskrnl/mm/freelist.c
View file

@ -371,17 +371,11 @@ MmInitializePageList(VOID)
/* Finally handle the pages describing the PFN database themselves */ /* Finally handle the pages describing the PFN database themselves */
for (i = (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount); for (i = (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount);
i <= MmPageArraySize; i < (MiFreeDescriptorOrg.BasePage + MiFreeDescriptorOrg.PageCount);
i++) i++)
{ {
/* If this page was marked as free it should be removed from /* Ensure this page was not added previously */
the unzeroed free pages list */ ASSERT(MmPageArray[i].Flags.Type == 0);
if (MmPageArray[i].Flags.Type == MM_PHYSICAL_PAGE_FREE)
{
RemoveEntryList(&MmPageArray[i].ListEntry);
UnzeroedPageCount--;
MmStats.NrFreePages--;
}
/* Mark it as used kernel memory */ /* Mark it as used kernel memory */
MmPageArray[i] = UsedPage; MmPageArray[i] = UsedPage;

5
reactos/ntoskrnl/mm/mminit.c
View file

@ -55,6 +55,7 @@ ULONG_PTR MiKSeg0Start, MiKSeg0End;
PVOID MmPfnDatabase; PVOID MmPfnDatabase;
ULONG_PTR MmPfnDatabaseEnd; ULONG_PTR MmPfnDatabaseEnd;
PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor;
MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg;
extern KMUTANT MmSystemLoadLock; extern KMUTANT MmSystemLoadLock;
BOOLEAN MiDbgEnableMdDump = BOOLEAN MiDbgEnableMdDump =
#ifdef _ARM_ #ifdef _ARM_
@ -246,6 +247,10 @@ MiCountFreePagesInLoaderBlock(PLOADER_PARAMETER_BLOCK LoaderBlock)
} }
} }
} }
/* Save original values of the free descriptor, since it'll be
altered by early allocations */
MiFreeDescriptorOrg = *MiFreeDescriptor;
} }
VOID VOID