Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[ros-arm-bringup] 32374: Remove Ke386Pae conditionals from page code -- PAE is never turned on ReactOS (and probably wouldn't work), so there's no point in wasting CPU cycles and making the code even more unredable by having the PAE code there. The PAE implementation has been moved to pagepae.c, in case someone will ever want to revive. Even in that case, it's recommended to build two kernels like everyone else does, instead of doing runtime conditionals for every single page operation.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Fri Feb 15 09:53:49 2008 New Revision: 32374 URL: http://svn.reactos.org/svn/reactos?rev=32374&view=rev Log: Remove Ke386Pae conditionals from page code -- PAE is never turned on ReactOS (and probably wouldn't work), so there's no point in wasting CPU cycles and making the code even more unredable by having the PAE code there. The PAE implementation has been moved to pagepae.c, in case someone will ever want to revive. Even in that case, it's recommended to build two kernels like everyone else does, instead of doing runtime conditionals for every single page operation. Added: trunk/reactos/ntoskrnl/mm/i386/pagepae.c (with props) Modified: trunk/reactos/ntoskrnl/mm/i386/page.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… Added: trunk/reactos/ntoskrnl/mm/i386/pagepae.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c…

16 years, 8 months

[ros-arm-bringup] 32373: Christ! Don't zero out the shared memory page during Virtual Memory initialization! The page is already well in-use by the time we were zeroing it out, and this is also the reason why all the attempts to move MmInit1 into MmInitSystem had previously failed -- the NtSystemRoot path would get written during initialization (But before MmInitSystem), and MmInit1 would then zero out the entire structure. Not only does this allow us to do MmInit1 in MmInitSystem, where it shou

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Fri Feb 15 09:49:59 2008 New Revision: 32373 URL: http://svn.reactos.org/svn/reactos?rev=32373&view=rev Log: Christ! Don't zero out the shared memory page during Virtual Memory initialization! The page is already well in-use by the time we were zeroing it out, and this is also the reason why all the attempts to move MmInit1 into MmInitSystem had previously failed -- the NtSystemRoot path would get written during initialization (But before MmInitSystem), and MmInit1 would then zero out the entire structure. Not only does this allow us to do MmInit1 in MmInitSystem, where it should be, but it also fixes the fact that several KUSER_SHARED_DATA flags were being zeroed out. As an added benefit, ARM/PPC ports now need to worry about Mm much later then before (well after the HAL has initialized and interrupts are enabled). Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=323… ============================================================================== (empty) 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 09:49:59 2008 @@ -536,9 +536,6 @@ /* HACK for MmUpdatePageDir */ ((PETHREAD)InitThread)->ThreadsProcess = (PEPROCESS)InitProcess; - /* Initialize Kernel Memory Address Space */ - MmInit1(); - /* Set basic CPU Features that user mode can read */ SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = (KeFeatureBits & KF_MMX) ? TRUE: FALSE; 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 09:49:59 2008 @@ -182,7 +182,6 @@ 0, BoundaryAddressMultiple); MmSharedDataPagePhysicalAddress.QuadPart = 2 << PAGE_SHIFT; - RtlZeroMemory(BaseAddress, Length); /* * @@ -420,6 +419,9 @@ ULONG Flags = 0; if (Phase == 0) { + /* Initialize Mm bootstrap */ + MmInit1(); + /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE);

16 years, 8 months

