Ros-diffs July 2023

ros-diffs@reactos.org

26 participants
189 discussions

[reactos] 10/14: [NTOS:Mm] Implement MmRebalanceMemoryConsumersAndWait

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=047dc9729f0cbf0b7b757… commit 047dc9729f0cbf0b7b7571ae522a9f8677943959 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Apr 6 08:42:32 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 29 14:00:44 2023 +0300 [NTOS:Mm] Implement MmRebalanceMemoryConsumersAndWait --- ntoskrnl/mm/balance.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index f81027a65cd..ab71d0f195b 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -33,6 +33,7 @@ static ULONG MiMinimumPagesPerRun; static CLIENT_ID MiBalancerThreadId; static HANDLE MiBalancerThreadHandle = NULL; static KEVENT MiBalancerEvent; +static KEVENT MiBalancerDoneEvent; static KTIMER MiBalancerTimer; static LONG PageOutThreadActive; @@ -296,6 +297,19 @@ MmRebalanceMemoryConsumers(VOID) } } +VOID +NTAPI +MmRebalanceMemoryConsumersAndWait(VOID) +{ + ASSERT(PsGetCurrentProcess()->AddressCreationLock.Owner != KeGetCurrentThread()); + ASSERT(!MM_ANY_WS_LOCK_HELD(PsGetCurrentThread())); + ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); + + KeResetEvent(&MiBalancerDoneEvent); + MmRebalanceMemoryConsumers(); + KeWaitForSingleObject(&MiBalancerDoneEvent, Executive, KernelMode, FALSE, NULL); +} + NTSTATUS NTAPI MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, @@ -334,6 +348,7 @@ MiBalancerThread(PVOID Unused) while (1) { + KeSetEvent(&MiBalancerDoneEvent, IO_NO_INCREMENT, FALSE); Status = KeWaitForMultipleObjects(2, WaitObjects, WaitAny, @@ -388,6 +403,7 @@ MiInitBalancerThread(VOID) LARGE_INTEGER Timeout; KeInitializeEvent(&MiBalancerEvent, SynchronizationEvent, FALSE); + KeInitializeEvent(&MiBalancerDoneEvent, SynchronizationEvent, FALSE); KeInitializeTimerEx(&MiBalancerTimer, SynchronizationTimer); Timeout.QuadPart = -20000000; /* 2 sec */

1 year, 1 month

[reactos] 09/14: [NTOS:Mm] Handle failure to allocate pages in the page fault handler

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c6e4d38c7718a7ecfb92… commit 7c6e4d38c7718a7ecfb927025cf968356ccc6d42 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Apr 5 22:14:09 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 29 14:00:44 2023 +0300 [NTOS:Mm] Handle failure to allocate pages in the page fault handler --- ntoskrnl/mm/ARM3/pagfault.c | 63 ++++++++++++++++++++++++++++++++++++++------- ntoskrnl/mm/section.c | 59 +++++++++++++++++++++++++++++------------- 2 files changed, 95 insertions(+), 27 deletions(-) diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index a5dd04560d3..a312f4a8bdd 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -653,7 +653,7 @@ MiResolveDemandZeroFault(IN PVOID Address, ASSERT(PointerPte->u.Hard.Valid == 0); /* Assert we have enough pages */ - ASSERT(MmAvailablePages >= 32); + //ASSERT(MmAvailablePages >= 32); #if MI_TRACE_PFNS if (UserPdeFault) MI_SET_USAGE(MI_USAGE_PAGE_TABLE); @@ -698,6 +698,12 @@ MiResolveDemandZeroFault(IN PVOID Address, } } + if (PageFrameNumber == 0) + { + MiReleasePfnLock(OldIrql); + return STATUS_NO_MEMORY; + } + /* Initialize it */ MiInitializePfn(PageFrameNumber, PointerPte, TRUE); @@ -920,6 +926,10 @@ MiResolvePageFileFault(_In_ BOOLEAN StoreInstruction, /* Get any page, it will be overwritten */ Color = MI_GET_NEXT_PROCESS_COLOR(CurrentProcess); Page = MiRemoveAnyPage(Color); + if (Page == 0) + { + return STATUS_NO_MEMORY; + } /* Initialize this PFN */ MiInitializePfn(Page, PointerPte, StoreInstruction); @@ -1230,6 +1240,11 @@ MiResolveProtoPteFault(IN BOOLEAN StoreInstruction, Color = MI_GET_NEXT_COLOR(); PageFrameIndex = MiRemoveAnyPage(Color); + if (PageFrameIndex == 0) + { + MiReleasePfnLock(OldIrql); + return STATUS_NO_MEMORY; + } /* Perform the copy */ MiCopyPfn(PageFrameIndex, ProtoPageFrameIndex); @@ -1669,9 +1684,9 @@ MiDispatchFault(IN ULONG FaultCode, } // - // Generate an access fault + // Return status // - return STATUS_ACCESS_VIOLATION; + return Status; } NTSTATUS @@ -2126,11 +2141,15 @@ UserFault: } /* Resolve a demand zero fault */ - MiResolveDemandZeroFault(PointerPpe, + Status = MiResolveDemandZeroFault(PointerPpe, PointerPxe, MM_EXECUTE_READWRITE, CurrentProcess, MM_NOIRQL); + if (!NT_SUCCESS(Status)) + { + goto ExitUser; + } /* We should come back with a valid PXE */ ASSERT(PointerPxe->u.Hard.Valid == 1); @@ -2160,11 +2179,15 @@ UserFault: } /* Resolve a demand zero fault */ - MiResolveDemandZeroFault(PointerPde, + Status = MiResolveDemandZeroFault(PointerPde, PointerPpe, MM_EXECUTE_READWRITE, CurrentProcess, MM_NOIRQL); + if (!NT_SUCCESS(Status)) + { + goto ExitUser; + } /* We should come back with a valid PPE */ ASSERT(PointerPpe->u.Hard.Valid == 1); @@ -2203,11 +2226,16 @@ UserFault: } /* Resolve a demand zero fault */ - MiResolveDemandZeroFault(PointerPte, + Status = MiResolveDemandZeroFault(PointerPte, PointerPde, MM_EXECUTE_READWRITE, CurrentProcess, MM_NOIRQL); + if (!NT_SUCCESS(Status)) + { + goto ExitUser; + } + #if _MI_PAGING_LEVELS >= 3 MiIncrementPageTableReferences(PointerPte); #endif @@ -2254,6 +2282,12 @@ UserFault: /* Allocate a new page and copy it */ PageFrameIndex = MiRemoveAnyPage(MI_GET_NEXT_PROCESS_COLOR(CurrentProcess)); + if (PageFrameIndex == 0) + { + MiReleasePfnLock(LockIrql); + Status = STATUS_NO_MEMORY; + goto ExitUser; + } OldPageFrameIndex = PFN_FROM_PTE(&TempPte); MiCopyPfn(PageFrameIndex, OldPageFrameIndex); @@ -2308,11 +2342,15 @@ UserFault: (TempPte.u.Long == (MM_EXECUTE_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS))) { /* Resolve the fault */ - MiResolveDemandZeroFault(Address, + Status = MiResolveDemandZeroFault(Address, PointerPte, TempPte.u.Soft.Protection, CurrentProcess, MM_NOIRQL); + if (!NT_SUCCESS(Status)) + { + goto ExitUser; + } #if MI_TRACE_PFNS /* Update debug info */ @@ -2410,7 +2448,7 @@ UserFault: OldIrql = MiAcquirePfnLock(); /* Make sure we have enough pages */ - ASSERT(MmAvailablePages >= 32); + //ASSERT(MmAvailablePages >= 32); /* Try to get a zero page */ MI_SET_USAGE(MI_USAGE_PEB_TEB); @@ -2421,11 +2459,16 @@ UserFault: { /* Grab a page out of there. Later we should grab a colored zero page */ PageFrameIndex = MiRemoveAnyPage(Color); - ASSERT(PageFrameIndex); /* Release the lock since we need to do some zeroing */ MiReleasePfnLock(OldIrql); + if (PageFrameIndex == 0) + { + Status = STATUS_NO_MEMORY; + goto ExitUser; + } + /* Zero out the page, since it's for user-mode */ MiZeroPfn(PageFrameIndex); @@ -2568,6 +2611,8 @@ UserFault: TrapInformation, Vad); +ExitUser: + /* Return the status */ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 7b2e9d0d694..653b4759b27 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1335,9 +1335,16 @@ MmMakeSegmentResident( RtlZeroMemory(Pages, BYTES_TO_PAGES(ReadLength) * sizeof(PFN_NUMBER)); for (UINT i = 0; i < BYTES_TO_PAGES(ReadLength); i++) { - /* MmRequestPageMemoryConsumer succeeds or bugchecks */ - (void)MmRequestPageMemoryConsumer(MC_USER, FALSE, &Pages[i]); + Status = MmRequestPageMemoryConsumer(MC_USER, FALSE, &Pages[i]); + if (!NT_SUCCESS(Status)) + { + /* Damn. Roll-back. */ + for (UINT j = 0; j < i; j++) + MmReleasePageMemoryConsumer(MC_USER, Pages[j]); + goto Failed; + } } + Mdl->MdlFlags |= MDL_PAGES_LOCKED | MDL_IO_PAGE_READ; LARGE_INTEGER FileOffset; @@ -1389,6 +1396,7 @@ MmMakeSegmentResident( for (UINT i = 0; i < BYTES_TO_PAGES(ReadLength); i++) MmReleasePageMemoryConsumer(MC_USER, Pages[i]); +Failed: MmLockSectionSegment(Segment); while (ChunkOffset < ChunkEnd) { @@ -1613,6 +1621,15 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, return STATUS_MM_RESTART_OPERATION; } + MI_SET_USAGE(MI_USAGE_SECTION); + if (Process) MI_SET_PROCESS2(Process->ImageFileName); + if (!Process) MI_SET_PROCESS2("Kernel Section"); + Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); + if (!NT_SUCCESS(Status)) + { + return STATUS_NO_MEMORY; + } + /* * Must be private page we have swapped out. */ @@ -1627,14 +1644,6 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); MmUnlockAddressSpace(AddressSpace); - MI_SET_USAGE(MI_USAGE_SECTION); - if (Process) MI_SET_PROCESS2(Process->ImageFileName); - if (!Process) MI_SET_PROCESS2("Kernel Section"); - Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); - if (!NT_SUCCESS(Status)) - { - KeBugCheck(MEMORY_MANAGEMENT); - } Status = MmReadFromSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) @@ -1736,7 +1745,12 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, MI_SET_USAGE(MI_USAGE_SECTION); if (Process) MI_SET_PROCESS2(Process->ImageFileName); if (!Process) MI_SET_PROCESS2("Kernel Section"); - MmRequestPageMemoryConsumer(MC_USER, FALSE, &Page); + Status = MmRequestPageMemoryConsumer(MC_USER, FALSE, &Page); + if (!NT_SUCCESS(Status)) + { + MmUnlockSectionSegment(Segment); + return STATUS_NO_MEMORY; + } MmSetPageEntrySectionSegment(Segment, &Offset, MAKE_SSE(Page << PAGE_SHIFT, 1)); MmUnlockSectionSegment(Segment); @@ -1770,6 +1784,10 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, MmLockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { + if (Status == STATUS_NO_MEMORY) + { + return Status; + } /* Damn */ DPRINT1("Failed to page data in!\n"); return STATUS_IN_PAGE_ERROR; @@ -1794,6 +1812,13 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, return STATUS_MM_RESTART_OPERATION; } + Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); + if (!NT_SUCCESS(Status)) + { + MmUnlockSectionSegment(Segment); + return STATUS_NO_MEMORY; + } + /* * Release all our locks and read in the page from disk */ @@ -1801,11 +1826,6 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); - Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); - if (!NT_SUCCESS(Status)) - { - KeBugCheck(MEMORY_MANAGEMENT); - } Status = MmReadFromSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) @@ -1905,6 +1925,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, BOOLEAN Cow = FALSE; ULONG NewProtect; BOOLEAN Unmapped; + NTSTATUS Status; DPRINT("MmAccessFaultSectionView(%p, %p, %p)\n", AddressSpace, MemoryArea, Address); @@ -1990,9 +2011,11 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, /* * Allocate a page */ - if (!NT_SUCCESS(MmRequestPageMemoryConsumer(MC_USER, TRUE, &NewPage))) + Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &NewPage); + if (!NT_SUCCESS(Status)) { - KeBugCheck(MEMORY_MANAGEMENT); + MmUnlockSectionSegment(Segment); + return STATUS_NO_MEMORY; } /*

1 year, 1 month

[reactos] 08/14: [NTOS:Mm] Fail gracefully when no pages are available

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ae12d5a8c4f975a3ce0b… commit 3ae12d5a8c4f975a3ce0be1158a0b0cf02757970 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 2 18:35:30 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 29 14:00:44 2023 +0300 [NTOS:Mm] Fail gracefully when no pages are available --- ntoskrnl/mm/ARM3/pfnlist.c | 12 ++++++++++-- ntoskrnl/mm/balance.c | 11 ++++++----- ntoskrnl/mm/freelist.c | 3 ++- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/mm/ARM3/pfnlist.c b/ntoskrnl/mm/ARM3/pfnlist.c index 56654d1e113..cf7871f2023 100644 --- a/ntoskrnl/mm/ARM3/pfnlist.c +++ b/ntoskrnl/mm/ARM3/pfnlist.c @@ -481,8 +481,11 @@ MiRemoveAnyPage(IN ULONG Color) /* Make sure PFN lock is held and we have pages */ MI_ASSERT_PFN_LOCK_HELD(); - ASSERT(MmAvailablePages != 0); ASSERT(Color < MmSecondaryColors); + if (MmAvailablePages == 0) + { + return 0; + } /* Check the colored free list */ PageIndex = MmFreePagesByColor[FreePageList][Color].Flink; @@ -514,6 +517,7 @@ MiRemoveAnyPage(IN ULONG Color) /* Remove the page from its list */ PageIndex = MiRemovePageByColor(PageIndex, Color); + ASSERT(PageIndex != 0); /* Sanity checks */ Pfn1 = MI_PFN_ELEMENT(PageIndex); @@ -538,8 +542,11 @@ MiRemoveZeroPage(IN ULONG Color) /* Make sure PFN lock is held and we have pages */ MI_ASSERT_PFN_LOCK_HELD(); - ASSERT(MmAvailablePages != 0); ASSERT(Color < MmSecondaryColors); + if (MmAvailablePages == 0) + { + return 0; + } /* Check the colored zero list */ PageIndex = MmFreePagesByColor[ZeroedPageList][Color].Flink; @@ -583,6 +590,7 @@ MiRemoveZeroPage(IN ULONG Color) /* Remove the page from its list */ PageIndex = MiRemovePageByColor(PageIndex, Color); + ASSERT(PageIndex != 0); ASSERT(Pfn1 == MI_PFN_ELEMENT(PageIndex)); /* Zero it, if needed */ diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index a8c9e4c6482..f81027a65cd 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -303,20 +303,21 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, { PFN_NUMBER Page; - /* Update the target */ - InterlockedIncrementUL(&MiMemoryConsumers[Consumer].PagesUsed); - UpdateTotalCommittedPages(1); - /* * Actually allocate the page. */ Page = MmAllocPage(Consumer); if (Page == 0) { - KeBugCheck(NO_PAGES_AVAILABLE); + *AllocatedPage = 0; + return STATUS_NO_MEMORY; } *AllocatedPage = Page; + /* Update the target */ + InterlockedIncrementUL(&MiMemoryConsumers[Consumer].PagesUsed); + UpdateTotalCommittedPages(1); + return(STATUS_SUCCESS); } diff --git a/ntoskrnl/mm/freelist.c b/ntoskrnl/mm/freelist.c index e3b2f30f9fa..95d73eb3cd4 100644 --- a/ntoskrnl/mm/freelist.c +++ b/ntoskrnl/mm/freelist.c @@ -623,7 +623,8 @@ MmAllocPage(ULONG Type) PfnOffset = MiRemoveZeroPage(MI_GET_NEXT_COLOR()); if (!PfnOffset) { - KeBugCheck(NO_PAGES_AVAILABLE); + MiReleasePfnLock(OldIrql); + return 0; } DPRINT("Legacy allocate: %lx\n", PfnOffset);

1 year, 1 month

[reactos] 07/14: [NTOS:Mm] Bail out in MmTrimUserMemory, when all LRU pages have been looped through

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7de53b6d585a1048902b… commit d7de53b6d585a1048902b0376a16f85d8ebee114 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Apr 8 19:27:15 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 29 14:00:44 2023 +0300 [NTOS:Mm] Bail out in MmTrimUserMemory, when all LRU pages have been looped through --- ntoskrnl/mm/balance.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index 0c9d34ce54f..a8c9e4c6482 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -138,14 +138,15 @@ MiTrimMemoryConsumer(ULONG Consumer, ULONG InitialTarget) NTSTATUS MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages) { - PFN_NUMBER CurrentPage; + PFN_NUMBER FirstPage, CurrentPage; NTSTATUS Status; (*NrFreedPages) = 0; DPRINT1("MM BALANCER: %s\n", Priority ? "Paging out!" : "Removing access bit!"); - CurrentPage = MmGetLRUFirstUserPage(); + FirstPage = MmGetLRUFirstUserPage(); + CurrentPage = FirstPage; while (CurrentPage != 0 && Target > 0) { if (Priority) @@ -156,6 +157,10 @@ MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages) DPRINT("Succeeded\n"); Target--; (*NrFreedPages)++; + if (CurrentPage == FirstPage) + { + FirstPage = 0; + } } } else @@ -245,8 +250,14 @@ MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages) /* Nobody accessed this page since the last time we check. Time to clean up */ Status = MmPageOutPhysicalAddress(CurrentPage); + if (NT_SUCCESS(Status)) + { + if (CurrentPage == FirstPage) + { + FirstPage = 0; + } + } // DPRINT1("Paged-out one page: %s\n", NT_SUCCESS(Status) ? "Yes" : "No"); - (void)Status; } /* Done for this page. */ @@ -254,6 +265,15 @@ MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages) } CurrentPage = MmGetLRUNextUserPage(CurrentPage, TRUE); + if (FirstPage == 0) + { + FirstPage = CurrentPage; + } + else if (CurrentPage == FirstPage) + { + DPRINT1("We are back at the start, abort!\n"); + return STATUS_SUCCESS; + } } if (CurrentPage)

