Ros-diffs June 2021

ros-diffs@reactos.org

19 participants
228 discussions

[reactos] 02/02: [CSRSS] Do not give IOPL to the Client/Server native process if ran on a AMD64 system

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f144ba8d8b1a35d962921… commit f144ba8d8b1a35d9629215beb1fbcafa7fab63d0 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Jun 20 15:49:55 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Fri Jun 25 10:33:28 2021 +0200 [CSRSS] Do not give IOPL to the Client/Server native process if ran on a AMD64 system ProcessUserModeIOPL is strictly implemented for 32-bit architecture so it doesn't make any sense for CSRSS to gather user mode I/O privilege when that won't work anyway. --- subsystems/win32/csrss/csrss.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/subsystems/win32/csrss/csrss.c b/subsystems/win32/csrss/csrss.c index 10f916ccf3c..7862d8f7a4d 100644 --- a/subsystems/win32/csrss/csrss.c +++ b/subsystems/win32/csrss/csrss.c @@ -52,6 +52,7 @@ _main(int argc, &BasePriority, sizeof(KPRIORITY)); +#if defined (_X86_) /* Give us IOPL so that we can access the VGA registers */ Status = NtSetInformationProcess(NtCurrentProcess(), ProcessUserModeIOPL, @@ -70,6 +71,7 @@ _main(int argc, &Response); #endif } +#endif /* Initialize CSR through CSRSRV */ Status = CsrServerInitialization(argc, argv);

3 years, 6 months

[reactos] 01/02: [NTOS:PS] Fix several issues within info classes in AMD64 build

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2791ecd303b72fe74414c… commit 2791ecd303b72fe74414c651031522b770377b80 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Jun 20 15:46:58 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Fri Jun 25 10:33:18 2021 +0200 [NTOS:PS] Fix several issues within info classes in AMD64 build ProcessUserModeIOPL, ProcessWow64Information and ThreadZeroTlsCell classes fail on AMD64 build because of wrong IQS values assigned to them. Also explicitly tell the compiler that ProcessUserModeIOPL is strictly for x86 as user mode I/O privilege level is 32-bit stuff. In addition to that, implement IQS_NO_TYPE_LENGTH macro which it'll be used for classes such as ProcessUserModeIOPL where type length is not required and that it should be 0. With that said, we indirectly fix a size length mismatch issue with ProcessUserModeIOPL on 32-bit of ReactOS as well. --- ntoskrnl/include/internal/icif.h | 3 +++ ntoskrnl/include/internal/ps_i.h | 13 ++++++++----- ntoskrnl/ps/query.c | 6 +++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/include/internal/icif.h b/ntoskrnl/include/internal/icif.h index 6eb4a3d5f87..e73ad9e1b2c 100644 --- a/ntoskrnl/include/internal/icif.h +++ b/ntoskrnl/include/internal/icif.h @@ -37,5 +37,8 @@ typedef struct _INFORMATION_CLASS_INFO #define IQS(TypeQuery, AlignmentQuery, TypeSet, AlignmentSet, Flags) \ { sizeof(TypeQuery), sizeof(AlignmentQuery), sizeof(TypeSet), sizeof(AlignmentSet), Flags } +#define IQS_NO_TYPE_LENGTH(Alignment, Flags) \ + { 0, sizeof(Alignment), 0, sizeof(Alignment), Flags } + #define IQS_NONE \ { 0, sizeof(CHAR), 0, sizeof(CHAR), ICIF_NONE } diff --git a/ntoskrnl/include/internal/ps_i.h b/ntoskrnl/include/internal/ps_i.h index adec4cb8275..3e54c27b636 100644 --- a/ntoskrnl/include/internal/ps_i.h +++ b/ntoskrnl/include/internal/ps_i.h @@ -142,13 +142,16 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = ICIF_QUERY | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), - /* ProcessUserModeIOPL */ - IQS_SAME + /* ProcessUserModeIOPL is only implemented in x86 */ +#if defined (_X86_) + IQS_NO_TYPE_LENGTH ( - UCHAR, ULONG, ICIF_SET ), +#else + IQS_NONE, +#endif /* ProcessEnableAlignmentFaultFixup */ IQS @@ -233,7 +236,7 @@ static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = /* ProcessWow64Information */ IQS_SAME ( - ULONG, + ULONG_PTR, ULONG, ICIF_QUERY ), @@ -443,7 +446,7 @@ static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = /* ThreadZeroTlsCell */ IQS_SAME ( - ULONG_PTR, + ULONG, ULONG, ICIF_SET ), diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index 5c28b03d068..7211a63e964 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -1172,7 +1172,7 @@ NtSetInformationProcess(IN HANDLE ProcessHandle, case ProcessWx86Information: /* Check buffer length */ - if (ProcessInformationLength != sizeof(HANDLE)) + if (ProcessInformationLength != sizeof(ULONG)) { Status = STATUS_INFO_LENGTH_MISMATCH; break; @@ -2439,7 +2439,7 @@ NtSetInformationThread(IN HANDLE ThreadHandle, case ThreadZeroTlsCell: /* Check buffer length */ - if (ThreadInformationLength != sizeof(ULONG_PTR)) + if (ThreadInformationLength != sizeof(ULONG)) { Status = STATUS_INFO_LENGTH_MISMATCH; break; @@ -2449,7 +2449,7 @@ NtSetInformationThread(IN HANDLE ThreadHandle, _SEH2_TRY { /* Get the priority */ - TlsIndex = *(PULONG_PTR)ThreadInformation; + TlsIndex = *(PULONG)ThreadInformation; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