[ros-arm-bringup] 32371: Fixed several off-by-one errors when playing with the PFN database array size. Among other things, certain valid pages would be considered invalid, and also the PFN database wouldn't be properly erased on startup (which would result in a crash after a warm reboot or restarting the emulator).

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Fri Feb 15 04:04:22 2008 New Revision: 32371 URL: http://svn.reactos.org/svn/reactos?rev=32371&view=rev Log: Fixed several off-by-one errors when playing with the PFN database array size. Among other things, certain valid pages would be considered invalid, and also the PFN database wouldn't be properly erased on startup (which would result in a crash after a warm reboot or restarting the emulator). 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 Fri Feb 15 04:04:22 2008 @@ -337,7 +337,7 @@ } /* Clear the PFN database */ - RtlZeroMemory(MmPageArray, MmPageArraySize * sizeof(PHYSICAL_PAGE)); + RtlZeroMemory(MmPageArray, (MmPageArraySize + 1) * sizeof(PHYSICAL_PAGE)); /* This is what a used page looks like */ RtlZeroMemory(&UsedPage, sizeof(UsedPage)); @@ -436,6 +436,7 @@ * Descriptor List, why bother, right? */ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_FREE; + MmPageArray[i].ReferenceCount = 0; InsertTailList(&FreeUnzeroedPageListHead, &MmPageArray[i].ListEntry); UnzeroedPageCount++; @@ -501,7 +502,7 @@ KIRQL oldIrql; PPHYSICAL_PAGE Page; - if (Pfn < MmPageArraySize) + if (Pfn <= MmPageArraySize) { KeAcquireSpinLock(&PageListLock, &oldIrql); Page = MiGetPfnEntry(Pfn); @@ -523,7 +524,7 @@ KIRQL oldIrql; PPHYSICAL_PAGE Page; - if (Pfn < MmPageArraySize) + if (Pfn <= MmPageArraySize) { KeAcquireSpinLock(&PageListLock, &oldIrql); Page = MiGetPfnEntry(Pfn); @@ -592,7 +593,7 @@ DPRINT("MmReferencePageUnsafe(PysicalAddress %x)\n", Pfn << PAGE_SHIFT); - if (Pfn == 0 || Pfn >= MmPageArraySize) + if (Pfn == 0 || Pfn > MmPageArraySize) { return; } @@ -616,11 +617,6 @@ { DPRINT("MmReferencePage(PysicalAddress %x)\n", Pfn << PAGE_SHIFT); - if (Pfn == 0 || Pfn >= MmPageArraySize) - { - KEBUGCHECK(0); - } - MmReferencePageUnsafe(Pfn); } @@ -633,11 +629,6 @@ PPHYSICAL_PAGE Page; DPRINT("MmGetReferenceCountPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - - if (Pfn == 0 || Pfn >= MmPageArraySize) - { - KEBUGCHECK(0); - } KeAcquireSpinLock(&PageListLock, &oldIrql); Page = MiGetPfnEntry(Pfn);

16 years, 8 months

