Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 34/100: [NTOS/CC] Be more precise when notifying Mm about dirty pages
by Jérôme Gardou 03 Feb '21

03 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c74cbf0c0bed7ae9831c2… commit c74cbf0c0bed7ae9831c23527931907de55379cc Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Dec 2 12:30:48 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS/CC] Be more precise when notifying Mm about dirty pages --- ntoskrnl/cc/copy.c | 10 ++++++++++ ntoskrnl/cc/pin.c | 5 +++++ ntoskrnl/cc/view.c | 3 --- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 17b7a366d17..f92040aa0b2 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -586,6 +586,11 @@ CcCopyWrite ( Buffer = (PVOID)((ULONG_PTR)Buffer + VacbLength); CurrentOffset += VacbLength; Length -= VacbLength; + + /* Tell Mm */ + Status = MmMakePagesDirty(NULL, Add2Ptr(Vacb->BaseAddress, VacbOffset), VacbLength); + if (!NT_SUCCESS(Status)) + ExRaiseStatus(Status); } _SEH2_FINALLY { @@ -829,6 +834,11 @@ CcZeroData ( WriteOffset.QuadPart += VacbLength; Length -= VacbLength; + + /* Tell Mm */ + Status = MmMakePagesDirty(NULL, Add2Ptr(Vacb->BaseAddress, VacbOffset), VacbLength); + if (!NT_SUCCESS(Status)) + ExRaiseStatus(Status); } _SEH2_FINALLY { diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 189ba480305..0d5642b9932 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -540,6 +540,11 @@ CcSetDirtyPinnedData ( CCTRACE(CC_API_DEBUG, "Bcb=%p Lsn=%p\n", Bcb, Lsn); + /* Tell Mm */ + MmMakePagesDirty(NULL, + Add2Ptr(iBcb->Vacb->BaseAddress, iBcb->PFCB.MappedFileOffset.QuadPart - iBcb->Vacb->FileOffset.QuadPart), + iBcb->PFCB.MappedLength); + if (!iBcb->Vacb->Dirty) { CcRosMarkDirtyVacb(iBcb->Vacb); diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index a14635f2135..0e07eb7f1b6 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -420,9 +420,6 @@ CcRosMarkDirtyVacb ( CcScheduleLazyWriteScan(FALSE); } KeReleaseQueuedSpinLock(LockQueueMasterLock, oldIrql); - - /* Tell Mm */ - MmMakePagesDirty(NULL, Vacb->BaseAddress, Length); } VOID

1 0

[reactos] 33/100: [NTOS:CC] Fix releasing VACB when an exception is raised in CcZeroData & CcCopyWrite
by Jérôme Gardou 03 Feb '21

03 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c295d6b229fc679a38eae… commit c295d6b229fc679a38eaea2f0797b7ffb139478d Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Dec 2 12:28:38 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS:CC] Fix releasing VACB when an exception is raised in CcZeroData & CcCopyWrite --- ntoskrnl/cc/copy.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index ced4271fc9b..17b7a366d17 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -557,8 +557,9 @@ CcCopyWrite ( return FALSE; /* FIXME: Honor FileObject FO_WRITE_THROUGH flag */ + ASSERT((FileOffset->QuadPart + Length) <= SharedCacheMap->SectionSize.QuadPart); - ASSERT((FileOffset->QuadPart + Length) <= SharedCacheMap->FileSize.QuadPart); + ASSERT((FileObject->Flags & FO_WRITE_THROUGH) == 0); CurrentOffset = FileOffset->QuadPart; while(CurrentOffset < WriteEnd) @@ -577,7 +578,6 @@ CcCopyWrite ( { if (!CcRosEnsureVacbResident(Vacb, Wait, FALSE, VacbOffset, VacbLength)) { - CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, FALSE, FALSE); return FALSE; } @@ -589,7 +589,8 @@ CcCopyWrite ( } _SEH2_FINALLY { - CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, TRUE, FALSE); + /* Do not mark the VACB as dirty if an exception was raised */ + CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, !_SEH2_AbnormalTermination(), FALSE); } _SEH2_END; } @@ -821,7 +822,6 @@ CcZeroData ( { if (!CcRosEnsureVacbResident(Vacb, Wait, FALSE, VacbOffset, VacbLength)) { - CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, FALSE, FALSE); return FALSE; } @@ -832,7 +832,8 @@ CcZeroData ( } _SEH2_FINALLY { - CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, TRUE, FALSE); + /* Do not mark the VACB as dirty if an exception was raised */ + CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, !_SEH2_AbnormalTermination(), FALSE); } _SEH2_END; }