3 years, 6 months

[reactos] 03/03: [NTOS:MM] Implement MmFlushImageSection(MmFlushForDelete)

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=59cddd15e277dd55b2228… commit 59cddd15e277dd55b222876ca8f571a0add56321 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Jun 7 19:31:24 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Fri Jun 25 10:28:51 2021 +0200 [NTOS:MM] Implement MmFlushImageSection(MmFlushForDelete) CORE-17544 --- ntoskrnl/include/internal/mm.h | 22 +++++-- ntoskrnl/mm/ARM3/miarm.h | 5 -- ntoskrnl/mm/section.c | 137 ++++++++++++++++++++++++++++++++++++----- 3 files changed, 141 insertions(+), 23 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 0b75e613687..e8ace692bd2 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -51,6 +51,11 @@ struct _EPROCESS; struct _MM_RMAP_ENTRY; typedef ULONG_PTR SWAPENTRY; +// +// Special IRQL value (found in assertions) +// +#define MM_NOIRQL ((KIRQL)0xFFFFFFFF) + // // MmDbgCopyMemory Flags // @@ -175,6 +180,7 @@ typedef ULONG_PTR SWAPENTRY; typedef struct _MM_SECTION_SEGMENT { + LONG64 RefCount; PFILE_OBJECT FileObject; FAST_MUTEX Lock; /* lock which protects the page directory */ @@ -194,7 +200,6 @@ typedef struct _MM_SECTION_SEGMENT ULONG Characteristics; } Image; - LONG64 RefCount; ULONG SegFlags; ULONGLONG LastPage; @@ -204,9 +209,10 @@ typedef struct _MM_SECTION_SEGMENT typedef struct _MM_IMAGE_SECTION_OBJECT { - PFILE_OBJECT FileObject; - LONG64 RefCount; + PFILE_OBJECT FileObject; + ULONG SectionCount; + LONG MapCount; ULONG SegFlags; SECTION_IMAGE_INFORMATION ImageInformation; @@ -219,6 +225,7 @@ typedef struct _MM_IMAGE_SECTION_OBJECT #define MM_DATAFILE_SEGMENT (0x2) #define MM_SEGMENT_INDELETE (0x4) #define MM_SEGMENT_INCREATE (0x8) +#define MM_IMAGE_SECTION_FLUSH_DELETE (0x10) #define MA_GetStartingAddress(_MemoryArea) ((_MemoryArea)->VadNode.StartingVpn << PAGE_SHIFT) @@ -1471,7 +1478,14 @@ MmUnsharePageEntrySectionSegment(PMEMORY_AREA MemoryArea, VOID NTAPI -MmDereferenceSegment(PMM_SECTION_SEGMENT Segment); +MmDereferenceSegmentWithLock(PMM_SECTION_SEGMENT Segment, KIRQL OldIrql); + +FORCEINLINE +VOID +MmDereferenceSegment(PMM_SECTION_SEGMENT Segment) +{ + MmDereferenceSegmentWithLock(Segment, MM_NOIRQL); +} NTSTATUS NTAPI diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index 721c66c54bb..6d2f2753bb5 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -230,11 +230,6 @@ extern const ULONG MmProtectToValue[32]; #error Define these please! #endif -// -// Special IRQL value (found in assertions) -// -#define MM_NOIRQL (KIRQL)0xFFFFFFFF - // // Returns the color of a page // diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index d758e8d3de0..25d8db8561c 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -989,23 +989,29 @@ FreeSegmentPage(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER Offset) VOID NTAPI -MmDereferenceSegment(PMM_SECTION_SEGMENT Segment) +MmDereferenceSegmentWithLock(PMM_SECTION_SEGMENT Segment, KIRQL OldIrql) { - KIRQL OldIrql; + BOOLEAN HaveLock = FALSE; /* Lock the PFN lock because we mess around with SectionObjectPointers */ - OldIrql = MiAcquirePfnLock(); + if (OldIrql == MM_NOIRQL) + { + HaveLock = TRUE; + OldIrql = MiAcquirePfnLock(); + } if (InterlockedDecrement64(Segment->ReferenceCount) > 0) { /* Nothing to do yet */ - MiReleasePfnLock(OldIrql); + if (HaveLock) + MiReleasePfnLock(OldIrql); return; } *Segment->Flags |= MM_SEGMENT_INDELETE; - MiReleasePfnLock(OldIrql); + if (HaveLock) + MiReleasePfnLock(OldIrql); /* Flush the segment */ if (*Segment->Flags & MM_DATAFILE_SEGMENT) @@ -1013,11 +1019,13 @@ MmDereferenceSegment(PMM_SECTION_SEGMENT Segment) /* Free the page table. This will flush any remaining dirty data */ MmFreePageTablesSectionSegment(Segment, FreeSegmentPage); - OldIrql = MiAcquirePfnLock(); + if (HaveLock) + OldIrql = MiAcquirePfnLock(); /* Delete the pointer on the file */ ASSERT(Segment->FileObject->SectionObjectPointer->DataSectionObject == Segment); Segment->FileObject->SectionObjectPointer->DataSectionObject = NULL; - MiReleasePfnLock(OldIrql); + if (HaveLock) + MiReleasePfnLock(OldIrql); ObDereferenceObject(Segment->FileObject); ExFreePoolWithTag(Segment, TAG_MM_SECTION_SEGMENT); @@ -1030,11 +1038,13 @@ MmDereferenceSegment(PMM_SECTION_SEGMENT Segment) ULONG NrSegments; ULONG i; - OldIrql = MiAcquirePfnLock(); + if (HaveLock) + OldIrql = MiAcquirePfnLock(); /* Delete the pointer on the file */ ASSERT(ImageSectionObject->FileObject->SectionObjectPointer->ImageSectionObject == ImageSectionObject); ImageSectionObject->FileObject->SectionObjectPointer->ImageSectionObject = NULL; - MiReleasePfnLock(OldIrql); + if (HaveLock) + MiReleasePfnLock(OldIrql); ObDereferenceObject(ImageSectionObject->FileObject); @@ -2113,9 +2123,13 @@ MmpDeleteSection(PVOID ObjectBody) if (Section->Segment == NULL) return; + KIRQL OldIrql = MiAcquirePfnLock(); + ImageSectionObject->SectionCount--; + /* We just dereference the first segment */ ASSERT(ImageSectionObject->RefCount > 0); - MmDereferenceSegment(ImageSectionObject->Segments); + MmDereferenceSegmentWithLock(ImageSectionObject->Segments, OldIrql); + MiReleasePfnLock(OldIrql); } else { @@ -2128,8 +2142,11 @@ MmpDeleteSection(PVOID ObjectBody) if (Segment == NULL) return; + KIRQL OldIrql = MiAcquirePfnLock(); Segment->SectionCount--; - MmDereferenceSegment(Segment); + + MmDereferenceSegmentWithLock(Segment, OldIrql); + MiReleasePfnLock(OldIrql); } } @@ -2473,7 +2490,7 @@ grab_segment: else { Section->Segment = (PSEGMENT)Segment; - Segment->RefCount++; + InterlockedIncrement64(&Segment->RefCount); InterlockedIncrementUL(&Segment->SectionCount); MiReleasePfnLock(OldIrql); @@ -3205,6 +3222,7 @@ grab_image_section_object: ImageSectionObject->SegFlags = MM_SEGMENT_INCREATE; ImageSectionObject->RefCount = 1; + ImageSectionObject->SectionCount = 1; OldIrql = MiAcquirePfnLock(); if (FileObject->SectionObjectPointer->ImageSectionObject != NULL) @@ -3281,8 +3299,12 @@ grab_image_section_object: } else { + /* If FS driver called for delete, tell them it's not possible anymore. */ + ImageSectionObject->SegFlags &= ~MM_IMAGE_SECTION_FLUSH_DELETE; + /* Take one ref */ - ImageSectionObject->RefCount++; + InterlockedIncrement64(&ImageSectionObject->RefCount); + ImageSectionObject->SectionCount++; MiReleasePfnLock(OldIrql); @@ -3603,6 +3625,7 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, ASSERT(NT_SUCCESS(Status)); } } + InterlockedDecrement(&ImageSectionObject->MapCount); } else { @@ -4026,6 +4049,9 @@ MmMapViewOfSection(IN PVOID SectionObject, *BaseAddress = (PVOID)ImageBase; *ViewSize = ImageSize; + + /* One more map */ + InterlockedIncrement(&ImageSectionObject->MapCount); } else { @@ -4172,6 +4198,87 @@ MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, switch(FlushType) { case MmFlushForDelete: + { + KIRQL OldIrql = MiAcquirePfnLock(); + PMM_IMAGE_SECTION_OBJECT ImageSectionObject = SectionObjectPointer->ImageSectionObject; + + if (!ImageSectionObject || (ImageSectionObject->SegFlags & MM_SEGMENT_INDELETE)) + { + MiReleasePfnLock(OldIrql); + return TRUE; + } + + /* Do we have open sections or mappings on it ? */ + if ((ImageSectionObject->SectionCount) || (ImageSectionObject->MapCount)) + { + /* We do. No way to delete it */ + MiReleasePfnLock(OldIrql); + return FALSE; + } + + /* There are no sections open on it, but we must still have pages around. Discard everything */ + ImageSectionObject->SegFlags |= MM_IMAGE_SECTION_FLUSH_DELETE; + InterlockedIncrement64(&ImageSectionObject->RefCount); + MiReleasePfnLock(OldIrql); + + for (ULONG i = 0; i < ImageSectionObject->NrSegments; i++) + { + PMM_SECTION_SEGMENT Segment = &ImageSectionObject->Segments[i]; + LONGLONG Length; + + MmLockSectionSegment(Segment); + /* Loop over all entries */ + LARGE_INTEGER Offset; + Offset.QuadPart = 0; + + Length = Segment->Length.QuadPart; + if (Length < Segment->RawLength.QuadPart) + Length = Segment->RawLength.QuadPart; + + while (Offset.QuadPart < Length) + { + ULONG_PTR Entry = MmGetPageEntrySectionSegment(Segment, &Offset); + + /* Shared data must already be discarded, and nobody should be reading it. */ + ASSERT(!IS_SWAP_FROM_SSE(Entry)); + if (Entry != 0) + { + DPRINT1("Freeing page %lx for image section %p\n", PFN_FROM_SSE(Entry), ImageSectionObject); + /* Release the page */ + ASSERT(SHARE_COUNT_FROM_SSE(Entry) == 0); + ASSERT(!IS_WRITE_SSE(Entry)); + ASSERT(MmGetSavedSwapEntryPage(PFN_FROM_SSE(Entry)) == 0); + MmSetPageEntrySectionSegment(Segment, &Offset, 0); + MmReleasePageMemoryConsumer(MC_USER, PFN_FROM_SSE(Entry)); + } + Offset.QuadPart += PAGE_SIZE; + } + MmUnlockSectionSegment(Segment); + } + + /* Grab lock again */ + OldIrql = MiAcquirePfnLock(); + + if (!(ImageSectionObject->SegFlags & MM_IMAGE_SECTION_FLUSH_DELETE)) + { + /* + * Someone actually created a section while we were not looking. + * Drop our ref and deny. + */ + MmDereferenceSegmentWithLock(&ImageSectionObject->Segments[0], OldIrql); + MiReleasePfnLock(OldIrql); + return FALSE; + } + + /* We should be the last one holding a ref here. */ + ASSERT(ImageSectionObject->RefCount == 1); + ASSERT(ImageSectionObject->SectionCount == 0); + + /* Dereference the first segment, this will free everything & release the lock */ + MmDereferenceSegmentWithLock(&ImageSectionObject->Segments[0], OldIrql); + MiReleasePfnLock(OldIrql); + return TRUE; + } case MmFlushForWrite: { BOOLEAN Ret = TRUE; @@ -4237,6 +4344,9 @@ MmMapViewInSystemSpaceEx ( DPRINT("MmMapViewInSystemSpaceEx() called\n"); + /* unsupported for now */ + ASSERT(Section->u.Flags.Image == 0); + Section = SectionObject; Segment = (PMM_SECTION_SEGMENT)Section->Segment; @@ -4761,7 +4871,6 @@ MmFlushSegment( } MmUnlockSectionSegment(Segment); - MmDereferenceSegment(Segment); if (Iosb)