[ros-arm-bringup] 32372: Get rid of complete hack that MmInitializePageList was, and use the ARC Memory Descriptor Tree instead. No more magical assumptions about page numbers. No more BIOS Memory Map from FreeLDR. No more hard-coded/static addresses being pased from the bowels of FreeLDR to the kernel. "Oh my God, I can't believe this is real." We can now continue the ARM port since the ARM port uses real ARC memory descriptors and not the completely hacked up pages the kernel was previously cr

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Fri Feb 15 04:19:46 2008 New Revision: 32372 URL: http://svn.reactos.org/svn/reactos?rev=32372&view=rev Log: Get rid of complete hack that MmInitializePageList was, and use the ARC Memory Descriptor Tree instead. No more magical assumptions about page numbers. No more BIOS Memory Map from FreeLDR. No more hard-coded/static addresses being pased from the bowels of FreeLDR to the kernel. "Oh my God, I can't believe this is real." We can now continue the ARM port since the ARM port uses real ARC memory descriptors and not the completely hacked up pages the kernel was previously crossing its fingers to get. As a side effect, this probably unblocks the final hurdle to get ReactOS booted by NTLDR. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/ke/freeldr.c 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 04:19:46 2008 @@ -21,7 +21,6 @@ extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; extern ULONG MmHighestPhysicalPage; extern PVOID MmPfnDatabase; -extern ULONG_PTR MiKSeg0Start, MiKSeg0End; struct _KTRAP_FRAME; struct _EPROCESS; @@ -560,8 +559,7 @@ VOID NTAPI MmInit1( - PADDRESS_RANGE BIOSMemoryMap, - ULONG AddressRangeCount + VOID ); BOOLEAN @@ -968,8 +966,7 @@ VOID NTAPI MmInitializePageList( - PADDRESS_RANGE BIOSMemoryMap, - ULONG AddressRangeCount + VOID ); PFN_TYPE Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Fri Feb 15 04:19:46 2008 @@ -28,11 +28,6 @@ } BIOS_MEMORY_DESCRIPTOR, *PBIOS_MEMORY_DESCRIPTOR; /* GLOBALS *******************************************************************/ - -/* FreeLDR Memory Data */ -ULONG_PTR MmFreeLdrFirstKrnlPhysAddr, MmFreeLdrLastKrnlPhysAddr; -ULONG_PTR MmFreeLdrLastKernelAddress; -ULONG MmFreeLdrPageDirectoryEnd; /* FreeLDR Loader Data */ PROS_LOADER_PARAMETER_BLOCK KeRosLoaderBlock; @@ -925,8 +920,6 @@ /* First get some kernel-loader globals */ AcpiTableDetected = (RosLoaderBlock->Flags & MB_FLAGS_ACPI_TABLE) ? TRUE : FALSE; - MmFreeLdrPageDirectoryEnd = RosLoaderBlock->PageDirectoryEnd; - if (!MmFreeLdrPageDirectoryEnd) MmFreeLdrPageDirectoryEnd = 0x40000; /* Set the NT Loader block and initialize it */ *NtLoaderBlock = KeLoaderBlock = LoaderBlock = &BldrLoaderBlock; @@ -1288,22 +1281,6 @@ /* Save pointer to ROS Block */ KeRosLoaderBlock = LoaderBlock; - MmFreeLdrLastKernelAddress = PAGE_ROUND_UP(KeRosLoaderBlock-> - ModsAddr[KeRosLoaderBlock-> - ModsCount - 1]. - ModEnd); -#if defined(_M_PPC) - MmFreeLdrFirstKrnlPhysAddr = KeRosLoaderBlock->ModsAddr[0].ModStart; - MmFreeLdrLastKrnlPhysAddr = MmFreeLdrLastKernelAddress; - MmFreeLdrLastKernelAddress = 0x80800000 + KeRosLoaderBlock->ModsAddr[KeRosLoaderBlock->ModsCount - 1].ModEnd - MmFreeLdrFirstKrnlPhysAddr; - DbgPrint("kernel phys = %08x-%08x\n", - MmFreeLdrFirstKrnlPhysAddr, - MmFreeLdrLastKrnlPhysAddr); -#else - MmFreeLdrFirstKrnlPhysAddr = KeRosLoaderBlock->ModsAddr[0].ModStart - - KSEG0_BASE; - MmFreeLdrLastKrnlPhysAddr = MmFreeLdrLastKernelAddress - KSEG0_BASE; -#endif /* Save memory manager data */ KeMemoryMapRangeCount = 0; 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 04:19:46 2008 @@ -537,7 +537,7 @@ ((PETHREAD)InitThread)->ThreadsProcess = (PEPROCESS)InitProcess; /* Initialize Kernel Memory Address Space */ - MmInit1(KeMemoryMap, KeMemoryMapRangeCount); + MmInit1(); /* 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 04:19:46 2008 @@ -237,63 +237,17 @@ return 0; } - -BOOLEAN -NTAPI -MiIsPfnRam(PADDRESS_RANGE BIOSMemoryMap, - ULONG AddressRangeCount, - PFN_TYPE Pfn) -{ - BOOLEAN IsUsable; - LARGE_INTEGER BaseAddress; - LARGE_INTEGER EndAddress; - ULONG i; - if (BIOSMemoryMap != NULL && AddressRangeCount > 0) - { - IsUsable = FALSE; - for (i = 0; i < AddressRangeCount; i++) - { - BaseAddress.u.LowPart = BIOSMemoryMap[i].BaseAddrLow; - BaseAddress.u.HighPart = BIOSMemoryMap[i].BaseAddrHigh; - EndAddress.u.LowPart = BIOSMemoryMap[i].LengthLow; - EndAddress.u.HighPart = BIOSMemoryMap[i].LengthHigh; - EndAddress.QuadPart += BaseAddress.QuadPart; - BaseAddress.QuadPart = PAGE_ROUND_DOWN(BaseAddress.QuadPart); - EndAddress.QuadPart = PAGE_ROUND_UP(EndAddress.QuadPart); - - if ((BaseAddress.QuadPart >> PAGE_SHIFT) <= Pfn && - Pfn < (EndAddress.QuadPart >> PAGE_SHIFT)) - { - if (BIOSMemoryMap[i].Type == 1) - { - IsUsable = TRUE; - } - else - { - return FALSE; - } - } - } - return IsUsable; - } - return TRUE; -} - -VOID -NTAPI -MmInitializePageList(IN PADDRESS_RANGE BIOSMemoryMap, - IN ULONG AddressRangeCount) +VOID +NTAPI +MmInitializePageList(VOID) { ULONG i; ULONG Reserved; NTSTATUS Status; PFN_TYPE Pfn = 0; PHYSICAL_PAGE UsedPage; - ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; - ULONG PdePageStart, PdePageEnd; - ULONG VideoPageStart, VideoPageEnd; - ULONG KernelPageStart, KernelPageEnd; - ULONG_PTR KernelStart, KernelEnd; + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR Md; /* Initialize the page lists */ KeInitializeSpinLock(&PageListLock); @@ -345,113 +299,73 @@ UsedPage.Flags.Consumer = MC_NPPOOL; UsedPage.ReferenceCount = 2; 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 = KernelStart / PAGE_SIZE; - KernelPageEnd = KernelEnd / PAGE_SIZE; - // Glorious Hack: - // The kernel seems to crash if the region of memory that FreeLDR maps - // (those evil 6MB) is not *entirely* marked "in use", even though only - // 3 or 4MB of it may actually be in use. - // This wasn't noticed before, because the PFN database pages which are - // *VIRTUALLY* continous after the kernel end were also marked as - // *PHYSICALLY* continous (even though they were allocated at the very far - // end of physical memory). - // - // So we'll simply gobble up whatever is left of what FreeLDR mapped. - // - // PS. This is really sinister - // - KernelEnd += (KernelStart + 0x600000) - KernelEnd; - KernelPageEnd = KernelEnd / PAGE_SIZE; - - /* Loop every page on the system */ - for (i = 0; i <= MmPageArraySize; i++) - { - /* Check if it's part of RAM */ - if (MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, i)) + /* Loop the memory descriptors */ + for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; + NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; + NextEntry = NextEntry->Flink) + { + /* Get the descriptor */ + Md = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + + /* Skip bad memory */ + if ((Md->MemoryType == LoaderFirmwarePermanent) || + (Md->MemoryType == LoaderBBTMemory) || + (Md->MemoryType == LoaderSpecialMemory) || + (Md->MemoryType == LoaderBad)) { - /* Apply assumptions that all computers are built the same way */ - if (i == 0) - { - /* Page 0 is reserved for the IVT */ - MmPageArray[i] = UsedPage; + /* Loop every page part of the block but valid in the database */ + for (i = 0; i < Md->PageCount; i++) + { + /* Skip memory we ignore completely */ + if ((Md->BasePage + i) > MmPageArraySize) break; + + /* These are pages reserved by the BIOS/ROMs */ + MmPageArray[Md->BasePage + i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[Md->BasePage + i].Flags.Consumer = MC_NPPOOL; MmStats.NrSystemPages++; } - else if (i == 1) - { - /* Page 1 is reserved for the PCR */ - MmPageArray[i] = UsedPage; - MmStats.NrSystemPages++; - } - else if (i == 2) - { - /* Page 2 is reserved for the KUSER_SHARED_DATA */ - MmPageArray[i] = UsedPage; - MmStats.NrSystemPages++; - } - else if ((i >= PdePageStart) && (i < PdePageEnd)) - { - /* These pages contain the initial FreeLDR PDEs */ - MmPageArray[i] = UsedPage; - MmStats.NrSystemPages++; - } - else if ((i >= VideoPageStart) && (i < VideoPageEnd)) - { - /* - * These pages are usually for the Video ROM BIOS. - * Supposedly anyway. We'll simply ignore the fact that - * many systems have this area somewhere else entirely - * (which we'll assume to be "free" a couple of lines below) - */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmStats.NrSystemPages++; - } - else if ((i >= KernelPageStart) && (i < KernelPageEnd)) - { - /* These are pages beloning to the kernel */ - 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] = UsedPage; - MmStats.NrSystemPages++; - } - else - { - /* - * These are supposedly free pages. - * By the way, not all of them are, some contain vital - * FreeLDR data, but since we choose to ignore the Memory - * Descriptor List, why bother, right? - */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_FREE; - MmPageArray[i].ReferenceCount = 0; + } + else if ((Md->MemoryType == LoaderFree) || + (Md->MemoryType == LoaderLoadedProgram) || + (Md->MemoryType == LoaderFirmwareTemporary) || + (Md->MemoryType == LoaderOsloaderStack)) + { + /* Loop every page part of the block */ + for (i = 0; i < Md->PageCount; i++) + { + /* Mark it as a free page */ + MmPageArray[Md->BasePage + i].Flags.Type = MM_PHYSICAL_PAGE_FREE; InsertTailList(&FreeUnzeroedPageListHead, - &MmPageArray[i].ListEntry); + &MmPageArray[Md->BasePage + i].ListEntry); UnzeroedPageCount++; - MmStats.NrFreePages++; + MmStats.NrFreePages++; } } else { - /* These are pages reserved by the BIOS/ROMs */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmStats.NrSystemPages++; + /* Loop every page part of the block */ + for (i = 0; i < Md->PageCount; i++) + { + /* Everything else is used memory */ + MmPageArray[Md->BasePage + i] = UsedPage; + MmStats.NrSystemPages++; + } } } + /* Finally handle the pages describing the PFN database themselves */ + for (i = (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount); + i <= MmPageArraySize; + i++) + { + /* Mark them as used kernel memory */ + MmPageArray[i] = UsedPage; + MmStats.NrSystemPages++; + } + KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); DPRINT("Pages: %x %x\n", MmStats.NrFreePages, MmStats.NrSystemPages); 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 04:19:46 2008 @@ -277,23 +277,6 @@ 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 -NTAPI MiDbgDumpMemoryDescriptors(VOID) { PLIST_ENTRY NextEntry; @@ -342,14 +325,12 @@ VOID INIT_FUNCTION NTAPI -MmInit1(IN PADDRESS_RANGE BIOSMemoryMap, - IN ULONG AddressRangeCount) +MmInit1(VOID) { PLDR_DATA_TABLE_ENTRY LdrEntry; /* Dump memory descriptors */ if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); - if (MiDbgEnableMdDump) MiDbgDumpBiosMap(BIOSMemoryMap, AddressRangeCount); /* Set the page directory */ PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart = (ULONG)MmGetPageDirectory(); @@ -419,7 +400,7 @@ MiDbgKernelLayout(); /* Initialize the page list */ - MmInitializePageList(BIOSMemoryMap, AddressRangeCount); + MmInitializePageList(); /* Unmap low memory */ MmDeletePageTable(NULL, 0);

