Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 49440: [NTOS]: Fix a bug in the MDL Code which would dereference a completely bogus page frame index.
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:58:10 2010 New Revision: 49440 URL: http://svn.reactos.org/svn/reactos?rev=49440&view=rev Log: [NTOS]: Fix a bug in the MDL Code which would dereference a completely bogus page frame index. Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Tue Nov 2 14:58:10 2010 @@ -1343,7 +1343,7 @@ InterlockedExchangeAddSizeT(&MmSystemLockPagesCount, -1); /* Do the last dereference, we're done here */ - MiDecrementReferenceCount(Pfn1, *MdlPages); + MiDecrementReferenceCount(Pfn1, MiGetPfnEntryIndex(Pfn1)); } else {

1 0

[sir_richard] 49439: [NTOS]: Fix a bug in MmFindGapBottomUp which could make it return an address lower than what the caller said should be the lowest address.
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:50:06 2010 New Revision: 49439 URL: http://svn.reactos.org/svn/reactos?rev=49439&view=rev Log: [NTOS]: Fix a bug in MmFindGapBottomUp which could make it return an address lower than what the caller said should be the lowest address. Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=49… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Tue Nov 2 14:50:06 2010 @@ -492,13 +492,16 @@ break; AlignedAddress = MM_ROUND_UP(PreviousNode->EndingAddress, Granularity); - if (Node->StartingAddress > AlignedAddress && - (ULONG_PTR)Node->StartingAddress - (ULONG_PTR)AlignedAddress >= Length) - { - DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); - return AlignedAddress; - } - + if (AlignedAddress >= LowestAddress) + { + if (Node->StartingAddress > AlignedAddress && + (ULONG_PTR)Node->StartingAddress - (ULONG_PTR)AlignedAddress >= Length) + { + DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); + ASSERT(AlignedAddress >= LowestAddress); + return AlignedAddress; + } + } PreviousNode = Node; } @@ -508,6 +511,7 @@ (ULONG_PTR)HighestAddress - (ULONG_PTR)AlignedAddress >= Length) { DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); + ASSERT(AlignedAddress >= LowestAddress); return AlignedAddress; } @@ -517,6 +521,7 @@ (ULONG_PTR)FirstNode->StartingAddress - (ULONG_PTR)AlignedAddress >= Length) { DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); + ASSERT(AlignedAddress >= LowestAddress); return AlignedAddress; }

1 0

[sir_richard] 49438: [NTOS]: You can't just set MDL_LOCKED_PAGES without actually... locking the page. Add a MmReferencePage when doing so, so when that a paging read/write IRP gets completed (and ...
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:46:46 2010 New Revision: 49438 URL: http://svn.reactos.org/svn/reactos?rev=49438&view=rev Log: [NTOS]: You can't just set MDL_LOCKED_PAGES without actually... locking the page. Add a MmReferencePage when doing so, so when that a paging read/write IRP gets completed (and MmUnlockPages is called), the page gets handled correctly. Can now boot with 64MB RAM without ASSERTs. [NTOS]: Fix one of the MDL code paths that isn't getting called frequently. Modified: trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/pagefile.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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Tue Nov 2 14:46:46 2010 @@ -246,12 +246,14 @@ // ASSERT(Pfn1->u3.e2.ReferenceCount == 0); - // - // Allocate it and mark it - // + /* Now setup the page and mark it */ + Pfn1->u3.e2.ReferenceCount = 1; + Pfn1->u2.ShareCount = 1; + MI_SET_PFN_DELETED(Pfn1); + Pfn1->u4.PteFrame = 0x1FFEDCB; Pfn1->u3.e1.StartOfAllocation = 1; Pfn1->u3.e1.EndOfAllocation = 1; - Pfn1->u3.e2.ReferenceCount = 1; + Pfn1->u4.VerifierAllocation = 0; // // Save it into the MDL @@ -370,7 +372,7 @@ } // - // We're done, mark the pages as locked (should we lock them, though???) + // We're done, mark the pages as locked // Mdl->Process = NULL; Mdl->MdlFlags |= MDL_PAGES_LOCKED; Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Tue Nov 2 14:46:46 2010 @@ -252,6 +252,7 @@ MmInitializeMdl(Mdl, NULL, PAGE_SIZE); MmBuildMdlFromPages(Mdl, &Page); + MmReferencePage(Page); Mdl->MdlFlags |= MDL_PAGES_LOCKED; file_offset.QuadPart = offset * PAGE_SIZE; @@ -313,6 +314,7 @@ MmInitializeMdl(Mdl, NULL, PAGE_SIZE); MmBuildMdlFromPages(Mdl, &Page); + MmReferencePage(Page); Mdl->MdlFlags |= MDL_PAGES_LOCKED; file_offset.QuadPart = offset * PAGE_SIZE;

1 0

[sir_richard] 49437: [NTOS]: ASSERT nobody tries to put ARM3 pages into the MC_USER LRU.
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:42:08 2010 New Revision: 49437 URL: http://svn.reactos.org/svn/reactos?rev=49437&view=rev Log: [NTOS]: ASSERT nobody tries to put ARM3 pages into the MC_USER LRU. 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Tue Nov 2 14:42:08 2010 @@ -79,6 +79,8 @@ if (Position == 0xFFFFFFFF) return 0; /* Return it */ + ASSERT(Position != 0); + ASSERT_IS_ROS_PFN(MiGetPfnEntry(Position)); return Position; } @@ -89,6 +91,8 @@ KIRQL OldIrql; /* Set the page as a user page */ + ASSERT(Pfn != 0); + ASSERT_IS_ROS_PFN(MiGetPfnEntry(Pfn)); OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); RtlSetBit(&MiUserPfnBitMap, Pfn); KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); @@ -108,6 +112,8 @@ if (Position == 0xFFFFFFFF) return 0; /* Return it */ + ASSERT(Position != 0); + ASSERT_IS_ROS_PFN(MiGetPfnEntry(Position)); return Position; } @@ -116,6 +122,8 @@ MmRemoveLRUUserPage(PFN_NUMBER Page) { /* Unset the page as a user page */ + ASSERT(Page != 0); + ASSERT_IS_ROS_PFN(MiGetPfnEntry(Page)); RtlClearBit(&MiUserPfnBitMap, Page); }

1 0

[sir_richard] 49436: [NTOS]: Assert nobody tries to touch the sharecount of a non-ARM3 page.
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:41:51 2010 New Revision: 49436 URL: http://svn.reactos.org/svn/reactos?rev=49436&view=rev Log: [NTOS]: Assert nobody tries to touch the sharecount of a non-ARM3 page. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Tue Nov 2 14:41:51 2010 @@ -812,6 +812,7 @@ ASSERT(PageFrameIndex > 0); ASSERT(MiGetPfnEntry(PageFrameIndex) != NULL); ASSERT(Pfn1 == MiGetPfnEntry(PageFrameIndex)); + ASSERT(MI_IS_ROS_PFN(Pfn1) == FALSE); /* Page must be in-use */ if ((Pfn1->u3.e1.PageLocation != ActiveAndValid) &&

1 0

[sir_richard] 49435: [NTOS]: Fix typos.
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:41:29 2010 New Revision: 49435 URL: http://svn.reactos.org/svn/reactos?rev=49435&view=rev Log: [NTOS]: Fix typos. Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Tue Nov 2 14:41:29 2010 @@ -1286,7 +1286,7 @@ /* Check if we have an import list */ if (LoadedImports) { - /* Reset the count again, and loop entries*/ + /* Reset the count again, and loop entries */ ImportCount = 0; for (i = 0; i < LoadedImports->Count; i++) { Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Nov 2 14:41:29 2010 @@ -160,7 +160,7 @@ MiDecrementShareCount(Pfn1, PageFrameIndex); /* Decrement the page table too */ - DPRINT("FIXME: ARM3 should decrement the PT refcount for: %p\n", Pfn2); + DPRINT("FIXME: ARM3 should decrement the pool PDE refcount for: %p\n", PageTableIndex); #if 0 // ARM3: Dont't trust this yet MiDecrementShareCount(Pfn2, PageTableIndex); #endif @@ -184,7 +184,7 @@ * * Right now, we shouldn't expect any page file information in the PTE */ - ASSERT(PointerPte->u.Soft.PageFileHigh == 0); + ASSERT(PointerPte->u.Soft.PageFileHigh == 0); /* Destroy the PTE */ PointerPte->u.Long = 0; @@ -259,7 +259,7 @@ } #endif /* FIXME: Drop the reference on the page table. For now, leak it until RosMM is gone */ - //MiDecrementShareCount(MiGetPfnEntry(PFN_FROM_PTE(PointerPde)), PFN_FROM_PDE(PointerPde)); + //MiDecrementShareCount(MiGetPfnEntry(PFN_FROM_PTE(PointerPde)), PFN_FROM_PTE(PointerPde)); /* Drop the share count */ MiDecrementShareCount(Pfn1, PageFrameIndex);

1 0

[sir_richard] 49434: [NTOS]: Sanity checks when dealing with creating/cleaning process address space. [NTOS]: Set the VmDeleted flag when the process address space is being nuked.
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:41:03 2010 New Revision: 49434 URL: http://svn.reactos.org/svn/reactos?rev=49434&view=rev Log: [NTOS]: Sanity checks when dealing with creating/cleaning process address space. [NTOS]: Set the VmDeleted flag when the process address space is being nuked. Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Tue Nov 2 14:41:03 2010 @@ -190,6 +190,7 @@ ASSERT((Vad->StartingVpn == ((ULONG_PTR)Teb >> PAGE_SHIFT) && (Vad->EndingVpn == (TebEnd >> PAGE_SHIFT)))); ASSERT(Vad->u.VadFlags.NoChange == TRUE); + ASSERT(Vad->u2.VadFlags2.OneSecured == TRUE); ASSERT(Vad->u2.VadFlags2.MultipleSecured == FALSE); /* Lock the working set */ @@ -1169,8 +1170,14 @@ PMM_AVL_TABLE VadTree; PETHREAD Thread = PsGetCurrentThread(); + /* Only support this */ + ASSERT(Process->AddressSpaceInitialized == 2); + /* Lock the process address space from changes */ MmLockAddressSpace(&Process->Vm); + + /* VM is deleted now */ + Process->VmDeleted = TRUE; /* Enumerate the VADs */ VadTree = &Process->VadRoot;

1 0

[sir_richard] 49433: [NTOS]: Make sure we don't get a user-pointer back from MmMapInSystemSpace.
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:40:31 2010 New Revision: 49433 URL: http://svn.reactos.org/svn/reactos?rev=49433&view=rev Log: [NTOS]: Make sure we don't get a user-pointer back from MmMapInSystemSpace. Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=494… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Tue Nov 2 14:40:31 2010 @@ -329,6 +329,7 @@ } /* Copy the codepage data in its new location. */ + ASSERT(SectionBase > MmSystemRangeStart); RtlCopyMemory(SectionBase, ExpNlsTableBase, ExpNlsTableSize); /* Free the previously allocated buffer and set the new location */

1 0

[sir_richard] 49432: [NTOS]: Remove merge artifact from newcc.
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:40:07 2010 New Revision: 49432 URL: http://svn.reactos.org/svn/reactos?rev=49432&view=rev Log: [NTOS]: Remove merge artifact from newcc. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Nov 2 14:40:07 2010 @@ -1427,7 +1427,6 @@ if (!MmIsPagePresent(Process, Address)) { Entry = MmGetPageEntrySectionSegment(Segment, Offset); - DPRINT1("Entry %x\n", Entry); HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)PAddress); if (PAGE_FROM_SSE(Entry) == 0 || HasSwapEntry)

1 0

[sir_richard] 49431: [NTOS]: Protect Arty's changes with #ifdef NEWCC, otherwise this code ASSERTs and crashes as soon as a pageout operation is required. Since your advanced test/regression system...
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:38:52 2010 New Revision: 49431 URL: http://svn.reactos.org/svn/reactos?rev=49431&view=rev Log: [NTOS]: Protect Arty's changes with #ifdef NEWCC, otherwise this code ASSERTs and crashes as soon as a pageout operation is required. Since your advanced test/regression systems boot into configurations with 1GB+ RAM, you never even test these paths and one could put an ASSERT(FALSE) and you wouldn't even notice it (as proven). Modified: trunk/reactos/ntoskrnl/mm/rmap.c Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=494… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Tue Nov 2 14:38:52 2010 @@ -10,7 +10,9 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> +#ifdef NEWCC #include "../cache/section/newmm.h" +#endif #define NDEBUG #include <debug.h> @@ -56,8 +58,6 @@ ULONG Offset; NTSTATUS Status = STATUS_SUCCESS; - ASSERT(FALSE); - ExAcquireFastMutex(&RmapListLock); entry = MmGetRmapListHeadPage(Page); if (entry == NULL) @@ -197,7 +197,9 @@ } while (current_entry != NULL) { +#ifdef NEWCC if (!RMAP_IS_SEGMENT(current_entry->Address)) +#endif MmSetCleanPage(current_entry->Process, current_entry->Address); current_entry = current_entry->Next; } @@ -219,7 +221,9 @@ } while (current_entry != NULL) { +#ifdef NEWCC if (!RMAP_IS_SEGMENT(current_entry->Address)) +#endif MmSetDirtyPage(current_entry->Process, current_entry->Address); current_entry = current_entry->Next; } @@ -241,7 +245,10 @@ } while (current_entry != NULL) { - if (!RMAP_IS_SEGMENT(current_entry->Address) && + if ( +#ifdef NEWCC + !RMAP_IS_SEGMENT(current_entry->Address) && +#endif MmIsDirtyPage(current_entry->Process, current_entry->Address)) { ExReleaseFastMutex(&RmapListLock); @@ -261,8 +268,9 @@ PMM_RMAP_ENTRY current_entry; PMM_RMAP_ENTRY new_entry; ULONG PrevSize; - +#ifdef NEWCC if (!RMAP_IS_SEGMENT(Address)) +#endif Address = (PVOID)PAGE_ROUND_DOWN(Address); new_entry = ExAllocateFromNPagedLookasideList(&RmapLookasideList); @@ -280,7 +288,10 @@ #endif #endif - if (!RMAP_IS_SEGMENT(Address) && + if ( +#ifdef NEWCC + !RMAP_IS_SEGMENT(Address) && +#endif MmGetPfnForProcess(Process, Address) != Page) { DPRINT1("Insert rmap (%d, 0x%.8X) 0x%.8X which doesn't match physical " @@ -311,8 +322,9 @@ #endif MmSetRmapListHeadPage(Page, new_entry); ExReleaseFastMutex(&RmapListLock); - +#ifdef NEWCC if (!RMAP_IS_SEGMENT(Address)) +#endif { if (Process == NULL) { @@ -352,7 +364,9 @@ { previous_entry = current_entry; current_entry = current_entry->Next; +#ifdef NEWCC if (!RMAP_IS_SEGMENT(current_entry->Address)) +#endif { if (DeleteMapping) { @@ -370,10 +384,12 @@ (void)InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); } } +#ifdef NEWCC else { ExFreeToNPagedLookasideList(&RmapLookasideList, previous_entry); } +#endif } } @@ -403,7 +419,10 @@ } ExReleaseFastMutex(&RmapListLock); ExFreeToNPagedLookasideList(&RmapLookasideList, current_entry); - if (!RMAP_IS_SEGMENT(Address)) { +#ifdef NEWCC + if (!RMAP_IS_SEGMENT(Address)) +#endif + { if (Process == NULL) { Process = PsInitialSystemProcess; @@ -421,6 +440,7 @@ KeBugCheck(MEMORY_MANAGEMENT); } +#ifdef NEWCC PVOID NTAPI MmGetSegmentRmap(PFN_NUMBER Page, PULONG RawOffset) @@ -478,3 +498,4 @@ } ExReleaseFastMutex(&RmapListLock); } +#endif

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