3 years, 6 months

[reactos] 02/03: [NTOS:MM] Simplify refcounting when adding/deleting a page in a shared segment

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3e9c8972553b040d1b43… commit b3e9c8972553b040d1b43dd96406d28ebd5b953f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Jun 7 19:28:51 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Fri Jun 25 10:28:51 2021 +0200 [NTOS:MM] Simplify refcounting when adding/deleting a page in a shared segment CORE-17544 --- ntoskrnl/cache/section/sptab.c | 13 +++++++++++-- ntoskrnl/mm/rmap.c | 3 --- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/cache/section/sptab.c b/ntoskrnl/cache/section/sptab.c index 0877fb085f6..b0125f26b0e 100644 --- a/ntoskrnl/cache/section/sptab.c +++ b/ntoskrnl/cache/section/sptab.c @@ -204,6 +204,16 @@ _MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, OldEntry, Entry); + /* Manage ref on segment */ + if (Entry && !OldEntry) + { + InterlockedIncrement64(Segment->ReferenceCount); + } + if (OldEntry && !Entry) + { + MmDereferenceSegment(Segment); + } + if (Entry && !IS_SWAP_FROM_SSE(Entry)) { /* We have a valid entry. See if we must do something */ @@ -223,7 +233,6 @@ _MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, * 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 = (Offset->QuadPart >> PAGE_SHIFT) + 1; @@ -233,7 +242,6 @@ _MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, { /* 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)) { @@ -363,6 +371,7 @@ MmGetSectionAssociation(PFN_NUMBER Page, Offset->QuadPart = PageTable->FileOffset.QuadPart + ((ULONG64)RawOffset << PAGE_SHIFT); ASSERT(PFN_FROM_SSE(PageTable->PageEntries[RawOffset]) == Page); + InterlockedIncrement64(Segment->ReferenceCount); } return Segment; diff --git a/ntoskrnl/mm/rmap.c b/ntoskrnl/mm/rmap.c index 64758cc5b89..e27e31de820 100644 --- a/ntoskrnl/mm/rmap.c +++ b/ntoskrnl/mm/rmap.c @@ -300,7 +300,6 @@ WriteSegment: Released = MmCheckDirtySegment(Segment, &SegmentOffset, FALSE, TRUE); MmUnlockSectionSegment(Segment); - MmDereferenceSegment(Segment); if (Released) @@ -475,8 +474,6 @@ MmGetSegmentRmap(PFN_NUMBER Page, PULONG RawOffset) MiReleasePfnLock(OldIrql); return NULL; } - - InterlockedIncrement64(Result->Segment->ReferenceCount); MiReleasePfnLock(OldIrql); return Result; }

3 years, 6 months

[reactos] 01/03: [NTOS:MM] Do not call ExAllocatePool* with PFN lock acquired

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bec42b653031205a37567… commit bec42b653031205a37567179ba6a70bce8fcfb02 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri May 21 15:11:50 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Fri Jun 25 10:28:51 2021 +0200 [NTOS:MM] Do not call ExAllocatePool* with PFN lock acquired Unsurprisingly, it actually might acquire it --- ntoskrnl/mm/section.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index b6a6ca67b4c..d758e8d3de0 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -2385,6 +2385,7 @@ MmCreateDataFileSection(PSECTION *SectionObject, } /* Lock the PFN lock while messing with Section Object pointers */ +grab_segment: OldIrql = MiAcquirePfnLock(); Segment = FileObject->SectionObjectPointer->DataSectionObject; @@ -2402,12 +2403,14 @@ MmCreateDataFileSection(PSECTION *SectionObject, */ if (Segment == NULL) { + /* Release the lock. ExAllocatePoolWithTag might acquire it */ + MiReleasePfnLock(OldIrql); + Segment = ExAllocatePoolWithTag(NonPagedPool, sizeof(MM_SECTION_SEGMENT), TAG_MM_SECTION_SEGMENT); if (Segment == NULL) { //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); - MiReleasePfnLock(OldIrql); ObDereferenceObject(Section); return STATUS_NO_MEMORY; } @@ -2417,6 +2420,17 @@ MmCreateDataFileSection(PSECTION *SectionObject, Segment->SegFlags = MM_DATAFILE_SEGMENT | MM_SEGMENT_INCREATE; Segment->RefCount = 1; + /* Acquire lock again */ + OldIrql = MiAcquirePfnLock(); + + if (FileObject->SectionObjectPointer->DataSectionObject != NULL) + { + /* Well that's bad luck. Restart it all over */ + MiReleasePfnLock(OldIrql); + ExFreePoolWithTag(Segment, TAG_MM_SECTION_SEGMENT); + goto grab_segment; + } + FileObject->SectionObjectPointer->DataSectionObject = Segment; /* We're safe to release the lock now */ @@ -3160,6 +3174,7 @@ MmCreateImageSection(PSECTION *SectionObject, if (AllocationAttributes & SEC_NO_CHANGE) Section->u.Flags.NoChange = 1; +grab_image_section_object: OldIrql = MiAcquirePfnLock(); /* Wait for it to be properly created or deleted */ @@ -3178,16 +3193,28 @@ MmCreateImageSection(PSECTION *SectionObject, { NTSTATUS StatusExeFmt; + /* Release the lock because ExAllocatePoolWithTag could need to acquire it */ + MiReleasePfnLock(OldIrql); + ImageSectionObject = ExAllocatePoolZero(NonPagedPool, sizeof(MM_IMAGE_SECTION_OBJECT), TAG_MM_SECTION_SEGMENT); if (ImageSectionObject == NULL) { - MiReleasePfnLock(OldIrql); ObDereferenceObject(Section); return STATUS_NO_MEMORY; } ImageSectionObject->SegFlags = MM_SEGMENT_INCREATE; ImageSectionObject->RefCount = 1; + + OldIrql = MiAcquirePfnLock(); + if (FileObject->SectionObjectPointer->ImageSectionObject != NULL) + { + MiReleasePfnLock(OldIrql); + /* Bad luck. Start over */ + ExFreePoolWithTag(ImageSectionObject, TAG_MM_SECTION_SEGMENT); + goto grab_image_section_object; + } + FileObject->SectionObjectPointer->ImageSectionObject = ImageSectionObject; MiReleasePfnLock(OldIrql);

3 years, 6 months

[reactos] 01/01: [ATL] Close m_hKey in CRegKey destructor and when attaching to a new key (#3764)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42e111f26b96bd3703b44… commit 42e111f26b96bd3703b44653fe9871f2e6b7e915 Author: He Yang <1160386205(a)qq.com> AuthorDate: Fri Jun 25 03:20:01 2021 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jun 24 23:50:01 2021 +0200 [ATL] Close m_hKey in CRegKey destructor and when attaching to a new key (#3764) --- sdk/lib/atl/atlbase.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdk/lib/atl/atlbase.h b/sdk/lib/atl/atlbase.h index fa3cf72cd8a..502d7b1ad44 100644 --- a/sdk/lib/atl/atlbase.h +++ b/sdk/lib/atl/atlbase.h @@ -1043,6 +1043,7 @@ public: ~CRegKey() throw() { + Close(); } void Attach(HKEY hKey) throw() @@ -1359,7 +1360,11 @@ public: CRegKey& operator=(CRegKey& key) throw() { - Attach(key.Detach()); + if (m_hKey != key.m_hKey) + { + Close(); + Attach(key.Detach()); + } return *this; }

3 years, 6 months

[reactos] 04/04: [NTOSKRNL] Enforce -fno-common on GCC & CLang builds

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa2697df2da823bd38cd7… commit aa2697df2da823bd38cd79ace699c848ae510c28 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jun 24 17:07:26 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Jun 24 18:48:31 2021 +0200 [NTOSKRNL] Enforce -fno-common on GCC & CLang builds --- ntoskrnl/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index b3362814e56..0c91c1f7f40 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -3,6 +3,11 @@ PROJECT(NTOS) include(ntos.cmake) +if (CMAKE_C_COMPILER_ID MATCHES "GNU|Clang") + # Make sure we don't duplicate some symbols + add_compile_options(-fno-common) +endif() + set(NTOSKRNL_SOURCE ${SOURCE}) set(NTOSKRNL_ASM_SOURCE ${ASM_SOURCE})

3 years, 6 months

[reactos] 03/04: [NTOSKRNL] Deduplicate some symbols

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6e9fea844acfb6ee84be… commit c6e9fea844acfb6ee84be5e764272c7ba4faf25a Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jun 24 17:06:57 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Jun 24 18:48:31 2021 +0200 [NTOSKRNL] Deduplicate some symbols --- ntoskrnl/io/pnpmgr/pnpmgr.c | 1 - ntoskrnl/ke/amd64/cpu.c | 4 ---- ntoskrnl/ke/amd64/stubs.c | 1 - ntoskrnl/mm/ARM3/procsup.c | 1 - 4 files changed, 7 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index d4f5cd97a19..fbbb8fa5e35 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -18,7 +18,6 @@ ERESOURCE PpRegistryDeviceResource; KGUARDED_MUTEX PpDeviceReferenceTableLock; RTL_AVL_TABLE PpDeviceReferenceTable; -BOOLEAN PnPBootDriversLoaded; extern ULONG ExpInitializationPhase; diff --git a/ntoskrnl/ke/amd64/cpu.c b/ntoskrnl/ke/amd64/cpu.c index 91ca92ac189..320e48bdd3b 100644 --- a/ntoskrnl/ke/amd64/cpu.c +++ b/ntoskrnl/ke/amd64/cpu.c @@ -27,10 +27,6 @@ ULONG KeLargestCacheLine = 0x40; ULONG KiDmaIoCoherency = 0; BOOLEAN KiSMTProcessorsPresent; -/* Freeze data */ -KIRQL KiOldIrql; -ULONG KiFreezeFlag; - /* Flush data */ volatile LONG KiTbFlushTimeStamp; diff --git a/ntoskrnl/ke/amd64/stubs.c b/ntoskrnl/ke/amd64/stubs.c index 21d9b20b920..0683ce73aa4 100644 --- a/ntoskrnl/ke/amd64/stubs.c +++ b/ntoskrnl/ke/amd64/stubs.c @@ -14,7 +14,6 @@ #include <debug.h> ULONG ProcessCount; -BOOLEAN CcPfEnablePrefetcher; SIZE_T KeXStateLength = sizeof(XSAVE_FORMAT); VOID diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index 0d46aa9c05f..5924aa067f8 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -18,7 +18,6 @@ /* GLOBALS ********************************************************************/ ULONG MmProcessColorSeed = 0x12345678; -PMMWSL MmWorkingSetList; ULONG MmMaximumDeadKernelStacks = 5; SLIST_HEADER MmDeadStackSListHead;

3 years, 6 months

[reactos] 02/04: [NTOS:MM] Fix-up call site of traced PFNs when serving a page fault

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c5ce8d11cbcce37a5ade… commit 1c5ce8d11cbcce37a5ade6e3b4ab836546d52c2e Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jun 24 17:01:38 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Jun 24 18:48:31 2021 +0200 [NTOS:MM] Fix-up call site of traced PFNs when serving a page fault --- ntoskrnl/mm/ARM3/pagfault.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index 4656828a3b0..8d1ce33c399 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -1286,6 +1286,14 @@ MiResolveProtoPteFault(IN BOOLEAN StoreInstruction, (ULONG)TempPte.u.Soft.Protection, Process, OldIrql); +#if MI_TRACE_PFNS + /* Update debug info */ + if (TrapInformation) + MiGetPfnEntry(PointerProtoPte->u.Hard.PageFrameNumber)->CallSite = (PVOID)((PKTRAP_FRAME)TrapInformation)->Eip; + else + MiGetPfnEntry(PointerProtoPte->u.Hard.PageFrameNumber)->CallSite = _ReturnAddress(); +#endif + ASSERT(NT_SUCCESS(Status)); } @@ -1637,6 +1645,14 @@ MiDispatchFault(IN ULONG FaultCode, ASSERT(KeAreAllApcsDisabled() == TRUE); if (NT_SUCCESS(Status)) { +#if MI_TRACE_PFNS + /* Update debug info */ + if (TrapInformation) + MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber)->CallSite = (PVOID)((PKTRAP_FRAME)TrapInformation)->Eip; + else + MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber)->CallSite = _ReturnAddress(); +#endif + // // Make sure we're returning in a sane state and pass the status down // @@ -2191,6 +2207,11 @@ UserFault: #if MI_TRACE_PFNS UserPdeFault = FALSE; + /* Update debug info */ + if (TrapInformation) + MiGetPfnEntry(PointerPde->u.Hard.PageFrameNumber)->CallSite = (PVOID)((PKTRAP_FRAME)TrapInformation)->Eip; + else + MiGetPfnEntry(PointerPde->u.Hard.PageFrameNumber)->CallSite = _ReturnAddress(); #endif /* We should come back with APCs enabled, and with a valid PDE */ ASSERT(KeAreAllApcsDisabled() == TRUE); @@ -2286,6 +2307,14 @@ UserFault: CurrentProcess, MM_NOIRQL); +#if MI_TRACE_PFNS + /* Update debug info */ + if (TrapInformation) + MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber)->CallSite = (PVOID)((PKTRAP_FRAME)TrapInformation)->Eip; + else + MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber)->CallSite = _ReturnAddress(); +#endif + /* Return the status */ MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); return STATUS_PAGE_FAULT_DEMAND_ZERO;

3 years, 6 months

[reactos] 01/04: [NTOS:MM] Save caller address when tracing PFNs

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=146337cc50e29e3f11e55… commit 146337cc50e29e3f11e55ede4885f5967e86d3f3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jun 24 16:35:00 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Jun 24 18:48:31 2021 +0200 [NTOS:MM] Save caller address when tracing PFNs --- ntoskrnl/include/internal/mm.h | 3 ++- ntoskrnl/mm/ARM3/pfnlist.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 81c3954d8ae..0b75e613687 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -275,7 +275,7 @@ void MI_SET_PROCESS_USTR(PUNICODE_STRING ustr) { PWSTR pos, strEnd; - int i; + ULONG i; if (!ustr->Buffer || ustr->Length == 0) { @@ -407,6 +407,7 @@ typedef struct _MMPFN MI_PFN_USAGES PfnUsage; CHAR ProcessName[16]; #define MI_SET_PFN_PROCESS_NAME(pfn, x) memcpy(pfn->ProcessName, x, min(sizeof(x), sizeof(pfn->ProcessName))) + PVOID CallSite; #endif // HACK until WS lists are supported diff --git a/ntoskrnl/mm/ARM3/pfnlist.c b/ntoskrnl/mm/ARM3/pfnlist.c index 726143870f4..bbf4275a9df 100644 --- a/ntoskrnl/mm/ARM3/pfnlist.c +++ b/ntoskrnl/mm/ARM3/pfnlist.c @@ -254,6 +254,7 @@ MiUnlinkFreeOrZeroedPage(IN PMMPFN Entry) ASSERT(MI_PFN_CURRENT_USAGE != MI_USAGE_NOT_SET); Entry->PfnUsage = MI_PFN_CURRENT_USAGE; memcpy(Entry->ProcessName, MI_PFN_CURRENT_PROCESS_NAME, 16); + Entry->CallSite = _ReturnAddress(); MI_PFN_CURRENT_USAGE = MI_USAGE_NOT_SET; MI_SET_PROCESS2("Not Set"); #endif @@ -462,6 +463,7 @@ MiRemovePageByColor(IN PFN_NUMBER PageIndex, ASSERT(MI_PFN_CURRENT_USAGE != MI_USAGE_NOT_SET); Pfn1->PfnUsage = MI_PFN_CURRENT_USAGE; memcpy(Pfn1->ProcessName, MI_PFN_CURRENT_PROCESS_NAME, 16); + Pfn1->CallSite = _ReturnAddress(); MI_PFN_CURRENT_USAGE = MI_USAGE_NOT_SET; MI_SET_PROCESS2("Not Set"); #endif @@ -710,6 +712,7 @@ MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex) #if MI_TRACE_PFNS Pfn1->PfnUsage = MI_USAGE_FREE_PAGE; RtlZeroMemory(Pfn1->ProcessName, 16); + Pfn1->CallSite = NULL; #endif } @@ -940,6 +943,7 @@ MiInsertPageInList(IN PMMPFNLIST ListHead, ASSERT(MI_PFN_CURRENT_USAGE == MI_USAGE_NOT_SET); Pfn1->PfnUsage = MI_USAGE_FREE_PAGE; RtlZeroMemory(Pfn1->ProcessName, 16); + Pfn1->CallSite = NULL; #endif } else if (ListName == ModifiedPageList)

3 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
...
23
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 June 2021