16 years, 8 months

[ros-arm-bringup] 32370: Remove accidentally enabled debugging function, and apply the FreeLDR 6MB hack when building the ARC Memory Descriptor List as well. This will reflect the memory in use (thus representing the ARC-based glorious hack) when parsing the memory descriptor list, something we'll soon have to do in MmInitializePageList.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Fri Feb 15 03:50:26 2008 New Revision: 32370 URL: http://svn.reactos.org/svn/reactos?rev=32370&view=rev Log: Remove accidentally enabled debugging function, and apply the FreeLDR 6MB hack when building the ARC Memory Descriptor List as well. This will reflect the memory in use (thus representing the ARC-based glorious hack) when parsing the memory descriptor list, something we'll soon have to do in MmInitializePageList. Modified: trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Fri Feb 15 03:50:26 2008 @@ -906,7 +906,7 @@ { PLOADER_PARAMETER_BLOCK LoaderBlock; PLDR_DATA_TABLE_ENTRY LdrEntry; - PLOADER_MODULE RosEntry; + PLOADER_MODULE RosEntry = NULL; ULONG i, j, ModSize; PVOID ModStart; PCHAR DriverName; @@ -1147,6 +1147,14 @@ InsertTailList(&LoaderBlock->LoadOrderListHead, &LdrEntry->InLoadOrderLinks); } + + /* Now mark the remainder of the FreeLDR 6MB area as "in use" */ + KiRosAllocateNtDescriptor(LoaderMemoryData, + KERNEL_DESCRIPTOR_PAGE(RosEntry->ModEnd), + KERNEL_DESCRIPTOR_PAGE((0x80800000 + 0x600000)) - + KERNEL_DESCRIPTOR_PAGE(RosEntry->ModEnd), + 0, + &Base); /* Setup command line */ LoaderBlock->LoadOptions = BldrCommandLine; 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 03:50:26 2008 @@ -348,7 +348,7 @@ PLDR_DATA_TABLE_ENTRY LdrEntry; /* Dump memory descriptors */ - if (TRUE) MiDbgDumpMemoryDescriptors(); + if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); if (MiDbgEnableMdDump) MiDbgDumpBiosMap(BIOSMemoryMap, AddressRangeCount); /* Set the page directory */

