Ros-diffs February 2021

ros-diffs@reactos.org

30 participants
434 discussions

[reactos] 57/100: Fix physical memory section creation

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=543112008aafc40b34fd6… commit 543112008aafc40b34fd68b43baa04645aeaaaf1 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Dec 18 16:53:39 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 Fix physical memory section creation --- ntoskrnl/mm/section.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index b709a50cd8d..b9242c6eade 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -2068,7 +2068,7 @@ MmCreatePhysicalMemorySection(VOID) /* * Create the section mapping physical memory */ - SectionSize.QuadPart = MmNumberOfPhysicalPages * PAGE_SIZE; + SectionSize.QuadPart = MmHighestPhysicalPage * PAGE_SIZE; InitializeObjectAttributes(&Obj, &Name, OBJ_PERMANENT | OBJ_KERNEL_EXCLUSIVE, @@ -2136,6 +2136,7 @@ MmCreatePhysicalMemorySection(VOID) if (!NT_SUCCESS(Status)) { ObDereferenceObject(PhysSection); + return Status; } ObCloseHandle(Handle, KernelMode); @@ -3654,16 +3655,17 @@ NtQuerySection( Sbi.BaseAddress = (PVOID)Section->Address.StartingVpn; Sbi.Attributes = 0; - if (Section->u.Flags.Commit) - Sbi.Attributes |= SEC_COMMIT; - if (Section->u.Flags.Reserve) - Sbi.Attributes |= SEC_RESERVE; if (Section->u.Flags.File) Sbi.Attributes |= SEC_FILE; if (Section->u.Flags.Image) Sbi.Attributes |= SEC_IMAGE; - /* FIXME : Complete/test the list of flags passed back from NtCreateSection */ + /* Those are not set ************* + if (Section->u.Flags.Commit) + Sbi.Attributes |= SEC_COMMIT; + if (Section->u.Flags.Reserve) + Sbi.Attributes |= SEC_RESERVE; + **********************************/ if (Section->u.Flags.Image) { @@ -4005,8 +4007,9 @@ MmMapViewOfSection(IN PVOID SectionObject, { (*ViewSize) = Section->SizeOfSection.QuadPart - ViewOffset; } - else if (((*ViewSize)+ViewOffset) > Section->SizeOfSection.QuadPart) + else if ((ExGetPreviousMode() == UserMode) && (((*ViewSize)+ViewOffset) > Section->SizeOfSection.QuadPart)) { + /* Dubious */ (*ViewSize) = MIN(Section->SizeOfSection.QuadPart - ViewOffset, SIZE_T_MAX - PAGE_SIZE); } @@ -4329,8 +4332,16 @@ MmCreateSection (OUT PVOID * Section, return STATUS_INVALID_PARAMETER_6; } - /* Did the caller pass a handle? */ - if (FileHandle) + /* Did the caller pass a file object ? */ + if (FileObject) + { + /* Reference the object directly */ + ObReferenceObject(FileObject); + + /* We don't create image mappings with file objects */ + AllocationAttributes &= ~SEC_IMAGE; + } + else { /* Reference the file handle to get the object */ Status = ObReferenceObjectByHandle(FileHandle, @@ -4368,11 +4379,6 @@ MmCreateSection (OUT PVOID * Section, DPRINT1("Creating image map with writers open on the file!\n"); #endif } - else - { - /* Reference the object directly */ - ObReferenceObject(FileObject); - } } else {

3 years, 7 months

[reactos] 56/100: Disable CcScheduleReadAhead call

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91f6fa0259cc2a98371b8… commit 91f6fa0259cc2a98371b8644310d47d7fdf79e12 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Dec 18 16:19:45 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 Disable CcScheduleReadAhead call --- ntoskrnl/cc/copy.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 3dd172fa9db..502dfb03ee8 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -556,6 +556,7 @@ CcCopyRead ( IoStatus->Status = STATUS_SUCCESS; IoStatus->Information = ReadLength; +#if 0 /* If that was a successful sync read operation, let's handle read ahead */ if (Length == 0 && Wait) { @@ -576,6 +577,7 @@ CcCopyRead ( PrivateCacheMap->FileOffset2.QuadPart = FileOffset->QuadPart; PrivateCacheMap->BeyondLastByte2.QuadPart = FileOffset->QuadPart + ReadLength; } +#endif return TRUE; }

3 years, 7 months

[reactos] 55/100: [NTOS:CC] Fix some tests, complain where the current implementation won't let us do the right thing

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d97d8d2e15d9db634a21… commit 6d97d8d2e15d9db634a2188d0f17983d74ea156c Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Dec 18 15:24:09 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS:CC] Fix some tests, complain where the current implementation won't let us do the right thing --- ntoskrnl/cc/pin.c | 9 ++++++++- ntoskrnl/cc/view.c | 6 ------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 0d5642b9932..597468f6fd7 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -225,9 +225,13 @@ CcpPinData( BOOLEAN Result; VacbOffset = (ULONG)(FileOffset->QuadPart % VACB_MAPPING_GRANULARITY); - /* This seems to be valid, according to KMTests */ + if ((VacbOffset + Length) > VACB_MAPPING_GRANULARITY) + { + /* Complain loudly, we shoud pin the whole range */ + DPRINT1("TRUNCATING DATA PIN FROM %lu to %lu!\n", Length, VACB_MAPPING_GRANULARITY - VacbOffset); Length = VACB_MAPPING_GRANULARITY - VacbOffset; + } KeAcquireSpinLock(&SharedCacheMap->BcbSpinLock, &OldIrql); NewBcb = CcpFindBcb(SharedCacheMap, FileOffset, Length, TRUE); @@ -353,7 +357,10 @@ CcMapData ( VacbOffset = (ULONG)(FileOffset->QuadPart % VACB_MAPPING_GRANULARITY); /* KMTests seem to show that it is allowed to call accross mapping granularity */ if ((VacbOffset + Length) > VACB_MAPPING_GRANULARITY) + { + DPRINT1("TRUNCATING DATA MAP FROM %lu to %lu!\n", Length, VACB_MAPPING_GRANULARITY - VacbOffset); Length = VACB_MAPPING_GRANULARITY - VacbOffset; + } KeAcquireSpinLock(&SharedCacheMap->BcbSpinLock, &OldIrql); iBcb = CcpFindBcb(SharedCacheMap, FileOffset, Length, FALSE); diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index ae6464f2b58..3952986dc44 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -572,12 +572,6 @@ CcRosCreateVacb ( DPRINT("CcRosCreateVacb()\n"); - if (FileOffset >= SharedCacheMap->SectionSize.QuadPart) - { - *Vacb = NULL; - return STATUS_INVALID_PARAMETER; - } - current = ExAllocateFromNPagedLookasideList(&VacbLookasideList); current->BaseAddress = NULL; current->Valid = FALSE;

3 years, 7 months

[reactos] 54/100: [NTOS:MM] Remove a check for now

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=674ab3dce3da08ca41b96… commit 674ab3dce3da08ca41b9685cbec5bb3d48fdcece Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Dec 17 18:09:56 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS:MM] Remove a check for now --- 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 c20c506c2b8..b709a50cd8d 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -4356,12 +4356,17 @@ MmCreateSection (OUT PVOID * Section, FileLock = TRUE; /* Deny access if there are writes on the file */ +#if 0 if ((AllocationAttributes & SEC_IMAGE) && (Status == STATUS_FILE_LOCKED_WITH_WRITERS)) { DPRINT1("Cannot create image maps with writers open on the file!\n"); Status = STATUS_ACCESS_DENIED; goto Quit; } +#else + if ((AllocationAttributes & SEC_IMAGE) && (Status == STATUS_FILE_LOCKED_WITH_WRITERS)) + DPRINT1("Creating image map with writers open on the file!\n"); +#endif } else { @@ -4415,7 +4420,6 @@ MmCreateSection (OUT PVOID * Section, Status = STATUS_INVALID_PARAMETER; } -Quit: if (FileLock) FsRtlReleaseFile(FileObject); if (FileObject)

3 years, 7 months

[reactos] 53/100: [NTOS:MM] Do not reference the section when mapping it.

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f796267bc885ad0b8154… commit 1f796267bc885ad0b8154352bf714477ea2a0b58 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Dec 14 15:55:08 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 reference the section when mapping it. Referencing the segment is enough. --- ntoskrnl/include/internal/mm.h | 2 +- ntoskrnl/mm/section.c | 51 ++++++++++++++++++++++++++---------------- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 55e9fcfc29c..05f89c50cb9 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -202,6 +202,7 @@ typedef struct _MM_IMAGE_SECTION_OBJECT PMM_SECTION_SEGMENT Segments; } MM_IMAGE_SECTION_OBJECT, *PMM_IMAGE_SECTION_OBJECT; +#define MM_PHYSICALMEMORY_SEGMENT (0x1) #define MM_DATAFILE_SEGMENT (0x2) #define MM_SEGMENT_INDELETE (0x4) #define MM_SEGMENT_INCREATE (0x8) @@ -222,7 +223,6 @@ typedef struct _MEMORY_AREA struct { - PSECTION Section; LARGE_INTEGER ViewOffset; PMM_SECTION_SEGMENT Segment; LIST_ENTRY RegionListHead; diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index a3efe4f0b6b..c20c506c2b8 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -83,6 +83,14 @@ _MmUnlockSectionSegment(PMM_SECTION_SEGMENT Segment, const char *file, int line) } #endif +/* Somewhat grotesque, but eh... */ +PMM_IMAGE_SECTION_OBJECT ImageSectionObjectFromSegment(PMM_SECTION_SEGMENT Segment) +{ + ASSERT((Segment->SegFlags & MM_DATAFILE_SEGMENT) == 0); + + return CONTAINING_RECORD(Segment->ReferenceCount, MM_IMAGE_SECTION_OBJECT, RefCount); +} + NTSTATUS NTAPI MiMapViewInSystemSpace(IN PVOID Section, @@ -1209,15 +1217,18 @@ MiReadPage(PMEMORY_AREA MemoryArea, 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; } - if (!MemoryArea->SectionData.Section->u.Flags.Reserve + if ((MemoryArea->VadNode.u.VadFlags.VadType == VadImageMap) && ((SegOffset + PAGE_SIZE) > MemoryArea->SectionData.Segment->RawLength.QuadPart)) { KIRQL OldIrql; PUCHAR PageMap; + DPRINT("Zeroing at offset %I64d for file %wZ.\n", SegOffset, &FileObject->FileName); + /* Zero out the end of it */ PageMap = MiMapPageInHyperSpace(PsGetCurrentProcess(), *Page, &OldIrql); RtlZeroMemory(PageMap + MemoryArea->SectionData.Segment->RawLength.QuadPart - SegOffset, @@ -1352,7 +1363,6 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, LARGE_INTEGER Offset; PFN_NUMBER Page; NTSTATUS Status; - PSECTION Section; PMM_SECTION_SEGMENT Segment; ULONG_PTR Entry; ULONG_PTR Entry1; @@ -1391,7 +1401,6 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, + MemoryArea->SectionData.ViewOffset.QuadPart; Segment = MemoryArea->SectionData.Segment; - Section = MemoryArea->SectionData.Section; Region = MmFindRegion((PVOID)MA_GetStartingAddress(MemoryArea), &MemoryArea->SectionData.RegionListHead, Address, NULL); @@ -1537,7 +1546,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, /* * Satisfying a page fault on a map of /Device/PhysicalMemory is easy */ - if (Section->u.Flags.PhysicalMemory) + if ((*Segment->Flags) & MM_PHYSICALMEMORY_SEGMENT) { MmUnlockSectionSegment(Segment); /* @@ -1600,6 +1609,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, } else { + DPRINT("Getting fresh page for file %wZ at offset %I64d.\n", &Segment->FileObject->FileName, Offset.QuadPart); Status = MiReadPage(MemoryArea, Offset.QuadPart, &Page); if (!NT_SUCCESS(Status)) { @@ -2111,7 +2121,7 @@ MmCreatePhysicalMemorySection(VOID) Segment->Protection = PAGE_EXECUTE_READWRITE; Segment->RawLength = SectionSize; Segment->Length = SectionSize; - Segment->SegFlags = 0; + Segment->SegFlags = MM_PHYSICALMEMORY_SEGMENT; Segment->WriteCopy = FALSE; Segment->Image.VirtualAddress = 0; Segment->Image.Characteristics = 0; @@ -2230,7 +2240,6 @@ MmCreateDataFileSection(PSECTION *SectionObject, if (!NT_SUCCESS(Status)) { ObDereferenceObject(Section); - ObDereferenceObject(FileObject); return Status; } @@ -3283,10 +3292,9 @@ MmMapViewOfSegment(PMMSUPPORT AddressSpace, return(Status); } - ObReferenceObject((PVOID)Section); + InterlockedIncrementUL(Segment->ReferenceCount); MArea->SectionData.Segment = Segment; - MArea->SectionData.Section = Section; MArea->SectionData.ViewOffset.QuadPart = ViewOffset; if (Section->u.Flags.Image) { @@ -3390,7 +3398,6 @@ MmUnmapViewOfSegment(PMMSUPPORT AddressSpace, { NTSTATUS Status; PMEMORY_AREA MemoryArea; - PSECTION Section; PMM_SECTION_SEGMENT Segment; PLIST_ENTRY CurrentEntry; PMM_REGION CurrentRegion; @@ -3403,7 +3410,6 @@ MmUnmapViewOfSegment(PMMSUPPORT AddressSpace, return(STATUS_UNSUCCESSFUL); } - Section = MemoryArea->SectionData.Section; Segment = MemoryArea->SectionData.Segment; #ifdef NEWCC @@ -3429,7 +3435,7 @@ MmUnmapViewOfSegment(PMMSUPPORT AddressSpace, ExFreePoolWithTag(CurrentRegion, TAG_MM_REGION); } - if (Section->u.Flags.PhysicalMemory) + if ((*Segment->Flags) & MM_PHYSICALMEMORY_SEGMENT) { Status = MmFreeMemoryArea(AddressSpace, MemoryArea, @@ -3444,7 +3450,7 @@ MmUnmapViewOfSegment(PMMSUPPORT AddressSpace, AddressSpace); } MmUnlockSectionSegment(Segment); - ObDereferenceObject(Section); + MmDereferenceSegment(Segment); return(Status); } @@ -3457,7 +3463,6 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, NTSTATUS Status; PMEMORY_AREA MemoryArea; PMMSUPPORT AddressSpace; - PSECTION Section; PVOID ImageBaseAddress = 0; DPRINT("Opening memory area Process %p BaseAddress %p\n", @@ -3484,9 +3489,7 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, return STATUS_NOT_MAPPED_VIEW; } - Section = MemoryArea->SectionData.Section; - - if ((Section != NULL) && Section->u.Flags.Image) + if (MemoryArea->VadNode.u.VadFlags.VadType == VadImageMap) { ULONG i; ULONG NrSegments; @@ -3495,7 +3498,7 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, PMM_SECTION_SEGMENT Segment; Segment = MemoryArea->SectionData.Segment; - ImageSectionObject = ((PMM_IMAGE_SECTION_OBJECT)Section->Segment); + ImageSectionObject = ImageSectionObjectFromSegment(Segment); SectionSegments = ImageSectionObject->Segments; NrSegments = ImageSectionObject->NrSegments; @@ -3937,6 +3940,15 @@ MmMapViewOfSection(IN PVOID SectionObject, MmUnlockSectionSegment(&SectionSegments[i]); if (!NT_SUCCESS(Status)) { + /* roll-back */ + while (i--) + { + SBaseAddress = ((char*)ImageBase + (ULONG_PTR)SectionSegments[i].Image.VirtualAddress); + MmLockSectionSegment(&SectionSegments[i]); + MmUnmapViewOfSegment(AddressSpace, SBaseAddress); + MmUnlockSectionSegment(&SectionSegments[i]); + } + MmUnlockAddressSpace(AddressSpace); return(Status); } @@ -4018,7 +4030,6 @@ MmMapViewOfSection(IN PVOID SectionObject, } MmUnlockAddressSpace(AddressSpace); - ASSERT(*BaseAddress == ALIGN_DOWN_POINTER_BY(*BaseAddress, MM_VIRTMEM_GRANULARITY)); if (NotAtBase) Status = STATUS_IMAGE_NOT_AT_BASE; @@ -4074,7 +4085,7 @@ CheckSectionPointer: else { /* We can't shrink, but we can extend */ - Ret = NewFileSize->QuadPart > Segment->RawLength.QuadPart; + Ret = NewFileSize->QuadPart >= Segment->RawLength.QuadPart; } } else @@ -4679,6 +4690,8 @@ MmCheckDirtySegment( 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); if (PageOut)

3 years, 7 months

[reactos] 52/100: [NTOS:MM] Save the dirty bit when sharing a segment page

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c2b1bf59b0771a92f7d2… commit 3c2b1bf59b0771a92f7d2aa8c96cad1dd58dc31d Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Dec 14 15:48:27 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS:MM] Save the dirty bit when sharing a segment page --- ntoskrnl/mm/section.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 8acc368a884..a3efe4f0b6b 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1020,6 +1020,7 @@ MmSharePageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER Offset) { ULONG_PTR Entry; + BOOLEAN Dirty; Entry = MmGetPageEntrySectionSegment(Segment, Offset); if (Entry == 0) @@ -1036,7 +1037,10 @@ MmSharePageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, { KeBugCheck(MEMORY_MANAGEMENT); } + Dirty = IS_DIRTY_SSE(Entry); Entry = MAKE_SSE(PAGE_FROM_SSE(Entry), SHARE_COUNT_FROM_SSE(Entry) + 1); + if (Dirty) + Entry = DIRTY_SSE(Entry); MmSetPageEntrySectionSegment(Segment, Offset, Entry); }

3 years, 7 months

[reactos] 51/100: [NTOS:MM] Various fixes.

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3141668724e37d0dac6ce… commit 3141668724e37d0dac6cee831db1fe4eda6bf84f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Dec 11 18:53:32 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS:MM] Various fixes. Fix MmFlushImageSection behaviour Remove an invalid ASSERT --- ntoskrnl/mm/section.c | 48 ++++++++++++++---------------------------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 8e9669d9ab9..8acc368a884 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -4093,46 +4093,26 @@ CheckSectionPointer: */ BOOLEAN NTAPI MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, - IN MMFLUSH_TYPE FlushType) + IN MMFLUSH_TYPE FlushType) { - BOOLEAN Result = TRUE; -#ifdef NEWCC - PMM_SECTION_SEGMENT Segment; -#endif - switch(FlushType) { - case MmFlushForDelete: - if (SectionObjectPointer->ImageSectionObject || - SectionObjectPointer->DataSectionObject) + case MmFlushForDelete: + case MmFlushForWrite: { - return FALSE; - } -#ifndef NEWCC - CcRosRemoveIfClosed(SectionObjectPointer); -#endif - return TRUE; - case MmFlushForWrite: - { - DPRINT("MmFlushImageSection(%d)\n", FlushType); -#ifdef NEWCC - Segment = (PMM_SECTION_SEGMENT)SectionObjectPointer->DataSectionObject; -#endif + BOOLEAN Ret = TRUE; + KIRQL OldIrql = MiAcquirePfnLock(); - if (SectionObjectPointer->ImageSectionObject) - { - DPRINT1("SectionObject has ImageSection\n"); - return FALSE; - } + if (SectionObjectPointer->ImageSectionObject) + { + PMM_IMAGE_SECTION_OBJECT ImageSectionObject = SectionObjectPointer->ImageSectionObject; + if (!(ImageSectionObject->SegFlags & MM_SEGMENT_INDELETE)) + Ret = FALSE; + } -#ifdef NEWCC - CcpLock(); - Result = !SectionObjectPointer->SharedCacheMap || (Segment->ReferenceCount == CcpCountCacheSections((PNOCC_CACHE_MAP)SectionObjectPointer->SharedCacheMap)); - CcpUnlock(); - DPRINT("Result %d\n", Result); -#endif - return Result; - } + MiReleasePfnLock(OldIrql); + return Ret; + } } return FALSE; }

3 years, 7 months

[reactos] 50/100: [NTOS] Zero data unconditionally after segment end, unless section is created with SEC_RESERVE

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30f71c7fc0f6404cb2988… commit 30f71c7fc0f6404cb298841a9d2123eaca1877be Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Dec 11 15:29:35 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS] Zero data unconditionally after segment end, unless section is created with SEC_RESERVE Use a SEC_RESERVE section in Cc --- ntoskrnl/cc/view.c | 2 +- ntoskrnl/mm/section.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index ee0ec497d40..ae6464f2b58 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1286,7 +1286,7 @@ CcRosInitializeFileCache ( NULL, &SharedCacheMap->SectionSize, PAGE_READWRITE, - 0, + SEC_RESERVE, NULL, FileObject); diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index d71bc490934..8e9669d9ab9 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1208,7 +1208,8 @@ MiReadPage(PMEMORY_AREA MemoryArea, Status = STATUS_SUCCESS; } - if ((MemoryArea->VadNode.u.VadFlags.VadType == VadImageMap) && ((SegOffset + PAGE_SIZE) > MemoryArea->SectionData.Segment->RawLength.QuadPart)) + if (!MemoryArea->SectionData.Section->u.Flags.Reserve + && ((SegOffset + PAGE_SIZE) > MemoryArea->SectionData.Segment->RawLength.QuadPart)) { KIRQL OldIrql; PUCHAR PageMap; @@ -2209,6 +2210,8 @@ MmCreateDataFileSection(PSECTION *SectionObject, if (AllocationAttributes & SEC_NO_CHANGE) Section->u.Flags.NoChange = 1; + if (AllocationAttributes & SEC_RESERVE) + Section->u.Flags.Reserve = 1; if (!GotFileHandle) { @@ -4832,13 +4835,16 @@ MmExtendSection( PMM_SECTION_SEGMENT Segment = (PMM_SECTION_SEGMENT)Section->Segment; Section->SizeOfSection = *NewSize; - MmLockSectionSegment(Segment); - if (Segment->RawLength.QuadPart < NewSize->QuadPart) + if (!Section->u.Flags.Reserve) { - Segment->RawLength = *NewSize; - Segment->Length.QuadPart = (NewSize->QuadPart + PAGE_SIZE - 1) & ~((LONGLONG)PAGE_SIZE); + MmLockSectionSegment(Segment); + if (Segment->RawLength.QuadPart < NewSize->QuadPart) + { + Segment->RawLength = *NewSize; + Segment->Length.QuadPart = (NewSize->QuadPart + PAGE_SIZE - 1) & ~((LONGLONG)PAGE_SIZE); + } + MmUnlockSectionSegment(Segment); } - MmUnlockSectionSegment(Segment); } return STATUS_SUCCESS;

3 years, 7 months

[reactos] 49/100: [NTOS:CC] Restore read-ahead behaviour in CcCopyRead

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a52bc6d1799385726097e… commit a52bc6d1799385726097ecf701f833b7a327a08e Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Dec 11 14:31:08 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS:CC] Restore read-ahead behaviour in CcCopyRead --- ntoskrnl/cc/copy.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 315e9f1f1b0..3dd172fa9db 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -556,6 +556,27 @@ CcCopyRead ( IoStatus->Status = STATUS_SUCCESS; IoStatus->Information = ReadLength; + /* If that was a successful sync read operation, let's handle read ahead */ + if (Length == 0 && Wait) + { + PPRIVATE_CACHE_MAP PrivateCacheMap = FileObject->PrivateCacheMap; + + /* If file isn't random access and next read may get us cross VACB boundary, + * schedule next read + */ + if (!BooleanFlagOn(FileObject->Flags, FO_RANDOM_ACCESS) && + (CurrentOffset - 1) / VACB_MAPPING_GRANULARITY != (CurrentOffset + ReadLength - 1) / VACB_MAPPING_GRANULARITY) + { + CcScheduleReadAhead(FileObject, FileOffset, ReadLength); + } + + /* And update read history in private cache map */ + PrivateCacheMap->FileOffset1.QuadPart = PrivateCacheMap->FileOffset2.QuadPart; + PrivateCacheMap->BeyondLastByte1.QuadPart = PrivateCacheMap->BeyondLastByte2.QuadPart; + PrivateCacheMap->FileOffset2.QuadPart = FileOffset->QuadPart; + PrivateCacheMap->BeyondLastByte2.QuadPart = FileOffset->QuadPart + ReadLength; + } + return TRUE; }

3 years, 7 months

[reactos] 48/100: [NTOS:CC] Fix some tests for CcCopyRead and CcCopyWrite

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4441b1cd44bbf0f16b493… commit 4441b1cd44bbf0f16b49383759bf50a35828da6a Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Dec 8 10:28:52 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Feb 3 09:41:22 2021 +0100 [NTOS:CC] Fix some tests for CcCopyRead and CcCopyWrite Most importantly: raise the right status when provided an invalid buffer. --- ntoskrnl/cc/copy.c | 51 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 357e98162e6..315e9f1f1b0 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -447,6 +447,26 @@ CcCanIWrite ( return TRUE; } +static +int +CcpCheckInvalidUserBuffer(PEXCEPTION_POINTERS Except, PVOID Buffer, ULONG Length) +{ + ULONG_PTR ExceptionAddress; + ULONG_PTR BeginAddress = (ULONG_PTR)Buffer; + ULONG_PTR EndAddress = (ULONG_PTR)Buffer + Length; + + if (Except->ExceptionRecord->ExceptionCode != STATUS_ACCESS_VIOLATION) + return EXCEPTION_CONTINUE_SEARCH; + if (Except->ExceptionRecord->NumberParameters < 2) + return EXCEPTION_CONTINUE_SEARCH; + + ExceptionAddress = Except->ExceptionRecord->ExceptionInformation[1]; + if ((ExceptionAddress >= BeginAddress) && (ExceptionAddress < EndAddress)) + return EXCEPTION_EXECUTE_HANDLER; + + return EXCEPTION_CONTINUE_SEARCH; +} + /* * @implemented */ @@ -465,6 +485,7 @@ CcCopyRead ( NTSTATUS Status; LONGLONG CurrentOffset; LONGLONG ReadEnd = FileOffset->QuadPart + Length; + ULONG ReadLength = 0; CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%I64d Length=%lu Wait=%d\n", FileObject, FileOffset->QuadPart, Length, Wait); @@ -480,9 +501,6 @@ CcCopyRead ( /* Documented to ASSERT, but KMTests test this case... */ // ASSERT((FileOffset->QuadPart + Length) <= SharedCacheMap->FileSize.QuadPart); - IoStatus->Status = STATUS_SUCCESS; - IoStatus->Information = 0; - CurrentOffset = FileOffset->QuadPart; while(CurrentOffset < ReadEnd) { @@ -506,13 +524,23 @@ CcCopyRead ( if (CurrentOffset + VacbLength > SharedCacheMap->SectionSize.QuadPart) CopyLength = SharedCacheMap->SectionSize.QuadPart - CurrentOffset; if (CopyLength != 0) - RtlCopyMemory(Buffer, (PUCHAR)Vacb->BaseAddress + VacbOffset, CopyLength); + { + _SEH2_TRY + { + RtlCopyMemory(Buffer, (PUCHAR)Vacb->BaseAddress + VacbOffset, CopyLength); + } + _SEH2_EXCEPT(CcpCheckInvalidUserBuffer(_SEH2_GetExceptionInformation(), Buffer, VacbLength)) + { + ExRaiseStatus(STATUS_INVALID_USER_BUFFER); + } + _SEH2_END; + } /* Zero-out the buffer tail if needed */ if (CopyLength < VacbLength) RtlZeroMemory((PUCHAR)Buffer + CopyLength, VacbLength - CopyLength); - IoStatus->Information += VacbLength; + ReadLength += VacbLength; Buffer = (PVOID)((ULONG_PTR)Buffer + VacbLength); CurrentOffset += VacbLength; @@ -525,6 +553,9 @@ CcCopyRead ( _SEH2_END; } + IoStatus->Status = STATUS_SUCCESS; + IoStatus->Information = ReadLength; + return TRUE; } @@ -578,7 +609,15 @@ CcCopyWrite ( return FALSE; } - RtlCopyMemory((PVOID)((ULONG_PTR)Vacb->BaseAddress + VacbOffset), Buffer, VacbLength); + _SEH2_TRY + { + RtlCopyMemory((PVOID)((ULONG_PTR)Vacb->BaseAddress + VacbOffset), Buffer, VacbLength); + } + _SEH2_EXCEPT(CcpCheckInvalidUserBuffer(_SEH2_GetExceptionInformation(), Buffer, VacbLength)) + { + ExRaiseStatus(STATUS_INVALID_USER_BUFFER); + } + _SEH2_END; Buffer = (PVOID)((ULONG_PTR)Buffer + VacbLength); CurrentOffset += VacbLength;

3 years, 7 months

← Newer
1
...
33
34
35
36
37
38
39
...
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