1 year, 1 month

[reactos] 06/14: [NTOS:Mm] Handle RosMm pages in MiDecrementReferenceCount

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f014e421b8944cae3127… commit 5f014e421b8944cae3127ac124b1097d4bd49b61 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 9 23:12:14 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 29 14:00:44 2023 +0300 [NTOS:Mm] Handle RosMm pages in MiDecrementReferenceCount This is required, when RosMm unmaps locked pages and they later get unlocked. --- ntoskrnl/mm/ARM3/pfnlist.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ntoskrnl/mm/ARM3/pfnlist.c b/ntoskrnl/mm/ARM3/pfnlist.c index 5712f22557a..56654d1e113 100644 --- a/ntoskrnl/mm/ARM3/pfnlist.c +++ b/ntoskrnl/mm/ARM3/pfnlist.c @@ -1219,6 +1219,10 @@ MiDecrementShareCount(IN PMMPFN Pfn1, } } +VOID +NTAPI +MmDereferencePage(PFN_NUMBER Pfn); + VOID NTAPI MiDecrementReferenceCount(IN PMMPFN Pfn1, @@ -1227,6 +1231,13 @@ MiDecrementReferenceCount(IN PMMPFN Pfn1, /* PFN lock must be held */ MI_ASSERT_PFN_LOCK_HELD(); + /* Handle RosMm PFNs here, too (in case they got locked/unlocked by ARM3) */ + if (MI_IS_ROS_PFN(Pfn1)) + { + MmDereferencePage(PageFrameIndex); + return; + } + /* Sanity checks on the page */ if (PageFrameIndex > MmHighestPhysicalPage || Pfn1 != MI_PFN_ELEMENT(PageFrameIndex) ||

1 year, 1 month

[reactos] 05/14: [NTOS:Mm] Add PFN ShareCount handling to old Mm

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80dd9f5a90487188213da… commit 80dd9f5a90487188213da24ff1e46335461e2281 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Apr 10 22:14:23 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 29 14:00:44 2023 +0300 [NTOS:Mm] Add PFN ShareCount handling to old Mm --- ntoskrnl/mm/i386/page.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index 4c64dd2a941..38cd5066256 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -325,7 +325,18 @@ MmDeleteVirtualMappingEx( if (!IsPhysical && OldPte.u.Hard.Valid) { - // TODO: Handle PFN ShareCount + PMMPFN Pfn1; + KIRQL OldIrql; + + OldIrql = MiAcquirePfnLock(); + Pfn1 = &MmPfnDatabase[OldPte.u.Hard.PageFrameNumber]; + ASSERT(Pfn1->u3.e1.PageLocation == ActiveAndValid); + ASSERT(Pfn1->u2.ShareCount > 0); + if (--Pfn1->u2.ShareCount == 0) + { + Pfn1->u3.e1.PageLocation = TransitionPage; + } + MiReleasePfnLock(OldIrql); } MiUnlockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); @@ -685,7 +696,14 @@ MmCreateVirtualMappingUnsafeEx( if (!IsPhysical) { - // TODO: Handle PFN ShareCount + PMMPFN Pfn1; + KIRQL OldIrql; + + OldIrql = MiAcquirePfnLock(); + Pfn1 = &MmPfnDatabase[TempPte.u.Hard.PageFrameNumber]; + Pfn1->u2.ShareCount++; + Pfn1->u3.e1.PageLocation = ActiveAndValid; + MiReleasePfnLock(OldIrql); } /* We don't need to flush the TLB here because it only caches valid translations

1 year, 1 month

[reactos] 04/14: [NTOS:Mm] Implement MmCreatePhysicalMapping and MmDeletePhysicalMapping to handle pyhsical memory sections

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73de609917e7cf4e78e09… commit 73de609917e7cf4e78e092f631ab5ffd7c5326be Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Apr 10 21:14:06 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 29 14:00:44 2023 +0300 [NTOS:Mm] Implement MmCreatePhysicalMapping and MmDeletePhysicalMapping to handle pyhsical memory sections --- ntoskrnl/include/internal/mm.h | 19 +++++++++++- ntoskrnl/mm/i386/page.c | 70 +++++++++++++++++++++++++++++++++++++----- ntoskrnl/mm/marea.c | 4 +++ ntoskrnl/mm/section.c | 8 ++--- 4 files changed, 89 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 5e8ad09a861..5b82d033f37 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1135,6 +1135,14 @@ MmCreateVirtualMappingUnsafe( PFN_NUMBER Page ); +NTSTATUS +NTAPI +MmCreatePhysicalMapping( + _Inout_opt_ PEPROCESS Process, + _In_ PVOID Address, + _In_ ULONG flProtect, + _In_ PFN_NUMBER Page); + ULONG NTAPI MmGetPageProtect( @@ -1291,12 +1299,21 @@ MmGetExecuteOptions(IN PULONG ExecuteOptions); _Success_(return) BOOLEAN MmDeleteVirtualMapping( - _In_opt_ PEPROCESS Process, + _Inout_opt_ PEPROCESS Process, _In_ PVOID Address, _Out_opt_ BOOLEAN* WasDirty, _Out_opt_ PPFN_NUMBER Page ); +_Success_(return) +BOOLEAN +MmDeletePhysicalMapping( + _Inout_opt_ PEPROCESS Process, + _In_ PVOID Address, + _Out_opt_ BOOLEAN * WasDirty, + _Out_opt_ PPFN_NUMBER Page +); + /* arch/procsup.c ************************************************************/ BOOLEAN diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index 833c2e2c8d6..4c64dd2a941 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -234,11 +234,12 @@ MmGetPfnForProcess(PEPROCESS Process, */ _Success_(return) BOOLEAN -MmDeleteVirtualMapping( - _In_opt_ PEPROCESS Process, +MmDeleteVirtualMappingEx( + _Inout_opt_ PEPROCESS Process, _In_ PVOID Address, _Out_opt_ BOOLEAN* WasDirty, - _Out_opt_ PPFN_NUMBER Page) + _Out_opt_ PPFN_NUMBER Page, + _In_ BOOLEAN IsPhysical) { PMMPTE PointerPte; MMPTE OldPte; @@ -322,12 +323,38 @@ MmDeleteVirtualMapping( } } + if (!IsPhysical && OldPte.u.Hard.Valid) + { + // TODO: Handle PFN ShareCount + } + MiUnlockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); } return OldPte.u.Long != 0; } +_Success_(return) +BOOLEAN +MmDeleteVirtualMapping( + _Inout_opt_ PEPROCESS Process, + _In_ PVOID Address, + _Out_opt_ BOOLEAN * WasDirty, + _Out_opt_ PPFN_NUMBER Page) +{ + return MmDeleteVirtualMappingEx(Process, Address, WasDirty, Page, FALSE); +} + +_Success_(return) +BOOLEAN +MmDeletePhysicalMapping( + _Inout_opt_ PEPROCESS Process, + _In_ PVOID Address, + _Out_opt_ BOOLEAN * WasDirty, + _Out_opt_ PPFN_NUMBER Page) +{ + return MmDeleteVirtualMappingEx(Process, Address, WasDirty, Page, TRUE); +} VOID NTAPI @@ -588,10 +615,12 @@ MmCreatePageFileMapping(PEPROCESS Process, NTSTATUS NTAPI -MmCreateVirtualMappingUnsafe(PEPROCESS Process, - PVOID Address, - ULONG flProtect, - PFN_NUMBER Page) +MmCreateVirtualMappingUnsafeEx( + _Inout_opt_ PEPROCESS Process, + _In_ PVOID Address, + _In_ ULONG flProtect, + _In_ PFN_NUMBER Page, + _In_ BOOLEAN IsPhysical) { ULONG ProtectionMask; PMMPTE PointerPte; @@ -654,6 +683,11 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, KeBugCheck(MEMORY_MANAGEMENT); } + if (!IsPhysical) + { + // TODO: Handle PFN ShareCount + } + /* We don't need to flush the TLB here because it only caches valid translations * and we're moving this PTE from invalid to valid so it can't be cached right now */ @@ -667,6 +701,28 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, return(STATUS_SUCCESS); } +NTSTATUS +NTAPI +MmCreateVirtualMappingUnsafe( + _Inout_opt_ PEPROCESS Process, + _In_ PVOID Address, + _In_ ULONG flProtect, + _In_ PFN_NUMBER Page) +{ + return MmCreateVirtualMappingUnsafeEx(Process, Address, flProtect, Page, FALSE); +} + +NTSTATUS +NTAPI +MmCreatePhysicalMapping( + _Inout_opt_ PEPROCESS Process, + _In_ PVOID Address, + _In_ ULONG flProtect, + _In_ PFN_NUMBER Page) +{ + return MmCreateVirtualMappingUnsafeEx(Process, Address, flProtect, Page, TRUE); +} + NTSTATUS NTAPI MmCreateVirtualMapping(PEPROCESS Process, diff --git a/ntoskrnl/mm/marea.c b/ntoskrnl/mm/marea.c index 8bf8ab72630..ab8bff4a18e 100644 --- a/ntoskrnl/mm/marea.c +++ b/ntoskrnl/mm/marea.c @@ -322,6 +322,10 @@ MmFreeMemoryArea( /* We'll have to do some cleanup when we're on the page file */ DoFree = TRUE; } + else if (FreePage == NULL) + { + DoFree = MmDeletePhysicalMapping(Process, (PVOID)Address, &Dirty, &Page); + } else { DoFree = MmDeleteVirtualMapping(Process, (PVOID)Address, &Dirty, &Page); diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 33584a02230..7b2e9d0d694 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1689,10 +1689,10 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, * Just map the desired physical page */ Page = (PFN_NUMBER)(Offset.QuadPart >> PAGE_SHIFT); - Status = MmCreateVirtualMappingUnsafe(Process, - PAddress, - Region->Protect, - Page); + Status = MmCreatePhysicalMapping(Process, + PAddress, + Region->Protect, + Page); if (!NT_SUCCESS(Status)) { DPRINT("MmCreateVirtualMappingUnsafe failed, not out of memory\n");

1 year, 1 month

[reactos] 03/14: [NTOS:Mm] Fix race condition in _MmSetPageEntrySectionSegment

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=918e33197024163fd6e27… commit 918e33197024163fd6e2781eeed3bb6b7be82270 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 9 19:10:38 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 29 14:00:44 2023 +0300 [NTOS:Mm] Fix race condition in _MmSetPageEntrySectionSegment The function updates the entry in the section page table and updates the section association rmaps for it. In the page-in path, when the new section association is set before the entry is updated, a concurrent attempt to unmap the page would find an inconsistent entry, where there is an rmap, but the section page table entry is still an MM_WAIT_ENTRY. --- ntoskrnl/cache/section/sptab.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cache/section/sptab.c b/ntoskrnl/cache/section/sptab.c index 5149ea3b76e..83f7c5f542a 100644 --- a/ntoskrnl/cache/section/sptab.c +++ b/ntoskrnl/cache/section/sptab.c @@ -223,8 +223,17 @@ _MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, if (PFN_FROM_SSE(Entry) != PFN_FROM_SSE(OldEntry)) { MmDeleteSectionAssociation(PFN_FROM_SSE(OldEntry)); + + /* This has to be done before setting the new section association + to prevent a race condition with the paging out path */ + PageTable->PageEntries[PageIndex] = Entry; + MmSetSectionAssociation(PFN_FROM_SSE(Entry), Segment, Offset); } + else + { + PageTable->PageEntries[PageIndex] = Entry; + } } else { @@ -232,6 +241,7 @@ _MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, * We're switching to a valid entry from an invalid one. * Add the Rmap and take a ref on the segment. */ + PageTable->PageEntries[PageIndex] = Entry; MmSetSectionAssociation(PFN_FROM_SSE(Entry), Segment, Offset); if (Offset->QuadPart >= (Segment->LastPage << PAGE_SHIFT)) @@ -242,6 +252,7 @@ _MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, { /* We're switching to an invalid entry from a valid one */ MmDeleteSectionAssociation(PFN_FROM_SSE(OldEntry)); + PageTable->PageEntries[PageIndex] = Entry; if (Offset->QuadPart == ((Segment->LastPage - 1ULL) << PAGE_SHIFT)) { @@ -256,8 +267,11 @@ _MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, } } } + else + { + PageTable->PageEntries[PageIndex] = Entry; + } - PageTable->PageEntries[PageIndex] = Entry; return STATUS_SUCCESS; }

1 year, 1 month

[reactos] 02/14: [NTOS:Mm] Fix locking for MmGetSectionAssociation

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54d1b396767b40b7f8646… commit 54d1b396767b40b7f864644bc8b732861eac0ff7 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Apr 10 00:26:34 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 29 14:00:44 2023 +0300 [NTOS:Mm] Fix locking for MmGetSectionAssociation MmGetSectionAssociation races with _MmSetPageEntrySectionSegment without sharing a lock. So we need to hold the PFN lock, until we have referenced the section segment found in the RMAP. This prevents that a section segment, which still has associated RMAPs from being deleted behind our back. --- ntoskrnl/cache/section/sptab.c | 4 ++++ ntoskrnl/mm/rmap.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/cache/section/sptab.c b/ntoskrnl/cache/section/sptab.c index b0125f26b0e..5149ea3b76e 100644 --- a/ntoskrnl/cache/section/sptab.c +++ b/ntoskrnl/cache/section/sptab.c @@ -364,6 +364,8 @@ MmGetSectionAssociation(PFN_NUMBER Page, PMM_SECTION_SEGMENT Segment = NULL; PCACHE_SECTION_PAGE_TABLE PageTable; + KIRQL OldIrql = MiAcquirePfnLock(); + PageTable = MmGetSegmentRmap(Page, &RawOffset); if (PageTable) { @@ -374,6 +376,8 @@ MmGetSectionAssociation(PFN_NUMBER Page, InterlockedIncrement64(Segment->ReferenceCount); } + MiReleasePfnLock(OldIrql); + return Segment; } diff --git a/ntoskrnl/mm/rmap.c b/ntoskrnl/mm/rmap.c index 3447bda81cd..c8f16300f6d 100644 --- a/ntoskrnl/mm/rmap.c +++ b/ntoskrnl/mm/rmap.c @@ -469,7 +469,9 @@ MmGetSegmentRmap(PFN_NUMBER Page, PULONG RawOffset) { PCACHE_SECTION_PAGE_TABLE Result = NULL; PMM_RMAP_ENTRY current_entry;//, previous_entry; - KIRQL OldIrql = MiAcquirePfnLock(); + + /* Must hold the PFN lock */ + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); //previous_entry = NULL; current_entry = MmGetRmapListHeadPage(Page); @@ -481,16 +483,15 @@ MmGetSegmentRmap(PFN_NUMBER Page, PULONG RawOffset) *RawOffset = (ULONG_PTR)current_entry->Address & ~RMAP_SEGMENT_MASK; if (*Result->Segment->Flags & MM_SEGMENT_INDELETE) { - MiReleasePfnLock(OldIrql); return NULL; } - MiReleasePfnLock(OldIrql); + return Result; } //previous_entry = current_entry; current_entry = current_entry->Next; } - MiReleasePfnLock(OldIrql); + return NULL; }

1 year, 1 month

[reactos] 01/14: [NTOS:Mm] Replace YieldProcessor() with KeDelayExecutionThread()

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=477792856e42be09b12fd… commit 477792856e42be09b12fd3e3ce557657c6cc63c2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Apr 1 19:18:45 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 29 14:00:44 2023 +0300 [NTOS:Mm] Replace YieldProcessor() with KeDelayExecutionThread() These are used in the paging path, when the page is currently in the process of being read from or written to the disk. While YieldProcessor() provides the chance to switch context to the other paging thread, it only does so, once the current thread's quantum has expired. On a single CPU system this effectively leads to busy waiting for the rest of the quantum. On SMP systems this could succeed earlier, thus reducing latency, but it would still contribute to high CPU usage, while wait [...] Using KeDelayExecutionThread() will instantly allow another thread to run, providing enough time to complete the IO operation. --- ntoskrnl/mm/section.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 49c0e0e8f4f..33584a02230 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1477,7 +1477,7 @@ MmAlterViewAttributes(PMMSUPPORT AddressSpace, break; MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); - YieldProcessor(); + KeDelayExecutionThread(KernelMode, FALSE, &TinyTime); MmLockAddressSpace(AddressSpace); MmLockSectionSegment(Segment); } @@ -1608,7 +1608,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, if (SwapEntry == MM_WAIT_ENTRY) { MmUnlockAddressSpace(AddressSpace); - YieldProcessor(); + KeDelayExecutionThread(KernelMode, FALSE, &TinyTime); MmLockAddressSpace(AddressSpace); return STATUS_MM_RESTART_OPERATION; } @@ -1789,7 +1789,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, { MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); - YieldProcessor(); + KeDelayExecutionThread(KernelMode, FALSE, &TinyTime); MmLockAddressSpace(AddressSpace); return STATUS_MM_RESTART_OPERATION; } @@ -3442,7 +3442,7 @@ MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); - YieldProcessor(); + KeDelayExecutionThread(KernelMode, FALSE, &TinyTime); MmLockAddressSpace(AddressSpace); MmLockSectionSegment(Segment); @@ -5202,7 +5202,7 @@ MmMakePagesDirty( { MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); - YieldProcessor(); + KeDelayExecutionThread(KernelMode, FALSE, &TinyTime); MmLockAddressSpace(AddressSpace); MmLockSectionSegment(Segment); Entry = MmGetPageEntrySectionSegment(Segment, &SegmentOffset);

1 year, 1 month

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 July 2023