16 years, 8 months

[ros-arm-bringup] 32369: Fixed some bugs we introduced by incorrectly double-accounting the PFN database. The database is *virtually* continous and follows the kernel address region, but not physically -- physically, it is at the very far end of memory. Unfortunately, fixing this bug now caused any unused memory in the FreeLDR-mapped region of 6MB to appear...well...unused. This would normally be a good thing, except ReactOS started crashing. We fixed it by applying the Glorious Hack. See freeli

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Fri Feb 15 03:31:18 2008 New Revision: 32369 URL: http://svn.reactos.org/svn/reactos?rev=32369&view=rev Log: Fixed some bugs we introduced by incorrectly double-accounting the PFN database. The database is *virtually* continous and follows the kernel address region, but not physically -- physically, it is at the very far end of memory. Unfortunately, fixing this bug now caused any unused memory in the FreeLDR-mapped region of 6MB to appear...well...unused. This would normally be a good thing, except ReactOS started crashing. We fixed it by applying the Glorious Hack. See freelist.c:359. 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 Fri Feb 15 03:31:18 2008 @@ -356,6 +356,22 @@ KernelPageStart = KernelStart / PAGE_SIZE; KernelPageEnd = KernelEnd / PAGE_SIZE; + // Glorious Hack: + // The kernel seems to crash if the region of memory that FreeLDR maps + // (those evil 6MB) is not *entirely* marked "in use", even though only + // 3 or 4MB of it may actually be in use. + // This wasn't noticed before, because the PFN database pages which are + // *VIRTUALLY* continous after the kernel end were also marked as + // *PHYSICALLY* continous (even though they were allocated at the very far + // end of physical memory). + // + // So we'll simply gobble up whatever is left of what FreeLDR mapped. + // + // PS. This is really sinister + // + KernelEnd += (KernelStart + 0x600000) - KernelEnd; + KernelPageEnd = KernelEnd / PAGE_SIZE; + /* Loop every page on the system */ for (i = 0; i <= MmPageArraySize; i++) { @@ -437,6 +453,7 @@ KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); + DPRINT("Pages: %x %x\n", MmStats.NrFreePages, MmStats.NrSystemPages); MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrUserPages; MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages); } 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 03:31:18 2008 @@ -53,6 +53,7 @@ ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage; ULONG_PTR MiKSeg0Start, MiKSeg0End; PVOID MmPfnDatabase; +ULONG_PTR MmPfnDatabaseEnd; PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; extern KMUTANT MmSystemLoadLock; BOOLEAN MiDbgEnableMdDump = @@ -257,14 +258,14 @@ KSEG0_BASE, MiKSeg0Start, "Undefined region"); DPRINT1("0x%p - 0x%p\t%s\n", - MiKSeg0Start, MmPfnDatabase, + MiKSeg0Start, MiKSeg0End, "FreeLDR Kernel mapping region"); DPRINT1("0x%p - 0x%p\t%s\n", - MmPfnDatabase, MiKSeg0End, + MmPfnDatabase, MmPfnDatabaseEnd, "PFN Database region"); - if (MiKSeg0End != (ULONG_PTR)MiNonPagedPoolStart) + if (MmPfnDatabaseEnd != (ULONG_PTR)MiNonPagedPoolStart) DPRINT1("0x%p - 0x%p\t%s\n", - MiKSeg0End, MiNonPagedPoolStart, + MmPfnDatabaseEnd, MiNonPagedPoolStart, "Remaining FreeLDR mapping"); DPRINT1("0x%p - 0x%p\t%s\n", MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength, @@ -347,7 +348,7 @@ PLDR_DATA_TABLE_ENTRY LdrEntry; /* Dump memory descriptors */ - if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); + if (TRUE) MiDbgDumpMemoryDescriptors(); if (MiDbgEnableMdDump) MiDbgDumpBiosMap(BIOSMemoryMap, AddressRangeCount); /* Set the page directory */ @@ -386,8 +387,8 @@ /* We'll put the PFN array right after the loaded modules */ MmPfnDatabase = (PVOID)MiKSeg0End; - MiKSeg0End += MmHighestPhysicalPage * sizeof(PHYSICAL_PAGE); - MiKSeg0End = PAGE_ROUND_UP(MiKSeg0End); + MmPfnDatabaseEnd = (ULONG_PTR)MmPfnDatabase + (MmHighestPhysicalPage * sizeof(PHYSICAL_PAGE)); + MmPfnDatabaseEnd = PAGE_ROUND_UP(MmPfnDatabaseEnd); /* * FreeLDR maps 6MB starting at the kernel base address, followed by the @@ -395,15 +396,15 @@ * 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)) + if ((ULONG_PTR)MmPfnDatabaseEnd < (MiKSeg0Start + 0x600000)) { /* Use the first memory following FreeLDR's 6MB mapping */ - MiNonPagedPoolStart = (PVOID)PAGE_ROUND_UP(MiKSeg0Start + 0x600000); + MiNonPagedPoolStart = (PVOID)((ULONG_PTR)MiKSeg0Start + 0x600000); } else { /* Use the next free available page */ - MiNonPagedPoolStart = (PVOID)MiKSeg0End; + MiNonPagedPoolStart = (PVOID)MmPfnDatabaseEnd; } /* Length of non-paged pool */

16 years, 8 months

[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

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();

16 years, 8 months

[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

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); }

16 years, 8 months

[dreimer] 32366: reactivate kdbg.

by dreimer＠svn.reactos.org

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" /> <!--

16 years, 8 months

[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

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; } }

16 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2008