1 0

[reactos] 32/100: [NTOS:CC] Rewrite the non-cached path of CcZeroData
by Jérôme Gardou 03 Feb '21

03 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f47f032969cac0eaaf32… commit 7f47f032969cac0eaaf3246a3e0ae9da3008aeb1 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Dec 2 12:27:32 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS:CC] Rewrite the non-cached path of CcZeroData --- ntoskrnl/cc/copy.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 5bb14cc210a..ced4271fc9b 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -759,25 +759,25 @@ CcZeroData ( PMDL Mdl; ULONG i; ULONG CurrentLength; + PPFN_NUMBER PfnArray; - Mdl = _alloca(MmSizeOfMdl(NULL, MAX_ZERO_LENGTH)); + /* Setup our Mdl */ + Mdl = IoAllocateMdl(NULL, min(Length, MAX_ZERO_LENGTH), FALSE, FALSE, NULL); + if (!Mdl) + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); + PfnArray = MmGetMdlPfnArray(Mdl); + for (i = 0; i < BYTES_TO_PAGES(Mdl->ByteCount); i++) + PfnArray[i] = CcZeroPage; + Mdl->MdlFlags |= MDL_PAGES_LOCKED; + + /* Perform the write sequencially */ while (Length > 0) { - if (Length + WriteOffset.QuadPart % PAGE_SIZE > MAX_ZERO_LENGTH) - { - CurrentLength = MAX_ZERO_LENGTH - WriteOffset.QuadPart % PAGE_SIZE; - } - else - { - CurrentLength = Length; - } - MmInitializeMdl(Mdl, (PVOID)(ULONG_PTR)WriteOffset.QuadPart, CurrentLength); - Mdl->MdlFlags |= MDL_PAGES_LOCKED; - for (i = 0; i < ((Mdl->Size - sizeof(MDL)) / sizeof(ULONG)); i++) - { - ((PPFN_NUMBER)(Mdl + 1))[i] = CcZeroPage; - } + CurrentLength = min(Length, MAX_ZERO_LENGTH); + + Mdl->ByteCount = CurrentLength; + KeInitializeEvent(&Event, NotificationEvent, FALSE); Status = IoSynchronousPageWrite(FileObject, Mdl, &WriteOffset, &Event, &Iosb); if (Status == STATUS_PENDING) @@ -791,12 +791,15 @@ CcZeroData ( } if (!NT_SUCCESS(Status)) { - return FALSE; + IoFreeMdl(Mdl); + ExRaiseStatus(Status); } WriteOffset.QuadPart += CurrentLength; Length -= CurrentLength; } + IoFreeMdl(Mdl); + return TRUE; }

1 0

[reactos] 31/100: [NTOS:CC] Remove unused functions
by Jérôme Gardou 03 Feb '21

