Ros-diffs February 2021

ros-diffs@reactos.org

30 participants
434 discussions

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7eb0fddf3b675ab495c4… commit b7eb0fddf3b675ab495c41e44861a924eded4730 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Feb 2 10:06:00 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:24 2021 +0100 Address PR review --- ntoskrnl/cache/newcc.h | 4 -- ntoskrnl/cc/cacheman.c | 1 - ntoskrnl/cc/view.c | 26 +------- ntoskrnl/include/internal/cc.h | 16 +---- ntoskrnl/include/internal/mm.h | 14 +---- ntoskrnl/mm/ARM3/section.c | 20 +++--- ntoskrnl/mm/rmap.c | 2 +- ntoskrnl/mm/section.c | 137 ++++++++++++++++++++--------------------- 8 files changed, 85 insertions(+), 135 deletions(-) diff --git a/ntoskrnl/cache/newcc.h b/ntoskrnl/cache/newcc.h index 8768d7aebd2..801bdc08bb8 100644 --- a/ntoskrnl/cache/newcc.h +++ b/ntoskrnl/cache/newcc.h @@ -62,10 +62,6 @@ NTAPI CcpUnpinData(PNOCC_BCB Bcb, BOOLEAN ActuallyRelease); -BOOLEAN -NTAPI -CcInitializeCacheManager(VOID); - VOID NTAPI CcShutdownSystem(VOID); diff --git a/ntoskrnl/cc/cacheman.c b/ntoskrnl/cc/cacheman.c index fa519d43e7a..238fecb0f5a 100644 --- a/ntoskrnl/cc/cacheman.c +++ b/ntoskrnl/cc/cacheman.c @@ -42,7 +42,6 @@ CcPfInitializePrefetcher(VOID) CODE_SEG("INIT") BOOLEAN -NTAPI CcInitializeCacheManager(VOID) { ULONG Thread; diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index c0f1458287d..4c094f074d5 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -110,7 +110,6 @@ ULONG CcRosVacbGetRefCount_(PROS_VACB vacb, PCSTR file, INT line) /* FUNCTIONS *****************************************************************/ VOID -NTAPI CcRosTraceCacheMap ( PROS_SHARED_CACHE_MAP SharedCacheMap, BOOLEAN Trace ) @@ -157,14 +156,6 @@ CcRosTraceCacheMap ( } NTSTATUS -NTAPI -MmFlushVirtualMemory(IN PEPROCESS Process, - IN OUT PVOID *BaseAddress, - IN OUT PSIZE_T RegionSize, - OUT PIO_STATUS_BLOCK IoStatusBlock); - -NTSTATUS -NTAPI CcRosFlushVacb ( _In_ PROS_VACB Vacb, _In_ PIO_STATUS_BLOCK Iosb) @@ -210,7 +201,6 @@ quit: } NTSTATUS -NTAPI CcRosFlushDirtyPages ( ULONG Target, PULONG Count, @@ -349,7 +339,6 @@ CcRosFlushDirtyPages ( } NTSTATUS -NTAPI CcRosReleaseVacb ( PROS_SHARED_CACHE_MAP SharedCacheMap, PROS_VACB Vacb, @@ -382,7 +371,6 @@ CcRosReleaseVacb ( /* Returns with VACB Lock Held! */ PROS_VACB -NTAPI CcRosLookupVacb ( PROS_SHARED_CACHE_MAP SharedCacheMap, LONGLONG FileOffset) @@ -426,7 +414,6 @@ CcRosLookupVacb ( } VOID -NTAPI CcRosMarkDirtyVacb ( PROS_VACB Vacb) { @@ -463,7 +450,6 @@ CcRosMarkDirtyVacb ( } VOID -NTAPI CcRosUnmarkDirtyVacb ( PROS_VACB Vacb, BOOLEAN LockViews) @@ -617,7 +603,7 @@ CcRosCreateVacb ( Retried = FALSE; Retry: /* Map VACB in system space */ - Status = MmMapViewInSystemSpaceEx(SharedCacheMap->Section, &current->BaseAddress, &ViewSize, &current->FileOffset); + Status = MmMapViewInSystemSpaceEx(SharedCacheMap->Section, &current->BaseAddress, &ViewSize, &current->FileOffset, 0); if (!NT_SUCCESS(Status)) { @@ -735,7 +721,6 @@ Retry: } BOOLEAN -NTAPI CcRosEnsureVacbResident( _In_ PROS_VACB Vacb, _In_ BOOLEAN Wait, @@ -783,7 +768,6 @@ CcRosEnsureVacbResident( NTSTATUS -NTAPI CcRosGetVacb ( PROS_SHARED_CACHE_MAP SharedCacheMap, LONGLONG FileOffset, @@ -835,7 +819,6 @@ CcRosGetVacb ( } NTSTATUS -NTAPI CcRosRequestVacb ( PROS_SHARED_CACHE_MAP SharedCacheMap, LONGLONG FileOffset, @@ -1032,7 +1015,6 @@ quit: } NTSTATUS -NTAPI CcRosDeleteFileCache ( PFILE_OBJECT FileObject, PROS_SHARED_CACHE_MAP SharedCacheMap, @@ -1085,11 +1067,10 @@ CcRosDeleteFileCache ( /* Flush to disk, if needed */ if (Vacb->Dirty) { - SIZE_T FlushSize = VACB_MAPPING_GRANULARITY; IO_STATUS_BLOCK Iosb; NTSTATUS Status; - Status = MmFlushVirtualMemory(NULL, &Vacb->BaseAddress, &FlushSize, &Iosb); + Status = MmFlushSegment(FileObject->SectionObjectPointer, &Vacb->FileOffset, VACB_MAPPING_GRANULARITY, &Iosb); if (!NT_SUCCESS(Status)) { /* Complain. There's not much we can do */ @@ -1134,7 +1115,6 @@ CcRosDeleteFileCache ( } VOID -NTAPI CcRosReferenceCache ( PFILE_OBJECT FileObject) { @@ -1150,7 +1130,6 @@ CcRosReferenceCache ( } NTSTATUS -NTAPI CcRosReleaseFileCache ( PFILE_OBJECT FileObject) /* @@ -1207,7 +1186,6 @@ CcRosReleaseFileCache ( } NTSTATUS -NTAPI CcRosInitializeFileCache ( PFILE_OBJECT FileObject, PCC_FILE_SIZES FileSizes, diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index cf57319449b..52a7b19f0a6 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -3,7 +3,7 @@ // // Define this if you want debugging support // -#define _CC_DEBUG_ 0x0 +#define _CC_DEBUG_ 0x00 // // These define the Debug Masks Supported @@ -309,11 +309,9 @@ CcMdlWriteComplete2( ); NTSTATUS -NTAPI CcRosFlushVacb(PROS_VACB Vacb, PIO_STATUS_BLOCK Iosb); NTSTATUS -NTAPI CcRosGetVacb( PROS_SHARED_CACHE_MAP SharedCacheMap, LONGLONG FileOffset, @@ -321,7 +319,6 @@ CcRosGetVacb( ); BOOLEAN -NTAPI CcRosEnsureVacbResident( _In_ PROS_VACB Vacb, _In_ BOOLEAN Wait, @@ -339,11 +336,9 @@ NTAPI CcShutdownLazyWriter(VOID); BOOLEAN -NTAPI CcInitializeCacheManager(VOID); PROS_VACB -NTAPI CcRosLookupVacb( PROS_SHARED_CACHE_MAP SharedCacheMap, LONGLONG FileOffset @@ -354,18 +349,15 @@ NTAPI CcInitCacheZeroPage(VOID); VOID -NTAPI CcRosMarkDirtyVacb( PROS_VACB Vacb); VOID -NTAPI CcRosUnmarkDirtyVacb( PROS_VACB Vacb, BOOLEAN LockViews); NTSTATUS -NTAPI CcRosFlushDirtyPages( ULONG Target, PULONG Count, @@ -374,15 +366,12 @@ CcRosFlushDirtyPages( ); VOID -NTAPI CcRosDereferenceCache(PFILE_OBJECT FileObject); VOID -NTAPI CcRosReferenceCache(PFILE_OBJECT FileObject); NTSTATUS -NTAPI CcRosReleaseVacb( PROS_SHARED_CACHE_MAP SharedCacheMap, PROS_VACB Vacb, @@ -391,7 +380,6 @@ CcRosReleaseVacb( ); NTSTATUS -NTAPI CcRosRequestVacb( PROS_SHARED_CACHE_MAP SharedCacheMap, LONGLONG FileOffset, @@ -399,7 +387,6 @@ CcRosRequestVacb( ); NTSTATUS -NTAPI CcRosInitializeFileCache( PFILE_OBJECT FileObject, PCC_FILE_SIZES FileSizes, @@ -409,7 +396,6 @@ CcRosInitializeFileCache( ); NTSTATUS -NTAPI CcRosReleaseFileCache( PFILE_OBJECT FileObject ); diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index cec0d6e13d1..a661aa469f3 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -224,7 +224,7 @@ typedef struct _MEMORY_AREA struct { - LARGE_INTEGER ViewOffset; + LONGLONG ViewOffset; PMM_SECTION_SEGMENT Segment; LIST_ENTRY RegionListHead; } SectionData; @@ -770,15 +770,6 @@ MmAccessFault( IN PVOID TrapInformation ); -/* kmap.c ********************************************************************/ - -NTSTATUS -NTAPI -MiCopyFromUserPage( - PFN_NUMBER DestPage, - const VOID *SrcAddress -); - /* process.c *****************************************************************/ PVOID @@ -1359,7 +1350,8 @@ MmMapViewInSystemSpaceEx ( _In_ PVOID Section, _Outptr_result_bytebuffer_ (*ViewSize) PVOID *MappedBase, _Inout_ PSIZE_T ViewSize, - _Inout_ PLARGE_INTEGER SectionOffset + _Inout_ PLARGE_INTEGER SectionOffset, + _In_ ULONG_PTR Flags ); BOOLEAN diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index aeccb2adf28..3e6a25b44db 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -412,19 +412,19 @@ MiInsertInSystemSpace(IN PMMSESSION Session, return Base; } +static NTSTATUS -NTAPI MiAddMappedPtes(IN PMMPTE FirstPte, IN PFN_NUMBER PteCount, IN PCONTROL_AREA ControlArea, - IN PLARGE_INTEGER SectionOffset) + IN LONGLONG SectionOffset) { MMPTE TempPte; PMMPTE PointerPte, ProtoPte, LastProtoPte, LastPte; PSUBSECTION Subsection; /* Mapping at offset not supported yet */ - ASSERT(SectionOffset->QuadPart == 0); + ASSERT(SectionOffset == 0); /* ARM3 doesn't support this yet */ ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); @@ -1054,12 +1054,12 @@ _WARN("MiSessionCommitPageTables halfplemented for amd64") } NTSTATUS -NTAPI -MiMapViewInSystemSpace(IN PVOID Section, - IN PMMSESSION Session, - OUT PVOID *MappedBase, - IN OUT PSIZE_T ViewSize, - IN PLARGE_INTEGER SectionOffset) +MiMapViewInSystemSpace( + _In_ PVOID Section, + _In_ PMMSESSION Session, + _Outptr_result_bytebuffer_ (*ViewSize) PVOID *MappedBase, + _Inout_ PSIZE_T ViewSize, + _Inout_ PLARGE_INTEGER SectionOffset) { PVOID Base; PCONTROL_AREA ControlArea; @@ -1156,7 +1156,7 @@ MiMapViewInSystemSpace(IN PVOID Section, Status = MiAddMappedPtes(MiAddressToPte(Base), BYTES_TO_PAGES(*ViewSize), ControlArea, - SectionOffset); + SectionOffset->QuadPart); ASSERT(NT_SUCCESS(Status)); /* Return the base adress of the mapping and success */ diff --git a/ntoskrnl/mm/rmap.c b/ntoskrnl/mm/rmap.c index 75bcc45a230..cb3f956ef35 100644 --- a/ntoskrnl/mm/rmap.c +++ b/ntoskrnl/mm/rmap.c @@ -128,7 +128,7 @@ GetEntry: LARGE_INTEGER Offset; BOOLEAN Released; - Offset.QuadPart = MemoryArea->SectionData.ViewOffset.QuadPart + + Offset.QuadPart = MemoryArea->SectionData.ViewOffset + ((ULONG_PTR)Address - MA_GetStartingAddress(MemoryArea)); Segment = MemoryArea->SectionData.Segment; diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 62da435122e..3f364b49f4d 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -125,7 +125,6 @@ PMM_IMAGE_SECTION_OBJECT ImageSectionObjectFromSegment(PMM_SECTION_SEGMENT Segme } NTSTATUS -NTAPI MiMapViewInSystemSpace(IN PVOID Section, IN PVOID Session, OUT PVOID *MappedBase, @@ -1160,8 +1159,8 @@ MmUnsharePageEntrySectionSegment(PMEMORY_AREA MemoryArea, return TRUE; } +static NTSTATUS -NTAPI MiCopyFromUserPage(PFN_NUMBER DestPage, const VOID *SrcAddress) { PEPROCESS Process; @@ -1172,13 +1171,13 @@ MiCopyFromUserPage(PFN_NUMBER DestPage, const VOID *SrcAddress) DestAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql); if (DestAddress == NULL) { - return(STATUS_NO_MEMORY); + return STATUS_NO_MEMORY; } ASSERT((ULONG_PTR)DestAddress % PAGE_SIZE == 0); ASSERT((ULONG_PTR)SrcAddress % PAGE_SIZE == 0); RtlCopyMemory(DestAddress, SrcAddress, PAGE_SIZE); MiUnmapPageInHyperSpace(Process, DestAddress, Irql); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } static @@ -1465,7 +1464,7 @@ MmAlterViewAttributes(PMMSUPPORT AddressSpace, PFN_NUMBER Page; Offset.QuadPart = (ULONG_PTR)Address - MA_GetStartingAddress(MemoryArea) - + MemoryArea->SectionData.ViewOffset.QuadPart; + + MemoryArea->SectionData.ViewOffset; Entry = MmGetPageEntrySectionSegment(Segment, &Offset); /* * An MM_WAIT_ENTRY is ok in this case... It'll just count as @@ -1518,12 +1517,12 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, */ if (MmIsPagePresent(Process, Address)) { - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } if (MmIsDisabledPage(Process, Address)) { - return(STATUS_ACCESS_VIOLATION); + return STATUS_ACCESS_VIOLATION; } /* @@ -1531,12 +1530,12 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, */ if (MemoryArea->DeleteInProgress) { - return(STATUS_UNSUCCESSFUL); + return STATUS_UNSUCCESSFUL; } PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); Offset.QuadPart = (ULONG_PTR)PAddress - MA_GetStartingAddress(MemoryArea) - + MemoryArea->SectionData.ViewOffset.QuadPart; + + MemoryArea->SectionData.ViewOffset; Segment = MemoryArea->SectionData.Segment; Region = MmFindRegion((PVOID)MA_GetStartingAddress(MemoryArea), @@ -1596,7 +1595,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, MiWaitForPageEvent(NULL, NULL); MmLockAddressSpace(AddressSpace); DPRINT("Address 0x%p\n", Address); - return(STATUS_MM_RESTART_OPERATION); + return STATUS_MM_RESTART_OPERATION; } HasSwapEntry = MmIsPageSwapEntry(Process, Address); @@ -1660,7 +1659,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, { DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); KeBugCheck(MEMORY_MANAGEMENT); - return(Status); + return Status; } /* @@ -1678,7 +1677,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, */ MiSetPageEvent(Process, Address); DPRINT("Address 0x%p\n", Address); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } /* @@ -1700,7 +1699,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, { DPRINT("MmCreateVirtualMappingUnsafe failed, not out of memory\n"); KeBugCheck(MEMORY_MANAGEMENT); - return(Status); + return Status; } /* @@ -1708,7 +1707,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, */ MiSetPageEvent(Process, Address); DPRINT("Address 0x%p\n", Address); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } /* @@ -1743,7 +1742,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, MiSetPageEvent(Process, Address); DPRINT("Address 0x%p\n", Address); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } MmUnlockSectionSegment(Segment); @@ -1853,7 +1852,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, MiSetPageEvent(Process, Address); DPRINT("Address 0x%p\n", Address); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } else { @@ -1880,7 +1879,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, MiSetPageEvent(Process, Address); DPRINT("Address 0x%p\n", Address); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } } @@ -1916,7 +1915,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, if (MmGetPageProtect(Process, Address) & PAGE_READWRITE) { DPRINT("Address 0x%p\n", Address); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } /* @@ -1924,7 +1923,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, */ PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); Offset.QuadPart = (ULONG_PTR)PAddress - MA_GetStartingAddress(MemoryArea) - + MemoryArea->SectionData.ViewOffset.QuadPart; + + MemoryArea->SectionData.ViewOffset; Segment = MemoryArea->SectionData.Segment; Region = MmFindRegion((PVOID)MA_GetStartingAddress(MemoryArea), @@ -1940,7 +1939,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, Region->Protect == PAGE_EXECUTE_READWRITE))) { DPRINT("Address 0x%p\n", Address); - return(STATUS_ACCESS_VIOLATION); + return STATUS_ACCESS_VIOLATION; } /* Get the page mapping this section offset. */ @@ -1958,7 +1957,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, MmUnlockSectionSegment(Segment); /* This is a private page. We must only change the page protection. */ MmSetPageProtect(Process, PAddress, Region->Protect); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } /* @@ -2000,7 +1999,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, { DPRINT1("MmCreateVirtualMapping failed, unable to create virtual mapping, not out of memory\n"); KeBugCheck(MEMORY_MANAGEMENT); - return(Status); + return Status; } if (Process) @@ -2008,7 +2007,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, MiSetPageEvent(Process, Address); DPRINT("Address 0x%p\n", Address); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } NTSTATUS @@ -2045,7 +2044,7 @@ MmProtectSectionView(PMMSUPPORT AddressSpace, BaseAddress, Length, Region->Type, Protect, MmAlterViewAttributes); - return(Status); + return Status; } NTSTATUS NTAPI @@ -2084,7 +2083,7 @@ MmQuerySectionView(PMEMORY_AREA MemoryArea, Info->Protect = Region->Protect; *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } VOID NTAPI @@ -2180,7 +2179,7 @@ MmCreatePhysicalMemorySection(VOID) if (!NT_SUCCESS(Status)) { DPRINT1("MmCreatePhysicalMemorySection: failed to create object (0x%lx)\n", Status); - return(Status); + return Status; } /* @@ -2198,7 +2197,7 @@ MmCreatePhysicalMemorySection(VOID) if (Segment == NULL) { ObDereferenceObject(PhysSection); - return(STATUS_NO_MEMORY); + return STATUS_NO_MEMORY; } RtlZeroMemory(Segment, sizeof(MM_SECTION_SEGMENT)); PhysSection->Segment = (PSEGMENT)Segment; @@ -2231,7 +2230,7 @@ MmCreatePhysicalMemorySection(VOID) } ObCloseHandle(Handle, KernelMode); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } CODE_SEG("INIT") @@ -2264,7 +2263,7 @@ MmInitSectionImplementation(VOID) MmCreatePhysicalMemorySection(); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } static @@ -2302,7 +2301,7 @@ MmCreateDataFileSection(PSECTION *SectionObject, (PVOID*)&Section); if (!NT_SUCCESS(Status)) { - return(Status); + return Status; } /* * Initialize it @@ -2363,7 +2362,7 @@ MmCreateDataFileSection(PSECTION *SectionObject, if (!NT_SUCCESS(Status)) { ObDereferenceObject(Section); - return(STATUS_SECTION_NOT_EXTENDED); + return STATUS_SECTION_NOT_EXTENDED; } } } @@ -2381,7 +2380,7 @@ MmCreateDataFileSection(PSECTION *SectionObject, if (Status != STATUS_SUCCESS) { ObDereferenceObject(Section); - return(Status); + return Status; } /* Lock the PFN lock while messing with Section Object pointers */ @@ -2390,10 +2389,8 @@ MmCreateDataFileSection(PSECTION *SectionObject, while (Segment && (Segment->SegFlags & (MM_SEGMENT_INDELETE | MM_SEGMENT_INCREATE))) { - LARGE_INTEGER ShortTime = {{-10 * 100 * 1000, -1}}; - MiReleasePfnLock(OldIrql); - KeDelayExecutionThread(KernelMode, FALSE, &ShortTime); + KeDelayExecutionThread(KernelMode, FALSE, &TinyTime); OldIrql = MiAcquirePfnLock(); Segment = FileObject->SectionObjectPointer->DataSectionObject; } @@ -2411,7 +2408,7 @@ MmCreateDataFileSection(PSECTION *SectionObject, //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); MiReleasePfnLock(OldIrql); ObDereferenceObject(Section); - return(STATUS_NO_MEMORY); + return STATUS_NO_MEMORY; } /* We are creating it */ @@ -2481,7 +2478,7 @@ MmCreateDataFileSection(PSECTION *SectionObject, //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); *SectionObject = Section; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } /* @@ -3145,7 +3142,7 @@ MmCreateImageSection(PSECTION *SectionObject, (PVOID*)(PVOID)&Section); if (!NT_SUCCESS(Status)) { - return(Status); + return Status; } /* @@ -3168,12 +3165,9 @@ MmCreateImageSection(PSECTION *SectionObject, ImageSectionObject = FileObject->SectionObjectPointer->ImageSectionObject; while(ImageSectionObject && (ImageSectionObject->SegFlags & (MM_SEGMENT_INDELETE | MM_SEGMENT_INCREATE))) { - LARGE_INTEGER ShortTime; - MiReleasePfnLock(OldIrql); - ShortTime.QuadPart = - 10 * 100 * 1000; - KeDelayExecutionThread(KernelMode, FALSE, &ShortTime); + KeDelayExecutionThread(KernelMode, FALSE, &TinyTime); OldIrql = MiAcquirePfnLock(); ImageSectionObject = FileObject->SectionObjectPointer->ImageSectionObject; @@ -3188,7 +3182,7 @@ MmCreateImageSection(PSECTION *SectionObject, { MiReleasePfnLock(OldIrql); ObDereferenceObject(Section); - return(STATUS_NO_MEMORY); + return STATUS_NO_MEMORY; } ImageSectionObject->SegFlags = MM_SEGMENT_INCREATE; @@ -3223,7 +3217,7 @@ MmCreateImageSection(PSECTION *SectionObject, ExFreePoolWithTag(ImageSectionObject, TAG_MM_SECTION_SEGMENT); ObDereferenceObject(Section); - return(Status); + return Status; } Section->Segment = (PSEGMENT)ImageSectionObject; @@ -3244,7 +3238,7 @@ MmCreateImageSection(PSECTION *SectionObject, ExFreePool(ImageSectionObject->Segments); ExFreePool(ImageSectionObject); ObDereferenceObject(Section); - return(Status); + return Status; } OldIrql = MiAcquirePfnLock(); @@ -3272,7 +3266,7 @@ MmCreateImageSection(PSECTION *SectionObject, *SectionObject = Section; ASSERT(ImageSectionObject->RefCount > 0); - return(Status); + return Status; } @@ -3337,13 +3331,13 @@ MmMapViewOfSegment( { DPRINT1("Mapping between 0x%p and 0x%p failed (%X).\n", (*BaseAddress), (char*)(*BaseAddress) + ViewSize, Status); - return(Status); + return Status; } InterlockedIncrement64(Segment->ReferenceCount); MArea->SectionData.Segment = Segment; - MArea->SectionData.ViewOffset.QuadPart = ViewOffset; + MArea->SectionData.ViewOffset = ViewOffset; if (AsImage) { MArea->VadNode.u.VadFlags.VadType = VadImageMap; @@ -3352,7 +3346,7 @@ MmMapViewOfSegment( MmInitializeRegion(&MArea->SectionData.RegionListHead, ViewSize, 0, Protect); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } @@ -3373,7 +3367,7 @@ MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, Address = (PVOID)PAGE_ROUND_DOWN(Address); Offset.QuadPart = ((ULONG_PTR)Address - MA_GetStartingAddress(MemoryArea)) + - MemoryArea->SectionData.ViewOffset.QuadPart; + MemoryArea->SectionData.ViewOffset; Segment = MemoryArea->SectionData.Segment; @@ -3455,7 +3449,7 @@ MmUnmapViewOfSegment(PMMSUPPORT AddressSpace, BaseAddress); if (MemoryArea == NULL) { - return(STATUS_UNSUCCESSFUL); + return STATUS_UNSUCCESSFUL; } Segment = MemoryArea->SectionData.Segment; @@ -3499,7 +3493,7 @@ MmUnmapViewOfSegment(PMMSUPPORT AddressSpace, } MmUnlockSectionSegment(Segment); MmDereferenceSegment(Segment); - return(Status); + return Status; } /* This functions must be called with a locked address space */ @@ -3596,7 +3590,7 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, /* Notify debugger */ if (ImageBaseAddress && !SkipDebuggerNotify) DbgkUnMapViewOfSection(ImageBaseAddress); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } @@ -3801,7 +3795,7 @@ NtQuerySection( ObDereferenceObject(Section); - return(Status); + return Status; } /********************************************************************** @@ -3959,14 +3953,14 @@ MmMapViewOfSection(IN PVOID SectionObject, if ((*BaseAddress) != NULL) { MmUnlockAddressSpace(AddressSpace); - return(STATUS_CONFLICTING_ADDRESSES); + return STATUS_CONFLICTING_ADDRESSES; } /* Otherwise find a gap to map the image. */ ImageBase = (ULONG_PTR)MmFindGap(AddressSpace, PAGE_ROUND_UP(ImageSize), MM_VIRTMEM_GRANULARITY, FALSE); if (ImageBase == 0) { MmUnlockAddressSpace(AddressSpace); - return(STATUS_CONFLICTING_ADDRESSES); + return STATUS_CONFLICTING_ADDRESSES; } /* Remember that we loaded image at a different base address */ NotAtBase = TRUE; @@ -3998,7 +3992,7 @@ MmMapViewOfSection(IN PVOID SectionObject, } MmUnlockAddressSpace(AddressSpace); - return(Status); + return Status; } } @@ -4046,7 +4040,7 @@ MmMapViewOfSection(IN PVOID SectionObject, if ((ViewOffset % PAGE_SIZE) != 0) { MmUnlockAddressSpace(AddressSpace); - return(STATUS_MAPPED_ALIGNMENT); + return STATUS_MAPPED_ALIGNMENT; } if ((*ViewSize) == 0) @@ -4076,7 +4070,7 @@ MmMapViewOfSection(IN PVOID SectionObject, if (!NT_SUCCESS(Status)) { MmUnlockAddressSpace(AddressSpace); - return(Status); + return Status; } } @@ -4115,7 +4109,8 @@ MmCanFileBeTruncated (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, } MmLockSectionSegment(Segment); - if ((Segment->SectionCount == 0) || ((Segment->SectionCount == 1) && (SectionObjectPointer->SharedCacheMap != NULL))) + if ((Segment->SectionCount == 0) || + ((Segment->SectionCount == 1) && (SectionObjectPointer->SharedCacheMap != NULL))) { /* If the cache is the only one holding a reference to the segment, then it's fine to resize */ Ret = TRUE; @@ -4171,7 +4166,8 @@ MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, /* * @implemented */ -NTSTATUS NTAPI +NTSTATUS +NTAPI MmMapViewInSystemSpace (IN PVOID SectionObject, OUT PVOID * MappedBase, IN OUT PSIZE_T ViewSize) @@ -4180,7 +4176,7 @@ MmMapViewInSystemSpace (IN PVOID SectionObject, SectionOffset.QuadPart = 0; - return MmMapViewInSystemSpaceEx(SectionObject, MappedBase, ViewSize, &SectionOffset); + return MmMapViewInSystemSpaceEx(SectionObject, MappedBase, ViewSize, &SectionOffset, 0); } NTSTATUS @@ -4189,7 +4185,8 @@ MmMapViewInSystemSpaceEx ( _In_ PVOID SectionObject, _Outptr_result_bytebuffer_ (*ViewSize) PVOID *MappedBase, _Inout_ PSIZE_T ViewSize, - _Inout_ PLARGE_INTEGER SectionOffset + _Inout_ PLARGE_INTEGER SectionOffset, + _In_ ULONG_PTR Flags ) { PSECTION Section = SectionObject; @@ -4197,6 +4194,8 @@ MmMapViewInSystemSpaceEx ( PMMSUPPORT AddressSpace; NTSTATUS Status; + UNREFERENCED_PARAMETER(Flags); + PAGED_CODE(); if (MiIsRosSectionObject(SectionObject) == FALSE) @@ -4523,9 +4522,9 @@ MmArePagesResident( MmLockSectionSegment(Segment); SegmentOffset.QuadPart = PAGE_ROUND_DOWN(Address) - MA_GetStartingAddress(MemoryArea) - + MemoryArea->SectionData.ViewOffset.QuadPart; + + MemoryArea->SectionData.ViewOffset; RangeEnd.QuadPart = PAGE_ROUND_UP((ULONG_PTR)Address + Length) - MA_GetStartingAddress(MemoryArea) - + MemoryArea->SectionData.ViewOffset.QuadPart; + + MemoryArea->SectionData.ViewOffset; while (SegmentOffset.QuadPart < RangeEnd.QuadPart) { @@ -4576,9 +4575,9 @@ MmRosFlushVirtualMemory( Segment = MemoryArea->SectionData.Segment; SegmentOffset.QuadPart = PAGE_ROUND_DOWN(*Address) - MA_GetStartingAddress(MemoryArea) - + MemoryArea->SectionData.ViewOffset.QuadPart; + + MemoryArea->SectionData.ViewOffset; RangeEnd.QuadPart = PAGE_ROUND_UP((ULONG_PTR)*Address + *Length) - MA_GetStartingAddress(MemoryArea) - + MemoryArea->SectionData.ViewOffset.QuadPart; + + MemoryArea->SectionData.ViewOffset; CurrentAddress = *Address; @@ -4990,9 +4989,9 @@ MmMakePagesDirty( MmLockSectionSegment(Segment); SegmentOffset.QuadPart = PAGE_ROUND_DOWN(Address) - MA_GetStartingAddress(MemoryArea) - + MemoryArea->SectionData.ViewOffset.QuadPart; + + MemoryArea->SectionData.ViewOffset; RangeEnd.QuadPart = PAGE_ROUND_UP((ULONG_PTR)Address + Length) - MA_GetStartingAddress(MemoryArea) - + MemoryArea->SectionData.ViewOffset.QuadPart; + + MemoryArea->SectionData.ViewOffset; DPRINT("MmMakePagesResident: Segment %p, 0x%I64x -> 0x%I64x\n", Segment, SegmentOffset.QuadPart, RangeEnd.QuadPart);

3 years, 10 months

[reactos] 96/100: [NTOS:MM] Fix regression of MmCanFileBeTruncated

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0bf352069bd0c1b0d51d… commit c0bf352069bd0c1b0d51da64c48fda70bb3ba92a Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Feb 1 18:20:18 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:24 2021 +0100 [NTOS:MM] Fix regression of MmCanFileBeTruncated --- ntoskrnl/mm/section.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index d848e337038..62da435122e 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -4115,7 +4115,7 @@ MmCanFileBeTruncated (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, } MmLockSectionSegment(Segment); - if ((Segment->SectionCount == 1) && (SectionObjectPointer->SharedCacheMap != NULL)) + if ((Segment->SectionCount == 0) || ((Segment->SectionCount == 1) && (SectionObjectPointer->SharedCacheMap != NULL))) { /* If the cache is the only one holding a reference to the segment, then it's fine to resize */ Ret = TRUE; @@ -4124,6 +4124,12 @@ MmCanFileBeTruncated (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, { /* We can't shrink, but we can extend */ Ret = NewFileSize->QuadPart >= Segment->RawLength.QuadPart; +#if DBG + if (!Ret) + { + DPRINT1("Cannot truncate data: New Size %I64d, Segment Size %I64d\n", NewFileSize->QuadPart, Segment->RawLength.QuadPart); + } +#endif } MmUnlockSectionSegment(Segment); MmDereferenceSegment(Segment);

3 years, 10 months

[reactos] 95/100: [NTOS:MM] Simplify code & fix MSVC x64 build

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f7abc983800d8d221fed… commit 7f7abc983800d8d221fed2394e3c25528704f4c4 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Feb 1 12:02:53 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:23 2021 +0100 [NTOS:MM] Simplify code & fix MSVC x64 build --- ntoskrnl/mm/rmap.c | 52 +++++++++++----------------------------------------- 1 file changed, 11 insertions(+), 41 deletions(-) diff --git a/ntoskrnl/mm/rmap.c b/ntoskrnl/mm/rmap.c index e40d9554038..75bcc45a230 100644 --- a/ntoskrnl/mm/rmap.c +++ b/ntoskrnl/mm/rmap.c @@ -102,7 +102,7 @@ GetEntry: MmLockAddressSpace(AddressSpace); - if ((MmGetPfnForProcess(Process, Address) != Page) || MmIsPageAccessed(Process, Address)) + if (MmGetPfnForProcess(Process, Address) != Page) { /* This changed in the short window where we didn't have any locks */ MmUnlockAddressSpace(AddressSpace); @@ -152,31 +152,8 @@ GetEntry: /* Delete this virtual mapping in the process */ MmDeleteVirtualMapping(Process, Address, &Dirty, &MapPage); - /* There is a window betwwen the start of this function and now, - * where it's possible that the process changed its memory layout, - * because of copy-on-write, unmapping memory, or whatsoever. - * Just go away if that is the case */ - if (MapPage != Page) - { - PMM_REGION Region = MmFindRegion((PVOID)MA_GetStartingAddress(MemoryArea), - &MemoryArea->SectionData.RegionListHead, - Address, NULL); - /* Restore the mapping */ - MmCreateVirtualMapping(Process, Address, Region->Protect, &MapPage, 1); - if (Dirty) - MmSetDirtyPage(Process, Address); - - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - if (Address < MmSystemRangeStart) - { - ExReleaseRundownProtection(&Process->RundownProtect); - ObDereferenceObject(Process); - } - - /* We can still try to flush it to disk, though */ - goto WriteSegment; - } + /* We checked this earlier */ + ASSERT(MapPage == Page); if (Page != PFN_FROM_SSE(Entry)) { @@ -232,11 +209,9 @@ GetEntry: MmSetDirtyPage(Process, Address); MmUnlockAddressSpace(AddressSpace); - if (Address < MmSystemRangeStart) - { - ExReleaseRundownProtection(&Process->RundownProtect); - ObDereferenceObject(Process); - } + ExReleaseRundownProtection(&Process->RundownProtect); + ObDereferenceObject(Process); + return STATUS_UNSUCCESSFUL; } } @@ -259,11 +234,9 @@ GetEntry: #endif MmReleasePageMemoryConsumer(MC_USER, Page); - if (Address < MmSystemRangeStart) - { - ExReleaseRundownProtection(&Process->RundownProtect); - ObDereferenceObject(Process); - } + ExReleaseRundownProtection(&Process->RundownProtect); + ObDereferenceObject(Process); + return STATUS_SUCCESS; } @@ -276,11 +249,8 @@ GetEntry: MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); - if (Address < MmSystemRangeStart) - { - ExReleaseRundownProtection(&Process->RundownProtect); - ObDereferenceObject(Process); - } + ExReleaseRundownProtection(&Process->RundownProtect); + ObDereferenceObject(Process); if (Released) return STATUS_SUCCESS; }

3 years, 10 months

[reactos] 94/100: [NTOS:MM][NTOS:CC] Performance improvement again

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ba1926037223899fa205… commit 2ba1926037223899fa2052d9a72663f095d37f54 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jan 29 18:48:32 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:23 2021 +0100 [NTOS:MM][NTOS:CC] Performance improvement again Read files by 64kb chunks instead of page-sized chunks. --- ntoskrnl/cc/copy.c | 48 +--- ntoskrnl/cc/pin.c | 5 - ntoskrnl/cc/view.c | 40 +++- ntoskrnl/include/internal/cc.h | 2 +- ntoskrnl/include/internal/mm.h | 15 +- ntoskrnl/mm/section.c | 499 +++++++++++++++++++++-------------------- 6 files changed, 298 insertions(+), 311 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 8ed24f2bd92..cdab94c8313 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -504,24 +504,6 @@ CcCopyRead ( CurrentOffset = FileOffset->QuadPart; while(CurrentOffset < ReadEnd) { - if (CurrentOffset >= SharedCacheMap->ValidDataLength.QuadPart) - { - DPRINT1("Zeroing buffer because we are beyond the VDL.\n"); - /* We are beyond what is valid. Just zero this out */ - _SEH2_TRY - { - RtlZeroMemory(Buffer, Length); - } - _SEH2_EXCEPT(CcpCheckInvalidUserBuffer(_SEH2_GetExceptionInformation(), Buffer, Length)) - { - ExRaiseStatus(STATUS_INVALID_USER_BUFFER); - } - _SEH2_END; - - ReadLength += Length; - break; - } - Status = CcRosGetVacb(SharedCacheMap, CurrentOffset, &Vacb); if (!NT_SUCCESS(Status)) { @@ -538,25 +520,15 @@ CcCopyRead ( if (!CcRosEnsureVacbResident(Vacb, Wait, FALSE, VacbOffset, VacbLength)) return FALSE; - /* Do not copy past the section */ - if (CurrentOffset + VacbLength > SharedCacheMap->SectionSize.QuadPart) - CopyLength = SharedCacheMap->SectionSize.QuadPart - CurrentOffset; - if (CopyLength != 0) + _SEH2_TRY { - _SEH2_TRY - { - RtlCopyMemory(Buffer, (PUCHAR)Vacb->BaseAddress + VacbOffset, CopyLength); - } - _SEH2_EXCEPT(CcpCheckInvalidUserBuffer(_SEH2_GetExceptionInformation(), Buffer, VacbLength)) - { - ExRaiseStatus(STATUS_INVALID_USER_BUFFER); - } - _SEH2_END; + RtlCopyMemory(Buffer, (PUCHAR)Vacb->BaseAddress + VacbOffset, CopyLength); } - - /* Zero-out the buffer tail if needed */ - if (CopyLength < VacbLength) - RtlZeroMemory((PUCHAR)Buffer + CopyLength, VacbLength - CopyLength); + _SEH2_EXCEPT(CcpCheckInvalidUserBuffer(_SEH2_GetExceptionInformation(), Buffer, VacbLength)) + { + ExRaiseStatus(STATUS_INVALID_USER_BUFFER); + } + _SEH2_END; ReadLength += VacbLength; @@ -684,10 +656,6 @@ CcCopyWrite ( if (FileObject->Flags & FO_WRITE_THROUGH) CcFlushCache(FileObject->SectionObjectPointer, FileOffset, Length, NULL); - /* Update VDL */ - if (WriteEnd > SharedCacheMap->ValidDataLength.QuadPart) - SharedCacheMap->ValidDataLength.QuadPart = WriteEnd; - return TRUE; } @@ -898,7 +866,7 @@ CcZeroData ( } /* See if we should simply truncate the valid data length */ - if ((StartOffset->QuadPart < SharedCacheMap->ValidDataLength.QuadPart) && (EndOffset->QuadPart > SharedCacheMap->ValidDataLength.QuadPart)) + if ((StartOffset->QuadPart < SharedCacheMap->ValidDataLength.QuadPart) && (EndOffset->QuadPart >= SharedCacheMap->ValidDataLength.QuadPart)) { DPRINT1("Truncating VDL.\n"); SharedCacheMap->ValidDataLength = *StartOffset; diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index af7b3aa71a8..c48f1068042 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -543,7 +543,6 @@ CcSetDirtyPinnedData ( IN PLARGE_INTEGER Lsn) { PINTERNAL_BCB iBcb = CONTAINING_RECORD(Bcb, INTERNAL_BCB, PFCB); - PROS_SHARED_CACHE_MAP SharedCacheMap = iBcb->Vacb->SharedCacheMap; CCTRACE(CC_API_DEBUG, "Bcb=%p Lsn=%p\n", Bcb, Lsn); @@ -556,10 +555,6 @@ CcSetDirtyPinnedData ( { CcRosMarkDirtyVacb(iBcb->Vacb); } - - /* Update VDL */ - if (SharedCacheMap->ValidDataLength.QuadPart < (iBcb->PFCB.MappedFileOffset.QuadPart + iBcb->PFCB.MappedLength)) - SharedCacheMap->ValidDataLength.QuadPart = iBcb->PFCB.MappedFileOffset.QuadPart + iBcb->PFCB.MappedLength; } diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 591168eeba0..c0f1458287d 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -166,12 +166,12 @@ MmFlushVirtualMemory(IN PEPROCESS Process, NTSTATUS NTAPI CcRosFlushVacb ( - PROS_VACB Vacb) + _In_ PROS_VACB Vacb, + _In_ PIO_STATUS_BLOCK Iosb) { - IO_STATUS_BLOCK Iosb; - SIZE_T FlushSize = VACB_MAPPING_GRANULARITY; NTSTATUS Status; BOOLEAN HaveLock = FALSE; + PROS_SHARED_CACHE_MAP SharedCacheMap = Vacb->SharedCacheMap; CcRosUnmarkDirtyVacb(Vacb, TRUE); @@ -184,7 +184,10 @@ CcRosFlushVacb ( HaveLock = TRUE; } - Status = MmFlushVirtualMemory(NULL, &Vacb->BaseAddress, &FlushSize, &Iosb); + Status = MmFlushSegment(SharedCacheMap->FileObject->SectionObjectPointer, + &Vacb->FileOffset, + VACB_MAPPING_GRANULARITY, + Iosb); if (HaveLock) { @@ -194,6 +197,14 @@ CcRosFlushVacb ( quit: if (!NT_SUCCESS(Status)) CcRosMarkDirtyVacb(Vacb); + else + { + /* Update VDL */ + if (SharedCacheMap->ValidDataLength.QuadPart < (Vacb->FileOffset.QuadPart + VACB_MAPPING_GRANULARITY)) + { + SharedCacheMap->ValidDataLength.QuadPart = Vacb->FileOffset.QuadPart + VACB_MAPPING_GRANULARITY; + } + } return Status; } @@ -285,7 +296,8 @@ CcRosFlushDirtyPages ( continue; } - Status = CcRosFlushVacb(current); + IO_STATUS_BLOCK Iosb; + Status = CcRosFlushVacb(current, &Iosb); SharedCacheMap->Callbacks->ReleaseFromLazyWrite(SharedCacheMap->LazyWriteContext); @@ -308,7 +320,7 @@ CcRosFlushDirtyPages ( ULONG PagesFreed; /* How many pages did we free? */ - PagesFreed = VACB_MAPPING_GRANULARITY / PAGE_SIZE; + PagesFreed = Iosb.Information / PAGE_SIZE; (*Count) += PagesFreed; if (!Wait) @@ -756,7 +768,11 @@ CcRosEnsureVacbResident( if (!NoRead) { - NTSTATUS Status = MmMakePagesResident(NULL, BaseAddress, Length); + PROS_SHARED_CACHE_MAP SharedCacheMap = Vacb->SharedCacheMap; + NTSTATUS Status = MmMakeDataSectionResident(SharedCacheMap->FileObject->SectionObjectPointer, + Vacb->FileOffset.QuadPart + Offset, + Length, + &SharedCacheMap->ValidDataLength); if (!NT_SUCCESS(Status)) ExRaiseStatus(Status); } @@ -935,7 +951,6 @@ CcFlushCache ( } Status = STATUS_SUCCESS; - if (IoStatus) { IoStatus->Information = 0; @@ -953,9 +968,10 @@ CcFlushCache ( if (vacb != NULL) { + IO_STATUS_BLOCK VacbIosb; if (vacb->Dirty) { - Status = CcRosFlushVacb(vacb); + Status = CcRosFlushVacb(vacb, &VacbIosb); if (!NT_SUCCESS(Status)) { goto quit; @@ -966,7 +982,7 @@ CcFlushCache ( CcRosReleaseVacb(SharedCacheMap, vacb, FALSE, FALSE); if (IoStatus) - IoStatus->Information += VACB_MAPPING_GRANULARITY; + IoStatus->Information += VacbIosb.Information; } if (!DirtyVacb) @@ -992,6 +1008,10 @@ CcFlushCache ( if (IoStatus) IoStatus->Information += MmIosb.Information; + + /* Update VDL */ + if (SharedCacheMap->ValidDataLength.QuadPart < FlushEnd) + SharedCacheMap->ValidDataLength.QuadPart = FlushEnd; } if (!NT_SUCCESS(RtlLongLongAdd(FlushStart, VACB_MAPPING_GRANULARITY, &FlushStart))) diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 7384d9be0d3..cf57319449b 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -310,7 +310,7 @@ CcMdlWriteComplete2( NTSTATUS NTAPI -CcRosFlushVacb(PROS_VACB Vacb); +CcRosFlushVacb(PROS_VACB Vacb, PIO_STATUS_BLOCK Iosb); NTSTATUS NTAPI diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 0243ac55177..cec0d6e13d1 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1369,13 +1369,6 @@ MmArePagesResident( _In_ PVOID BaseAddress, _In_ ULONG Length); -NTSTATUS -NTAPI -MmMakePagesResident( - _In_ PEPROCESS Process, - _In_ PVOID Address, - _In_ ULONG Length); - NTSTATUS NTAPI MmMakePagesDirty( @@ -1399,6 +1392,14 @@ MmFlushSegment( _In_ ULONG Length, _In_opt_ PIO_STATUS_BLOCK Iosb); +NTSTATUS +NTAPI +MmMakeDataSectionResident( + _In_ PSECTION_OBJECT_POINTERS SectionObjectPointer, + _In_ LONGLONG Offset, + _In_ ULONG Length, + _In_ PLARGE_INTEGER ValidDataLength); + BOOLEAN NTAPI MmPurgeSegment( diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 94ea1844d2d..d848e337038 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1181,126 +1181,234 @@ MiCopyFromUserPage(PFN_NUMBER DestPage, const VOID *SrcAddress) return(STATUS_SUCCESS); } -#ifndef NEWCC static NTSTATUS NTAPI -MiReadPage(PMEMORY_AREA MemoryArea, - LONGLONG SegOffset, - PPFN_NUMBER Page, - BOOLEAN IgnoreSize) -/* - * FUNCTION: Read a page for a section backed memory area. - * PARAMETERS: - * MemoryArea - Memory area to read the page for. - * Offset - Offset of the page to read. - * Page - Variable that receives a page contains the read data. - */ +MmMakeSegmentResident( + _In_ PMM_SECTION_SEGMENT Segment, + _In_ LONGLONG Offset, + _In_ ULONG Length, + _In_opt_ PLARGE_INTEGER ValidDataLength) { + /* Let's use a 64K granularity. */ + LONGLONG RangeStart, RangeEnd; NTSTATUS Status; - IO_STATUS_BLOCK IoStatus; - KEVENT Event; - UCHAR MdlBase[sizeof(MDL) + sizeof(PFN_NUMBER)]; - PMDL Mdl = (PMDL)MdlBase; - PFILE_OBJECT FileObject = MemoryArea->SectionData.Segment->FileObject; - LARGE_INTEGER FileOffset; - KIRQL OldIrql; - PFSRTL_ADVANCED_FCB_HEADER FcbHeader = FileObject->FsContext; - - FileOffset.QuadPart = MemoryArea->SectionData.Segment->Image.FileOffset + SegOffset; - - DPRINT("Reading file at offset %08x:%08x\n", FileOffset.HighPart, FileOffset.LowPart); + PFILE_OBJECT FileObject = Segment->FileObject; - Status = MmRequestPageMemoryConsumer(MC_USER, FALSE, Page); + /* Calculate our range, aligned on 64K if possible. */ + Status = RtlLongLongAdd(Offset, Length, &RangeEnd); + ASSERT(NT_SUCCESS(Status)); if (!NT_SUCCESS(Status)) return Status; - if ((FileOffset.QuadPart > FcbHeader->ValidDataLength.QuadPart) && !IgnoreSize) + RangeStart = Offset - (Offset % _64K); + if (RangeEnd % _64K) + RangeEnd += _64K - (RangeEnd % _64K); + + /* Clamp if needed */ + if (!FlagOn(*Segment->Flags, MM_DATAFILE_SEGMENT)) { - /* Quick path : data is not valid; return a zero-page */ - return STATUS_SUCCESS; + if (RangeEnd > Segment->RawLength.QuadPart) + RangeEnd = Segment->RawLength.QuadPart; } - RtlZeroMemory(MdlBase, sizeof(MdlBase)); - MmInitializeMdl(Mdl, NULL, PAGE_SIZE); - MmBuildMdlFromPages(Mdl, Page); - Mdl->MdlFlags |= MDL_PAGES_LOCKED | MDL_IO_PAGE_READ; + /* Let's gooooooooo */ + for ( ; RangeStart < RangeEnd; RangeStart += _64K) + { + /* First take a look at where we miss pages */ + ULONG ToReadPageBits = 0; + LONGLONG ChunkEnd = RangeStart + _64K; - KeInitializeEvent(&Event, NotificationEvent, FALSE); + if (ChunkEnd > RangeEnd) + ChunkEnd = RangeEnd; - /* Disable APCs */ - KeRaiseIrql(APC_LEVEL, &OldIrql); + MmLockSectionSegment(Segment); + for (LONGLONG ChunkOffset = RangeStart; ChunkOffset < ChunkEnd; ChunkOffset += PAGE_SIZE) + { + LARGE_INTEGER CurrentOffset; - Status = IoPageRead(FileObject, Mdl, &FileOffset, &Event, &IoStatus); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, WrPageIn, KernelMode, FALSE, NULL); - Status = IoStatus.Status; - } + CurrentOffset.QuadPart = ChunkOffset; + ULONG_PTR Entry = MmGetPageEntrySectionSegment(Segment, &CurrentOffset); - if (Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) - { - MmUnmapLockedPages (Mdl->MappedSystemVa, Mdl); - } + /* Let any pending read proceed */ + while (MM_IS_WAIT_PTE(Entry)) + { + MmUnlockSectionSegment(Segment); - KeLowerIrql(OldIrql); + KeDelayExecutionThread(KernelMode, FALSE, &TinyTime); - if (Status == STATUS_END_OF_FILE) - { - DPRINT1("Got STATUS_END_OF_FILE at offset %I64d for file %wZ.\n", SegOffset, &FileObject->FileName); - Status = STATUS_SUCCESS; - } + MmLockSectionSegment(Segment); + Entry = MmGetPageEntrySectionSegment(Segment, &CurrentOffset); + } - if ((MemoryArea->VadNode.u.VadFlags.VadType == VadImageMap) - && ((SegOffset + PAGE_SIZE) > MemoryArea->SectionData.Segment->RawLength.QuadPart)) - { - KIRQL OldIrql; - PUCHAR PageMap; + if (Entry != 0) + { + /* There is a page here. Or a swap entry. Or whatever... */ + continue; + } - DPRINT("Zeroing at offset %I64d for file %wZ.\n", SegOffset, &FileObject->FileName); + ToReadPageBits |= 1UL << ((ChunkOffset - RangeStart) >> PAGE_SHIFT); - /* Zero out the end of it */ - PageMap = MiMapPageInHyperSpace(PsGetCurrentProcess(), *Page, &OldIrql); - RtlZeroMemory(PageMap + MemoryArea->SectionData.Segment->RawLength.QuadPart - SegOffset, - PAGE_SIZE - (MemoryArea->SectionData.Segment->RawLength.QuadPart - SegOffset)); - MiUnmapPageInHyperSpace(PsGetCurrentProcess(), PageMap, OldIrql); - } + /* Put a wait entry here */ + MmSetPageEntrySectionSegment(Segment, &CurrentOffset, MAKE_SWAP_SSE(MM_WAIT_ENTRY)); + } + MmUnlockSectionSegment(Segment); - return Status; -} + if (ToReadPageBits == 0) + { + /* Nothing to do for this chunk */ + continue; + } -#else -NTSTATUS -NTAPI -MiReadPage(PMEMORY_AREA MemoryArea, - LONGLONG SegOffset, - PPFN_NUMBER Page) -/* - * FUNCTION: Read a page for a section backed memory area. - * PARAMETERS: - * MemoryArea - Memory area to read the page for. - * Offset - Offset of the page to read. - * Page - Variable that receives a page contains the read data. - */ -{ - MM_REQUIRED_RESOURCES Resources; - NTSTATUS Status; + /* Now perform the actual read */ + LONGLONG ChunkOffset = RangeStart; + while (ChunkOffset < ChunkEnd) + { + /* Move forward if there is a hole */ + ULONG BitSet; + if (!_BitScanForward(&BitSet, ToReadPageBits)) + { + /* Nothing more to read */ + break; + } + ToReadPageBits >>= BitSet; + ChunkOffset += BitSet * PAGE_SIZE; + ASSERT(ChunkOffset < ChunkEnd); - RtlZeroMemory(&Resources, sizeof(MM_REQUIRED_RESOURCES)); + /* Get the range we have to read */ + _BitScanForward(&BitSet, ~ToReadPageBits); + ULONG ReadLength = BitSet * PAGE_SIZE; - Resources.Context = MemoryArea->SectionData.Section->FileObject; - Resources.FileOffset.QuadPart = SegOffset + - MemoryArea->SectionData.Segment->Image.FileOffset; - Resources.Consumer = MC_USER; - Resources.Amount = PAGE_SIZE; + ASSERT(ReadLength <= _64K); - DPRINT("%S, offset 0x%x, len 0x%x, page 0x%x\n", ((PFILE_OBJECT)Resources.Context)->FileName.Buffer, Resources.FileOffset.LowPart, Resources.Amount, Resources.Page[0]); + /* Clamp (This is for image mappings */ + if ((ChunkOffset + ReadLength) > ChunkEnd) + ReadLength = ChunkEnd - ChunkOffset; - Status = MiReadFilePage(MmGetKernelAddressSpace(), MemoryArea, &Resources); - *Page = Resources.Page[0]; - return Status; + ASSERT(ReadLength != 0); + + /* Allocate a MDL */ + PMDL Mdl = IoAllocateMdl(NULL, ReadLength, FALSE, FALSE, NULL); + if (!Mdl) + { + /* Damn. Roll-back. */ + MmLockSectionSegment(Segment); + while (ChunkOffset < ChunkEnd) + { + if (ToReadPageBits & 1) + { + LARGE_INTEGER CurrentOffset; + CurrentOffset.QuadPart = ChunkOffset; + ASSERT(MM_IS_WAIT_PTE(MmGetPageEntrySectionSegment(Segment, &CurrentOffset))); + MmSetPageEntrySectionSegment(Segment, &CurrentOffset, 0); + } + ToReadPageBits >>= 1; + ChunkOffset += PAGE_SIZE; + } + MmUnlockSectionSegment(Segment); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Get our pages */ + PPFN_NUMBER Pages = MmGetMdlPfnArray(Mdl); + 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]); + } + Mdl->MdlFlags |= MDL_PAGES_LOCKED | MDL_IO_PAGE_READ; + + LARGE_INTEGER FileOffset; + FileOffset.QuadPart = Segment->Image.FileOffset + ChunkOffset; + + /* Clamp to VDL */ + if (ValidDataLength && ((FileOffset.QuadPart + ReadLength) > ValidDataLength->QuadPart)) + { + if (FileOffset.QuadPart > ValidDataLength->QuadPart) + { + /* Great, nothing to read. */ + goto AssignPagesToSegment; + } + + Mdl->Size = (FileOffset.QuadPart + ReadLength) - ValidDataLength->QuadPart; + } + + KEVENT Event; + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* Disable APCs */ + KIRQL OldIrql; + KeRaiseIrql(APC_LEVEL, &OldIrql); + + IO_STATUS_BLOCK Iosb; + Status = IoPageRead(FileObject, Mdl, &FileOffset, &Event, &Iosb); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, WrPageIn, KernelMode, FALSE, NULL); + Status = Iosb.Status; + } + + if (Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) + { + MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); + } + + KeLowerIrql(OldIrql); + + if (Status == STATUS_END_OF_FILE) + { + DPRINT1("Got STATUS_END_OF_FILE at offset %I64d for file %wZ.\n", FileOffset.QuadPart, &FileObject->FileName); + Status = STATUS_SUCCESS; + } + + if (!NT_SUCCESS(Status)) + { + /* Damn. Roll back. */ + for (UINT i = 0; i < BYTES_TO_PAGES(ReadLength); i++) + MmReleasePageMemoryConsumer(MC_USER, Pages[i]); + + MmLockSectionSegment(Segment); + while (ChunkOffset < ChunkEnd) + { + if (ToReadPageBits & 1) + { + LARGE_INTEGER CurrentOffset; + CurrentOffset.QuadPart = ChunkOffset; + ASSERT(MM_IS_WAIT_PTE(MmGetPageEntrySectionSegment(Segment, &CurrentOffset))); + MmSetPageEntrySectionSegment(Segment, &CurrentOffset, 0); + } + ToReadPageBits >>= 1; + ChunkOffset += PAGE_SIZE; + } + MmUnlockSectionSegment(Segment); + IoFreeMdl(Mdl);; + return Status; + } + +AssignPagesToSegment: + MmLockSectionSegment(Segment); + + for (UINT i = 0; i < BYTES_TO_PAGES(ReadLength); i++) + { + LARGE_INTEGER CurrentOffset; + CurrentOffset.QuadPart = ChunkOffset + (i * PAGE_SIZE); + + ASSERT(MM_IS_WAIT_PTE(MmGetPageEntrySectionSegment(Segment, &CurrentOffset))); + + MmSetPageEntrySectionSegment(Segment, &CurrentOffset, MAKE_SSE(Pages[i] << PAGE_SHIFT, 0)); + } + + MmUnlockSectionSegment(Segment); + + IoFreeMdl(Mdl); + ToReadPageBits >>= BitSet; + ChunkOffset += BitSet * PAGE_SIZE; + } + } + + return STATUS_SUCCESS; } -#endif static VOID MmAlterViewAttributes(PMMSUPPORT AddressSpace, @@ -1610,85 +1718,57 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, if (Entry == 0) { - SWAPENTRY FakeSwapEntry; - - /* - * If the entry is zero (and it can't change because we have - * locked the segment) then we need to load the page. - */ - /* - * Release all our locks and read in the page from disk + * If the entry is zero, then we need to load the page. */ - MmSetPageEntrySectionSegment(Segment, &Offset, MAKE_SWAP_SSE(MM_WAIT_ENTRY)); - MmUnlockSectionSegment(Segment); - MmCreatePageFileMapping(Process, PAddress, MM_WAIT_ENTRY); - MmUnlockAddressSpace(AddressSpace); - if ((Offset.QuadPart >= (LONGLONG)PAGE_ROUND_UP(Segment->RawLength.QuadPart)) && (MemoryArea->VadNode.u.VadFlags.VadType == VadImageMap)) { + /* We are beyond the data which is on file. Just get a new page. */ 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)) - { - DPRINT1("MmRequestPageMemoryConsumer failed (Status %x)\n", Status); - } + MmRequestPageMemoryConsumer(MC_USER, FALSE, &Page); + MmSetPageEntrySectionSegment(Segment, &Offset, MAKE_SSE(Page << PAGE_SHIFT, 1)); + MmUnlockSectionSegment(Segment); - } - else - { - DPRINT("Getting fresh page for file %wZ at offset %I64d.\n", &Segment->FileObject->FileName, Offset.QuadPart); - Status = MiReadPage(MemoryArea, Offset.QuadPart, &Page, FALSE); + Status = MmCreateVirtualMapping(Process, PAddress, Attributes, &Page, 1); if (!NT_SUCCESS(Status)) { - DPRINT1("MiReadPage failed (Status %x)\n", Status); + DPRINT1("Unable to create virtual mapping\n"); + KeBugCheck(MEMORY_MANAGEMENT); } - } - if (!NT_SUCCESS(Status)) - { - /* - * FIXME: What do we know in this case? - */ - /* - * Cleanup and release locks - */ - MmLockAddressSpace(AddressSpace); + ASSERT(MmIsPagePresent(Process, PAddress)); + if (Process) + MmInsertRmap(Page, Process, Address); + MiSetPageEvent(Process, Address); DPRINT("Address 0x%p\n", Address); - return(Status); + return(STATUS_SUCCESS); } - /* Lock both segment and process address space while we proceed. */ - MmLockAddressSpace(AddressSpace); - MmLockSectionSegment(Segment); + MmUnlockSectionSegment(Segment); + MmUnlockAddressSpace(AddressSpace); - MmDeletePageFileMapping(Process, PAddress, &FakeSwapEntry); - DPRINT("CreateVirtualMapping Page %x Process %p PAddress %p Attributes %x\n", - Page, Process, PAddress, Attributes); - Status = MmCreateVirtualMapping(Process, - PAddress, - Attributes, - &Page, - 1); + /* The data must be paged in. Lock the file, so that the VDL doesn't get updated behind us. */ + FsRtlAcquireFileExclusive(Segment->FileObject); + + PFSRTL_COMMON_FCB_HEADER FcbHeader = Segment->FileObject->FsContext; + + Status = MmMakeSegmentResident(Segment, Offset.QuadPart, PAGE_SIZE, &FcbHeader->ValidDataLength); + + FsRtlReleaseFile(Segment->FileObject); + + /* Lock address space again */ + MmLockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { - DPRINT1("Unable to create virtual mapping\n"); - KeBugCheck(MEMORY_MANAGEMENT); + /* Damn */ + DPRINT1("Failed to page data in!\n"); + return STATUS_IN_PAGE_ERROR; } - ASSERT(MmIsPagePresent(Process, PAddress)); - if (Process) - MmInsertRmap(Page, Process, Address); - - /* Set this section offset has being backed by our new page. */ - Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); - MmSetPageEntrySectionSegment(Segment, &Offset, Entry); - MmUnlockSectionSegment(Segment); - MiSetPageEvent(Process, Address); - DPRINT("Address 0x%p\n", Address); - return(STATUS_SUCCESS); + /* Everything went fine. Restart the operation */ + return STATUS_MM_RESTART_OPERATION; } else if (IS_SWAP_FROM_SSE(Entry)) { @@ -4458,103 +4538,6 @@ MmArePagesResident( return Ret; } -NTSTATUS -NTAPI -MmMakePagesResident( - _In_ PEPROCESS Process, - _In_ PVOID Address, - _In_ ULONG Length) -{ - PMEMORY_AREA MemoryArea; - PMM_SECTION_SEGMENT Segment; - LARGE_INTEGER SegmentOffset, RangeEnd; - PMMSUPPORT AddressSpace = Process ? &Process->Vm : MmGetKernelAddressSpace(); - - MmLockAddressSpace(AddressSpace); - - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); - if (MemoryArea == NULL) - { - DPRINT1("Unable to find memory area at address %p.\n", Address); - MmUnlockAddressSpace(AddressSpace); - return STATUS_NOT_MAPPED_VIEW; - } - - /* Only supported in old Mm for now */ - ASSERT(MemoryArea->Type == MEMORY_AREA_SECTION_VIEW); - /* For file mappings */ - ASSERT(MemoryArea->VadNode.u.VadFlags.VadType != VadImageMap); - - Segment = MemoryArea->SectionData.Segment; - MmLockSectionSegment(Segment); - - SegmentOffset.QuadPart = PAGE_ROUND_DOWN(Address) - MA_GetStartingAddress(MemoryArea) - + MemoryArea->SectionData.ViewOffset.QuadPart; - RangeEnd.QuadPart = PAGE_ROUND_UP((ULONG_PTR)Address + Length) - MA_GetStartingAddress(MemoryArea) - + MemoryArea->SectionData.ViewOffset.QuadPart; - - DPRINT("MmMakePagesResident: Segment %p, 0x%I64x -> 0x%I64x\n", Segment, SegmentOffset.QuadPart, RangeEnd.QuadPart); - - while (SegmentOffset.QuadPart < RangeEnd.QuadPart) - { - ULONG_PTR Entry = MmGetPageEntrySectionSegment(Segment, &SegmentOffset); - - /* Let any pending read proceed */ - while (MM_IS_WAIT_PTE(Entry)) - { - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - MiWaitForPageEvent(NULL, NULL); - MmLockAddressSpace(AddressSpace); - MmLockSectionSegment(Segment); - Entry = MmGetPageEntrySectionSegment(Segment, &SegmentOffset); - } - - /* We are called from Cc, this can't be backed by the page files */ - ASSERT(!IS_SWAP_FROM_SSE(Entry)); - - /* At this point, there may be a valid page there */ - if (Entry == 0) - { - PFN_NUMBER Page; - NTSTATUS Status; - - /* - * Release all our locks and read in the page from disk - */ - MmSetPageEntrySectionSegment(Segment, &SegmentOffset, MAKE_SWAP_SSE(MM_WAIT_ENTRY)); - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - - /* FIXME: Read the whole range at once instead of one page at a time */ - /* Ignore file size, as Cc already checked on its side. */ - Status = MiReadPage(MemoryArea, SegmentOffset.QuadPart, &Page, TRUE); - if (!NT_SUCCESS(Status)) - { - /* Reset the Segment entry and fail */ - MmLockSectionSegment(Segment); - MmSetPageEntrySectionSegment(Segment, &SegmentOffset, 0); - MmUnlockSectionSegment(Segment); - MiSetPageEvent(Process, Address); - return Status; - } - - MmLockAddressSpace(AddressSpace); - MmLockSectionSegment(Segment); - - /* We set it with 0 ref count, nobody maps this page yet. */ - MmSetPageEntrySectionSegment(Segment, &SegmentOffset, MAKE_SSE(Page << PAGE_SHIFT, 0)); - MiSetPageEvent(Process, Address); - } - SegmentOffset.QuadPart += PAGE_SIZE; - } - - MmUnlockSectionSegment(Segment); - - MmUnlockAddressSpace(AddressSpace); - return STATUS_SUCCESS; -} - NTSTATUS NTAPI MmRosFlushVirtualMemory( @@ -4723,6 +4706,26 @@ MmPurgeSegment( return TRUE; } +NTSTATUS +NTAPI +MmMakeDataSectionResident( + _In_ PSECTION_OBJECT_POINTERS SectionObjectPointer, + _In_ LONGLONG Offset, + _In_ ULONG Length, + _In_ PLARGE_INTEGER ValidDataLength) +{ + PMM_SECTION_SEGMENT Segment = MiGrabDataSection(SectionObjectPointer); + + /* There must be a segment for this call */ + ASSERT(Segment); + + NTSTATUS Status = MmMakeSegmentResident(Segment, Offset, Length, ValidDataLength); + + MmDereferenceSegment(Segment); + + return Status; +} + NTSTATUS NTAPI MmFlushSegment(

3 years, 10 months

[reactos] 93/100: [NTOS:MM] More fine-tuning of the memory balancer

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=625f27336176c7f1db4ad… commit 625f27336176c7f1db4ad5ade75597a3820853ed Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jan 29 18:47:26 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:23 2021 +0100 [NTOS:MM] More fine-tuning of the memory balancer --- ntoskrnl/mm/balance.c | 21 +++++++++++---------- ntoskrnl/mm/rmap.c | 10 ---------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index 04231e86951..1cab99be0ec 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -37,6 +37,8 @@ static HANDLE MiBalancerThreadHandle = NULL; static KEVENT MiBalancerEvent; static KTIMER MiBalancerTimer; +static LONG PageOutThreadActive; + /* FUNCTIONS ****************************************************************/ CODE_SEG("INIT") @@ -102,19 +104,16 @@ MiTrimMemoryConsumer(ULONG Consumer, ULONG InitialTarget) return InitialTarget; } - if (MiMemoryConsumers[Consumer].PagesUsed > MiMemoryConsumers[Consumer].PagesTarget) - { - /* Consumer page limit exceeded */ - Target = max(Target, MiMemoryConsumers[Consumer].PagesUsed - MiMemoryConsumers[Consumer].PagesTarget); - } if (MmAvailablePages < MiMinimumAvailablePages) { /* Global page limit exceeded */ Target = (ULONG)max(Target, MiMinimumAvailablePages - MmAvailablePages); } - - /* Don't be too greedy in one run */ - Target = min(Target, 256); + else if (MiMemoryConsumers[Consumer].PagesUsed > MiMemoryConsumers[Consumer].PagesTarget) + { + /* Consumer page limit exceeded */ + Target = max(Target, MiMemoryConsumers[Consumer].PagesUsed - MiMemoryConsumers[Consumer].PagesTarget); + } if (Target) { @@ -265,8 +264,7 @@ VOID NTAPI MmRebalanceMemoryConsumers(VOID) { - if (MiBalancerThreadHandle != NULL && - !MiIsBalancerThread()) + if (InterlockedCompareExchange(&PageOutThreadActive, 0, 1) == 0) { KeSetEvent(&MiBalancerEvent, IO_NO_INCREMENT, FALSE); } @@ -366,6 +364,9 @@ MiBalancerThread(PVOID Unused) } } while (InitialTarget != 0); + + if (Status == STATUS_WAIT_0) + InterlockedDecrement(&PageOutThreadActive); } else { diff --git a/ntoskrnl/mm/rmap.c b/ntoskrnl/mm/rmap.c index f926afb8471..e40d9554038 100644 --- a/ntoskrnl/mm/rmap.c +++ b/ntoskrnl/mm/rmap.c @@ -68,16 +68,6 @@ GetEntry: while (entry && RMAP_IS_SEGMENT(entry->Address)) entry = entry->Next; - /* See if we are retrying because the page is actively used */ - while (entry && ((entry->Address < Address) || RMAP_IS_SEGMENT(entry->Address))) - entry = entry->Next; - - if (entry && (entry->Address == Address)) - { - while (entry && ((entry->Process <= Process) || RMAP_IS_SEGMENT(entry->Address))) - entry = entry->Next; - } - if (entry == NULL) { MiReleasePfnLock(OldIrql);

3 years, 10 months

[reactos] 92/100: [NTOS:CC] Performance improvements

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41475dfcd71275f2c704c… commit 41475dfcd71275f2c704cc3e8cfbcb8bf35aa242 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jan 28 15:42:12 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:23 2021 +0100 [NTOS:CC] Performance improvements Do not ditch the pages as soon as the section are unmapped Improve MmBalancer "algorithm" (or whatever you call that) Various needed fixes to get this going. --- ntoskrnl/cache/section/newmm.h | 2 - ntoskrnl/include/internal/mm.h | 10 +++ ntoskrnl/mm/balance.c | 197 +++++++++++++++++++++-------------------- ntoskrnl/mm/freelist.c | 9 +- ntoskrnl/mm/i386/page.c | 40 +++++++++ ntoskrnl/mm/rmap.c | 111 ++++++++++++++--------- ntoskrnl/mm/section.c | 137 +++++++++++++++++----------- 7 files changed, 309 insertions(+), 197 deletions(-) diff --git a/ntoskrnl/cache/section/newmm.h b/ntoskrnl/cache/section/newmm.h index 3fb731c6ace..2efcd9cf7d5 100644 --- a/ntoskrnl/cache/section/newmm.h +++ b/ntoskrnl/cache/section/newmm.h @@ -5,8 +5,6 @@ /* TYPES *********************************************************************/ #define MM_SEGMENT_FINALIZE (0x40000000) -#define RMAP_SEGMENT_MASK ~((ULONG_PTR)0xff) -#define RMAP_IS_SEGMENT(x) (((ULONG_PTR)(x) & RMAP_SEGMENT_MASK) == RMAP_SEGMENT_MASK) #define MIN(x,y) (((x)<(y))?(x):(y)) #define MAX(x,y) (((x)>(y))?(x):(y)) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 86ed4dfb23a..0243ac55177 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -830,6 +830,8 @@ NTAPI MmRebalanceMemoryConsumers(VOID); /* rmap.c **************************************************************/ +#define RMAP_SEGMENT_MASK ~((ULONG_PTR)0xff) +#define RMAP_IS_SEGMENT(x) (((ULONG_PTR)(x) & RMAP_SEGMENT_MASK) == RMAP_SEGMENT_MASK) VOID NTAPI @@ -1189,6 +1191,14 @@ MmIsDirtyPage( PVOID Address ); +VOID +NTAPI +MmClearPageAccessedBit(PEPROCESS Process, PVOID Address); + +BOOLEAN +NTAPI +MmIsPageAccessed(PEPROCESS Process, PVOID Address); + /* wset.c ********************************************************************/ NTSTATUS diff --git a/ntoskrnl/mm/balance.c b/ntoskrnl/mm/balance.c index f9067c58a13..04231e86951 100644 --- a/ntoskrnl/mm/balance.c +++ b/ntoskrnl/mm/balance.c @@ -113,14 +113,13 @@ MiTrimMemoryConsumer(ULONG Consumer, ULONG InitialTarget) Target = (ULONG)max(Target, MiMinimumAvailablePages - MmAvailablePages); } - /* Don't be too greedy if we're not in a hurry */ - if (MmAvailablePages > MiMinimumAvailablePages) - Target = min(Target, 256); + /* Don't be too greedy in one run */ + Target = min(Target, 256); if (Target) { /* Now swap the pages out */ - Status = MiMemoryConsumers[Consumer].Trim(Target, 0, &NrFreedPages); + Status = MiMemoryConsumers[Consumer].Trim(Target, MmAvailablePages < MiMinimumAvailablePages, &NrFreedPages); DPRINT("Trimming consumer %lu: Freed %lu pages with a target of %lu pages\n", Consumer, NrFreedPages, Target); @@ -142,15 +141,104 @@ MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages) (*NrFreedPages) = 0; + DPRINT1("MM BALANCER: %s\n", Priority ? "Paging out!" : "Removing access bit!"); + CurrentPage = MmGetLRUFirstUserPage(); while (CurrentPage != 0 && Target > 0) { - Status = MmPageOutPhysicalAddress(CurrentPage); - if (NT_SUCCESS(Status)) + if (Priority) + { + Status = MmPageOutPhysicalAddress(CurrentPage); + if (NT_SUCCESS(Status)) + { + DPRINT("Succeeded\n"); + Target--; + (*NrFreedPages)++; + } + } + else { - DPRINT("Succeeded\n"); + /* When not paging-out agressively, just reset the accessed bit */ + PEPROCESS Process = NULL; + PVOID Address = NULL; + BOOLEAN Accessed = FALSE; + + /* + * We have a lock-ordering problem here. We cant lock the PFN DB before the Process address space. + * So we must use circonvoluted loops. + * Well... + */ + while (TRUE) + { + KAPC_STATE ApcState; + KIRQL OldIrql = MiAcquirePfnLock(); + PMM_RMAP_ENTRY Entry = MmGetRmapListHeadPage(CurrentPage); + while (Entry) + { + if (RMAP_IS_SEGMENT(Entry->Address)) + { + Entry = Entry->Next; + continue; + } + + /* Check that we didn't treat this entry before */ + if (Entry->Address < Address) + { + Entry = Entry->Next; + continue; + } + + if ((Entry->Address == Address) && (Entry->Process <= Process)) + { + Entry = Entry->Next; + continue; + } + + break; + } + + if (!Entry) + { + MiReleasePfnLock(OldIrql); + break; + } + + Process = Entry->Process; + Address = Entry->Address; + + MiReleasePfnLock(OldIrql); + + KeStackAttachProcess(&Process->Pcb, &ApcState); + + MmLockAddressSpace(&Process->Vm); + + /* Be sure this is still valid. */ + PMMPTE Pte = MiAddressToPte(Address); + if (Pte->u.Hard.Valid) + { + Accessed = Accessed || Pte->u.Hard.Accessed; + Pte->u.Hard.Accessed = 0; + + /* There is no need to invalidate, the balancer thread is never on a user process */ + //KeInvalidateTlbEntry(Address); + } + + MmUnlockAddressSpace(&Process->Vm); + + KeUnstackDetachProcess(&ApcState); + } + + if (!Accessed) + { + /* Nobody accessed this page since the last time we check. Time to clean up */ + + Status = MmPageOutPhysicalAddress(CurrentPage); + // DPRINT1("Paged-out one page: %s\n", NT_SUCCESS(Status) ? "Yes" : "No"); + (void)Status; + } + + /* Done for this page. */ Target--; - (*NrFreedPages)++; } CurrentPage = MmGetLRUNextUserPage(CurrentPage, TRUE); @@ -189,78 +277,10 @@ NTAPI MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, PPFN_NUMBER AllocatedPage) { - ULONG PagesUsed; PFN_NUMBER Page; - /* - * Make sure we don't exceed our individual target. - */ - PagesUsed = InterlockedIncrementUL(&MiMemoryConsumers[Consumer].PagesUsed); - if (PagesUsed > MiMemoryConsumers[Consumer].PagesTarget && - !MiIsBalancerThread()) - { - MmRebalanceMemoryConsumers(); - } - - /* - * Allocate always memory for the non paged pool and for the pager thread. - */ - if (Consumer == MC_SYSTEM) - { - Page = MmAllocPage(Consumer); - if (Page == 0) - { - KeBugCheck(NO_PAGES_AVAILABLE); - } - *AllocatedPage = Page; - if (MmAvailablePages < MiMinimumAvailablePages) - MmRebalanceMemoryConsumers(); - return(STATUS_SUCCESS); - } - - /* - * Make sure we don't exceed global targets. - */ - if (((MmAvailablePages < MiMinimumAvailablePages) && !MiIsBalancerThread()) - || (MmAvailablePages < (MiMinimumAvailablePages / 2))) - { - MM_ALLOCATION_REQUEST Request; - - if (!CanWait) - { - (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); - MmRebalanceMemoryConsumers(); - return(STATUS_NO_MEMORY); - } - - /* Insert an allocation request. */ - Request.Page = 0; - KeInitializeEvent(&Request.Event, NotificationEvent, FALSE); - - ExInterlockedInsertTailList(&AllocationListHead, &Request.ListEntry, &AllocationListLock); - MmRebalanceMemoryConsumers(); - - KeWaitForSingleObject(&Request.Event, - 0, - KernelMode, - FALSE, - NULL); - - Page = Request.Page; - if (Page == 0) - { - KeBugCheck(NO_PAGES_AVAILABLE); - } - - *AllocatedPage = Page; - - if (MmAvailablePages < MiMinimumAvailablePages) - { - MmRebalanceMemoryConsumers(); - } - - return(STATUS_SUCCESS); - } + /* Update the target */ + InterlockedIncrementUL(&MiMemoryConsumers[Consumer].PagesUsed); /* * Actually allocate the page. @@ -272,11 +292,6 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, } *AllocatedPage = Page; - if (MmAvailablePages < MiMinimumAvailablePages) - { - MmRebalanceMemoryConsumers(); - } - return(STATUS_SUCCESS); } @@ -407,22 +422,14 @@ MiInitBalancerThread(VOID) { KPRIORITY Priority; NTSTATUS Status; -#if !defined(__GNUC__) - - LARGE_INTEGER dummyJunkNeeded; - dummyJunkNeeded.QuadPart = -20000000; /* 2 sec */ - ; -#endif - + LARGE_INTEGER Timeout; KeInitializeEvent(&MiBalancerEvent, SynchronizationEvent, FALSE); KeInitializeTimerEx(&MiBalancerTimer, SynchronizationTimer); + + Timeout.QuadPart = -20000000; /* 2 sec */ KeSetTimerEx(&MiBalancerTimer, -#if defined(__GNUC__) - (LARGE_INTEGER)(LONGLONG)-20000000LL, /* 2 sec */ -#else - dummyJunkNeeded, -#endif + Timeout, 2000, /* 2 sec */ NULL); diff --git a/ntoskrnl/mm/freelist.c b/ntoskrnl/mm/freelist.c index 35c6336dcc6..4aa15a12582 100644 --- a/ntoskrnl/mm/freelist.c +++ b/ntoskrnl/mm/freelist.c @@ -139,7 +139,7 @@ MmGetLRUNextUserPage(PFN_NUMBER PreviousPage, BOOLEAN MoveToLast) * If it's not, then it means it is still hanging in some process address space. * This avoids paging-out e.g. ntdll early just because it's mapped first time. */ - if (MoveToLast) + if ((MoveToLast) && (MmGetReferenceCountPage(PreviousPage) > 1)) { MmRemoveLRUUserPage(PreviousPage); MmInsertLRULastUserPage(PreviousPage); @@ -424,10 +424,11 @@ VOID NTAPI MmSetRmapListHeadPage(PFN_NUMBER Pfn, PMM_RMAP_ENTRY ListHead) { - KIRQL oldIrql; PMMPFN Pfn1; - oldIrql = MiAcquirePfnLock(); + /* PFN database must be locked */ + MI_ASSERT_PFN_LOCK_HELD(); + Pfn1 = MiGetPfnEntry(Pfn); ASSERT(Pfn1); ASSERT_IS_ROS_PFN(Pfn1); @@ -450,8 +451,6 @@ MmSetRmapListHeadPage(PFN_NUMBER Pfn, PMM_RMAP_ENTRY ListHead) /* ReactOS semantics will now release the page, which will make it free and enter a colored list */ } - - MiReleasePfnLock(oldIrql); } PMM_RMAP_ENTRY diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index bcc2be911b1..b541b5d4752 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -585,6 +585,46 @@ MmSetDirtyPage(PEPROCESS Process, PVOID Address) } } +VOID +NTAPI +MmClearPageAccessedBit(PEPROCESS Process, PVOID Address) +{ + PULONG Pt; + LONG Pte; + KIRQL OldIrql; + + if (Address < MmSystemRangeStart && Process == NULL) + { + DPRINT1("MmClearPageAccessedBit is called for user space without a process.\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + + Pt = MmGetPageTableForProcess(Process, Address, FALSE, &OldIrql); + if (Pt == NULL) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + + do + { + Pte = *Pt; + } while (Pte != InterlockedCompareExchangePte(Pt, Pte & ~PA_ACCESSED, Pte)); + + if (!(Pte & PA_PRESENT)) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + + MiFlushTlb(Pt, Address, OldIrql); +} + +BOOLEAN +NTAPI +MmIsPageAccessed(PEPROCESS Process, PVOID Address) +{ + return BooleanFlagOn(MmGetPageEntryForProcess(Process, Address), PA_ACCESSED); +} + BOOLEAN NTAPI MmIsPagePresent(PEPROCESS Process, PVOID Address) diff --git a/ntoskrnl/mm/rmap.c b/ntoskrnl/mm/rmap.c index 5b7ffe3a3da..f926afb8471 100644 --- a/ntoskrnl/mm/rmap.c +++ b/ntoskrnl/mm/rmap.c @@ -53,13 +53,14 @@ MmPageOutPhysicalAddress(PFN_NUMBER Page) PMM_RMAP_ENTRY entry; PMEMORY_AREA MemoryArea; PMMSUPPORT AddressSpace; - PVOID Address; - PEPROCESS Process; + PVOID Address = NULL; + PEPROCESS Process = NULL; NTSTATUS Status = STATUS_SUCCESS; PMM_SECTION_SEGMENT Segment; LARGE_INTEGER SegmentOffset; KIRQL OldIrql; +GetEntry: OldIrql = MiAcquirePfnLock(); entry = MmGetRmapListHeadPage(Page); @@ -67,6 +68,16 @@ MmPageOutPhysicalAddress(PFN_NUMBER Page) while (entry && RMAP_IS_SEGMENT(entry->Address)) entry = entry->Next; + /* See if we are retrying because the page is actively used */ + while (entry && ((entry->Address < Address) || RMAP_IS_SEGMENT(entry->Address))) + entry = entry->Next; + + if (entry && (entry->Address == Address)) + { + while (entry && ((entry->Process <= Process) || RMAP_IS_SEGMENT(entry->Address))) + entry = entry->Next; + } + if (entry == NULL) { MiReleasePfnLock(OldIrql); @@ -81,41 +92,42 @@ MmPageOutPhysicalAddress(PFN_NUMBER Page) KeBugCheck(MEMORY_MANAGEMENT); } - if (Address < MmSystemRangeStart) - { - if (!ExAcquireRundownProtection(&Process->RundownProtect)) - { - MiReleasePfnLock(OldIrql); - return STATUS_PROCESS_IS_TERMINATING; - } + /* This is for user-mode address only */ + ASSERT(Address < MmSystemRangeStart); - Status = ObReferenceObjectByPointer(Process, PROCESS_ALL_ACCESS, NULL, KernelMode); + if (!ExAcquireRundownProtection(&Process->RundownProtect)) + { MiReleasePfnLock(OldIrql); - if (!NT_SUCCESS(Status)) - { - ExReleaseRundownProtection(&Process->RundownProtect); - return Status; - } - AddressSpace = &Process->Vm; + return STATUS_PROCESS_IS_TERMINATING; } - else + + Status = ObReferenceObjectByPointer(Process, PROCESS_ALL_ACCESS, NULL, KernelMode); + MiReleasePfnLock(OldIrql); + if (!NT_SUCCESS(Status)) { - MiReleasePfnLock(OldIrql); - AddressSpace = MmGetKernelAddressSpace(); + ExReleaseRundownProtection(&Process->RundownProtect); + return Status; } + AddressSpace = &Process->Vm; MmLockAddressSpace(AddressSpace); + if ((MmGetPfnForProcess(Process, Address) != Page) || MmIsPageAccessed(Process, Address)) + { + /* This changed in the short window where we didn't have any locks */ + MmUnlockAddressSpace(AddressSpace); + ExReleaseRundownProtection(&Process->RundownProtect); + ObDereferenceObject(Process); + goto GetEntry; + } + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); if (MemoryArea == NULL || MemoryArea->DeleteInProgress) { MmUnlockAddressSpace(AddressSpace); - if (Address < MmSystemRangeStart) - { - ExReleaseRundownProtection(&Process->RundownProtect); - ObDereferenceObject(Process); - } - return(STATUS_UNSUCCESSFUL); + ExReleaseRundownProtection(&Process->RundownProtect); + ObDereferenceObject(Process); + goto GetEntry; } if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) @@ -269,7 +281,7 @@ MmPageOutPhysicalAddress(PFN_NUMBER Page) MmDeleteRmap(Page, Process, Address); /* One less mapping referencing this segment */ - Released = MmUnsharePageEntrySectionSegment(MemoryArea, Segment, &Offset, Dirty, FALSE, NULL); + Released = MmUnsharePageEntrySectionSegment(MemoryArea, Segment, &Offset, Dirty, TRUE, NULL); MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); @@ -396,11 +408,7 @@ MmInsertRmap(PFN_NUMBER Page, PEPROCESS Process, new_entry->Address = Address; new_entry->Process = (PEPROCESS)Process; #if DBG -#ifdef __GNUC__ - new_entry->Caller = __builtin_return_address(0); -#else new_entry->Caller = _ReturnAddress(); -#endif #endif if ( @@ -417,24 +425,39 @@ MmInsertRmap(PFN_NUMBER Page, PEPROCESS Process, OldIrql = MiAcquirePfnLock(); current_entry = MmGetRmapListHeadPage(Page); - new_entry->Next = current_entry; -#if DBG - while (current_entry) + + PMM_RMAP_ENTRY previous_entry = NULL; + /* Keep the list sorted */ + while (current_entry && (current_entry->Address < Address)) + { + previous_entry = current_entry; + current_entry = current_entry->Next; + } + + /* In case of clash in the address, sort by process */ + if (current_entry && (current_entry->Address == Address)) { - if (current_entry->Address == new_entry->Address && current_entry->Process == new_entry->Process) + while (current_entry && (current_entry->Process < Process)) { - DbgPrint("MmInsertRmap tries to add a second rmap entry for address %p\n current caller ", - current_entry->Address); - DbgPrint("%p", new_entry->Caller); - DbgPrint("\n previous caller "); - DbgPrint("%p", current_entry->Caller); - DbgPrint("\n"); - KeBugCheck(MEMORY_MANAGEMENT); + previous_entry = current_entry; + current_entry = current_entry->Next; } - current_entry = current_entry->Next; } -#endif - MmSetRmapListHeadPage(Page, new_entry); + + if (current_entry && (current_entry->Address == Address) && (current_entry->Process == Process)) + { + DbgPrint("MmInsertRmap tries to add a second rmap entry for address %p\n", current_entry->Address); + DbgPrint(" current caller %p\n", new_entry->Caller); + DbgPrint(" previous caller %p\n", current_entry->Caller); + KeBugCheck(MEMORY_MANAGEMENT); + } + + new_entry->Next = current_entry; + if (previous_entry) + previous_entry->Next = new_entry; + else + MmSetRmapListHeadPage(Page, new_entry); + MiReleasePfnLock(OldIrql); if (!RMAP_IS_SEGMENT(Address)) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index ff7d9438baa..94ea1844d2d 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1091,8 +1091,7 @@ MmUnsharePageEntrySectionSegment(PMEMORY_AREA MemoryArea, { ULONG_PTR Entry = InEntry ? *InEntry : MmGetPageEntrySectionSegment(Segment, Offset); PFN_NUMBER Page = PFN_FROM_SSE(Entry); - ULONG_PTR NewEntry = 0; - SWAPENTRY SwapEntry; + BOOLEAN IsDataMap = BooleanFlagOn(*Segment->Flags, MM_DATAFILE_SEGMENT); if (Entry == 0) { @@ -1111,64 +1110,53 @@ MmUnsharePageEntrySectionSegment(PMEMORY_AREA MemoryArea, Entry = DECREF_SSE(Entry); if (Dirty) Entry = DIRTY_SSE(Entry); - if (SHARE_COUNT_FROM_SSE(Entry) > 0) + /* If we are paging-out, pruning the page for real will be taken care of in MmCheckDirtySegment */ + if ((SHARE_COUNT_FROM_SSE(Entry) > 0) || PageOut) { /* Update the page mapping in the segment and we're done */ - if (InEntry) - *InEntry = Entry; - else - MmSetPageEntrySectionSegment(Segment, Offset, Entry); + MmSetPageEntrySectionSegment(Segment, Offset, Entry); return FALSE; } - if (IS_DIRTY_SSE(Entry) && (MemoryArea->VadNode.u.VadFlags.VadType != VadImageMap)) - { - ASSERT(!Segment->WriteCopy); - ASSERT(MmGetSavedSwapEntryPage(Page) == 0); + /* We are pruning the last mapping on this page. See if we can keep it a bit more. */ + ASSERT(!PageOut); - /* The entry must be written back to the disk, so let this in the segment, the page-out thread will take care of this */ + if (IsDataMap) + { + /* We can always keep memory in for data maps */ MmSetPageEntrySectionSegment(Segment, Offset, Entry); return FALSE; } - /* Only valid case for shared dirty pages is shared image section */ - ASSERT(!IS_DIRTY_SSE(Entry) || (Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)); - - SwapEntry = MmGetSavedSwapEntryPage(Page); - if (IS_DIRTY_SSE(Entry) && !SwapEntry) + if (!BooleanFlagOn(Segment->Image.Characteristics, IMAGE_SCN_MEM_SHARED)) { - SwapEntry = MmAllocSwapPage(); - if (!SwapEntry) - { - /* We can't have a swap entry for this page. Let the segment keep it */ - MmSetPageEntrySectionSegment(Segment, Offset, Entry); - return FALSE; - } + /* So this must have been a read-only page. Keep it ! */ + ASSERT(Segment->WriteCopy); + ASSERT(!IS_DIRTY_SSE(Entry)); + ASSERT(MmGetSavedSwapEntryPage(Page) == 0); + MmSetPageEntrySectionSegment(Segment, Offset, Entry); + return FALSE; } - if (IS_DIRTY_SSE(Entry)) + /* + * So this is a page for a shared section of a DLL. + * We can keep it if it is not dirty. + */ + SWAPENTRY SwapEntry = MmGetSavedSwapEntryPage(Page); + if ((SwapEntry == 0) && !IS_DIRTY_SSE(Entry)) { - NTSTATUS Status = MmWriteToSwapPage(SwapEntry, Page); - if (!NT_SUCCESS(Status)) - { - /* We failed. Clean up */ - MmSetSavedSwapEntryPage(Page, 0); - MmFreeSwapPage(SwapEntry); - MmSetPageEntrySectionSegment(Segment, Offset, Entry); - return FALSE; - } + MmSetPageEntrySectionSegment(Segment, Offset, Entry); + return FALSE; } + /* No more processes are referencing this shared dirty page. Ditch it. */ if (SwapEntry) { - NewEntry = MAKE_SWAP_SSE(SwapEntry); MmSetSavedSwapEntryPage(Page, 0); + MmFreeSwapPage(SwapEntry); } - - /* We can let this go */ - MmSetPageEntrySectionSegment(Segment, Offset, NewEntry); + MmSetPageEntrySectionSegment(Segment, Offset, 0); MmReleasePageMemoryConsumer(MC_USER, Page); - MiSetPageEvent(NULL, NULL); return TRUE; } @@ -4849,9 +4837,12 @@ MmCheckDirtySegment( { BOOLEAN DirtyAgain; - /* We got a dirty entry. Is this segment copy on write */ + /* + * We got a dirty entry. This path is for the shared data, + * be-it regular file maps or shared sections of DLLs + */ ASSERT(!Segment->WriteCopy); - ASSERT(Segment->SegFlags & MM_DATAFILE_SEGMENT); + ASSERT(FlagOn(*Segment->Flags, MM_DATAFILE_SEGMENT) || FlagOn(Segment->Image.Characteristics, IMAGE_SCN_MEM_SHARED)); /* Insert the cleaned entry back. Mark it as write in progress, and clear the dirty bit. */ Entry = MAKE_SSE(PAGE_FROM_SSE(Entry), SHARE_COUNT_FROM_SSE(Entry) + 1); @@ -4863,17 +4854,52 @@ MmCheckDirtySegment( MmUnlockSectionSegment(Segment); - /* Tell the FS driver who we are */ - if (PageOut) - IoSetTopLevelIrp((PIRP)FSRTL_MOD_WRITE_TOP_LEVEL_IRP); + if (FlagOn(*Segment->Flags, MM_DATAFILE_SEGMENT)) + { + /* We have to write it back to the file. Tell the FS driver who we are */ + if (PageOut) + IoSetTopLevelIrp((PIRP)FSRTL_MOD_WRITE_TOP_LEVEL_IRP); + + /* Go ahead and write the page */ + DPRINT("Writing page at offset %I64d for file %wZ, Pageout: %s\n", + Offset->QuadPart, &Segment->FileObject->FileName, PageOut ? "TRUE" : "FALSE"); + Status = MiWritePage(Segment, Offset->QuadPart, Page); - /* Go ahead and write the page */ - DPRINT("Writing page at offset %I64d for file %wZ, Pageout: %s\n", - Offset->QuadPart, &Segment->FileObject->FileName, PageOut ? "TRUE" : "FALSE"); - Status = MiWritePage(Segment, Offset->QuadPart, Page); + if (PageOut) + IoSetTopLevelIrp(NULL); + } + else + { + /* This must only be called by the page-out path */ + ASSERT(PageOut); - if (PageOut) - IoSetTopLevelIrp(NULL); + /* And this must be for a shared section in a DLL */ + ASSERT(Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED); + + SWAPENTRY SwapEntry = MmGetSavedSwapEntryPage(Page); + if (!SwapEntry) + { + SwapEntry = MmAllocSwapPage(); + } + + if (SwapEntry) + { + Status = MmWriteToSwapPage(SwapEntry, Page); + if (NT_SUCCESS(Status)) + { + MmSetSavedSwapEntryPage(Page, SwapEntry); + } + else + { + MmFreeSwapPage(SwapEntry); + } + } + else + { + DPRINT1("Failed to allocate a swap page!\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } MmLockSectionSegment(Segment); @@ -4905,8 +4931,17 @@ MmCheckDirtySegment( /* Were this page hanging there just for the sake of being present ? */ if (!IS_DIRTY_SSE(Entry) && (SHARE_COUNT_FROM_SSE(Entry) == 0) && PageOut) { + ULONG_PTR NewEntry = 0; + /* Restore the swap entry here */ + if (!FlagOn(*Segment->Flags, MM_DATAFILE_SEGMENT)) + { + SWAPENTRY SwapEntry = MmGetSavedSwapEntryPage(Page); + if (SwapEntry) + NewEntry = MAKE_SWAP_SSE(SwapEntry); + } + /* Yes. Release it */ - MmSetPageEntrySectionSegment(Segment, Offset, 0); + MmSetPageEntrySectionSegment(Segment, Offset, NewEntry); MmReleasePageMemoryConsumer(MC_USER, Page); /* Tell the caller we released the page */ return TRUE;

3 years, 10 months

[reactos] 91/100: [NTOS:CC] Fix a bug

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fbf90d6fdc6c297bb6b8… commit 7fbf90d6fdc6c297bb6b8497330a4d692e2ccf1f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jan 28 15:41:28 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:23 2021 +0100 [NTOS:CC] Fix a bug --- ntoskrnl/cc/pin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 07bfd63241c..af7b3aa71a8 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -301,7 +301,7 @@ CcpPinData( { CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", SharedCacheMap->FileObject, FileOffset, Length, Flags); - CcUnpinData(NewBcb); + CcUnpinData(&NewBcb->PFCB); return FALSE; } }

3 years, 10 months

[reactos] 90/100: [NTOS:MM] Unconditionally purge cache on image section creation.

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea354c4bc70cb7ee9302c… commit ea354c4bc70cb7ee9302cfdd6a2c780b29639af8 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Jan 27 17:02:43 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:23 2021 +0100 [NTOS:MM] Unconditionally purge cache on image section creation. --- ntoskrnl/mm/section.c | 60 ++++++--------------------------------------------- 1 file changed, 6 insertions(+), 54 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 8515820e116..ff7d9438baa 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -2470,20 +2470,6 @@ ExeFmtpAllocateSegments(IN ULONG NrSegments) return Segments; } - -static NTSTATUS -MmMapViewOfSegment(PMMSUPPORT AddressSpace, - BOOLEAN AsImage, - PMM_SECTION_SEGMENT Segment, - PVOID* BaseAddress, - SIZE_T ViewSize, - ULONG Protect, - LONGLONG ViewOffset, - ULONG AllocationType); -static NTSTATUS -MmUnmapViewOfSegment(PMMSUPPORT AddressSpace, - PVOID BaseAddress); - static NTSTATUS NTAPI @@ -2538,45 +2524,14 @@ ExeFmtpReadFile(IN PVOID File, return STATUS_INSUFFICIENT_RESOURCES; } - if (FileObject->SectionObjectPointer->DataSectionObject) - { - PVOID SegmentMap = NULL; - - /* Get the data from the file mapping instead */ - MmLockAddressSpace(MmGetKernelAddressSpace()); - Status = MmMapViewOfSegment(MmGetKernelAddressSpace(), - FALSE, - FileObject->SectionObjectPointer->DataSectionObject, - &SegmentMap, - BufferSize, - PAGE_READONLY, - FileOffset.QuadPart, - 0); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - - if (!NT_SUCCESS(Status)) - return Status; - - RtlCopyMemory(Buffer, SegmentMap, BufferSize); - UsedSize = BufferSize; - - MmLockAddressSpace(MmGetKernelAddressSpace()); + Status = MiSimpleRead(FileObject, &FileOffset, Buffer, BufferSize, TRUE, &Iosb); - MmUnmapViewOfSegment(MmGetKernelAddressSpace(), SegmentMap); + UsedSize = (ULONG)Iosb.Information; - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - } - else + if(NT_SUCCESS(Status) && UsedSize < OffsetAdjustment) { - Status = MiSimpleRead(FileObject, &FileOffset, Buffer, BufferSize, TRUE, &Iosb); - - UsedSize = (ULONG)Iosb.Information; - - if(NT_SUCCESS(Status) && UsedSize < OffsetAdjustment) - { - Status = STATUS_IN_PAGE_ERROR; - ASSERT(!NT_SUCCESS(Status)); - } + Status = STATUS_IN_PAGE_ERROR; + ASSERT(!NT_SUCCESS(Status)); } if(NT_SUCCESS(Status)) @@ -3175,10 +3130,7 @@ MmCreateImageSection(PSECTION *SectionObject, MiReleasePfnLock(OldIrql); /* Purge the cache */ - if (CcIsFileCached(FileObject)) - { - CcFlushCache(FileObject->SectionObjectPointer, NULL, 0, NULL); - } + CcFlushCache(FileObject->SectionObjectPointer, NULL, 0, NULL); StatusExeFmt = ExeFmtpCreateImageSection(FileObject, ImageSectionObject);

3 years, 10 months

[reactos] 89/100: [NTOS:MM] Keep a ref on the segment when mapping a page & keep trace of what is the highest offset mapped.

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1c51e31e439240fec454… commit c1c51e31e439240fec4542b002dae925ccfb9e3b Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Jan 27 16:59:37 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:23 2021 +0100 [NTOS:MM] Keep a ref on the segment when mapping a page & keep trace of what is the highest offset mapped. --- ntoskrnl/cache/section/sptab.c | 23 ++++++++++++++++++++++- ntoskrnl/mm/section.c | 3 --- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/cache/section/sptab.c b/ntoskrnl/cache/section/sptab.c index f0cb3d36c2a..7d960a1ff08 100644 --- a/ntoskrnl/cache/section/sptab.c +++ b/ntoskrnl/cache/section/sptab.c @@ -218,14 +218,35 @@ _MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, } else { - /* We're switching to a valid entry from an invalid one. Add the Rmap */ + /* + * We're switching to a valid entry from an invalid one. + * Add the Rmap and take a ref on the segment. + */ MmSetSectionAssociation(PFN_FROM_SSE(Entry), Segment, Offset); + InterlockedIncrement64(Segment->ReferenceCount); + + if ((Offset->QuadPart > (Segment->LastPage << PAGE_SHIFT)) || !Segment->LastPage) + Segment->LastPage = (Offset->QuadPart >> PAGE_SHIFT) + 1; } } else if (OldEntry && !IS_SWAP_FROM_SSE(OldEntry)) { /* We're switching to an invalid entry from a valid one */ MmDeleteSectionAssociation(PFN_FROM_SSE(OldEntry)); + MmDereferenceSegment(Segment); + + if (Offset->QuadPart == ((Segment->LastPage - 1ULL) << PAGE_SHIFT)) + { + /* We are unsetting the last page */ + while (--Segment->LastPage) + { + LARGE_INTEGER CheckOffset; + CheckOffset.QuadPart = (Segment->LastPage - 1) << PAGE_SHIFT; + ULONG_PTR Entry = MmGetPageEntrySectionSegment(Segment, &CheckOffset); + if ((Entry != 0) && !IS_SWAP_FROM_SSE(Entry)) + break; + } + } } PageTable->PageEntries[PageIndex] = Entry; diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 16767458bce..8515820e116 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -4113,9 +4113,6 @@ MmCanFileBeTruncated (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, return Ret; } - - - /* * @implemented */

3 years, 10 months

[reactos] 88/100: [NTOS:MM] Improve MmCanFileBeTruncated

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91a4e62376d1dbd5d7e15… commit 91a4e62376d1dbd5d7e155f2a86bb4b468649a24 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Jan 27 16:28:45 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:23 2021 +0100 [NTOS:MM] Improve MmCanFileBeTruncated --- ntoskrnl/mm/section.c | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 524b282f606..16767458bce 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -4077,54 +4077,36 @@ BOOLEAN NTAPI MmCanFileBeTruncated (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, IN PLARGE_INTEGER NewFileSize) { - KIRQL OldIrql = MiAcquirePfnLock(); BOOLEAN Ret; PMM_SECTION_SEGMENT Segment; -CheckSectionPointer: /* Check whether an ImageSectionObject exists */ if (SectionObjectPointer->ImageSectionObject != NULL) { DPRINT1("ERROR: File can't be truncated because it has an image section\n"); - MiReleasePfnLock(OldIrql); - return FALSE; } - Segment = (PMM_SECTION_SEGMENT)SectionObjectPointer->DataSectionObject; - /* Wait for it to be created/deleted properly */ - while (Segment && (Segment->SegFlags & (MM_SEGMENT_INCREATE | MM_SEGMENT_INDELETE))) + Segment = MiGrabDataSection(SectionObjectPointer); + if (!Segment) { - LARGE_INTEGER ShortTime; - - ShortTime.QuadPart = -10 * 100 * 1000; - - /* Bad luck. Wait a bit for the operation to finish */ - MiReleasePfnLock(OldIrql); - KeDelayExecutionThread(KernelMode, FALSE, &ShortTime); - OldIrql = MiAcquirePfnLock(); - goto CheckSectionPointer; + /* There is no data section. It's fine to do anything. */ + return TRUE; } - if (Segment) + MmLockSectionSegment(Segment); + if ((Segment->SectionCount == 1) && (SectionObjectPointer->SharedCacheMap != NULL)) { - if ((Segment->SectionCount == 1) && (SectionObjectPointer->SharedCacheMap != NULL)) - { - /* If the cache is the only one holding a reference to the segment, then it's fine to resize */ - Ret = TRUE; - } - else - { - /* We can't shrink, but we can extend */ - Ret = NewFileSize->QuadPart >= Segment->RawLength.QuadPart; - } + /* If the cache is the only one holding a reference to the segment, then it's fine to resize */ + Ret = TRUE; } else { - Ret = TRUE; + /* We can't shrink, but we can extend */ + Ret = NewFileSize->QuadPart >= Segment->RawLength.QuadPart; } - - MiReleasePfnLock(OldIrql); + MmUnlockSectionSegment(Segment); + MmDereferenceSegment(Segment); DPRINT("FIXME: didn't check for outstanding write probes\n");

3 years, 10 months

← Newer
1
...
29
30
31
32
33
34
35
...
44
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 2021