Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 32368: Review and fix the buildingg and mapping of boot-time kernel address space. The selection of the non-paged pool base address was broken (ion's comment was correct, but his implementation was not) -- NP pool now follows the PFN, or end of FreeLDR mapping area. There was no reason to put paged pool at a 4MB boundary away from NP pool -- it now follows it immediately. Got rid of multiple values which were calculated 3, even 4 times in a row, or even values that were calcula
by ros-arm-bringup＠svn.reactos.org 15 Feb '08

15 Feb '08

Author: ros-arm-bringup Date: Fri Feb 15 02:39:31 2008 New Revision: 32368 URL: http://svn.reactos.org/svn/reactos?rev=32368&view=rev Log: Review and fix the buildingg and mapping of boot-time kernel address space. The selection of the non-paged pool base address was broken (ion's comment was correct, but his implementation was not) -- NP pool now follows the PFN, or end of FreeLDR mapping area. There was no reason to put paged pool at a 4MB boundary away from NP pool -- it now follows it immediately. Got rid of multiple values which were calculated 3, even 4 times in a row, or even values that were calculated but never used (such as kernel_len). Got rid of the shuffling back and forth of kernel and virtual start/end addresses. A global now keeps track of this, and MmInit1 is now solely responsible for assigning addresses to each kernel region. Added new debug routine to show the kernel regions mapped -- enabled by default for now to visually detect any problems (once ReactOS's drivers go over 6MB, there may be). Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.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 (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Fri Feb 15 02:39:31 2008 @@ -17,6 +17,11 @@ extern PVOID MmPagedPoolBase; extern ULONG MmPagedPoolSize; + +extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; +extern ULONG MmHighestPhysicalPage; +extern PVOID MmPfnDatabase; +extern ULONG_PTR MiKSeg0Start, MiKSeg0End; struct _KTRAP_FRAME; struct _EPROCESS; @@ -260,6 +265,29 @@ ULONG PagingRequestsInLastFiveMinutes; ULONG PagingRequestsInLastFifteenMinutes; } MM_STATS; + +typedef struct _PHYSICAL_PAGE +{ + union + { + struct + { + ULONG Type: 2; + ULONG Consumer: 3; + ULONG Zero: 1; + } + Flags; + ULONG AllFlags; + }; + + LIST_ENTRY ListEntry; + ULONG ReferenceCount; + SWAPENTRY SavedSwapEntry; + ULONG LockCount; + ULONG MapCount; + struct _MM_RMAP_ENTRY* RmapListHead; +} +PHYSICAL_PAGE, *PPHYSICAL_PAGE; extern MM_STATS MmStats; @@ -532,12 +560,8 @@ VOID NTAPI MmInit1( - ULONG_PTR FirstKernelPhysAddress, - ULONG_PTR LastKernelPhysAddress, - ULONG_PTR LastKernelAddress, PADDRESS_RANGE BIOSMemoryMap, - ULONG AddressRangeCount, - ULONG MaxMemInMeg + ULONG AddressRangeCount ); BOOLEAN @@ -941,13 +965,9 @@ NTAPI MmGetLockCountPage(PFN_TYPE Page); -PVOID +VOID NTAPI MmInitializePageList( - ULONG_PTR FirstPhysKernelAddress, - ULONG_PTR LastPhysKernelAddress, - ULONG MemorySizeInPages, - ULONG_PTR LastKernelBase, PADDRESS_RANGE BIOSMemoryMap, ULONG AddressRangeCount ); Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Fri Feb 15 02:39:31 2008 @@ -537,12 +537,7 @@ ((PETHREAD)InitThread)->ThreadsProcess = (PEPROCESS)InitProcess; /* Initialize Kernel Memory Address Space */ - MmInit1(MmFreeLdrFirstKrnlPhysAddr, - MmFreeLdrLastKrnlPhysAddr, - MmFreeLdrLastKernelAddress, - KeMemoryMap, - KeMemoryMapRangeCount, - 4096); + MmInit1(KeMemoryMap, KeMemoryMapRangeCount); /* Set basic CPU Features that user mode can read */ SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Fri Feb 15 02:39:31 2008 @@ -25,29 +25,6 @@ #define MM_PHYSICAL_PAGE_FREE (0x1) #define MM_PHYSICAL_PAGE_USED (0x2) #define MM_PHYSICAL_PAGE_BIOS (0x3) - -typedef struct _PHYSICAL_PAGE -{ - union - { - struct - { - ULONG Type: 2; - ULONG Consumer: 3; - ULONG Zero: 1; - } - Flags; - ULONG AllFlags; - }; - - LIST_ENTRY ListEntry; - ULONG ReferenceCount; - SWAPENTRY SavedSwapEntry; - ULONG LockCount; - ULONG MapCount; - struct _MM_RMAP_ENTRY* RmapListHead; -} -PHYSICAL_PAGE, *PPHYSICAL_PAGE; #define ASSERT_PFN(x) ASSERT((x)->Flags.Type != 0) @@ -302,15 +279,9 @@ return TRUE; } - -PVOID -INIT_FUNCTION -NTAPI -MmInitializePageList(IN ULONG_PTR FirstPhysKernelAddress, - IN ULONG_PTR LastPhysKernelAddress, - IN ULONG HighestPage, - IN ULONG_PTR LastKernelAddress, - IN PADDRESS_RANGE BIOSMemoryMap, +VOID +NTAPI +MmInitializePageList(IN PADDRESS_RANGE BIOSMemoryMap, IN ULONG AddressRangeCount) { ULONG i; @@ -318,11 +289,11 @@ NTSTATUS Status; PFN_TYPE Pfn = 0; PHYSICAL_PAGE UsedPage; - extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; ULONG PdePageStart, PdePageEnd; ULONG VideoPageStart, VideoPageEnd; ULONG KernelPageStart, KernelPageEnd; + ULONG_PTR KernelStart, KernelEnd; /* Initialize the page lists */ KeInitializeSpinLock(&PageListLock); @@ -331,13 +302,9 @@ InitializeListHead(&FreeZeroedPageListHead); /* Set the size and start of the PFN Database */ - MmPageArraySize = HighestPage; - MmPageArray = (PHYSICAL_PAGE *)LastKernelAddress; + MmPageArray = (PHYSICAL_PAGE *)MmPfnDatabase; + MmPageArraySize = MmHighestPhysicalPage; Reserved = PAGE_ROUND_UP((MmPageArraySize * sizeof(PHYSICAL_PAGE))) / PAGE_SIZE; - - /* Update the last kernel address pointers */ - LastKernelAddress = ((ULONG_PTR)LastKernelAddress + (Reserved * PAGE_SIZE)); - LastPhysKernelAddress = (ULONG_PTR)LastPhysKernelAddress + (Reserved * PAGE_SIZE); /* Loop every page required to hold the PFN database */ for (i = 0; i < Reserved; i++) @@ -380,12 +347,14 @@ UsedPage.MapCount = 1; /* We'll be applying a bunch of hacks -- precompute some static values */ + KernelStart = MiKSeg0Start - KSEG0_BASE; + KernelEnd = MiKSeg0End - KSEG0_BASE; PdePageStart = PdeStart / PAGE_SIZE; PdePageEnd = MmFreeLdrPageDirectoryEnd / PAGE_SIZE; VideoPageStart = 0xA0000 / PAGE_SIZE; VideoPageEnd = 0x100000 / PAGE_SIZE; - KernelPageStart = FirstPhysKernelAddress / PAGE_SIZE; - KernelPageEnd = LastPhysKernelAddress / PAGE_SIZE; + KernelPageStart = KernelStart / PAGE_SIZE; + KernelPageEnd = KernelEnd / PAGE_SIZE; /* Loop every page on the system */ for (i = 0; i <= MmPageArraySize; i++) @@ -470,7 +439,6 @@ MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrUserPages; MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages); - return((PVOID)LastKernelAddress); } VOID Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Fri Feb 15 02:39:31 2008 @@ -49,7 +49,10 @@ PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress; PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; +ULONG MmBootImageSize; ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage; +ULONG_PTR MiKSeg0Start, MiKSeg0End; +PVOID MmPfnDatabase; PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; extern KMUTANT MmSystemLoadLock; BOOLEAN MiDbgEnableMdDump = @@ -71,8 +74,7 @@ VOID INIT_FUNCTION NTAPI -MmInitVirtualMemory(ULONG_PTR LastKernelAddress, - ULONG KernelLength) +MmInitVirtualMemory() { PVOID BaseAddress; ULONG Length; @@ -80,24 +82,9 @@ PHYSICAL_ADDRESS BoundaryAddressMultiple; PMEMORY_AREA MArea; - DPRINT("MmInitVirtualMemory(%x, %x)\n",LastKernelAddress, KernelLength); - BoundaryAddressMultiple.QuadPart = 0; - LastKernelAddress = PAGE_ROUND_UP(LastKernelAddress); MmInitMemoryAreas(); - - /* - * FreeLDR Marks 6MB "in use" at the start of the kernel base, - * so start the non-paged pool at a boundary of 6MB from where - * the last driver was loaded. This should be the end of the - * FreeLDR-marked region. - */ - MiNonPagedPoolStart = (PVOID)ROUND_UP((ULONG_PTR)LastKernelAddress + PAGE_SIZE, 0x600000); - MiNonPagedPoolLength = MM_NONPAGED_POOL_SIZE; - - MmPagedPoolBase = (PVOID)ROUND_UP((ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength + PAGE_SIZE, 0x400000); - MmPagedPoolSize = MM_PAGED_POOL_SIZE; DPRINT("NonPagedPool %x - %x, PagedPool %x - %x\n", MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength - 1, MmPagedPoolBase, (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize - 1); @@ -263,6 +250,32 @@ VOID NTAPI +MiDbgKernelLayout(VOID) +{ + DPRINT1("%8s%12s\t\t%s\n", "Start", "End", "Type"); + DPRINT1("0x%p - 0x%p\t%s\n", + KSEG0_BASE, MiKSeg0Start, + "Undefined region"); + DPRINT1("0x%p - 0x%p\t%s\n", + MiKSeg0Start, MmPfnDatabase, + "FreeLDR Kernel mapping region"); + DPRINT1("0x%p - 0x%p\t%s\n", + MmPfnDatabase, MiKSeg0End, + "PFN Database region"); + if (MiKSeg0End != (ULONG_PTR)MiNonPagedPoolStart) + DPRINT1("0x%p - 0x%p\t%s\n", + MiKSeg0End, MiNonPagedPoolStart, + "Remaining FreeLDR mapping"); + DPRINT1("0x%p - 0x%p\t%s\n", + MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength, + "Non paged pool region"); + DPRINT1("0x%p - 0x%p\t%s\n", + MmPagedPoolBase, (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize, + "Paged pool region"); +} + +VOID +NTAPI MiDbgDumpBiosMap(IN PADDRESS_RANGE BIOSMemoryMap, IN ULONG AddressRangeCount) { @@ -306,7 +319,7 @@ PLIST_ENTRY NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR Md; ULONG_PTR LastKrnlPhysAddr = 0; - + for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; NextEntry = NextEntry->Flink) @@ -320,7 +333,7 @@ LastKrnlPhysAddr = Md->BasePage+Md->PageCount; } } - + /* Convert to a physical address */ return LastKrnlPhysAddr << PAGE_SHIFT; } @@ -328,16 +341,11 @@ VOID INIT_FUNCTION NTAPI -MmInit1(ULONG_PTR FirstKrnlPhysAddr, - ULONG_PTR LastKrnlPhysAddr, - ULONG_PTR LastKernelAddress, - PADDRESS_RANGE BIOSMemoryMap, - ULONG AddressRangeCount, - ULONG MaxMem) -{ - ULONG kernel_len; +MmInit1(IN PADDRESS_RANGE BIOSMemoryMap, + IN ULONG AddressRangeCount) +{ PLDR_DATA_TABLE_ENTRY LdrEntry; - + /* Dump memory descriptors */ if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); if (MiDbgEnableMdDump) MiDbgDumpBiosMap(BIOSMemoryMap, AddressRangeCount); @@ -345,18 +353,9 @@ /* Set the page directory */ PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart = (ULONG)MmGetPageDirectory(); - /* NTLDR Hacks */ - if (!MmFreeLdrPageDirectoryEnd) MmFreeLdrPageDirectoryEnd = 0x40000; - - /* Get the first physical address */ - LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); - FirstKrnlPhysAddr = (ULONG_PTR)LdrEntry->DllBase - KSEG0_BASE; - - /* Get the last kernel address */ - LastKrnlPhysAddr = PAGE_ROUND_UP(MiGetLastKernelAddress()); - LastKernelAddress = LastKrnlPhysAddr | KSEG0_BASE; + /* Get the size of FreeLDR's image allocations */ + MmBootImageSize = KeLoaderBlock->Extension->LoaderPagesSpanned; + MmBootImageSize *= PAGE_SIZE; /* Set memory limits */ MmSystemRangeStart = (PVOID)KSEG0_BASE; @@ -377,21 +376,55 @@ /* Initialize the kernel address space */ MmInitializeKernelAddressSpace(); MmInitGlobalKernelPageDirectory(); - + + /* Get kernel address boundaries */ + LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + MiKSeg0Start = (ULONG_PTR)LdrEntry->DllBase | KSEG0_BASE; + MiKSeg0End = PAGE_ROUND_UP(MiGetLastKernelAddress() | KSEG0_BASE); + + /* We'll put the PFN array right after the loaded modules */ + MmPfnDatabase = (PVOID)MiKSeg0End; + MiKSeg0End += MmHighestPhysicalPage * sizeof(PHYSICAL_PAGE); + MiKSeg0End = PAGE_ROUND_UP(MiKSeg0End); + + /* + * FreeLDR maps 6MB starting at the kernel base address, followed by the + * PFN database. If the PFN database doesn't go over the FreeLDR allocation + * then choose the end of the FreeLDR block. If it does go past the FreeLDR + * allocation, then choose the next PAGE_SIZE boundary. + */ + if (MiKSeg0End < (MiKSeg0Start + 0x600000)) + { + /* Use the first memory following FreeLDR's 6MB mapping */ + MiNonPagedPoolStart = (PVOID)PAGE_ROUND_UP(MiKSeg0Start + 0x600000); + } + else + { + /* Use the next free available page */ + MiNonPagedPoolStart = (PVOID)MiKSeg0End; + } + + /* Length of non-paged pool */ + MiNonPagedPoolLength = MM_NONPAGED_POOL_SIZE; + + /* Put the paged pool after the non-paged pool */ + MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MiNonPagedPoolStart + + MiNonPagedPoolLength); + MmPagedPoolSize = MM_PAGED_POOL_SIZE; + + /* Dump kernel memory layout */ + MiDbgKernelLayout(); + /* Initialize the page list */ - LastKernelAddress = (ULONG_PTR)MmInitializePageList(FirstKrnlPhysAddr, - LastKrnlPhysAddr, - MmHighestPhysicalPage, - PAGE_ROUND_UP(LastKernelAddress), - BIOSMemoryMap, - AddressRangeCount); - kernel_len = LastKrnlPhysAddr - FirstKrnlPhysAddr; + MmInitializePageList(BIOSMemoryMap, AddressRangeCount); /* Unmap low memory */ MmDeletePageTable(NULL, 0); /* Intialize memory areas */ - MmInitVirtualMemory(LastKernelAddress, kernel_len); + MmInitVirtualMemory(); /* Initialize MDLs */ MmInitializeMdlImplementation();

1 0

[ros-arm-bringup] 32367: The system never considered "ReservedPages" as any different from "SystemPages", other than to spend the accounting time to mark these pages differently. Removed the notion of a reserved pages and count them as system pages instead.
by ros-arm-bringup＠svn.reactos.org 14 Feb '08

14 Feb '08

Author: ros-arm-bringup Date: Fri Feb 15 01:34:50 2008 New Revision: 32367 URL: http://svn.reactos.org/svn/reactos?rev=32367&view=rev Log: The system never considered "ReservedPages" as any different from "SystemPages", other than to spend the accounting time to mark these pages differently. Removed the notion of a reserved pages and count them as system pages instead. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/freelist.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 (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Fri Feb 15 01:34:50 2008 @@ -252,7 +252,6 @@ { ULONG NrTotalPages; ULONG NrSystemPages; - ULONG NrReservedPages; ULONG NrUserPages; ULONG NrFreePages; ULONG NrDirtyPages; 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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Fri Feb 15 01:34:50 2008 @@ -317,12 +317,12 @@ ULONG Reserved; NTSTATUS Status; PFN_TYPE Pfn = 0; + PHYSICAL_PAGE UsedPage; + extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; - PHYSICAL_PAGE UsedPage; ULONG PdePageStart, PdePageEnd; ULONG VideoPageStart, VideoPageEnd; ULONG KernelPageStart, KernelPageEnd; - extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; /* Initialize the page lists */ KeInitializeSpinLock(&PageListLock); @@ -398,25 +398,25 @@ { /* Page 0 is reserved for the IVT */ MmPageArray[i] = UsedPage; - MmStats.NrReservedPages++; + MmStats.NrSystemPages++; } else if (i == 1) { /* Page 1 is reserved for the PCR */ MmPageArray[i] = UsedPage; - MmStats.NrReservedPages++; + MmStats.NrSystemPages++; } else if (i == 2) { /* Page 2 is reserved for the KUSER_SHARED_DATA */ MmPageArray[i] = UsedPage; - MmStats.NrReservedPages++; + MmStats.NrSystemPages++; } else if ((i >= PdePageStart) && (i < PdePageEnd)) { /* These pages contain the initial FreeLDR PDEs */ MmPageArray[i] = UsedPage; - MmStats.NrReservedPages++; + MmStats.NrSystemPages++; } else if ((i >= VideoPageStart) && (i < VideoPageEnd)) { @@ -428,7 +428,7 @@ */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmStats.NrReservedPages++; + MmStats.NrSystemPages++; } else if ((i >= KernelPageStart) && (i < KernelPageEnd)) { @@ -462,14 +462,14 @@ /* These are pages reserved by the BIOS/ROMs */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmStats.NrReservedPages++; + MmStats.NrSystemPages++; } } KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); - MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrReservedPages + MmStats.NrUserPages; - MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages + MmStats.NrReservedPages); + MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrUserPages; + MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages); return((PVOID)LastKernelAddress); }

1 0

[dreimer] 32366: reactivate kdbg.
by dreimer＠svn.reactos.org 14 Feb '08

14 Feb '08

Author: dreimer Date: Fri Feb 15 01:02:57 2008 New Revision: 32366 URL: http://svn.reactos.org/svn/reactos?rev=32366&view=rev Log: reactivate kdbg. Modified: trunk/reactos/config.template.rbuild Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Fri Feb 15 01:02:57 2008 @@ -45,7 +45,7 @@  -<property name="KDBG" value="0" /> +<property name="KDBG" value="1" /> <!--

1 0

[ros-arm-bringup] 32365: Don't allow code to access the PFN database directly -- instead, always go through MiGetPfnEntry to have a controlled path. Add assertions to this function, to make sure PFN access is always valid (previous code would sometimes KEBUGCHECK(0) without a real explenation if such cases were encounted -- but developers randomly chose which functions would be protected). Also, since PFNs are 0-based, do allow Pfn == MmPageArraySize if someone is reading the last PFN on the sys
by ros-arm-bringup＠svn.reactos.org 14 Feb '08

14 Feb '08

Author: ros-arm-bringup Date: Fri Feb 15 00:19:30 2008 New Revision: 32365 URL: http://svn.reactos.org/svn/reactos?rev=32365&view=rev Log: Don't allow code to access the PFN database directly -- instead, always go through MiGetPfnEntry to have a controlled path. Add assertions to this function, to make sure PFN access is always valid (previous code would sometimes KEBUGCHECK(0) without a real explenation if such cases were encounted -- but developers randomly chose which functions would be protected). Also, since PFNs are 0-based, do allow Pfn == MmPageArraySize if someone is reading the last PFN on the system. Finally, protect some of the functions which were accessing the PFN entries outside the PFN list lock. Modified: trunk/reactos/config.template.rbuild trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Fri Feb 15 00:19:30 2008 @@ -45,7 +45,7 @@  -<property name="KDBG" value="1" /> +<property name="KDBG" value="0" /> <!-- 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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Fri Feb 15 00:19:30 2008 @@ -50,6 +50,8 @@ PHYSICAL_PAGE, *PPHYSICAL_PAGE; +#define ASSERT_PFN(x) ASSERT((x)->Flags.Type != 0) + /* GLOBALS ****************************************************************/ static PPHYSICAL_PAGE MmPageArray; @@ -67,6 +69,25 @@ /* FUNCTIONS *************************************************************/ +FORCEINLINE +PPHYSICAL_PAGE +MiGetPfnEntry(IN PFN_TYPE Pfn) +{ + PPHYSICAL_PAGE Page; + + /* Make sure the PFN number is valid */ + ASSERT(Pfn <= MmPageArraySize); + + /* Get the entry */ + Page = &MmPageArray[Pfn]; + + /* Make sure it's valid */ + ASSERT_PFN(Page); + + /* Return it */ + return Page; +} + PFN_TYPE NTAPI MmGetLRUFirstUserPage(VOID) @@ -83,6 +104,7 @@ return 0; } PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); + ASSERT_PFN(PageDescriptor); KeReleaseSpinLock(&PageListLock, oldIrql); return PageDescriptor - MmPageArray; } @@ -92,15 +114,15 @@ MmSetLRULastPage(PFN_TYPE Pfn) { KIRQL oldIrql; - - ASSERT(Pfn < MmPageArraySize); - KeAcquireSpinLock(&PageListLock, &oldIrql); - if (MmPageArray[Pfn].Flags.Type == MM_PHYSICAL_PAGE_USED && - MmPageArray[Pfn].Flags.Consumer == MC_USER) - { - RemoveEntryList(&MmPageArray[Pfn].ListEntry); - InsertTailList(&UserPageListHead, - &MmPageArray[Pfn].ListEntry); + PPHYSICAL_PAGE Page; + + KeAcquireSpinLock(&PageListLock, &oldIrql); + Page = MiGetPfnEntry(Pfn); + if (Page->Flags.Type == MM_PHYSICAL_PAGE_USED && + Page->Flags.Consumer == MC_USER) + { + RemoveEntryList(&Page->ListEntry); + InsertTailList(&UserPageListHead, &Page->ListEntry); } KeReleaseSpinLock(&PageListLock, oldIrql); } @@ -112,16 +134,18 @@ PLIST_ENTRY NextListEntry; PHYSICAL_PAGE* PageDescriptor; KIRQL oldIrql; - - KeAcquireSpinLock(&PageListLock, &oldIrql); - if (MmPageArray[PreviousPfn].Flags.Type != MM_PHYSICAL_PAGE_USED || - MmPageArray[PreviousPfn].Flags.Consumer != MC_USER) + PPHYSICAL_PAGE Page; + + KeAcquireSpinLock(&PageListLock, &oldIrql); + Page = MiGetPfnEntry(PreviousPfn); + if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED || + Page->Flags.Consumer != MC_USER) { NextListEntry = UserPageListHead.Flink; } else { - NextListEntry = MmPageArray[PreviousPfn].ListEntry.Flink; + NextListEntry = Page->ListEntry.Flink; } if (NextListEntry == &UserPageListHead) { @@ -166,7 +190,7 @@ */ for (i = j == 0 ? 0x100000 / PAGE_SIZE : LowestAcceptableAddress.LowPart / PAGE_SIZE; i <= last; ) { - if (MmPageArray[i].Flags.Type == MM_PHYSICAL_PAGE_FREE) + if (MiGetPfnEntry(i)->Flags.Type == MM_PHYSICAL_PAGE_FREE) { if (start == (ULONG)-1) { @@ -201,30 +225,32 @@ { for (i = start; i < (start + length); i++) { - RemoveEntryList(&MmPageArray[i].ListEntry); + PPHYSICAL_PAGE Page; + Page = MiGetPfnEntry(i); + RemoveEntryList(&Page->ListEntry); if (MmPageArray[i].Flags.Zero == 0) { UnzeroedPageCount--; } MmStats.NrFreePages--; MmStats.NrSystemPages++; - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; - MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 1; - MmPageArray[i].LockCount = 0; - MmPageArray[i].MapCount = 0; - MmPageArray[i].SavedSwapEntry = 0; + Page->Flags.Type = MM_PHYSICAL_PAGE_USED; + Page->Flags.Consumer = MC_NPPOOL; + Page->ReferenceCount = 1; + Page->LockCount = 0; + Page->MapCount = 0; + Page->SavedSwapEntry = 0; } KeReleaseSpinLock(&PageListLock, oldIrql); for (i = start; i < (start + length); i++) { - if (MmPageArray[i].Flags.Zero == 0) + if (MiGetPfnEntry(i)->Flags.Zero == 0) { MiZeroPage(i); } else { - MmPageArray[i].Flags.Zero = 0; + MiGetPfnEntry(i)->Flags.Zero = 0; } } return start; @@ -292,6 +318,7 @@ NTSTATUS Status; PFN_TYPE Pfn = 0; ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; + PHYSICAL_PAGE UsedPage; ULONG PdePageStart, PdePageEnd; ULONG VideoPageStart, VideoPageEnd; ULONG KernelPageStart, KernelPageEnd; @@ -344,7 +371,14 @@ /* Clear the PFN database */ RtlZeroMemory(MmPageArray, MmPageArraySize * sizeof(PHYSICAL_PAGE)); - + + /* This is what a used page looks like */ + RtlZeroMemory(&UsedPage, sizeof(UsedPage)); + UsedPage.Flags.Type = MM_PHYSICAL_PAGE_USED; + UsedPage.Flags.Consumer = MC_NPPOOL; + UsedPage.ReferenceCount = 2; + UsedPage.MapCount = 1; + /* We'll be applying a bunch of hacks -- precompute some static values */ PdePageStart = PdeStart / PAGE_SIZE; PdePageEnd = MmFreeLdrPageDirectoryEnd / PAGE_SIZE; @@ -363,37 +397,25 @@ if (i == 0) { /* Page 0 is reserved for the IVT */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; - MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 2; - MmPageArray[i].MapCount = 1; + MmPageArray[i] = UsedPage; MmStats.NrReservedPages++; } else if (i == 1) { /* Page 1 is reserved for the PCR */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; - MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 2; - MmPageArray[i].MapCount = 1; + MmPageArray[i] = UsedPage; MmStats.NrReservedPages++; } else if (i == 2) { /* Page 2 is reserved for the KUSER_SHARED_DATA */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; - MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 2; - MmPageArray[i].MapCount = 1; + MmPageArray[i] = UsedPage; MmStats.NrReservedPages++; } else if ((i >= PdePageStart) && (i < PdePageEnd)) { /* These pages contain the initial FreeLDR PDEs */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; - MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 2; - MmPageArray[i].MapCount = 1; + MmPageArray[i] = UsedPage; MmStats.NrReservedPages++; } else if ((i >= VideoPageStart) && (i < VideoPageEnd)) @@ -411,19 +433,13 @@ else if ((i >= KernelPageStart) && (i < KernelPageEnd)) { /* These are pages beloning to the kernel */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; - MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 2; - MmPageArray[i].MapCount = 1; + MmPageArray[i] = UsedPage; MmStats.NrSystemPages++; } else if (i >= (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount)) { /* These are pages we allocated above to hold the PFN DB */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; - MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 2; - MmPageArray[i].MapCount = 1; + MmPageArray[i] = UsedPage; MmStats.NrSystemPages++; } else @@ -463,9 +479,8 @@ { KIRQL oldIrql; - ASSERT(Pfn < MmPageArraySize); - KeAcquireSpinLock(&PageListLock, &oldIrql); - MmPageArray[Pfn].AllFlags = Flags; + KeAcquireSpinLock(&PageListLock, &oldIrql); + MiGetPfnEntry(Pfn)->AllFlags = Flags; KeReleaseSpinLock(&PageListLock, oldIrql); } @@ -473,14 +488,25 @@ NTAPI MmSetRmapListHeadPage(PFN_TYPE Pfn, struct _MM_RMAP_ENTRY* ListHead) { - MmPageArray[Pfn].RmapListHead = ListHead; + KIRQL oldIrql; + + KeAcquireSpinLock(&PageListLock, &oldIrql); + MiGetPfnEntry(Pfn)->RmapListHead = ListHead; + KeReleaseSpinLock(&PageListLock, oldIrql); } struct _MM_RMAP_ENTRY* NTAPI MmGetRmapListHeadPage(PFN_TYPE Pfn) { - return(MmPageArray[Pfn].RmapListHead); + KIRQL oldIrql; + struct _MM_RMAP_ENTRY* ListHead; + + KeAcquireSpinLock(&PageListLock, &oldIrql); + ListHead = MiGetPfnEntry(Pfn)->RmapListHead; + KeReleaseSpinLock(&PageListLock, oldIrql); + + return(ListHead); } VOID @@ -488,17 +514,19 @@ MmMarkPageMapped(PFN_TYPE Pfn) { KIRQL oldIrql; + PPHYSICAL_PAGE Page; if (Pfn < MmPageArraySize) { KeAcquireSpinLock(&PageListLock, &oldIrql); - if (MmPageArray[Pfn].Flags.Type == MM_PHYSICAL_PAGE_FREE) + Page = MiGetPfnEntry(Pfn); + if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) { DPRINT1("Mapping non-used page\n"); KEBUGCHECK(0); } - MmPageArray[Pfn].MapCount++; - MmPageArray[Pfn].ReferenceCount++; + Page->MapCount++; + Page->ReferenceCount++; KeReleaseSpinLock(&PageListLock, oldIrql); } } @@ -508,22 +536,24 @@ MmMarkPageUnmapped(PFN_TYPE Pfn) { KIRQL oldIrql; + PPHYSICAL_PAGE Page; if (Pfn < MmPageArraySize) { KeAcquireSpinLock(&PageListLock, &oldIrql); - if (MmPageArray[Pfn].Flags.Type == MM_PHYSICAL_PAGE_FREE) + Page = MiGetPfnEntry(Pfn); + if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) { DPRINT1("Unmapping non-used page\n"); KEBUGCHECK(0); } - if (MmPageArray[Pfn].MapCount == 0) + if (Page->MapCount == 0) { DPRINT1("Unmapping not mapped page\n"); KEBUGCHECK(0); } - MmPageArray[Pfn].MapCount--; - MmPageArray[Pfn].ReferenceCount--; + Page->MapCount--; + Page->ReferenceCount--; KeReleaseSpinLock(&PageListLock, oldIrql); } } @@ -535,9 +565,8 @@ KIRQL oldIrql; ULONG Flags; - ASSERT(Pfn < MmPageArraySize); - KeAcquireSpinLock(&PageListLock, &oldIrql); - Flags = MmPageArray[Pfn].AllFlags; + KeAcquireSpinLock(&PageListLock, &oldIrql); + Flags = MiGetPfnEntry(Pfn)->AllFlags; KeReleaseSpinLock(&PageListLock, oldIrql); return(Flags); @@ -550,9 +579,8 @@ { KIRQL oldIrql; - ASSERT(Pfn < MmPageArraySize); - KeAcquireSpinLock(&PageListLock, &oldIrql); - MmPageArray[Pfn].SavedSwapEntry = SavedSwapEntry; + KeAcquireSpinLock(&PageListLock, &oldIrql); + MiGetPfnEntry(Pfn)->SavedSwapEntry = SavedSwapEntry; KeReleaseSpinLock(&PageListLock, oldIrql); } @@ -563,9 +591,8 @@ SWAPENTRY SavedSwapEntry; KIRQL oldIrql; - ASSERT(Pfn < MmPageArraySize); - KeAcquireSpinLock(&PageListLock, &oldIrql); - SavedSwapEntry = MmPageArray[Pfn].SavedSwapEntry; + KeAcquireSpinLock(&PageListLock, &oldIrql); + SavedSwapEntry = MiGetPfnEntry(Pfn)->SavedSwapEntry; KeReleaseSpinLock(&PageListLock, oldIrql); return(SavedSwapEntry); @@ -576,6 +603,7 @@ MmReferencePageUnsafe(PFN_TYPE Pfn) { KIRQL oldIrql; + PPHYSICAL_PAGE Page; DPRINT("MmReferencePageUnsafe(PysicalAddress %x)\n", Pfn << PAGE_SHIFT); @@ -586,13 +614,14 @@ KeAcquireSpinLock(&PageListLock, &oldIrql); - if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) + Page = MiGetPfnEntry(Pfn); + if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Referencing non-used page\n"); KEBUGCHECK(0); } - MmPageArray[Pfn].ReferenceCount++; + Page->ReferenceCount++; KeReleaseSpinLock(&PageListLock, oldIrql); } @@ -616,6 +645,7 @@ { KIRQL oldIrql; ULONG RCount; + PPHYSICAL_PAGE Page; DPRINT("MmGetReferenceCountPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); @@ -625,14 +655,14 @@ } KeAcquireSpinLock(&PageListLock, &oldIrql); - - if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) + Page = MiGetPfnEntry(Pfn); + if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Getting reference count for free page\n"); KEBUGCHECK(0); } - RCount = MmPageArray[Pfn].ReferenceCount; + RCount = Page->ReferenceCount; KeReleaseSpinLock(&PageListLock, oldIrql); return(RCount); @@ -645,77 +675,70 @@ DPRINT("MmIsPageInUse(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - if (Pfn == 0 || Pfn >= MmPageArraySize) - { - KEBUGCHECK(0); - } + return (MiGetPfnEntry(Pfn)->Flags.Type == MM_PHYSICAL_PAGE_USED); +} + +VOID +NTAPI +MmDereferencePage(PFN_TYPE Pfn) +{ + KIRQL oldIrql; + PPHYSICAL_PAGE Page; + + DPRINT("MmDereferencePage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); + + KeAcquireSpinLock(&PageListLock, &oldIrql); - return (MmPageArray[Pfn].Flags.Type == MM_PHYSICAL_PAGE_USED); -} - -VOID -NTAPI -MmDereferencePage(PFN_TYPE Pfn) -{ - KIRQL oldIrql; - - DPRINT("MmDereferencePage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - - if (Pfn == 0 || Pfn >= MmPageArraySize) - { - KEBUGCHECK(0); - } - - KeAcquireSpinLock(&PageListLock, &oldIrql); - - if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) + Page = MiGetPfnEntry(Pfn); + + if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Dereferencing free page\n"); KEBUGCHECK(0); } - if (MmPageArray[Pfn].ReferenceCount == 0) + if (Page->ReferenceCount == 0) { DPRINT1("Derefrencing page with reference count 0\n"); KEBUGCHECK(0); } - MmPageArray[Pfn].ReferenceCount--; - if (MmPageArray[Pfn].ReferenceCount == 0) + Page->ReferenceCount--; + if (Page->ReferenceCount == 0) { MmStats.NrFreePages++; MmStats.NrSystemPages--; - if (MmPageArray[Pfn].Flags.Consumer == MC_USER) RemoveEntryList(&MmPageArray[Pfn].ListEntry); - if (MmPageArray[Pfn].RmapListHead != NULL) + if (Page->Flags.Consumer == MC_USER) RemoveEntryList(&Page->ListEntry); + if (Page->RmapListHead != NULL) { DPRINT1("Freeing page with rmap entries.\n"); KEBUGCHECK(0); } - if (MmPageArray[Pfn].MapCount != 0) + if (Page->MapCount != 0) { DPRINT1("Freeing mapped page (0x%x count %d)\n", - Pfn << PAGE_SHIFT, MmPageArray[Pfn].MapCount); + Pfn << PAGE_SHIFT, Page->MapCount); KEBUGCHECK(0); } - if (MmPageArray[Pfn].LockCount > 0) + if (Page->LockCount > 0) { DPRINT1("Freeing locked page\n"); KEBUGCHECK(0); } - if (MmPageArray[Pfn].SavedSwapEntry != 0) + if (Page->SavedSwapEntry != 0) { DPRINT1("Freeing page with swap entry.\n"); KEBUGCHECK(0); } - if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) + if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Freeing page with flags %x\n", - MmPageArray[Pfn].Flags.Type); + Page->Flags.Type); KEBUGCHECK(0); } - MmPageArray[Pfn].Flags.Type = MM_PHYSICAL_PAGE_FREE; - MmPageArray[Pfn].Flags.Consumer = MC_MAXIMUM; + Page->Flags.Type = MM_PHYSICAL_PAGE_FREE; + Page->Flags.Consumer = MC_MAXIMUM; InsertTailList(&FreeUnzeroedPageListHead, - &MmPageArray[Pfn].ListEntry); + &Page->ListEntry); UnzeroedPageCount++; if (UnzeroedPageCount > 8 && 0 == KeReadStateEvent(&ZeroPageThreadEvent)) { @@ -731,23 +754,20 @@ { KIRQL oldIrql; ULONG LockCount; + PPHYSICAL_PAGE Page; DPRINT("MmGetLockCountPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - if (Pfn == 0 || Pfn >= MmPageArraySize) - { - KEBUGCHECK(0); - } - - KeAcquireSpinLock(&PageListLock, &oldIrql); - - if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) + KeAcquireSpinLock(&PageListLock, &oldIrql); + + Page = MiGetPfnEntry(Pfn); + if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Getting lock count for free page\n"); KEBUGCHECK(0); } - LockCount = MmPageArray[Pfn].LockCount; + LockCount = Page->LockCount; KeReleaseSpinLock(&PageListLock, oldIrql); return(LockCount); @@ -758,23 +778,20 @@ MmLockPageUnsafe(PFN_TYPE Pfn) { KIRQL oldIrql; + PPHYSICAL_PAGE Page; DPRINT("MmLockPageUnsafe(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - if (Pfn == 0 || Pfn >= MmPageArraySize) - { - return; - } - - KeAcquireSpinLock(&PageListLock, &oldIrql); - - if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) + KeAcquireSpinLock(&PageListLock, &oldIrql); + + Page = MiGetPfnEntry(Pfn); + if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Locking free page\n"); KEBUGCHECK(0); } - MmPageArray[Pfn].LockCount++; + Page->LockCount++; KeReleaseSpinLock(&PageListLock, oldIrql); } @@ -784,11 +801,6 @@ { DPRINT("MmLockPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - if (Pfn == 0 || Pfn >= MmPageArraySize) - { - KEBUGCHECK(0); - } - MmLockPageUnsafe(Pfn); } @@ -797,23 +809,20 @@ MmUnlockPage(PFN_TYPE Pfn) { KIRQL oldIrql; + PPHYSICAL_PAGE Page; DPRINT("MmUnlockPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - if (Pfn == 0 || Pfn >= MmPageArraySize) - { - KEBUGCHECK(0); - } - - KeAcquireSpinLock(&PageListLock, &oldIrql); - - if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) + KeAcquireSpinLock(&PageListLock, &oldIrql); + + Page = MiGetPfnEntry(Pfn); + if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Unlocking free page\n"); KEBUGCHECK(0); } - MmPageArray[Pfn].LockCount--; + Page->LockCount--; KeReleaseSpinLock(&PageListLock, oldIrql); } @@ -1029,13 +1038,13 @@ for (i = 0; i < NumberOfPagesFound; i++) { pfn = Pages[i]; - if (MmPageArray[pfn].Flags.Zero == 0) + if (MiGetPfnEntry(pfn)->Flags.Zero == 0) { MiZeroPage(pfn); } else { - MmPageArray[pfn].Flags.Zero = 0; + MiGetPfnEntry(pfn)->Flags.Zero = 0; } }

1 0

[ros-arm-bringup] 32364: One would expect that a function called "MmIsUsablePage" would return whether a not a page is usable. In other words, we are making sure that the page is free/available, so that we may make use of it. Apparently not so -- MmIsUsable page returned if a page was NOT usable, but was instead "already used". The caller's wish was to ensure he was correctly using a used page, not to check if he could start using a usable page. This would just be an annoying gramatical/logic er
by ros-arm-bringup＠svn.reactos.org 14 Feb '08

14 Feb '08

Author: ros-arm-bringup Date: Thu Feb 14 23:30:31 2008 New Revision: 32364 URL: http://svn.reactos.org/svn/reactos?rev=32364&view=rev Log: One would expect that a function called "MmIsUsablePage" would return whether a not a page is usable. In other words, we are making sure that the page is free/available, so that we may make use of it. Apparently not so -- MmIsUsable page returned if a page was NOT usable, but was instead "already used". The caller's wish was to ensure he was correctly using a used page, not to check if he could start using a usable page. This would just be an annoying gramatical/logic error (but makes "sense" in the way it's used), if it weren't for the fact that MmIsUsablePage also returned TRUE for BIOS pages (which meant, "yes, you are correctly using/overwriting memory we spent time ensuring to mark as reserved/BIOS"). Renamed the function to MmIsPageInUse, and only return TRUE if the page is in use. Like the name says. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/i386/page.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 (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Feb 14 23:30:31 2008 @@ -1145,7 +1145,7 @@ BOOLEAN NTAPI -MmIsUsablePage(PFN_TYPE Page); +MmIsPageInUse(PFN_TYPE Page); VOID NTAPI 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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Feb 14 23:30:31 2008 @@ -640,23 +640,17 @@ BOOLEAN NTAPI -MmIsUsablePage(PFN_TYPE Pfn) -{ - - DPRINT("MmIsUsablePage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); +MmIsPageInUse(PFN_TYPE Pfn) +{ + + DPRINT("MmIsPageInUse(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); if (Pfn == 0 || Pfn >= MmPageArraySize) { KEBUGCHECK(0); } - - if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED && - MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_BIOS) - { - return(FALSE); - } - - return(TRUE); + + return (MmPageArray[Pfn].Flags.Type == MM_PHYSICAL_PAGE_USED); } VOID Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Thu Feb 14 23:30:31 2008 @@ -1941,18 +1941,10 @@ for (i = 0; i < PageCount; i++) { - if (!MmIsUsablePage(Pages[i])) - { - /* Is this an attempt to map KUSER_SHARED_DATA? */ - if ((Address == (PVOID)0x7FFE0000) && (PageCount == 1) && (Pages[0] == 2)) - { - // allow - } - else - { - DPRINT1("Page at address %x not usable\n", PFN_TO_PTE(Pages[i])); - KEBUGCHECK(0); - } + if (!MmIsPageInUse(Pages[i])) + { + DPRINT1("Page at address %x not in use\n", PFN_TO_PTE(Pages[i])); + KEBUGCHECK(0); } }

1 0

[fireball] 32363: - Load drivers database (AppPatch/drvmain.sdb), so Windows could use it if needed.
by fireball＠svn.reactos.org 14 Feb '08

14 Feb '08

Author: fireball Date: Thu Feb 14 23:27:59 2008 New Revision: 32363 URL: http://svn.reactos.org/svn/reactos?rev=32363&view=rev Log: - Load drivers database (AppPatch/drvmain.sdb), so Windows could use it if needed. Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/winldr.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/winldr.h Thu Feb 14 23:27:59 2008 @@ -68,6 +68,10 @@ IN PCCH DirectoryPath, IN PLDR_DATA_TABLE_ENTRY ScanDTE); +// winldr.c +PVOID WinLdrLoadModule(PCSTR ModuleName, ULONG *Size, + TYPE_OF_MEMORY MemoryType); + // wlmemory.c BOOLEAN WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Thu Feb 14 23:27:59 2008 @@ -76,6 +76,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, PCHAR Options, PCHAR SystemPath, + PCHAR BootPath, WORD VersionToBoot) { /* Examples of correct options and paths */ @@ -87,6 +88,7 @@ CHAR HalPath[] = "\\"; CHAR SystemRoot[256]; CHAR ArcBoot[256]; + CHAR MiscFiles[256]; ULONG i, PathSeparator; PLOADER_PARAMETER_EXTENSION Extension; @@ -192,6 +194,12 @@ Extension->MajorVersion = (VersionToBoot & 0xFF00) >> 8; Extension->MinorVersion = VersionToBoot & 0xFF; Extension->Profile.Status = 2; + + /* Load drivers database */ + strcpy(MiscFiles, BootPath); + strcat(MiscFiles, "AppPatch\\drvmain.sdb"); + Extension->DrvDBImage = PaToVa(WinLdrLoadModule(MiscFiles, + &Extension->DrvDBSize, LoaderRegistryData)); LoaderBlock->Extension = PaToVa(Extension); } @@ -352,6 +360,61 @@ return TRUE; } + +PVOID WinLdrLoadModule(PCSTR ModuleName, ULONG *Size, + TYPE_OF_MEMORY MemoryType) +{ + PFILE FileHandle; + PVOID PhysicalBase; + ULONG FileSize; + BOOLEAN Status; + + //CHAR ProgressString[256]; + + /* Inform user we are loading files */ + //sprintf(ProgressString, "Loading %s...", FileName); + //UiDrawProgressBarCenter(1, 100, ProgressString); + + DbgPrint((DPRINT_WINDOWS, "Loading module %s\n", ModuleName)); + *Size = 0; + + /* Open the image file */ + FileHandle = FsOpenFile(ModuleName); + + if (FileHandle == NULL) + { + /* In case of errors, we just return, without complaining to the user */ + return NULL; + } + + /* Get this file's size */ + FileSize = FsGetFileSize(FileHandle); + *Size = FileSize; + + /* Allocate memory */ + PhysicalBase = MmAllocateMemoryWithType(FileSize, MemoryType); + if (PhysicalBase == NULL) + { + FsCloseFile(FileHandle); + return NULL; + } + + /* Load whole file */ + Status = FsReadFile(FileHandle, FileSize, NULL, PhysicalBase); + if (!Status) + { + FsCloseFile(FileHandle); + return NULL; + } + + DbgPrint((DPRINT_WINDOWS, "Loaded %s at 0x%x with size 0x%x\n", ModuleName, PhysicalBase, FileSize)); + + /* We are done with the file - close it */ + FsCloseFile(FileHandle); + + return PhysicalBase; +} + VOID LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion) @@ -487,7 +550,7 @@ WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); /* Initialize Phase 1 - no drivers loading anymore */ - WinLdrInitializePhase1(LoaderBlock, BootOptions, SystemPath, OperatingSystemVersion); + WinLdrInitializePhase1(LoaderBlock, BootOptions, SystemPath, BootPath, OperatingSystemVersion); /* Save entry-point pointer and Loader block VAs */ KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint;

1 0

[ros-arm-bringup] 32362: Fix a couple of off-by-one bugs we recently introduced -- PFNs are one of the only indexes which are actually 0-based, so you really want to loop from 0 to the last page, inclusive (unlike most loops where you would stop *before* the last element index).
by ros-arm-bringup＠svn.reactos.org 14 Feb '08

14 Feb '08

Author: ros-arm-bringup Date: Thu Feb 14 23:20:44 2008 New Revision: 32362 URL: http://svn.reactos.org/svn/reactos?rev=32362&view=rev Log: Fix a couple of off-by-one bugs we recently introduced -- PFNs are one of the only indexes which are actually 0-based, so you really want to loop from 0 to the last page, inclusive (unlike most loops where you would stop *before* the last element index). Modified: trunk/reactos/ntoskrnl/mm/freelist.c 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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Feb 14 23:20:44 2008 @@ -354,7 +354,7 @@ KernelPageEnd = LastPhysKernelAddress / PAGE_SIZE; /* Loop every page on the system */ - for (i = 0; i < MmPageArraySize; i++) + for (i = 0; i <= MmPageArraySize; i++) { /* Check if it's part of RAM */ if (MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, i)) @@ -417,7 +417,7 @@ MmPageArray[i].MapCount = 1; MmStats.NrSystemPages++; } - else if (i > (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount - 1)) + else if (i >= (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount)) { /* These are pages we allocated above to hold the PFN DB */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED;

1 0

[ros-arm-bringup] 32361: Stop lying that the PCR, KUSER_SHARED_DATA, and PDEs are "BIOS" pages, they're USED pages. Stop initializing fields to 0 if we've already cleared the entire array! Stop setting arbitrary values for MapCount and ReferenceCount -- both the KPCR, KUSER_SHARED_DATA and PDE are mapped! Stop saying Video ROM has a reference count, it's the same as BIOS memory, except the MiIsPfnRam function doesn't detect it and we have a hack for it.
by ros-arm-bringup＠svn.reactos.org 14 Feb '08

14 Feb '08

Author: ros-arm-bringup Date: Thu Feb 14 23:03:33 2008 New Revision: 32361 URL: http://svn.reactos.org/svn/reactos?rev=32361&view=rev Log: Stop lying that the PCR, KUSER_SHARED_DATA, and PDEs are "BIOS" pages, they're USED pages. Stop initializing fields to 0 if we've already cleared the entire array! Stop setting arbitrary values for MapCount and ReferenceCount -- both the KPCR, KUSER_SHARED_DATA and PDE are mapped! Stop saying Video ROM has a reference count, it's the same as BIOS memory, except the MiIsPfnRam function doesn't detect it and we have a hack for it. Modified: trunk/reactos/ntoskrnl/mm/freelist.c 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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Feb 14 23:03:33 2008 @@ -363,37 +363,37 @@ if (i == 0) { /* Page 0 is reserved for the IVT */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].Flags.Zero = 0; - MmPageArray[i].ReferenceCount = 0; + MmPageArray[i].ReferenceCount = 2; + MmPageArray[i].MapCount = 1; MmStats.NrReservedPages++; } else if (i == 1) { /* Page 1 is reserved for the PCR */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].Flags.Zero = 0; - MmPageArray[i].ReferenceCount = 1; + MmPageArray[i].ReferenceCount = 2; + MmPageArray[i].MapCount = 1; MmStats.NrReservedPages++; } else if (i == 2) { /* Page 2 is reserved for the KUSER_SHARED_DATA */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].Flags.Zero = 0; - MmPageArray[i].ReferenceCount = 1; + MmPageArray[i].ReferenceCount = 2; + MmPageArray[i].MapCount = 1; MmStats.NrReservedPages++; } else if ((i >= PdePageStart) && (i < PdePageEnd)) { /* These pages contain the initial FreeLDR PDEs */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[i].Flags.Zero = 0; + MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 1; + MmPageArray[i].ReferenceCount = 2; + MmPageArray[i].MapCount = 1; MmStats.NrReservedPages++; } else if ((i >= VideoPageStart) && (i < VideoPageEnd)) @@ -405,16 +405,13 @@ * (which we'll assume to be "free" a couple of lines below) */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[i].Flags.Zero = 0; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 1; MmStats.NrReservedPages++; } else if ((i >= KernelPageStart) && (i < KernelPageEnd)) { /* These are pages beloning to the kernel */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; - MmPageArray[i].Flags.Zero = 0; MmPageArray[i].Flags.Consumer = MC_NPPOOL; MmPageArray[i].ReferenceCount = 2; MmPageArray[i].MapCount = 1; @@ -424,7 +421,6 @@ { /* These are pages we allocated above to hold the PFN DB */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; - MmPageArray[i].Flags.Zero = 0; MmPageArray[i].Flags.Consumer = MC_NPPOOL; MmPageArray[i].ReferenceCount = 2; MmPageArray[i].MapCount = 1; @@ -439,8 +435,6 @@ * Descriptor List, why bother, right? */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_FREE; - MmPageArray[i].Flags.Zero = 0; - MmPageArray[i].ReferenceCount = 0; InsertTailList(&FreeUnzeroedPageListHead, &MmPageArray[i].ListEntry); UnzeroedPageCount++; @@ -452,8 +446,6 @@ /* These are pages reserved by the BIOS/ROMs */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].Flags.Zero = 0; - MmPageArray[i].ReferenceCount = 0; MmStats.NrReservedPages++; } }

1 0

[ros-arm-bringup] 32360: Prepare for getting rid of the Freelist hacks and use memory descriptors instead, by detecting the highest free memory descriptor, and allocating the page array PTEs from there (gets rid of the "LastPage" variable).
by ros-arm-bringup＠svn.reactos.org 14 Feb '08

14 Feb '08

Author: ros-arm-bringup Date: Thu Feb 14 22:24:02 2008 New Revision: 32360 URL: http://svn.reactos.org/svn/reactos?rev=32360&view=rev Log: Prepare for getting rid of the Freelist hacks and use memory descriptors instead, by detecting the highest free memory descriptor, and allocating the page array PTEs from there (gets rid of the "LastPage" variable). Modified: trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.c 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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Feb 14 22:24:02 2008 @@ -280,21 +280,22 @@ PVOID INIT_FUNCTION NTAPI -MmInitializePageList(ULONG_PTR FirstPhysKernelAddress, - ULONG_PTR LastPhysKernelAddress, - ULONG MemorySizeInPages, - ULONG_PTR LastKernelAddress, - PADDRESS_RANGE BIOSMemoryMap, - ULONG AddressRangeCount) +MmInitializePageList(IN ULONG_PTR FirstPhysKernelAddress, + IN ULONG_PTR LastPhysKernelAddress, + IN ULONG HighestPage, + IN ULONG_PTR LastKernelAddress, + IN PADDRESS_RANGE BIOSMemoryMap, + IN ULONG AddressRangeCount) { ULONG i; ULONG Reserved; NTSTATUS Status; - PFN_TYPE LastPage, Pfn = 0; + PFN_TYPE Pfn = 0; ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; ULONG PdePageStart, PdePageEnd; ULONG VideoPageStart, VideoPageEnd; ULONG KernelPageStart, KernelPageEnd; + extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; /* Initialize the page lists */ KeInitializeSpinLock(&PageListLock); @@ -303,7 +304,7 @@ InitializeListHead(&FreeZeroedPageListHead); /* Set the size and start of the PFN Database */ - MmPageArraySize = MemorySizeInPages; + MmPageArraySize = HighestPage; MmPageArray = (PHYSICAL_PAGE *)LastKernelAddress; Reserved = PAGE_ROUND_UP((MmPageArraySize * sizeof(PHYSICAL_PAGE))) / PAGE_SIZE; @@ -311,10 +312,6 @@ LastKernelAddress = ((ULONG_PTR)LastKernelAddress + (Reserved * PAGE_SIZE)); LastPhysKernelAddress = (ULONG_PTR)LastPhysKernelAddress + (Reserved * PAGE_SIZE); - /* Find the highest usable page */ - LastPage = MmPageArraySize; - while (TRUE) if (MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, --LastPage)) break; - /* Loop every page required to hold the PFN database */ for (i = 0; i < Reserved; i++) { @@ -324,7 +321,8 @@ if (!MmIsPagePresent(NULL, Address)) { /* Use one of our highest usable pages */ - Pfn = LastPage--; + Pfn = MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount - 1; + MiFreeDescriptor->PageCount--; /* Set the PFN */ Status = MmCreateVirtualMappingForKernel(Address, @@ -422,7 +420,7 @@ MmPageArray[i].MapCount = 1; MmStats.NrSystemPages++; } - else if (i > LastPage) + else if (i > (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount - 1)) { /* These are pages we allocated above to hold the PFN DB */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Feb 14 22:24:02 2008 @@ -50,6 +50,7 @@ PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage; +PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; extern KMUTANT MmSystemLoadLock; BOOLEAN MiDbgEnableMdDump = #ifdef _ARM_ @@ -207,6 +208,7 @@ { PLIST_ENTRY NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR Md; + ULONG FreePages = 0; for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; @@ -240,6 +242,21 @@ /* Update the highest page */ MmHighestPhysicalPage = Md->BasePage + Md->PageCount - 1; } + + /* Check if this is free memory */ + if ((Md->MemoryType == LoaderFree) || + (Md->MemoryType == LoaderLoadedProgram) || + (Md->MemoryType == LoaderFirmwareTemporary) || + (Md->MemoryType == LoaderOsloaderStack)) + { + /* Check if this is the largest memory descriptor */ + if (Md->PageCount > FreePages) + { + /* For now, it is */ + FreePages = Md->PageCount; + MiFreeDescriptor = Md; + } + } } } }

1 0

[ros-arm-bringup] 32359: We were looping the memory descriptors in order to find the number of pages that are available to the system, that is to say, your RAM, minus pages that the BIOS said belong to it. This part is good. Next up, we were creating the page array for these pages, up to the highest entry, which we called, the number of pages on the system. This is the problem. Suppose we had 1000 pages somewhere in low memory that were used by the BIOS, we'd now call the total pages RAM - 1000
by ros-arm-bringup＠svn.reactos.org 14 Feb '08

14 Feb '08

Author: ros-arm-bringup Date: Thu Feb 14 21:33:38 2008 New Revision: 32359 URL: http://svn.reactos.org/svn/reactos?rev=32359&view=rev Log: We were looping the memory descriptors in order to find the number of pages that are available to the system, that is to say, your RAM, minus pages that the BIOS said belong to it. This part is good. Next up, we were creating the page array for these pages, up to the highest entry, which we called, the number of pages on the system. This is the problem. Suppose we had 1000 pages somewhere in low memory that were used by the BIOS, we'd now call the total pages RAM - 1000 (correct). However, we'd also set the highest page array entry to RAM - 1000, which is wrong, because esssentially this eats up 10MB of memory, since the top 10MB (which are FREE, usable memory) are never entered into the database. So really, what we want to do is differentiate the TOTAL amount of usable RAM, versus the HIGHEST page that is usable (which is actually what should be the highest entry in the page array). This will reclaim the lost RAM ReactOS has been eating up all these days. But it gets better: eventually, someone noticed ReactOS was eating memory, and added 1MB more to the "total", making the highest entry "1mb higher". This ...kind of... fixes the problem above by giving you one more MB, but what if ReactOS was only eating up 150KB, as was more the case? Then ReactOS would believe that the other 850KB of memory are "Free physical memory", when actually, they're pages that don't even exist. Wow! Fixed these bugs. Modified: trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.c 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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Feb 14 21:33:38 2008 @@ -290,7 +290,7 @@ ULONG i; ULONG Reserved; NTSTATUS Status; - PFN_TYPE LastPage, Pfn; + PFN_TYPE LastPage, Pfn = 0; ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; ULONG PdePageStart, PdePageEnd; ULONG VideoPageStart, VideoPageEnd; Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Feb 14 21:33:38 2008 @@ -49,7 +49,7 @@ PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress; PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; -ULONG MmNumberOfPhysicalPages; +ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage; extern KMUTANT MmSystemLoadLock; BOOLEAN MiDbgEnableMdDump = #ifdef _ARM_ @@ -201,13 +201,12 @@ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); } -ULONG +VOID NTAPI MiCountFreePagesInLoaderBlock(PLOADER_PARAMETER_BLOCK LoaderBlock) { PLIST_ENTRY NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR Md; - ULONG TotalPages = 0; for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; @@ -215,19 +214,51 @@ { Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - if (Md->MemoryType == LoaderBad || - Md->MemoryType == LoaderFirmwarePermanent || - Md->MemoryType == LoaderSpecialMemory || - Md->MemoryType == LoaderBBTMemory) + /* Skip invisible memory */ + if ((Md->MemoryType != LoaderFirmwarePermanent) && + (Md->MemoryType != LoaderSpecialMemory) && + (Md->MemoryType != LoaderHALCachedMemory) && + (Md->MemoryType != LoaderBBTMemory)) { - /* Don't count these blocks */ - continue; + /* Check if BURNMEM was used */ + if (Md->MemoryType != LoaderBad) + { + /* Count this in the total of pages */ + MmNumberOfPhysicalPages += Md->PageCount; + } + + /* Check if this is the new lowest page */ + if (Md->BasePage < MmLowestPhysicalPage) + { + /* Update the lowest page */ + MmLowestPhysicalPage = Md->BasePage; + } + + /* Check if this is the new highest page */ + if ((Md->BasePage + Md->PageCount) > MmHighestPhysicalPage) + { + /* Update the highest page */ + MmHighestPhysicalPage = Md->BasePage + Md->PageCount - 1; + } } - - TotalPages += Md->PageCount; - } - - return TotalPages; + } +} + +VOID +NTAPI +MiDbgDumpBiosMap(IN PADDRESS_RANGE BIOSMemoryMap, + IN ULONG AddressRangeCount) +{ + ULONG i; + + DPRINT1("Base\t\tLength\t\tType\n"); + for (i = 0; i < AddressRangeCount; i++) + { + DPRINT1("%08lX\t%08lX\t%d\n", + BIOSMemoryMap[i].BaseAddrLow, + BIOSMemoryMap[i].LengthLow, + BIOSMemoryMap[i].Type); + } } VOID @@ -269,8 +300,7 @@ Md->MemoryType == LoaderHalCode) { if (Md->BasePage+Md->PageCount > LastKrnlPhysAddr) - LastKrnlPhysAddr = Md->BasePage+Md->PageCount; - + LastKrnlPhysAddr = Md->BasePage+Md->PageCount; } } @@ -293,6 +323,7 @@ /* Dump memory descriptors */ if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); + if (MiDbgEnableMdDump) MiDbgDumpBiosMap(BIOSMemoryMap, AddressRangeCount); /* Set the page directory */ PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart = (ULONG)MmGetPageDirectory(); @@ -322,19 +353,9 @@ RtlZeroMemory(&MmStats, sizeof(MmStats)); /* Count RAM */ - MmStats.NrTotalPages = MiCountFreePagesInLoaderBlock(KeLoaderBlock); - MmNumberOfPhysicalPages = MmStats.NrTotalPages; - if (!MmStats.NrTotalPages) - { - DbgPrint("Memory not detected, default to 8 MB\n"); - MmStats.NrTotalPages = 2048; - } - else - { - /* HACK: add 1MB for standard memory (not extended). Why? */ - DbgPrint("Used memory %dKb\n", (MmStats.NrTotalPages * PAGE_SIZE) / 1024); - MmStats.NrTotalPages += 256; - } + MiCountFreePagesInLoaderBlock(KeLoaderBlock); + MmStats.NrTotalPages = MmNumberOfPhysicalPages; + DbgPrint("Used memory %dKb\n", (MmStats.NrTotalPages * PAGE_SIZE) / 1024); /* Initialize the kernel address space */ MmInitializeKernelAddressSpace(); @@ -343,7 +364,7 @@ /* Initialize the page list */ LastKernelAddress = (ULONG_PTR)MmInitializePageList(FirstKrnlPhysAddr, LastKrnlPhysAddr, - MmStats.NrTotalPages, + MmHighestPhysicalPage, PAGE_ROUND_UP(LastKernelAddress), BIOSMemoryMap, AddressRangeCount);

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