03 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36e18aab35049f5e4cb36… commit 36e18aab35049f5e4cb36d0751993f9af40e27cd Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Dec 2 12:14:49 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS:CC] Remove unused functions --- ntoskrnl/cc/view.c | 59 ------------------------------------------ ntoskrnl/include/internal/cc.h | 15 ----------- 2 files changed, 74 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index ddbe77e22af..a14635f2135 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -466,65 +466,6 @@ CcRosUnmarkDirtyVacb ( } } -NTSTATUS -NTAPI -CcRosMarkDirtyFile ( - PROS_SHARED_CACHE_MAP SharedCacheMap, - LONGLONG FileOffset) -{ - PROS_VACB Vacb; - - ASSERT(SharedCacheMap); - - DPRINT("CcRosMarkDirtyVacb(SharedCacheMap 0x%p, FileOffset %I64u)\n", - SharedCacheMap, FileOffset); - - Vacb = CcRosLookupVacb(SharedCacheMap, FileOffset); - if (Vacb == NULL) - { - KeBugCheck(CACHE_MANAGER); - } - - CcRosReleaseVacb(SharedCacheMap, Vacb, Vacb->Valid, TRUE, FALSE); - - return STATUS_SUCCESS; -} - -/* - * Note: this is not the contrary function of - * CcRosMapVacbInKernelSpace() - */ -NTSTATUS -NTAPI -CcRosUnmapVacb ( - PROS_SHARED_CACHE_MAP SharedCacheMap, - LONGLONG FileOffset, - BOOLEAN NowDirty) -{ - PROS_VACB Vacb; - - ASSERT(SharedCacheMap); - - DPRINT("CcRosUnmapVacb(SharedCacheMap 0x%p, FileOffset %I64u, NowDirty %u)\n", - SharedCacheMap, FileOffset, NowDirty); - - Vacb = CcRosLookupVacb(SharedCacheMap, FileOffset); - if (Vacb == NULL) - { - return STATUS_UNSUCCESSFUL; - } - - ASSERT(Vacb->MappedCount != 0); - if (InterlockedDecrement((PLONG)&Vacb->MappedCount) == 0) - { - CcRosVacbDecRefCount(Vacb); - } - - CcRosReleaseVacb(SharedCacheMap, Vacb, Vacb->Valid, NowDirty, FALSE); - - return STATUS_SUCCESS; -} - static BOOLEAN CcRosFreeUnusedVacb ( diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 9e186a61d11..862a759ef7a 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -342,14 +342,6 @@ BOOLEAN NTAPI CcInitializeCacheManager(VOID); -NTSTATUS -NTAPI -CcRosUnmapVacb( - PROS_SHARED_CACHE_MAP SharedCacheMap, - LONGLONG FileOffset, - BOOLEAN NowDirty -); - PROS_VACB NTAPI CcRosLookupVacb( @@ -361,13 +353,6 @@ VOID NTAPI CcInitCacheZeroPage(VOID); -NTSTATUS -NTAPI -CcRosMarkDirtyFile( - PROS_SHARED_CACHE_MAP SharedCacheMap, - LONGLONG FileOffset -); - VOID NTAPI CcRosMarkDirtyVacb(

1 0

[reactos] 30/100: [NTOS/MM] Force flushing when the page is dirtified in user mode
by Jérôme Gardou 03 Feb '21

03 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7dab3583cc4c80304df61… commit 7dab3583cc4c80304df61658fe4b1eeea8983f5e Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Dec 2 12:12:11 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS/MM] Force flushing when the page is dirtified in user mode --- ntoskrnl/mm/section.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index f3b30dedaed..6dcf764d7a1 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -4620,7 +4620,7 @@ MmRosFlushVirtualMemory( if (Entry != 0) { /* This will write the page to disk, if needed */ - MmCheckDirtySegment(Segment, &SegmentOffset, MmIsDirtyPage(Process, CurrentAddress), FALSE); + MmCheckDirtySegment(Segment, &SegmentOffset, Process ? MmIsDirtyPage(Process, CurrentAddress) : FALSE, FALSE); Iosb->Information += PAGE_SIZE; } SegmentOffset.QuadPart += PAGE_SIZE; @@ -4694,7 +4694,10 @@ MmCheckDirtySegment( /* Drop the reference we got */ Entry = MAKE_SSE(Page << PAGE_SHIFT, SHARE_COUNT_FROM_SSE(Entry) - 1); - if (DirtyAgain) Entry = DIRTY_SSE(Entry); + if (DirtyAgain) + { + Entry = DIRTY_SSE(Entry); + } MmSetPageEntrySectionSegment(Segment, Offset, Entry); }

1 0

[reactos] 29/100: [NTOS:MM] Do not limit ourselves in reading or writing the file
by Jérôme Gardou 03 Feb '21

03 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91edefa11e4d7230155dc… commit 91edefa11e4d7230155dcaafe052a6fd10d7dd57 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Dec 2 11:40:25 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS:MM] Do not limit ourselves in reading or writing the file --- ntoskrnl/mm/section.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 8df9b99cfb8..f3b30dedaed 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -214,16 +214,9 @@ MiWritePage(PMM_SECTION_SEGMENT Segment, PMDL Mdl = (PMDL)MdlBase; PFILE_OBJECT FileObject = Segment->FileObject; LARGE_INTEGER FileOffset; - PFSRTL_COMMON_FCB_HEADER Fcb = FileObject->FsContext; FileOffset.QuadPart = Segment->Image.FileOffset + SegOffset; - /* Check if we are not writing off-limit */ - if (FileOffset.QuadPart >= Fcb->AllocationSize.QuadPart) - { - return STATUS_SUCCESS; - } - RtlZeroMemory(MdlBase, sizeof(MdlBase)); MmInitializeMdl(Mdl, NULL, PAGE_SIZE); MmBuildMdlFromPages(Mdl, &Page); @@ -1179,18 +1172,15 @@ MiReadPage(PMEMORY_AREA MemoryArea, PMDL Mdl = (PMDL)MdlBase; PFILE_OBJECT FileObject = MemoryArea->SectionData.Segment->FileObject; LARGE_INTEGER FileOffset; - PFSRTL_COMMON_FCB_HEADER Fcb = FileObject->FsContext; FileOffset.QuadPart = MemoryArea->SectionData.Segment->Image.FileOffset + SegOffset; + DPRINT("Reading file at offset %08x:%08x\n", FileOffset.HighPart, FileOffset.LowPart); + Status = MmRequestPageMemoryConsumer(MC_USER, FALSE, Page); if (!NT_SUCCESS(Status)) return Status; - /* Check if we are beyond the file */ - if (FileOffset.QuadPart > Fcb->FileSize.QuadPart) - return STATUS_SUCCESS; - RtlZeroMemory(MdlBase, sizeof(MdlBase)); MmInitializeMdl(Mdl, NULL, PAGE_SIZE); MmBuildMdlFromPages(Mdl, Page); @@ -1204,6 +1194,7 @@ MiReadPage(PMEMORY_AREA MemoryArea, KeWaitForSingleObject(&Event, WrPageIn, KernelMode, FALSE, NULL); Status = IoStatus.Status; } + if (Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) { MmUnmapLockedPages (Mdl->MappedSystemVa, Mdl); @@ -4539,6 +4530,7 @@ MmMakePagesResident( 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); if (!NT_SUCCESS(Status)) {

1 0

[reactos] 28/100: [FASTFAT_NEW] Enable the driver
by Jérôme Gardou 03 Feb '21

03 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c05f3d8d1ce5641f1768e… commit c05f3d8d1ce5641f1768ecd775a375a34e368cf9 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Dec 2 11:17:59 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [FASTFAT_NEW] Enable the driver --- drivers/filesystems/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/filesystems/CMakeLists.txt b/drivers/filesystems/CMakeLists.txt index 7485d433b5a..3d5277dfa74 100644 --- a/drivers/filesystems/CMakeLists.txt +++ b/drivers/filesystems/CMakeLists.txt @@ -2,7 +2,8 @@ add_subdirectory(btrfs) add_subdirectory(cdfs) add_subdirectory(ext2) -add_subdirectory(fastfat) +#add_subdirectory(fastfat) +add_subdirectory(fastfat_new) add_subdirectory(ffs) add_subdirectory(fs_rec) add_subdirectory(msfs)

1 0

[reactos] 27/100: [NTOS/MM] Misc fixes
by Jérôme Gardou 03 Feb '21

03 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=774a4c703fdf241333906… commit 774a4c703fdf2413339064422f39ef2dbfd88fcc Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Nov 24 14:07:06 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS/MM] Misc fixes Purge data section object before creating an image mapping Zero-out the tail of the page after reading from file Properly map page as read-only when paging-in a COW memory map. --- ntoskrnl/mm/section.c | 92 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 24 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index f108533ed2e..8df9b99cfb8 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1214,6 +1214,18 @@ MiReadPage(PMEMORY_AREA MemoryArea, Status = STATUS_SUCCESS; } + if ((SegOffset + PAGE_SIZE) > MemoryArea->SectionData.Segment->RawLength.QuadPart) + { + KIRQL OldIrql; + PUCHAR PageMap; + + /* 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); + } + return Status; } @@ -1448,32 +1460,24 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, { SWAPENTRY DummyEntry; - /* - * Is it a wait entry? - */ - if (HasSwapEntry) + MmGetPageFileMapping(Process, Address, &SwapEntry); + if (SwapEntry == MM_WAIT_ENTRY) { - MmGetPageFileMapping(Process, Address, &SwapEntry); - - if (SwapEntry == MM_WAIT_ENTRY) - { - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - MiWaitForPageEvent(NULL, NULL); - MmLockAddressSpace(AddressSpace); - return STATUS_MM_RESTART_OPERATION; - } - - /* - * Must be private page we have swapped out. - */ - - /* - * Sanity check - */ - MmDeletePageFileMapping(Process, Address, &SwapEntry); + MmUnlockSectionSegment(Segment); + MmUnlockAddressSpace(AddressSpace); + MiWaitForPageEvent(NULL, NULL); + MmLockAddressSpace(AddressSpace); + return STATUS_MM_RESTART_OPERATION; } + /* + * Must be private page we have swapped out. + */ + + /* + * Sanity check + */ + MmDeletePageFileMapping(Process, Address, &SwapEntry); MmUnlockSectionSegment(Segment); /* Tell everyone else we are serving the fault. */ @@ -1709,7 +1713,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, /* Map the page into the process address space */ Status = MmCreateVirtualMapping(Process, PAddress, - Region->Protect, + Attributes, &Page, 1); if (!NT_SUCCESS(Status)) @@ -3096,6 +3100,7 @@ MmCreateImageSection(PSECTION *SectionObject, if (ImageSectionObject == NULL) { NTSTATUS StatusExeFmt; + PMM_SECTION_SEGMENT DataSectionObject; ImageSectionObject = ExAllocatePoolWithTag(NonPagedPool, sizeof(MM_IMAGE_SECTION_OBJECT), TAG_MM_SECTION_SEGMENT); if (ImageSectionObject == NULL) @@ -3112,8 +3117,47 @@ MmCreateImageSection(PSECTION *SectionObject, ImageSectionObject->RefCount = 1; FileObject->SectionObjectPointer->ImageSectionObject = ImageSectionObject; + /* Get a ref on the data section object */ + DataSectionObject = FileObject->SectionObjectPointer->DataSectionObject; + while (DataSectionObject && (DataSectionObject->SegFlags & (MM_SEGMENT_INDELETE | MM_SEGMENT_INCREATE))) + { + LARGE_INTEGER ShortTime; + + MiReleasePfnLock(OldIrql); + + ShortTime.QuadPart = - 10 * 100 * 1000; + KeDelayExecutionThread(KernelMode, FALSE, &ShortTime); + + OldIrql = MiAcquirePfnLock(); + DataSectionObject = FileObject->SectionObjectPointer->DataSectionObject; + ASSERT(DataSectionObject->SegFlags & MM_DATAFILE_SEGMENT); + } + + /* Get a ref on it. */ + if (DataSectionObject) + InterlockedIncrementUL(&DataSectionObject->RefCount); + MiReleasePfnLock(OldIrql); + if (DataSectionObject) + { + if ((DataSectionObject->SectionCount - (FileObject->SectionObjectPointer->SharedCacheMap != NULL)) > 0) + { + /* Someone's got a section opened. Deny creation */ + DPRINT1("Denying image creation for %wZ: Sections opened: %lu.\n", + &FileObject->FileName, DataSectionObject->SectionCount); + InterlockedExchangePointer(&FileObject->SectionObjectPointer->ImageSectionObject, NULL); + ExFreePoolWithTag(ImageSectionObject, TAG_MM_SECTION_SEGMENT); + MmDereferenceSegment(DataSectionObject); + ObDereferenceObject(FileObject); + ObDereferenceObject(Section); + return STATUS_ACCESS_DENIED; + } + + /* Purge the cache. */ + CcPurgeCacheSection(FileObject->SectionObjectPointer, NULL, 0, FALSE); + } + StatusExeFmt = ExeFmtpCreateImageSection(FileObject, ImageSectionObject); if (!NT_SUCCESS(StatusExeFmt))

1 0

[reactos] 26/100: [NTOS/MM] Do not dirtify section pages for system-space maps
by Jérôme Gardou 03 Feb '21

03 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=093333740468ad0af6828… commit 093333740468ad0af68280d53c928ed4bacfeea1 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Nov 18 17:45:47 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS/MM] Do not dirtify section pages for system-space maps Cc does it for itself. --- ntoskrnl/mm/section.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 46bf5cb571d..f108533ed2e 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -3343,8 +3343,12 @@ MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, else { if (Process) + { MmDeleteRmap(Page, Process, Address); - MmUnsharePageEntrySectionSegment(MemoryArea, Segment, &Offset, Dirty, FALSE, NULL); + } + + /* We don't dirtify for System Space Maps. We let Cc manage that */ + MmUnsharePageEntrySectionSegment(MemoryArea, Segment, &Offset, Process ? Dirty : FALSE, FALSE, NULL); } } }

1 0

[reactos] 25/100: [NTOS/MM] Do not error when FS returns STATUS_END_OF_FILE for paged read.
by Jérôme Gardou 03 Feb '21

03 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d440434a8e120067abba5… commit d440434a8e120067abba5630214dd804ba06449f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Nov 18 12:14:41 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS/MM] Do not error when FS returns STATUS_END_OF_FILE for paged read. Also remove a seemingly invalid ASSERT --- ntoskrnl/mm/section.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 6c521522f4f..46bf5cb571d 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1209,6 +1209,11 @@ MiReadPage(PMEMORY_AREA MemoryArea, MmUnmapLockedPages (Mdl->MappedSystemVa, Mdl); } + if (Status == STATUS_END_OF_FILE) + { + Status = STATUS_SUCCESS; + } + return Status; } @@ -2211,7 +2216,7 @@ MmCreateDataFileSection(PSECTION *SectionObject, if (!GotFileHandle) { ASSERT(UMaximumSize != NULL); - ASSERT(UMaximumSize->QuadPart != 0); + // ASSERT(UMaximumSize->QuadPart != 0); MaximumSize = *UMaximumSize; } else

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs