[reactos] 06/100: [NTOSKRNL] Get rid of ROS_SECTION_OBJECT::AllocationAttributes in favor of MM_SECTION_FLAGS
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10ac04ff6eb2a6cdfb0e36...
commit 10ac04ff6eb2a6cdfb0e368fea9ec1b271c2452f Author: Jérôme Gardou jerome.gardou@reactos.org AuthorDate: Fri Oct 23 13:17:45 2020 +0200 Commit: Jérôme Gardou jerome.gardou@reactos.org CommitDate: Wed Feb 3 09:41:21 2021 +0100
[NTOSKRNL] Get rid of ROS_SECTION_OBJECT::AllocationAttributes in favor of MM_SECTION_FLAGS --- ntoskrnl/include/internal/mm.h | 6 ++++- ntoskrnl/mm/ARM3/section.c | 9 +++---- ntoskrnl/mm/section.c | 56 +++++++++++++++++++++++++----------------- 3 files changed, 43 insertions(+), 28 deletions(-)
diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 47bb43b2a30..5700ad8ff65 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -200,7 +200,11 @@ typedef struct _ROS_SECTION_OBJECT CSHORT Size; LARGE_INTEGER SizeOfSection; ULONG InitialPageProtection; - ULONG AllocationAttributes; + union + { + ULONG LongFlags; + MMSECTION_FLAGS Flags; + } u; PFILE_OBJECT FileObject; union { diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index fe7e8b46145..d1f1e5bbaf2 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -1834,7 +1834,7 @@ MmGetFileNameForSection(IN PVOID Section, return STATUS_SECTION_NOT_IMAGE; } } - else if (!(((PROS_SECTION_OBJECT)Section)->AllocationAttributes & SEC_IMAGE)) + else if (!(((PROS_SECTION_OBJECT)Section)->u.Flags.Image)) { /* It's not, fail */ DPRINT1("Not an image section\n"); @@ -3715,8 +3715,7 @@ NtMapViewOfSection(IN HANDLE SectionHandle, return Status; }
- if (MiIsRosSectionObject(Section) && - (Section->AllocationAttributes & SEC_PHYSICALMEMORY)) + if (MiIsRosSectionObject(Section) && Section->u.Flags.PhysicalMemory) { if (PreviousMode == UserMode && SafeSectionOffset.QuadPart + SafeViewSize > MmHighestPhysicalPage << PAGE_SHIFT) @@ -3765,7 +3764,7 @@ NtMapViewOfSection(IN HANDLE SectionHandle, { /* Check if this is an image for the current process */ if (MiIsRosSectionObject(Section) && - (Section->AllocationAttributes & SEC_IMAGE) && + (Section->u.Flags.Image) && (Process == PsGetCurrentProcess()) && (Status != STATUS_IMAGE_NOT_AT_BASE)) { @@ -3873,7 +3872,7 @@ NtExtendSection(IN HANDLE SectionHandle, if (!NT_SUCCESS(Status)) return Status;
/* Really this should go in MmExtendSection */ - if (!(Section->AllocationAttributes & SEC_FILE)) + if (!Section->u.Flags.File || Section->u.Flags.Image) { DPRINT1("Not extending a file\n"); ObDereferenceObject(Section); diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index aa76377aa9a..9920f36ddcf 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -914,7 +914,7 @@ MmUnsharePageEntrySectionSegment(PROS_SECTION_OBJECT Section, LARGE_INTEGER FileOffset;
FileOffset.QuadPart = Offset->QuadPart + Segment->Image.FileOffset; - IsImageSection = Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; + IsImageSection = Section->u.Flags.Image; #endif
Page = PFN_FROM_SSE(Entry); @@ -1087,7 +1087,7 @@ MiReadPage(PMEMORY_AREA MemoryArea, SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; RawLength = MemoryArea->Data.SectionData.Segment->RawLength.QuadPart; FileOffset = SegOffset + MemoryArea->Data.SectionData.Segment->Image.FileOffset; - IsImageSection = MemoryArea->Data.SectionData.Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; + IsImageSection = MemoryArea->Data.SectionData.Section->u.Flags.Image;
ASSERT(SharedCacheMap);
@@ -1557,7 +1557,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, /* * Satisfying a page fault on a map of /Device/PhysicalMemory is easy */ - if (Section->AllocationAttributes & SEC_PHYSICALMEMORY) + if (Section->u.Flags.PhysicalMemory) { MmUnlockSectionSegment(Segment); /* @@ -1606,8 +1606,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, MmCreatePageFileMapping(Process, PAddress, MM_WAIT_ENTRY); MmUnlockAddressSpace(AddressSpace);
- if ((Offset.QuadPart >= (LONGLONG)PAGE_ROUND_UP(Segment->RawLength.QuadPart)) && - (Section->AllocationAttributes & SEC_IMAGE)) + if ((Offset.QuadPart >= (LONGLONG)PAGE_ROUND_UP(Segment->RawLength.QuadPart)) && Section->u.Flags.Image) { MI_SET_USAGE(MI_USAGE_SECTION); if (Process) MI_SET_PROCESS2(Process->ImageFileName); @@ -1989,7 +1988,7 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace,
#ifndef NEWCC FileOffset = Context.Offset.QuadPart + Context.Segment->Image.FileOffset; - IsImageSection = Context.Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; + IsImageSection = Context.Section->u.Flags.Image; FileObject = Context.Section->FileObject;
if (FileObject != NULL && @@ -2015,7 +2014,7 @@ MmPageOutSectionView(PMMSUPPORT AddressSpace, * This should never happen since mappings of physical memory are never * placed in the rmap lists. */ - if (Context.Section->AllocationAttributes & SEC_PHYSICALMEMORY) + if (Context.Section->u.Flags.PhysicalMemory) { DPRINT1("Trying to page out from physical memory section address 0x%p " "process %p\n", Address, @@ -2368,7 +2367,7 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace, */ Segment = MemoryArea->Data.SectionData.Segment; Section = MemoryArea->Data.SectionData.Section; - IsImageSection = Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; + IsImageSection = Section->u.Flags.Image;
FileObject = Section->FileObject; DirectMapped = FALSE; @@ -2395,7 +2394,7 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace, * This should never happen since mappings of physical memory are never * placed in the rmap lists. */ - if (Section->AllocationAttributes & SEC_PHYSICALMEMORY) + if (Section->u.Flags.PhysicalMemory) { DPRINT1("Trying to write back page from physical memory mapped at %p " "process %p\n", Address, @@ -2545,7 +2544,7 @@ MmQuerySectionView(PMEMORY_AREA MemoryArea, }
Section = MemoryArea->Data.SectionData.Section; - if (Section->AllocationAttributes & SEC_IMAGE) + if (Section->u.Flags.Image) { Segment = MemoryArea->Data.SectionData.Segment; Info->AllocationBase = (PUCHAR)MA_GetStartingAddress(MemoryArea) - Segment->Image.VirtualAddress; @@ -2621,7 +2620,7 @@ MmpDeleteSection(PVOID ObjectBody) }
DPRINT("MmpDeleteSection(ObjectBody %p)\n", ObjectBody); - if (Section->AllocationAttributes & SEC_IMAGE) + if (Section->u.Flags.Image) { ULONG i; ULONG NrSegments; @@ -2754,7 +2753,7 @@ MmCreatePhysicalMemorySection(VOID) PhysSection->Type = 'SC'; PhysSection->Size = 'TN'; PhysSection->InitialPageProtection = PAGE_EXECUTE_READWRITE; - PhysSection->AllocationAttributes = SEC_PHYSICALMEMORY; + PhysSection->u.Flags.PhysicalMemory = 1; PhysSection->SizeOfSection = SectionSize; Segment = ExAllocatePoolWithTag(NonPagedPool, sizeof(MM_SECTION_SEGMENT), TAG_MM_SECTION_SEGMENT); @@ -2869,7 +2868,9 @@ MmCreateDataFileSection(PROS_SECTION_OBJECT *SectionObject, Section->Type = 'SC'; Section->Size = 'TN'; Section->InitialPageProtection = SectionPageProtection; - Section->AllocationAttributes = AllocationAttributes; + Section->u.Flags.File = 1; + if (AllocationAttributes & SEC_NO_CHANGE) + Section->u.Flags.NoChange = 1;
/* * FIXME: This is propably not entirely correct. We can't look into @@ -3694,7 +3695,10 @@ MmCreateImageSection(PROS_SECTION_OBJECT *SectionObject, Section->Type = 'SC'; Section->Size = 'TN'; Section->InitialPageProtection = SectionPageProtection; - Section->AllocationAttributes = AllocationAttributes; + Section->u.Flags.File = 1; + Section->u.Flags.Image = 1; + if (AllocationAttributes & SEC_NO_CHANGE) + Section->u.Flags.NoChange = 1;
if (FileObject->SectionObjectPointer->ImageSectionObject == NULL) { @@ -3871,7 +3875,7 @@ MmMapViewOfSegment(PMMSUPPORT AddressSpace, MArea->Data.SectionData.Segment = Segment; MArea->Data.SectionData.Section = Section; MArea->Data.SectionData.ViewOffset.QuadPart = ViewOffset; - if (Section->AllocationAttributes & SEC_IMAGE) + if (Section->u.Flags.Image) { MArea->VadNode.u.VadFlags.VadType = VadImageMap; } @@ -4017,7 +4021,7 @@ MmUnmapViewOfSegment(PMMSUPPORT AddressSpace, ExFreePoolWithTag(CurrentRegion, TAG_MM_REGION); }
- if (Section->AllocationAttributes & SEC_PHYSICALMEMORY) + if (Section->u.Flags.PhysicalMemory) { Status = MmFreeMemoryArea(AddressSpace, MemoryArea, @@ -4070,7 +4074,7 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process,
Section = MemoryArea->Data.SectionData.Section;
- if ((Section != NULL) && (Section->AllocationAttributes & SEC_IMAGE)) + if ((Section != NULL) && Section->u.Flags.Image) { ULONG i; ULONG NrSegments; @@ -4237,8 +4241,15 @@ NtQuerySection(
_SEH2_TRY { - Sbi->Attributes = RosSection->AllocationAttributes; - if (RosSection->AllocationAttributes & SEC_IMAGE) + Sbi->Attributes = 0; + if (RosSection->u.Flags.Image) + Sbi->Attributes |= SEC_IMAGE; + if (RosSection->u.Flags.File) + Sbi->Attributes |= SEC_FILE; + if (RosSection->u.Flags.NoChange) + Sbi->Attributes |= SEC_NO_CHANGE; + + if (RosSection->u.Flags.Image) { Sbi->BaseAddress = 0; Sbi->Size.QuadPart = 0; @@ -4270,7 +4281,7 @@ NtQuerySection(
_SEH2_TRY { - if (RosSection->AllocationAttributes & SEC_IMAGE) + if (RosSection->u.Flags.Image) { PMM_IMAGE_SECTION_OBJECT ImageSectionObject; ImageSectionObject = RosSection->ImageSection; @@ -4448,11 +4459,12 @@ MmMapViewOfSection(IN PVOID SectionObject, Section = (PROS_SECTION_OBJECT)SectionObject; AddressSpace = &Process->Vm;
- AllocationType |= (Section->AllocationAttributes & SEC_NO_CHANGE); + if (Section->u.Flags.NoChange) + AllocationType |= SEC_NO_CHANGE;
MmLockAddressSpace(AddressSpace);
- if (Section->AllocationAttributes & SEC_IMAGE) + if (Section->u.Flags.Image) { ULONG i; ULONG NrSegments;
-
Jérôme Gardou