From fb21de32de261c79f81c5c618ed504d41435d385 Mon Sep 17 00:00:00 2001 From: David Welch Date: Tue, 14 May 2002 21:19:21 +0000 Subject: [PATCH] Reverted the MPW changes (keep these in a seperate branch) svn path=/trunk/; revision=2950 --- reactos/ntoskrnl/cc/view.c | 26 +- reactos/ntoskrnl/ex/work.c | 22 +- reactos/ntoskrnl/include/internal/id.h | 3 +- reactos/ntoskrnl/include/internal/kd.h | 24 +- reactos/ntoskrnl/include/internal/ke.h | 9 - reactos/ntoskrnl/include/internal/ldr.h | 5 - reactos/ntoskrnl/include/internal/mm.h | 768 ++++-------------- reactos/ntoskrnl/include/internal/ntoskrnl.h | 7 - reactos/ntoskrnl/include/internal/ps.h | 6 +- reactos/ntoskrnl/ke/bug.c | 22 +- reactos/ntoskrnl/ke/i386/exp.c | 7 - reactos/ntoskrnl/ke/i386/kernel.c | 4 +- reactos/ntoskrnl/ke/kthread.c | 28 +- reactos/ntoskrnl/ke/timer.c | 4 +- reactos/ntoskrnl/ke/wait.c | 165 +--- reactos/ntoskrnl/mm/aspace.c | 176 +---- reactos/ntoskrnl/mm/balance.c | 20 +- reactos/ntoskrnl/mm/cont.c | 46 +- reactos/ntoskrnl/mm/freelist.c | 788 ++++++++----------- reactos/ntoskrnl/mm/i386/page.c | 485 +++--------- reactos/ntoskrnl/mm/kmap.c | 27 +- reactos/ntoskrnl/mm/marea.c | 305 ++----- reactos/ntoskrnl/mm/mdl.c | 76 +- reactos/ntoskrnl/mm/mm.c | 47 +- reactos/ntoskrnl/mm/mminit.c | 55 +- reactos/ntoskrnl/mm/ncache.c | 24 +- reactos/ntoskrnl/mm/npool.c | 55 +- reactos/ntoskrnl/mm/pagefile.c | 79 +- reactos/ntoskrnl/mm/pageop.c | 132 +--- reactos/ntoskrnl/mm/ppool.c | 4 +- reactos/ntoskrnl/mm/rmap.c | 459 ++--------- reactos/ntoskrnl/mm/section.c | 116 ++- reactos/ntoskrnl/mm/slab.c | 18 +- reactos/ntoskrnl/mm/virtual.c | 95 ++- reactos/ntoskrnl/mm/wset.c | 8 +- reactos/ntoskrnl/ob/object.c | 22 +- reactos/ntoskrnl/ps/thread.c | 48 +- reactos/ntoskrnl/rtl/mem.c | 6 +- reactos/rules.mak | 3 +- 39 files changed, 1090 insertions(+), 3104 deletions(-) diff --git a/reactos/ntoskrnl/cc/view.c b/reactos/ntoskrnl/cc/view.c index 5ae6cedac31..f9e4dfac82c 100644 --- a/reactos/ntoskrnl/cc/view.c +++ b/reactos/ntoskrnl/cc/view.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: view.c,v 1.39 2002/05/13 18:10:38 chorns Exp $ +/* $Id: view.c,v 1.40 2002/05/14 21:19:16 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -284,7 +284,7 @@ CcRosCreateCacheSegment(PBCB Bcb, ExReleaseFastMutex(&ViewLock); for (i = 0; i < (Bcb->CacheSegmentSize / PAGESIZE); i++) { - ULONG_PTR Page; + PVOID Page; Status = MmRequestPageMemoryConsumer(MC_CACHE, TRUE, &Page); if (!NT_SUCCESS(Status)) @@ -295,7 +295,7 @@ CcRosCreateCacheSegment(PBCB Bcb, Status = MmCreateVirtualMapping(NULL, current->BaseAddress + (i * PAGESIZE), PAGE_READWRITE, - Page, + (ULONG)Page, TRUE); if (!NT_SUCCESS(Status)) { @@ -452,22 +452,14 @@ CcRosRequestCacheSegment(PBCB Bcb, CacheSeg)); } -VOID -CcFreeCachePage(IN BOOLEAN Before, - IN PVOID Context, - IN PMEMORY_AREA MemoryArea, - IN PVOID Address, - IN ULONG_PTR PhysicalAddress, - IN SWAPENTRY SwapEntry, - IN BOOLEAN Dirty) +STATIC VOID +CcFreeCachePage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, + ULONG PhysAddr, SWAPENTRY SwapEntry, BOOLEAN Dirty) { - if (!Before) + assert(SwapEntry == 0); + if (PhysAddr != 0) { - assert(SwapEntry == 0); - if (PhysicalAddress != 0) - { - MmReleasePageMemoryConsumer(MC_CACHE, PhysicalAddress); - } + MmReleasePageMemoryConsumer(MC_CACHE, (PVOID)PhysAddr); } } diff --git a/reactos/ntoskrnl/ex/work.c b/reactos/ntoskrnl/ex/work.c index a8065593edb..2b7399a6ae3 100644 --- a/reactos/ntoskrnl/ex/work.c +++ b/reactos/ntoskrnl/ex/work.c @@ -1,4 +1,4 @@ -/* $Id: work.c,v 1.12 2002/05/13 18:10:39 chorns Exp $ +/* $Id: work.c,v 1.13 2002/05/14 21:19:16 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -99,9 +99,9 @@ ExWorkerThreadEntryPoint(PVOID context) static VOID ExInitializeWorkQueue(PWORK_QUEUE WorkQueue, KPRIORITY Priority) { - NTSTATUS Status; ULONG i; - + PETHREAD Thread; + InitializeListHead(&WorkQueue->Head); KeInitializeSpinLock(&WorkQueue->Lock); KeInitializeSemaphore(&WorkQueue->Sem, @@ -116,13 +116,15 @@ static VOID ExInitializeWorkQueue(PWORK_QUEUE WorkQueue, NULL, ExWorkerThreadEntryPoint, WorkQueue); - Status = PiSetPriorityThread(WorkQueue->Thread[i], Priority); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("PiSetThreadPriority() failed with status 0x%.08x\n", Status); - KeBugCheck(0); - } + ObReferenceObjectByHandle(WorkQueue->Thread[i], + THREAD_ALL_ACCESS, + PsThreadType, + KernelMode, + (PVOID*)&Thread, + NULL); + KeSetPriorityThread(&Thread->Tcb, + Priority); + ObDereferenceObject(Thread); } } diff --git a/reactos/ntoskrnl/include/internal/id.h b/reactos/ntoskrnl/include/internal/id.h index cf3679f0277..43a29588163 100644 --- a/reactos/ntoskrnl/include/internal/id.h +++ b/reactos/ntoskrnl/include/internal/id.h @@ -15,4 +15,5 @@ #define InternalNotificationTimer (InternalBaseType + 10) #define InternalSynchronizationTimer (InternalBaseType + 11) #define InternalQueueType (InternalBaseType + 12) -#define InternalTypeMaximum InternalQueueType + + diff --git a/reactos/ntoskrnl/include/internal/kd.h b/reactos/ntoskrnl/include/internal/kd.h index ddf7c1a50e4..0613cd89c38 100644 --- a/reactos/ntoskrnl/include/internal/kd.h +++ b/reactos/ntoskrnl/include/internal/kd.h @@ -1,4 +1,4 @@ -/* $Id: kd.h,v 1.7 2002/05/08 17:05:32 chorns Exp $ +/* $Id: kd.h,v 1.8 2002/05/14 21:19:17 dwelch Exp $ * * kernel debugger prototypes */ @@ -8,18 +8,18 @@ #include -#define KD_DEBUG_DISABLED 0x00 -#define KD_DEBUG_GDB 0x01 -#define KD_DEBUG_PICE 0x02 -#define KD_DEBUG_SCREEN 0x04 -#define KD_DEBUG_SERIAL 0x08 -#define KD_DEBUG_BOCHS 0x10 -#define KD_DEBUG_FILELOG 0x20 +typedef enum +{ + NoDebug = 0, + GdbDebug, + PiceDebug, + ScreenDebug, + SerialDebug, + BochsDebug, + FileLogDebug +} DEBUG_TYPE; -extern ULONG KdDebugState; - -KD_PORT_INFORMATION GdbPortInfo; -KD_PORT_INFORMATION LogPortInfo; +extern DEBUG_TYPE KdDebugType; typedef enum _KD_CONTINUE_TYPE { diff --git a/reactos/ntoskrnl/include/internal/ke.h b/reactos/ntoskrnl/include/internal/ke.h index ce6faec8097..7fedba83361 100644 --- a/reactos/ntoskrnl/include/internal/ke.h +++ b/reactos/ntoskrnl/include/internal/ke.h @@ -222,15 +222,6 @@ KeBugCheckWithTf(ULONG BugCheckCode, VOID KiDumpTrapFrame(PKTRAP_FRAME Tf, ULONG ExceptionNr, ULONG cr2); -VOID -KiValidateDispatcherObject(IN PDISPATCHER_HEADER Object); - -#ifdef DBG -#define VALIDATE_DISPATCHER_OBJECT(Object) KiValidateDispatcherObject(Object); -#else /* !DBG */ -#define VALIDATE_DISPATCHER_OBJECT(Object) -#endif /* DBG */ - #endif /* not __ASM__ */ #define MAXIMUM_PROCESSORS 32 diff --git a/reactos/ntoskrnl/include/internal/ldr.h b/reactos/ntoskrnl/include/internal/ldr.h index 2c5c63d5909..4396f629c33 100644 --- a/reactos/ntoskrnl/include/internal/ldr.h +++ b/reactos/ntoskrnl/include/internal/ldr.h @@ -13,11 +13,6 @@ #include #include -#define KERNEL_MODULE_NAME L"ntoskrnl.exe" -#define HAL_MODULE_NAME L"hal.dll" -#define MODULE_ROOT_NAME L"\\Modules\\" -#define FILESYSTEM_ROOT_NAME L"\\FileSystem\\" - NTSTATUS LdrLoadDriver ( PUNICODE_STRING Filename, diff --git a/reactos/ntoskrnl/include/internal/mm.h b/reactos/ntoskrnl/include/internal/mm.h index 8d9faf67593..93259ca4719 100644 --- a/reactos/ntoskrnl/include/internal/mm.h +++ b/reactos/ntoskrnl/include/internal/mm.h @@ -5,7 +5,6 @@ #ifndef __INCLUDE_INTERNAL_MM_H #define __INCLUDE_INTERNAL_MM_H -#include #include #include @@ -15,8 +14,7 @@ struct _EPROCESS; struct _MM_RMAP_ENTRY; struct _MM_PAGEOP; -typedef ULONG SWAPENTRY, *PSWAPENTRY; - +typedef ULONG SWAPENTRY; #define MEMORY_AREA_INVALID (0) #define MEMORY_AREA_SECTION_VIEW_COMMIT (1) @@ -60,7 +58,7 @@ typedef ULONG SWAPENTRY, *PSWAPENTRY; typedef struct { - ULONG_PTR Entry[NR_SECTION_PAGE_ENTRIES]; + ULONG Entry[NR_SECTION_PAGE_ENTRIES]; } SECTION_PAGE_TABLE, *PSECTION_PAGE_TABLE; typedef struct @@ -119,24 +117,19 @@ typedef struct BOOLEAN Executable; } SECTION_OBJECT, *PSECTION_OBJECT; - -typedef struct _MEMORY_AREA +typedef struct { -#ifdef DBG - ULONG Magic; -#endif /* DBG */ ULONG Type; PVOID BaseAddress; ULONG Length; ULONG Attributes; LIST_ENTRY Entry; ULONG LockCount; - ULONG ReferenceCount; struct _EPROCESS* Process; union { struct - { + { SECTION_OBJECT* Section; ULONG ViewOffset; LIST_ENTRY ViewListEntry; @@ -150,287 +143,46 @@ typedef struct _MEMORY_AREA } Data; } MEMORY_AREA, *PMEMORY_AREA; - -#define MM_PAGEOP_PAGEIN (1) -#define MM_PAGEOP_PAGEOUT (2) -#define MM_PAGEOP_PAGESYNCH (3) -#define MM_PAGEOP_ACCESSFAULT (4) -#define MM_PAGEOP_MINIMUM MM_PAGEOP_PAGEIN -#define MM_PAGEOP_MAXIMUM MM_PAGEOP_ACCESSFAULT - -typedef struct _MM_PAGEOP -{ -#ifdef DBG - /* Magic ID */ - ULONG Magic; -#endif /* DBG */ - /* Type of operation. */ - ULONG OpType; - /* Number of threads interested in this operation. */ - ULONG ReferenceCount; - /* Event that will be set when the operation is completed. */ - KEVENT CompletionEvent; - /* Status of the operation once it is completed. */ - NTSTATUS Status; - /* TRUE if the operation was abandoned. */ - BOOLEAN Abandoned; - /* The memory area to be affected by the operation. */ - PMEMORY_AREA MArea; - ULONG Hash; - struct _MM_PAGEOP* Next; - struct _ETHREAD* Thread; - /* - * These fields are used to identify the operation if it is against a - * virtual memory area. - */ - ULONG Pid; - PVOID Address; - /* - * These fields are used to identify the operation if it is against a - * section mapping. - */ - PMM_SECTION_SEGMENT Segment; - ULONG Offset; -} MM_PAGEOP, *PMM_PAGEOP; - - -#define PAGE_STATE_VALID (0) -#define PAGE_STATE_PROTOTYPE (1) -#define PAGE_STATE_DEMAND_ZERO (2) -#define PAGE_STATE_TRANSITION (3) - -#define MM_PTYPE(x) (x) - -#define PAGE_LIST_FREE_ZEROED (0) -#define PAGE_LIST_FREE_UNZEROED (1) -#define PAGE_LIST_BIOS (2) -#define PAGE_LIST_STANDBY (3) -#define PAGE_LIST_MODIFIED (4) -#define PAGE_LIST_MODIFIED_NO_WRITE (5) -#define PAGE_LIST_MPW (6) - -/* PHYSICAL_PAGE.Flags */ -#define MM_PHYSICAL_PAGE_FREE (0x1) -#define MM_PHYSICAL_PAGE_USED (0x2) -#define MM_PHYSICAL_PAGE_BIOS (0x3) -#define MM_PHYSICAL_PAGE_STANDBY (0x4) -#define MM_PHYSICAL_PAGE_MODIFIED (0x5) -#define MM_PHYSICAL_PAGE_MPW (0x6) - -typedef VOID (*PRMAP_DELETE_CALLBACK)(IN PVOID Context, - IN PEPROCESS Process, - IN PVOID Address); - -/* FIXME: Unionize this structure */ -typedef struct _PHYSICAL_PAGE -{ - ULONG Flags; - LIST_ENTRY ListEntry; - ULONG ReferenceCount; - SWAPENTRY SavedSwapEntry; - ULONG LockCount; - ULONG MapCount; - struct _MM_RMAP_ENTRY* RmapListHead; - PRMAP_DELETE_CALLBACK RmapDelete; - PVOID RmapDeleteContext; - PMM_PAGEOP PageOp; -} PHYSICAL_PAGE, *PPHYSICAL_PAGE; - - -extern PPHYSICAL_PAGE MmPageArray; - -#define MiPageFromDescriptor(pp)((((ULONG_PTR)(pp) - (ULONG_PTR) MmPageArray) / sizeof(PHYSICAL_PAGE)) * PAGESIZE) - typedef struct _MADDRESS_SPACE { -#ifdef DBG - ULONG Magic; -#endif /* DBG */ LIST_ENTRY MAreaListHead; KMUTEX Lock; - ULONG ReferenceCount; ULONG LowestAddress; struct _EPROCESS* Process; PUSHORT PageTableRefCountTable; ULONG PageTableRefCountTableSize; } MADDRESS_SPACE, *PMADDRESS_SPACE; - -#define MmIsCopyOnWriteMemoryArea(MemoryArea) \ -( \ - ((MemoryArea)->Data.SectionData.Segment->WriteCopy \ - || (MemoryArea)->Data.SectionData.WriteCopyView) \ - && ((MemoryArea)->Attributes == PAGE_READWRITE \ - || (MemoryArea)->Attributes == PAGE_EXECUTE_READWRITE) \ -) - - -extern ULONG MiMaximumModifiedPageListSize; -extern ULONG MiModifiedPageListSize; -extern ULONG MiMaximumStandbyPageListSize; -extern ULONG MiStandbyPageListSize; - /* FUNCTIONS */ -#ifdef DBG - -VOID -DbgMmDumpProtection(IN ULONG Value); - -VOID -MiDumpPTE(IN ULONG Value); - -VOID -MiDumpProcessPTE(IN PEPROCESS Process, - IN PVOID Address); - -#endif /* DBG */ - -VOID -MiAcquirePageListLock(IN ULONG PageList, - OUT PLIST_ENTRY * ListHead); - -VOID -MiReleasePageListLock(); - -VOID -MiReclaimPage(IN ULONG_PTR PhysicalAddress, - IN BOOLEAN Dirty); - -VOID -MmInitMpwThreads(); - -VOID -MiShutdownMpwThreads(); - -VOID -MiSignalModifiedPageWriter(); - -VOID -MiSignalMappedPageWriter(); - -VOID -MmInitializeBalanceSetManager(); - -ULONG -MiGetLockCountPage(IN ULONG_PTR PhysicalAddress); - -VOID -MiDisableAllRmaps(IN ULONG_PTR PhysicalAddress, - IN PBOOLEAN Modified); - -VOID -MiEnableAllRmaps(IN ULONG_PTR PhysicalAddress, - IN BOOLEAN Modified); - -VOID -MiGetDirtyAllRmaps(IN ULONG_PTR PhysicalAddress, - IN PBOOLEAN Dirty); - -VOID -MiGetPageStateAllRmaps(IN ULONG_PTR PhysicalAddress, - IN ULONG PageState, - OUT PBOOLEAN Result); - -VOID -MiClearPageStateAllRmaps(IN ULONG_PTR PhysicalAddress, - IN ULONG PageState); - -VOID -MiSetPageStateAllRmaps(IN ULONG_PTR PhysicalAddress, - IN ULONG PageState); - -VOID -MiSetDirtyAllRmaps(IN ULONG_PTR PhysicalAddress, - IN BOOLEAN Dirty); - -BOOLEAN -MiPageState(IN PEPROCESS Process, - IN PVOID Address, - IN ULONG PageState); - -VOID -MiClearPageState(IN PEPROCESS Process, - IN PVOID Address, - IN ULONG PageState); - -VOID -MiSetPageState(IN PEPROCESS Process, - IN PVOID Address, - IN ULONG PageState); - -VOID -MmInitializeKernelAddressSpace(VOID); - -PMADDRESS_SPACE -MmGetCurrentAddressSpace(); - -PMADDRESS_SPACE -MmGetKernelAddressSpace(); - -NTSTATUS -MmInitializeAddressSpace(IN PEPROCESS Process, - IN PMADDRESS_SPACE AddressSpace); - -NTSTATUS -MmDestroyAddressSpace(IN PMADDRESS_SPACE AddressSpace); - -VOID -MmReferenceAddressSpace(IN PMADDRESS_SPACE AddressSpace); - -VOID -MmDereferenceAddressSpace(IN PMADDRESS_SPACE AddressSpace); - -VOID -MmApplyMemoryAreaProtection(IN PMEMORY_AREA MemoryArea); - -NTSTATUS -MmFlushSection(IN PSECTION_OBJECT SectionObject, - IN PLARGE_INTEGER FileOffset OPTIONAL, - IN ULONG Length, - OUT PIO_STATUS_BLOCK IoStatus OPTIONAL); - -PVOID STDCALL -MmAllocateSection(IN ULONG Length); - -NTSTATUS -MmCreateMemoryArea(IN PEPROCESS Process, - IN PMADDRESS_SPACE AddressSpace, - IN ULONG Type, - IN OUT PVOID* BaseAddress, - IN ULONG Length, - IN ULONG Attributes, - OUT PMEMORY_AREA* Result, - IN BOOLEAN FixedAddress); - -PMEMORY_AREA -MmOpenMemoryAreaByAddress(IN PMADDRESS_SPACE AddressSpace, - IN PVOID Address); - -VOID -MmCloseMemoryArea(IN PMEMORY_AREA MemoryArea); - -NTSTATUS -MmInitMemoryAreas(); - -VOID -ExInitNonPagedPool(IN PVOID BaseAddress); - -typedef VOID (*PFREE_MEMORY_AREA_PAGE_CALLBACK)(IN BOOLEAN Before, - IN PVOID Context, - IN PMEMORY_AREA MemoryArea, - IN PVOID Address, - IN ULONG_PTR PhysicalAddress, - IN SWAPENTRY SwapEntry, - IN BOOLEAN Dirty); - -NTSTATUS -MmFreeMemoryArea(IN PMADDRESS_SPACE AddressSpace, - IN PVOID BaseAddress, - IN ULONG Length, - IN PFREE_MEMORY_AREA_PAGE_CALLBACK FreePage, - IN PVOID FreePageContext); - +VOID MmLockAddressSpace(PMADDRESS_SPACE AddressSpace); +VOID MmUnlockAddressSpace(PMADDRESS_SPACE AddressSpace); +VOID MmInitializeKernelAddressSpace(VOID); +PMADDRESS_SPACE MmGetCurrentAddressSpace(VOID); +PMADDRESS_SPACE MmGetKernelAddressSpace(VOID); +NTSTATUS MmInitializeAddressSpace(struct _EPROCESS* Process, + PMADDRESS_SPACE AddressSpace); +NTSTATUS MmDestroyAddressSpace(PMADDRESS_SPACE AddressSpace); +PVOID STDCALL MmAllocateSection (IN ULONG Length); +NTSTATUS MmCreateMemoryArea(struct _EPROCESS* Process, + PMADDRESS_SPACE AddressSpace, + ULONG Type, + PVOID* BaseAddress, + ULONG Length, + ULONG Attributes, + MEMORY_AREA** Result, + BOOL FixedAddress); +MEMORY_AREA* MmOpenMemoryAreaByAddress(PMADDRESS_SPACE AddressSpace, + PVOID Address); +NTSTATUS MmInitMemoryAreas(VOID); +VOID ExInitNonPagedPool(ULONG BaseAddress); +NTSTATUS MmFreeMemoryArea(PMADDRESS_SPACE AddressSpace, + PVOID BaseAddress, + ULONG Length, + VOID (*FreePage)(PVOID Context, MEMORY_AREA* MemoryArea, + PVOID Address, ULONG PhysAddr, SWAPENTRY SwapEntry, + BOOLEAN Dirty), + PVOID FreePageContext); VOID MmDumpMemoryAreas(PLIST_ENTRY ListHead); NTSTATUS MmLockMemoryArea(MEMORY_AREA* MemoryArea); NTSTATUS MmUnlockMemoryArea(MEMORY_AREA* MemoryArea); @@ -452,12 +204,10 @@ PVOID MmInitializePageList(PVOID FirstPhysKernelAddress, PADDRESS_RANGE BIOSMemoryMap, ULONG AddressRangeCount); -ULONG_PTR -MmAllocPage(IN ULONG Consumer, - IN SWAPENTRY SavedSwapEntry); - -VOID MmDereferencePage(IN ULONG_PTR PhysicalAddress); -VOID MmReferencePage(IN ULONG_PTR PhysicalAddress); +PVOID +MmAllocPage(ULONG Consumer, SWAPENTRY SavedSwapEntry); +VOID MmDereferencePage(PVOID PhysicalAddress); +VOID MmReferencePage(PVOID PhysicalAddress); VOID MmDeletePageTable(struct _EPROCESS* Process, PVOID Address); NTSTATUS MmCopyMmInfo(struct _EPROCESS* Src, @@ -466,34 +216,22 @@ NTSTATUS MmReleaseMmInfo(struct _EPROCESS* Process); NTSTATUS Mmi386ReleaseMmInfo(struct _EPROCESS* Process); VOID MmDeleteVirtualMapping(struct _EPROCESS* Process, - PVOID Address, - BOOLEAN FreePage, - PBOOLEAN WasDirty, - PULONG PhysicalPage); + PVOID Address, + BOOL FreePage, + BOOL* WasDirty, + ULONG* PhysicalPage); #define MM_PAGE_CLEAN (0) #define MM_PAGE_DIRTY (1) -VOID -MmBuildMdlFromPages(IN PMDL Mdl, - IN PULONG_PTR Pages); - -PVOID -MmGetMdlPageAddress(IN PMDL Mdl, - IN PVOID Offset); - -VOID -MiShutdownMemoryManager(VOID); - -ULONG -MmGetPhysicalAddressForProcess(IN struct _EPROCESS* Process, - IN PVOID Address); - +VOID MmBuildMdlFromPages(PMDL Mdl, PULONG Pages); +PVOID MmGetMdlPageAddress(PMDL Mdl, PVOID Offset); +VOID MiShutdownMemoryManager(VOID); +ULONG MmGetPhysicalAddressForProcess(struct _EPROCESS* Process, + PVOID Address); NTSTATUS STDCALL MmUnmapViewOfSection(struct _EPROCESS* Process, PVOID BaseAddress); - -VOID -MmInitPagingFile(VOID); +VOID MmInitPagingFile(VOID); /* FIXME: it should be in ddk/mmfuncs.h */ NTSTATUS @@ -530,7 +268,7 @@ MmNotPresentFaultVirtualMemory(PMADDRESS_SPACE AddressSpace, BOOLEAN Locked); NTSTATUS MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace, - MEMORY_AREA* MemoryArea, + MEMORY_AREA* MemoryArea, PVOID Address, BOOLEAN Locked); NTSTATUS MmWaitForPage(PVOID Page); @@ -538,14 +276,13 @@ VOID MmClearWaitPage(PVOID Page); VOID MmSetWaitPage(PVOID Page); BOOLEAN MmIsPageDirty(struct _EPROCESS* Process, PVOID Address); BOOLEAN MmIsPageTablePresent(PVOID PAddress); - NTSTATUS -MmFlushVirtualMemory(PMADDRESS_SPACE AddressSpace, +MmPageOutVirtualMemory(PMADDRESS_SPACE AddressSpace, PMEMORY_AREA MemoryArea, PVOID Address, struct _MM_PAGEOP* PageOp); NTSTATUS -MmFlushSectionView(PMADDRESS_SPACE AddressSpace, +MmPageOutSectionView(PMADDRESS_SPACE AddressSpace, PMEMORY_AREA MemoryArea, PVOID Address, struct _MM_PAGEOP* PageOp); @@ -553,44 +290,14 @@ MEMORY_AREA* MmOpenMemoryAreaByRegion(PMADDRESS_SPACE AddressSpace, PVOID Address, ULONG Length); -VOID -ExUnmapPage(IN PVOID Addr); +VOID ExUnmapPage(PVOID Addr); +PVOID ExAllocatePage(VOID); -PVOID -ExAllocatePage(VOID); - -VOID -MmInitPagingFile(VOID); - -BOOLEAN -MmReserveSwapPages(IN ULONG Nr); - -VOID -MmDereserveSwapPages(IN ULONG Nr); - -SWAPENTRY -MmAllocSwapPage(VOID); - -VOID -MmFreeSwapPage(IN SWAPENTRY Entry); - -VOID -MiValidateSwapEntry(IN SWAPENTRY Entry); - -VOID -MiValidatePageOp(IN PMM_PAGEOP PageOp); - -VOID -MiValidatePhysicalAddress(IN ULONG_PTR PhysicalAddress); - -VOID -MiValidateAddressSpace(IN PMADDRESS_SPACE AddressSpace); - -VOID -MiValidateMemoryArea(IN PMEMORY_AREA MemoryArea); - -VOID -MiValidateRmapList(struct _MM_RMAP_ENTRY* RmapList); +VOID MmInitPagingFile(VOID); +BOOLEAN MmReserveSwapPages(ULONG Nr); +VOID MmDereserveSwapPages(ULONG Nr); +SWAPENTRY MmAllocSwapPage(VOID); +VOID MmFreeSwapPage(SWAPENTRY Entry); VOID MmInit1(ULONG FirstKernelPhysAddress, ULONG LastKernelPhysAddress, @@ -620,197 +327,107 @@ typedef struct extern MM_STATS MmStats; -extern BOOLEAN MiInitialized; - -#ifdef DBG -#define VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress) MiValidatePhysicalAddress((ULONG_PTR)PhysicalAddress) -#define VALIDATE_SWAP_ENTRY(Entry) MiValidateSwapEntry(Entry) -#define VALIDATE_PAGEOP(PageOp) MiValidatePageOp(PageOp) -#define VALIDATE_ADDRESS_SPACE(AddressSpace) MiValidateAddressSpace(AddressSpace) -#define VALIDATE_MEMORY_AREA(MemoryArea) MiValidateMemoryArea(MemoryArea) -#define VALIDATE_RMAP_LIST(RmapList) MiValidateRmapList(RmapList) -#else /* !DBG */ -#define VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress) -#define VALIDATE_SWAP_ENTRY(Entry) -#define VALIDATE_PAGEOP(PageOp) -#define VALIDATE_ADDRESS_SPACE(AddressSpace) -#define VALIDATE_MEMORY_AREA(MemoryArea) -#define VALIDATE_RMAP_LIST(RmapList) -#endif /* DBG */ - -#ifdef DBG - -VOID -MiLockAddressSpace(IN PMADDRESS_SPACE AddressSpace, - IN LPSTR FileName, - IN ULONG LineNumber); - -VOID -MiUnlockAddressSpace(IN PMADDRESS_SPACE AddressSpace, - IN LPSTR FileName, - IN ULONG LineNumber); - -/* Use macros for easier debugging */ -#define MmLockAddressSpace(AddressSpace) MiLockAddressSpace(AddressSpace, __FILE__, __LINE__) -#define MmUnlockAddressSpace(AddressSpace) MiUnlockAddressSpace(AddressSpace, __FILE__, __LINE__) - -#else /* !DBG */ - -VOID -MiLockAddressSpace(IN PMADDRESS_SPACE AddressSpace); - -VOID -MiUnlockAddressSpace(IN PMADDRESS_SPACE AddressSpace); - -#define MmLockAddressSpace MiLockAddressSpace -#define MmUnlockAddressSpace MiUnlockAddressSpace - -#endif /* !DBG */ - - -#ifdef DBG - -VOID -MiReferenceMemoryArea(IN PMEMORY_AREA MemoryArea, - IN LPSTR FileName, - IN ULONG LineNumber); - -VOID -MiDereferenceMemoryArea(IN PMEMORY_AREA MemoryArea, - IN LPSTR FileName, - IN ULONG LineNumber); - -/* Use macros for easier debugging */ -#define MmReferenceMemoryArea(MemoryArea) MiReferenceMemoryArea(MemoryArea, __FILE__, __LINE__) -#define MmDereferenceMemoryArea(MemoryArea) MiDereferenceMemoryArea(MemoryArea, __FILE__, __LINE__) - -#else /* !DBG */ - -VOID -MiReferenceMemoryArea(IN PMEMORY_AREA MemoryArea); - -VOID -MiDereferenceMemoryArea(IN PMEMORY_AREA MemoryArea); - -#define MmReferenceMemoryArea MiReferenceMemoryArea -#define MmDereferenceMemoryArea MiDereferenceMemoryArea - -#endif /* !DBG */ - - NTSTATUS MmWritePageSectionView(PMADDRESS_SPACE AddressSpace, - PMEMORY_AREA MArea, - PVOID Address); - + PMEMORY_AREA MArea, + PVOID Address); NTSTATUS MmWritePageVirtualMemory(PMADDRESS_SPACE AddressSpace, - PMEMORY_AREA MArea, - PVOID Address); - + PMEMORY_AREA MArea, + PVOID Address); PVOID MmGetDirtyPagesFromWorkingSet(struct _EPROCESS* Process); - NTSTATUS MmWriteToSwapPage(SWAPENTRY SwapEntry, PMDL Mdl); - NTSTATUS MmReadFromSwapPage(SWAPENTRY SwapEntry, PMDL Mdl); - -VOID -MmSetFlagsPage(IN ULONG_PTR PhysicalAddress, - IN ULONG Flags); - +VOID +MmSetFlagsPage(PVOID PhysicalAddress, ULONG Flags); ULONG -MmGetFlagsPage(IN ULONG_PTR PhysicalAddress); +MmGetFlagsPage(PVOID PhysicalAddress); +VOID MmSetSavedSwapEntryPage(PVOID PhysicalAddress, + SWAPENTRY SavedSwapEntry); +SWAPENTRY MmGetSavedSwapEntryPage(PVOID PhysicalAddress); +VOID MmSetCleanPage(struct _EPROCESS* Process, PVOID Address); +VOID MmLockPage(PVOID PhysicalPage); +VOID MmUnlockPage(PVOID PhysicalPage); -VOID -MmSetSavedSwapEntryPage(IN ULONG_PTR PhysicalAddress, - SWAPENTRY SavedSwapEntry); - -SWAPENTRY -MmGetSavedSwapEntryPage(IN ULONG_PTR PhysicalAddress); - -VOID -MmSetSavedPageOp(IN ULONG_PTR PhysicalAddress, - IN PMM_PAGEOP PageOp); - -PMM_PAGEOP -MmGetSavedPageOp(IN ULONG_PTR PhysicalAddress); - -VOID -MmSetCleanPage(IN PEPROCESS Process, - IN PVOID Address); - -VOID -MmLockPage(IN ULONG_PTR PhysicalPage); - -VOID -MmUnlockPage(IN ULONG_PTR PhysicalPage); - -NTSTATUS -MmSafeCopyFromUser(PVOID Dest, PVOID Src, ULONG Count); - -NTSTATUS -MmSafeCopyToUser(PVOID Dest, PVOID Src, ULONG Count); - -NTSTATUS +NTSTATUS MmSafeCopyFromUser(PVOID Dest, PVOID Src, ULONG Count); +NTSTATUS MmSafeCopyToUser(PVOID Dest, PVOID Src, ULONG Count); +NTSTATUS MmCreatePhysicalMemorySection(VOID); - PVOID MmGetContinuousPages(ULONG NumberOfBytes, - PHYSICAL_ADDRESS HighestAcceptableAddress, - ULONG Alignment); + PHYSICAL_ADDRESS HighestAcceptableAddress, + ULONG Alignment); + +#define MM_PHYSICAL_PAGE_MPW_PENDING (0x8) NTSTATUS -MmAccessFaultSectionView(IN PMADDRESS_SPACE AddressSpace, - IN MEMORY_AREA* IN MemoryArea, - IN PVOID Address, - IN BOOLEAN Locked); - +MmAccessFaultSectionView(PMADDRESS_SPACE AddressSpace, + MEMORY_AREA* MemoryArea, + PVOID Address, + BOOLEAN Locked); ULONG -MmGetPageProtect(IN struct _EPROCESS* Process, - IN PVOID Address); - -PVOID -ExAllocatePageWithPhysPage(IN ULONG_PTR Page); - +MmGetPageProtect(struct _EPROCESS* Process, PVOID Address); +PVOID +ExAllocatePageWithPhysPage(ULONG PhysPage); ULONG -MmGetReferenceCountPage(IN ULONG_PTR PhysicalAddress); - +MmGetReferenceCountPage(PVOID PhysicalAddress); BOOLEAN -MmIsUsablePage(IN ULONG_PTR PhysicalAddress); +MmIsUsablePage(PVOID PhysicalAddress); + +#define MM_PAGEOP_PAGEIN (1) +#define MM_PAGEOP_PAGEOUT (2) +#define MM_PAGEOP_PAGESYNCH (3) +#define MM_PAGEOP_ACCESSFAULT (4) + +typedef struct _MM_PAGEOP +{ + /* Type of operation. */ + ULONG OpType; + /* Number of threads interested in this operation. */ + ULONG ReferenceCount; + /* Event that will be set when the operation is completed. */ + KEVENT CompletionEvent; + /* Status of the operation once it is completed. */ + NTSTATUS Status; + /* TRUE if the operation was abandoned. */ + BOOLEAN Abandoned; + /* The memory area to be affected by the operation. */ + PMEMORY_AREA MArea; + ULONG Hash; + struct _MM_PAGEOP* Next; + struct _ETHREAD* Thread; + /* + * These fields are used to identify the operation if it is against a + * virtual memory area. + */ + ULONG Pid; + PVOID Address; + /* + * These fields are used to identify the operation if it is against a + * section mapping. + */ + PMM_SECTION_SEGMENT Segment; + ULONG Offset; +} MM_PAGEOP, *PMM_PAGEOP; VOID -MmReleasePageOp(IN PMM_PAGEOP PageOp); +MmReleasePageOp(PMM_PAGEOP PageOp); PMM_PAGEOP -MmGetPageOp(IN PMEMORY_AREA MArea, - IN ULONG Pid, - IN PVOID Address, - IN PMM_SECTION_SEGMENT Segment, - IN ULONG Offset, - IN ULONG OpType); - -PMM_PAGEOP -MmGotPageOp(IN PMEMORY_AREA MArea, - IN ULONG Pid, - IN PVOID Address, - IN PMM_SECTION_SEGMENT Segment, - IN ULONG Offset); +MmGetPageOp(PMEMORY_AREA MArea, ULONG Pid, PVOID Address, + PMM_SECTION_SEGMENT Segment, ULONG Offset, ULONG OpType); VOID MiDebugDumpNonPagedPool(BOOLEAN NewOnly); - VOID MiDebugDumpNonPagedPoolStats(BOOLEAN NewOnly); - VOID -MmMarkPageMapped(IN ULONG_PTR PhysicalAddress); - +MmMarkPageMapped(PVOID PhysicalAddress); VOID -MmMarkPageUnmapped(IN ULONG_PTR PhysicalAddress); - +MmMarkPageUnmapped(PVOID PhysicalAddress); VOID MmFreeSectionSegments(PFILE_OBJECT FileObject); @@ -822,15 +439,14 @@ typedef struct _MM_IMAGE_SECTION_OBJECT VOID MmFreeVirtualMemory(struct _EPROCESS* Process, PMEMORY_AREA MemoryArea); - NTSTATUS MiCopyFromUserPage(ULONG DestPhysPage, PVOID SourceAddress); - NTSTATUS -MiZeroPage(IN ULONG_PTR Page); - +MiZeroPage(ULONG PhysPage); BOOLEAN MmIsAccessedAndResetAccessPage(struct _EPROCESS* Process, PVOID Address); +SWAPENTRY +MmGetSavedSwapEntryPage(PVOID PhysicalAddress); #define STATUS_MM_RESTART_OPERATION (0xD0000001) @@ -847,22 +463,10 @@ MmInitializeMemoryConsumer(ULONG Consumer, PULONG NrFreed)); VOID MmInitializeBalancer(ULONG NrAvailablePages); - NTSTATUS -MmReleasePageMemoryConsumer(IN ULONG Consumer, - IN ULONG_PTR Page); - +MmReleasePageMemoryConsumer(ULONG Consumer, PVOID Page); NTSTATUS -MiFreePageMemoryConsumer(IN ULONG Consumer, - IN ULONG_PTR Page); - -NTSTATUS -MmRequestPageMemoryConsumer(IN ULONG Consumer, - IN BOOLEAN CanWait, - OUT PULONG_PTR pPage); - -VOID -MiSatisfyAllocationRequest(); +MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, PVOID* AllocatedPage); #define MC_CACHE (0) #define MC_USER (1) @@ -870,110 +474,40 @@ MiSatisfyAllocationRequest(); #define MC_NPPOOL (3) #define MC_MAXIMUM (4) -VOID -MiTransitionAllRmaps(IN ULONG_PTR PhysicalAddress, - IN BOOLEAN Reference, - OUT PBOOLEAN Modified); - -NTSTATUS -MiAbortTransition(IN ULONG_PTR Address); - -NTSTATUS -MiFinishTransition(IN ULONG_PTR PhysicalAddress, - IN BOOLEAN Dirty); - VOID -MmSetRmapListHeadPage(IN ULONG_PTR PhysicalAddress, - IN struct _MM_RMAP_ENTRY* ListHead); - +MmSetRmapListHeadPage(PVOID PhysicalAddress, struct _MM_RMAP_ENTRY* ListHead); struct _MM_RMAP_ENTRY* -MmGetRmapListHeadPage(IN ULONG_PTR PhysicalAddress); - +MmGetRmapListHeadPage(PVOID PhysicalAddress); VOID -MmSetRmapCallback(IN ULONG_PTR PhysicalAddress, - IN PRMAP_DELETE_CALLBACK RmapDelete, - IN PVOID RmapDeleteContext); - +MmInsertRmap(PVOID PhysicalAddress, PEPROCESS Process, PVOID Address); VOID -MmGetRmapCallback(IN ULONG_PTR PhysicalAddress, - IN PRMAP_DELETE_CALLBACK *RmapDelete, - IN PVOID *RmapDeleteContext); - -NTSTATUS -MmPageOutPhysicalAddress(ULONG_PTR PhysicalAddress); - +MmDeleteAllRmaps(PVOID PhysicalAddress, PVOID Context, + VOID (*DeleteMapping)(PVOID Context, PEPROCESS Process, PVOID Address)); VOID -MmInsertRmap(ULONG_PTR PhysicalAddress, PEPROCESS Process, PVOID Address); - -VOID -MmDeleteAllRmaps(ULONG_PTR PhysicalAddress, PVOID Context, - VOID (*DeleteMapping)(PVOID Context, PEPROCESS Process, - PVOID Address)); - -VOID -MmDeleteRmap(IN ULONG_PTR PhysicalAddress, - IN PEPROCESS Process, - IN PVOID Address); - +MmDeleteRmap(PVOID PhysicalAddress, PEPROCESS Process, PVOID Address); VOID MmInitializeRmapList(VOID); - -ULONG_PTR -MmGetLRUNextUserPage(IN ULONG_PTR PreviousPhysicalAddress); - -ULONG_PTR +PVOID +MmGetLRUNextUserPage(PVOID PreviousPhysicalAddress); +PVOID MmGetLRUFirstUserPage(VOID); - NTSTATUS -MmPrepareFlushPhysicalAddress(IN ULONG_PTR PhysicalAddress); - -NTSTATUS -MmFlushPhysicalAddress(IN ULONG_PTR PhysicalAddress); - +MmPageOutPhysicalAddress(PVOID PhysicalAddress); NTSTATUS MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages); VOID -MmDisableVirtualMapping(IN PEPROCESS Process, - IN PVOID Address, - OUT PBOOLEAN WasDirty, - OUT PULONG_PTR PhysicalAddr); - -VOID MmEnableVirtualMapping(IN PEPROCESS Process, - IN PVOID Address); - +MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOL* WasDirty, ULONG* PhysicalAddr); +VOID MmEnableVirtualMapping(PEPROCESS Process, PVOID Address); VOID -MmDeletePageFileMapping(IN PEPROCESS Process, - IN PVOID Address, - OUT PSWAPENTRY SwapEntry); - -NTSTATUS -MmCreatePageFileMapping(IN PEPROCESS Process, - IN PVOID Address, - IN SWAPENTRY SwapEntry); - -BOOLEAN -MmIsPageSwapEntry(IN PEPROCESS Process, - IN PVOID Address); - +MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, SWAPENTRY* SwapEntry); +NTSTATUS +MmCreatePageFileMapping(PEPROCESS Process, + PVOID Address, + SWAPENTRY SwapEntry); +BOOLEAN MmIsPageSwapEntry(PEPROCESS Process, PVOID Address); VOID -MmTransferOwnershipPage(IN ULONG_PTR PhysicalAddress, - IN ULONG NewConsumer); - -VOID -MmSetDirtyPage(IN PEPROCESS Process, - IN PVOID Address); - -NTSTATUS -MmPageOutSectionView(PMADDRESS_SPACE AddressSpace, - MEMORY_AREA* MemoryArea, - PVOID Address, - PMM_PAGEOP PageOp); - -NTSTATUS -MmPageOutVirtualMemory(PMADDRESS_SPACE AddressSpace, - PMEMORY_AREA MemoryArea, - PVOID Address, - PMM_PAGEOP PageOp); +MmTransferOwnershipPage(PVOID PhysicalAddress, ULONG NewConsumer); +VOID MmSetDirtyPage(PEPROCESS Process, PVOID Address); #endif diff --git a/reactos/ntoskrnl/include/internal/ntoskrnl.h b/reactos/ntoskrnl/include/internal/ntoskrnl.h index 5890fee9966..c89fed618bd 100644 --- a/reactos/ntoskrnl/include/internal/ntoskrnl.h +++ b/reactos/ntoskrnl/include/internal/ntoskrnl.h @@ -7,17 +7,10 @@ #ifndef __ASM__ -#include #include #include -#ifdef DBG -#define SET_MAGIC(x, magic)(x)->Magic = (magic); -#else /* !DBG */ -#define SET_MAGIC(x, magic) -#endif /* DBG */ - /* * Use these to place a function in a specific section of the executable */ diff --git a/reactos/ntoskrnl/include/internal/ps.h b/reactos/ntoskrnl/include/internal/ps.h index 7d9c26982a1..d3cb47f2551 100644 --- a/reactos/ntoskrnl/include/internal/ps.h +++ b/reactos/ntoskrnl/include/internal/ps.h @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: ps.h,v 1.32 2002/05/13 18:10:39 chorns Exp $ +/* $Id: ps.h,v 1.33 2002/05/14 21:19:17 dwelch Exp $ * * FILE: ntoskrnl/ke/kthread.c * PURPOSE: Process manager definitions @@ -585,10 +585,6 @@ PiTimeoutThread(struct _KDPC *dpc, VOID STDCALL PsDispatchThread(ULONG NewThreadStatus); -NTSTATUS -PiSetPriorityThread(IN HANDLE ThreadHandle, - IN KPRIORITY Priority); - #endif /* ASSEMBLER */ #endif /* __INCLUDE_INTERNAL_PS_H */ diff --git a/reactos/ntoskrnl/ke/bug.c b/reactos/ntoskrnl/ke/bug.c index ecfca8aab48..145ee64de5c 100644 --- a/reactos/ntoskrnl/ke/bug.c +++ b/reactos/ntoskrnl/ke/bug.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: bug.c,v 1.22 2002/05/13 18:10:39 chorns Exp $ +/* $Id: bug.c,v 1.23 2002/05/14 21:19:18 dwelch Exp $ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/bug.c @@ -103,10 +103,9 @@ KeBugCheckEx(ULONG BugCheckCode, { PRTL_MESSAGE_RESOURCE_ENTRY Message; NTSTATUS Status; - KIRQL OldIrql; - - KeRaiseIrql(HIGH_LEVEL, &OldIrql); - + + /* PJS: disable interrupts first, then do the rest */ + __asm__("cli\n\t"); DbgPrint("Bug detected (code %x param %x %x %x %x)\n", BugCheckCode, BugCheckParameter1, @@ -134,19 +133,12 @@ KeBugCheckEx(ULONG BugCheckCode, if (InBugCheck == 1) { DbgPrint("Recursive bug check halting now\n"); - - if (KdDebuggerEnabled) - { - DbgBreakPoint(); - } - for (;;) { __asm__("hlt\n\t"); } } InBugCheck = 1; - if (PsGetCurrentProcess() != NULL) { DbgPrint("Pid: %x <", PsGetCurrentProcess()->UniqueProcessId); @@ -158,10 +150,12 @@ KeBugCheckEx(ULONG BugCheckCode, PsGetCurrentThread(), PsGetCurrentThread()->Cid.UniqueThread); } - KeDumpStackFrames((PULONG)__builtin_frame_address(0)); - +// PsDumpThreads(); + KeDumpStackFrames((PULONG)__builtin_frame_address(0)); + if (KdDebuggerEnabled) { + __asm__("sti\n\t"); DbgBreakPoint(); } diff --git a/reactos/ntoskrnl/ke/i386/exp.c b/reactos/ntoskrnl/ke/i386/exp.c index 3b7b989e443..a4a4d59f8e4 100644 --- a/reactos/ntoskrnl/ke/i386/exp.c +++ b/reactos/ntoskrnl/ke/i386/exp.c @@ -544,10 +544,6 @@ KiTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr) */ if (ExceptionNr == 14) { -#ifdef DBG - KIRQL SavedIrql = KeGetCurrentIrql(); -#endif /* DBG */ - __asm__("sti\n\t"); Status = MmPageFault(Tf->Cs&0xffff, &Tf->Eip, @@ -556,9 +552,6 @@ KiTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr) Tf->ErrorCode); if (NT_SUCCESS(Status)) { - assertmsg((KeGetCurrentIrql() == SavedIrql), - ("Page fault handler changed IRQL (Before %d After %d). Forgot to release a spin lock?\n", - SavedIrql, KeGetCurrentIrql())); return(0); } diff --git a/reactos/ntoskrnl/ke/i386/kernel.c b/reactos/ntoskrnl/ke/i386/kernel.c index 80c15641acd..36d3fbe3134 100644 --- a/reactos/ntoskrnl/ke/i386/kernel.c +++ b/reactos/ntoskrnl/ke/i386/kernel.c @@ -40,7 +40,7 @@ ULONG KiPcrInitDone = 0; static ULONG PcrsAllocated = 0; -static ULONG_PTR PcrPages[MAXIMUM_PROCESSORS]; +static PVOID PcrPages[MAXIMUM_PROCESSORS]; /* FUNCTIONS *****************************************************************/ @@ -64,7 +64,7 @@ KeApplicationProcessorInit(VOID) KPCR = (PKPCR)(KPCR_BASE + (Offset * PAGESIZE)); MmCreateVirtualMappingForKernel((PVOID)KPCR, PAGE_READWRITE, - PcrPages[Offset]); + (ULONG)PcrPages[Offset]); memset(KPCR, 0, PAGESIZE); KPCR->ProcessorNumber = Offset; KPCR->Self = KPCR; diff --git a/reactos/ntoskrnl/ke/kthread.c b/reactos/ntoskrnl/ke/kthread.c index 57ca5bf8528..0f7970b8d65 100644 --- a/reactos/ntoskrnl/ke/kthread.c +++ b/reactos/ntoskrnl/ke/kthread.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: kthread.c,v 1.24 2002/05/13 18:10:39 chorns Exp $ +/* $Id: kthread.c,v 1.25 2002/05/14 21:19:18 dwelch Exp $ * * FILE: ntoskrnl/ke/kthread.c * PURPOSE: Microkernel thread support @@ -44,21 +44,13 @@ /* FUNCTIONS *****************************************************************/ VOID -KeFreeStackPage(IN BOOLEAN Before, - IN PVOID Context, - IN PMEMORY_AREA MemoryArea, - IN PVOID Address, - IN ULONG_PTR PhysicalAddress, - IN SWAPENTRY SwapEntry, - IN BOOLEAN Dirty) +KeFreeStackPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, ULONG PhysAddr, + SWAPENTRY SwapEntry, BOOLEAN Dirty) { - if (!Before) + assert(SwapEntry == 0); + if (PhysAddr != 0) { - assert(SwapEntry == 0); - if (PhysicalAddress != 0) - { - MmDereferencePage(PhysicalAddress); - } + MmDereferencePage((PVOID)PhysAddr); } } @@ -117,7 +109,7 @@ KeInitializeThread(PKPROCESS Process, PKTHREAD Thread, BOOLEAN First) MEMORY_AREA_KERNEL_STACK, &KernelStack, MM_STACK_SIZE, - PAGE_EXECUTE_READWRITE, + 0, &StackArea, FALSE); MmUnlockAddressSpace(MmGetKernelAddressSpace()); @@ -129,7 +121,7 @@ KeInitializeThread(PKPROCESS Process, PKTHREAD Thread, BOOLEAN First) } for (i = 0; i < (MM_STACK_SIZE / PAGESIZE); i++) { - ULONG_PTR Page; + PVOID Page; Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Page); if (!NT_SUCCESS(Status)) { @@ -137,8 +129,8 @@ KeInitializeThread(PKPROCESS Process, PKTHREAD Thread, BOOLEAN First) } Status = MmCreateVirtualMapping(NULL, KernelStack + (i * PAGESIZE), - StackArea->Attributes, - Page, + PAGE_EXECUTE_READWRITE, + (ULONG)Page, TRUE); } Thread->InitialStack = KernelStack + MM_STACK_SIZE; diff --git a/reactos/ntoskrnl/ke/timer.c b/reactos/ntoskrnl/ke/timer.c index 13a248c037b..09546e3c767 100644 --- a/reactos/ntoskrnl/ke/timer.c +++ b/reactos/ntoskrnl/ke/timer.c @@ -1,4 +1,4 @@ -/* $Id: timer.c,v 1.49 2002/05/13 18:10:39 chorns Exp $ +/* $Id: timer.c,v 1.50 2002/05/14 21:19:18 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -138,7 +138,7 @@ KeDelayExecutionThread (KPROCESSOR_MODE WaitMode, KeSetTimer(&Thread->Timer, *Interval, NULL); return (KeWaitForSingleObject(&Thread->Timer, Executive, - WaitMode, + UserMode, Alertable, NULL)); } diff --git a/reactos/ntoskrnl/ke/wait.c b/reactos/ntoskrnl/ke/wait.c index 22a097f35da..12dcd29fa48 100644 --- a/reactos/ntoskrnl/ke/wait.c +++ b/reactos/ntoskrnl/ke/wait.c @@ -35,127 +35,6 @@ static PKTHREAD Owner = NULL; /* FUNCTIONS *****************************************************************/ -#ifdef DBG - -VOID -KiValidateDispatcherObject(IN PDISPATCHER_HEADER Object) -{ - if ((Object->Type < InternalBaseType) - || (Object->Type > InternalTypeMaximum)) - { - assertmsg(FALSE, ("Bad dispatcher object type %d\n", Object->Type)); - } -} - - -PKTHREAD -KiGetDispatcherObjectOwner(IN PDISPATCHER_HEADER Header) -{ - switch (Header->Type) - { - case InternalMutexType: - { - PKMUTEX Mutex = (PKMUTEX)Header; - return Mutex->OwnerThread; - } - - default: - /* No owner */ - return NULL; - } -} - - -VOID KiDeadlockDetectionMutualResource(IN PDISPATCHER_HEADER CurrentObject, - IN PKTHREAD CurrentThread, - IN PKTHREAD OwnerThread) -/* - * PURPOSE: Perform deadlock detection. - * At this point, OwnerThread owns CurrentObject and CurrentThread - * is waiting on CurrentObject - * Deadlock happens if OwnerThread is waiting on a resource that - * InitialThread owns. - * NOTE: Called with the dispatcher database locked - */ -{ - PDISPATCHER_HEADER Object; - PKWAIT_BLOCK WaitBlock; - PKTHREAD Thread; - - DPRINT("KiDeadlockDetectionMutualResource(" - "CurrentObject 0x%.08x, CurrentThread 0x%.08x OwnerThread 0x%.08x)\n", - CurrentObject, CurrentThread, OwnerThread); - - /* Go through all dispather objects that OwnerThread is waiting on */ - for (WaitBlock = OwnerThread->WaitBlockList; - WaitBlock; - WaitBlock = WaitBlock->NextWaitBlock) - { - Object = WaitBlock->Object; - - /* If OwnerThread is waiting on a resource that CurrentThread has - * acquired then we have a deadlock */ - Thread = KiGetDispatcherObjectOwner(Object); - if ((Thread != NULL) && (Thread == CurrentThread)) - { - DbgPrint("Deadlock detected!\n"); - DbgPrint("Thread 0x%.08x is waiting on Object 0x%.08x of type %d " - " which is owned by Thread 0x%.08x\n", - Thread, CurrentObject, CurrentObject->Type, OwnerThread); - DbgPrint("Thread 0x%.08x is waiting on Object 0x%.08x of type %d " - " which is owned by Thread 0x%.08x\n", - OwnerThread, Object, Object->Type, Thread); - KeBugCheck(0); - } - } -} - - -VOID KiDeadlockDetection(IN PDISPATCHER_HEADER Header) -/* - * PURPOSE: Perform deadlock detection - * NOTE: Called with the dispatcher database locked - */ -{ - PLIST_ENTRY CurrentEntry; - PKWAIT_BLOCK WaitBlock; - PKWAIT_BLOCK Current; - PKTHREAD OwnerThread; - PKTHREAD Thread; - - DPRINT("KiDeadlockDetection(Header %x)\n", Header); - if (IsListEmpty(&(Header->WaitListHead))) - return; - - CurrentEntry = Header->WaitListHead.Flink; - Current = CONTAINING_RECORD(CurrentEntry, KWAIT_BLOCK, WaitListEntry); - - /* Go through all threads waiting on this dispatcher object */ - for (WaitBlock = Current->Thread->WaitBlockList; - WaitBlock; - WaitBlock = WaitBlock->NextWaitBlock) - { - Thread = WaitBlock->Thread; - - DPRINT("KiDeadlockDetection: WaitBlock->Thread %x waiting on WaitBlock->Object %x\n", - WaitBlock->Thread, WaitBlock->Object); - - /* If another thread is currently owning this dispatcher object, - see if we have a deadlock */ - OwnerThread = KiGetDispatcherObjectOwner(Current->Object); - DPRINT("KiDeadlockDetection: OwnerThread %x\n", OwnerThread); - if ((OwnerThread != NULL) && (OwnerThread != Thread)) - { - KiDeadlockDetectionMutualResource(Current->Object, - Current->Thread, - OwnerThread); - } - } -} - -#endif /* DBG */ - - VOID KeInitializeDispatcherHeader(DISPATCHER_HEADER* Header, ULONG Type, ULONG Size, @@ -257,7 +136,6 @@ static VOID KiSideEffectsBeforeWake(DISPATCHER_HEADER* hdr, DPRINT1("Thread == NULL!\n"); KeBugCheck(0); } - if (Abandoned != NULL) *Abandoned = Mutex->Abandoned; if (Thread != NULL) @@ -555,10 +433,6 @@ KeWaitForSingleObject(PVOID Object, KIRQL WaitIrql; BOOLEAN Abandoned; - assert_irql(DISPATCH_LEVEL); - - VALIDATE_DISPATCHER_OBJECT(Object); - CurrentThread = KeGetCurrentThread(); WaitIrql = KeGetCurrentIrql(); @@ -614,23 +488,10 @@ KeWaitForSingleObject(PVOID Object, } return(STATUS_TIMEOUT); } - -#ifdef DBG - - if (hdr->Type == InternalMutexType) - { - PKMUTEX Mutex; - - Mutex = CONTAINING_RECORD(hdr, KMUTEX, Header); - assertmsg(Mutex->OwnerThread != CurrentThread, - ("Recursive locking of mutex (0x%.08x)\n", Mutex)); - } - -#endif /* DBG */ - - /* - * Set up for a wait - */ + + /* + * Set up for a wait + */ CurrentThread->WaitStatus = STATUS_UNSUCCESSFUL; /* Append wait block to the KTHREAD wait block list */ CurrentThread->WaitBlockList = &CurrentThread->WaitBlock[0]; @@ -656,16 +517,6 @@ KeWaitForSingleObject(PVOID Object, { CurrentThread->WaitBlock[0].NextWaitBlock = NULL; } - -#ifdef DBG - /* - * Do deadlock detection in checked version - * NOTE: This must be done after the the dispatcher object is put on - * the wait block list. - */ - KiDeadlockDetection(Object); -#endif /* DBG */ - PsBlockThread(&Status, (UCHAR)Alertable, WaitMode, TRUE, WaitIrql); } while (Status == STATUS_KERNEL_APC); @@ -701,8 +552,6 @@ KeWaitForMultipleObjects(ULONG Count, DPRINT("Entering KeWaitForMultipleObjects(Count %lu Object[] %p) " "PsGetCurrentThread() %x\n",Count,Object,PsGetCurrentThread()); - assert_irql(APC_LEVEL); - CountSignaled = 0; CurrentThread = KeGetCurrentThread(); WaitIrql = KeGetCurrentIrql(); @@ -760,8 +609,6 @@ KeWaitForMultipleObjects(ULONG Count, for (i = 0; i < Count; i++) { hdr = (DISPATCHER_HEADER *)Object[i]; - - VALIDATE_DISPATCHER_OBJECT(hdr); if (KiIsObjectSignalled(hdr, CurrentThread, &Abandoned)) { @@ -808,7 +655,7 @@ KeWaitForMultipleObjects(ULONG Count, for (i = 0; i < Count; i++) { hdr = (DISPATCHER_HEADER *)Object[i]; - assertmsg(hdr != NULL, ("Waiting on uninitialized object\n")); + blk->Object = Object[i]; blk->Thread = CurrentThread; blk->WaitKey = STATUS_WAIT_0 + i; @@ -828,7 +675,7 @@ KeWaitForMultipleObjects(ULONG Count, { blk->NextWaitBlock = blk + 1; } - + InsertTailList(&hdr->WaitListHead, &blk->WaitListEntry); blk = blk->NextWaitBlock; diff --git a/reactos/ntoskrnl/mm/aspace.c b/reactos/ntoskrnl/mm/aspace.c index d73485879eb..b6b844d13c2 100644 --- a/reactos/ntoskrnl/mm/aspace.c +++ b/reactos/ntoskrnl/mm/aspace.c @@ -1,4 +1,4 @@ -/* $Id: aspace.c,v 1.9 2002/05/13 18:10:40 chorns Exp $ +/* $Id: aspace.c,v 1.10 2002/05/14 21:19:18 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -11,7 +11,6 @@ /* INCLUDES *****************************************************************/ -#include #include #include #include @@ -19,157 +18,64 @@ #include -/* Define to track address space locking/unlocking */ -//#define TRACK_ADDRESS_SPACE_LOCK - /* GLOBALS ******************************************************************/ STATIC MADDRESS_SPACE KernelAddressSpace; -#define TAG_ASPC TAG('A', 'S', 'P', 'C') #define TAG_PTRC TAG('P', 'T', 'R', 'C') /* FUNCTIONS *****************************************************************/ -#ifdef DBG -VOID -MiValidateAddressSpace(IN PMADDRESS_SPACE AddressSpace) +VOID +MmLockAddressSpace(PMADDRESS_SPACE AddressSpace) { - assertmsg(AddressSpace != NULL, - ("No address space can exist at 0x%.08x\n", AddressSpace)); - - assertmsg(AddressSpace->Magic == TAG_ASPC, - ("Bad magic (0x%.08x) for address space (0x%.08x). It should be 0x%.08x\n", - AddressSpace->Magic, AddressSpace, TAG_ASPC)); - - assertmsg(AddressSpace->ReferenceCount > 0, - ("No outstanding references on address space (0x%.08x)\n", AddressSpace)); -} -#endif /* DBG */ - - -#ifdef DBG - -VOID -MiLockAddressSpace(IN PMADDRESS_SPACE AddressSpace, - IN LPSTR FileName, - IN ULONG LineNumber) -{ - VALIDATE_ADDRESS_SPACE(AddressSpace); - - /* - * Don't bother with locking if we are the first thread. - */ - if (KeGetCurrentThread() == NULL) - { - return; - } - -#ifdef TRACK_ADDRESS_SPACE_LOCK - DbgPrint("(0x%.08x)(%s:%d) Locking address space 0x%.08x\n", - KeGetCurrentThread(), FileName, LineNumber, AddressSpace); -#endif /* TRACK_ADDRESS_SPACE_LOCK */ - - (VOID)KeWaitForMutexObject(&AddressSpace->Lock, - Executive, - KernelMode, - FALSE, - NULL); - -#ifdef TRACK_ADDRESS_SPACE_LOCK - DbgPrint("(0x%.08x)(%s:%d) Locked address space 0x%.08x\n", - KeGetCurrentThread(), FileName, LineNumber, AddressSpace); -#endif /* TRACK_ADDRESS_SPACE_LOCK */ -} - - -VOID -MiUnlockAddressSpace(IN PMADDRESS_SPACE AddressSpace, - IN LPSTR FileName, - IN ULONG LineNumber) -{ - VALIDATE_ADDRESS_SPACE(AddressSpace); - /* - * Don't bother locking if we are the first thread. + * Don't bother with locking if we are the first thread. */ if (KeGetCurrentThread() == NULL) { return; } - KeReleaseMutex(&AddressSpace->Lock, FALSE); - -#ifdef TRACK_ADDRESS_SPACE_LOCK - DbgPrint("(0x%.08x)(%s:%d) Unlocked address space 0x%.08x\n", - KeGetCurrentThread(), FileName, LineNumber, AddressSpace); -#endif /* TRACK_ADDRESS_SPACE_LOCK */ + (VOID)KeWaitForMutexObject(&AddressSpace->Lock, + 0, + KernelMode, + FALSE, + NULL); } -#else /* !DBG */ - -VOID -MiLockAddressSpace(IN PMADDRESS_SPACE AddressSpace) -{ - /* - * Don't bother with locking if we are the first thread. - */ - if (KeGetCurrentThread() == NULL) - { - return; - } - - (VOID)KeWaitForMutexObject(&AddressSpace->Lock, - Executive, - KernelMode, - FALSE, - NULL); -} - - -VOID -MiUnlockAddressSpace(IN PMADDRESS_SPACE AddressSpace) -{ - /* - * Don't bother locking if we are the first thread. - */ - if (KeGetCurrentThread() == NULL) - { - return; - } - KeReleaseMutex(&AddressSpace->Lock, FALSE); -} - -#endif /* !DBG */ - - VOID -MmInitializeKernelAddressSpace() +MmUnlockAddressSpace(PMADDRESS_SPACE AddressSpace) +{ + /* + * Don't bother locking if we are the first thread. + */ + if (KeGetCurrentThread() == NULL) + { + return; + } + KeReleaseMutex(&AddressSpace->Lock, FALSE); +} + +VOID +MmInitializeKernelAddressSpace(VOID) { MmInitializeAddressSpace(NULL, &KernelAddressSpace); } - -PMADDRESS_SPACE -MmGetCurrentAddressSpace() +PMADDRESS_SPACE MmGetCurrentAddressSpace(VOID) { return(&PsGetCurrentProcess()->AddressSpace); } - -PMADDRESS_SPACE -MmGetKernelAddressSpace() +PMADDRESS_SPACE MmGetKernelAddressSpace(VOID) { return(&KernelAddressSpace); } - NTSTATUS -MmInitializeAddressSpace(IN PEPROCESS Process, - IN PMADDRESS_SPACE AddressSpace) +MmInitializeAddressSpace(PEPROCESS Process, + PMADDRESS_SPACE AddressSpace) { - SET_MAGIC(AddressSpace, TAG_ASPC) - - AddressSpace->ReferenceCount = 1; InitializeListHead(&AddressSpace->MAreaListHead); KeInitializeMutex(&AddressSpace->Lock, 1); if (Process != NULL) @@ -196,38 +102,12 @@ MmInitializeAddressSpace(IN PEPROCESS Process, return(STATUS_SUCCESS); } - NTSTATUS -MmDestroyAddressSpace(IN PMADDRESS_SPACE AddressSpace) +MmDestroyAddressSpace(PMADDRESS_SPACE AddressSpace) { - VALIDATE_ADDRESS_SPACE(AddressSpace); - - AddressSpace->ReferenceCount--; - - assertmsg(AddressSpace->ReferenceCount == 0, - ("There are %d outstanding references on address space (0x%.08x)\n", - AddressSpace->ReferenceCount, AddressSpace)); - if (AddressSpace->PageTableRefCountTable != NULL) { ExFreePool(AddressSpace->PageTableRefCountTable); } return(STATUS_SUCCESS); } - - -VOID -MmReferenceAddressSpace(IN PMADDRESS_SPACE AddressSpace) -{ - InterlockedIncrement(&AddressSpace->ReferenceCount); -} - - -VOID -MmDereferenceAddressSpace(IN PMADDRESS_SPACE AddressSpace) -{ - InterlockedDecrement(&AddressSpace->ReferenceCount); - - assertmsg(AddressSpace->ReferenceCount > 0, - ("No outstanding references on address space (0x%.08x)\n", AddressSpace)); -} diff --git a/reactos/ntoskrnl/mm/balance.c b/reactos/ntoskrnl/mm/balance.c index 4bf081e9848..0f775e59edf 100644 --- a/reactos/ntoskrnl/mm/balance.c +++ b/reactos/ntoskrnl/mm/balance.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: balance.c,v 1.7 2002/05/13 18:10:40 chorns Exp $ +/* $Id: balance.c,v 1.8 2002/05/14 21:19:18 dwelch Exp $ * * COPYRIGHT: See COPYING in the top directory * PROJECT: ReactOS kernel @@ -47,7 +47,7 @@ typedef struct _MM_MEMORY_CONSUMER typedef struct _MM_ALLOCATION_REQUEST { - ULONG_PTR Page; + PVOID Page; LIST_ENTRY ListEntry; KEVENT Event; } MM_ALLOCATION_REQUEST, *PMM_ALLOCATION_REQUEST; @@ -93,13 +93,13 @@ MmInitializeMemoryConsumer(ULONG Consumer, } NTSTATUS -MmReleasePageMemoryConsumer(ULONG Consumer, ULONG_PTR Page) +MmReleasePageMemoryConsumer(ULONG Consumer, PVOID Page) { PMM_ALLOCATION_REQUEST Request; PLIST_ENTRY Entry; KIRQL oldIrql; - if (Page == 0) + if (Page == NULL) { DPRINT1("Tried to release page zero.\n"); KeBugCheck(0); @@ -173,11 +173,11 @@ MiRebalanceMemoryConsumers(VOID) } NTSTATUS -MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, PULONG_PTR AllocatedPage) +MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, PVOID* AllocatedPage) { ULONG OldUsed; ULONG OldAvailable; - ULONG_PTR Page; + PVOID Page; KIRQL oldIrql; /* @@ -211,7 +211,7 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, PULONG_PTR Allocate } /* Insert an allocation request. */ - Request.Page = 0; + Request.Page = NULL; KeInitializeEvent(&Request.Event, NotificationEvent, FALSE); InterlockedIncrement(&MiPagesRequired); @@ -234,7 +234,7 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, PULONG_PTR Allocate { Page = MmAllocPage(Consumer, 0); KeReleaseSpinLock(&AllocationListLock, oldIrql); - if (Page == 0) + if (Page == NULL) { KeBugCheck(0); } @@ -251,7 +251,7 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, PULONG_PTR Allocate NULL); Page = Request.Page; - if (Page == 0) + if (Page == NULL) { KeBugCheck(0); } @@ -264,7 +264,7 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, PULONG_PTR Allocate * Actually allocate the page. */ Page = MmAllocPage(Consumer, 0); - if (Page == 0) + if (Page == NULL) { KeBugCheck(0); } diff --git a/reactos/ntoskrnl/mm/cont.c b/reactos/ntoskrnl/mm/cont.c index 857d4f30987..b8524e958cc 100644 --- a/reactos/ntoskrnl/mm/cont.c +++ b/reactos/ntoskrnl/mm/cont.c @@ -1,4 +1,4 @@ -/* $Id: cont.c,v 1.18 2002/05/13 18:10:40 chorns Exp $ +/* $Id: cont.c,v 1.19 2002/05/14 21:19:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -19,22 +19,14 @@ /* FUNCTIONS *****************************************************************/ -VOID -MmFreeContinuousPage(IN BOOLEAN Before, - IN PVOID Context, - IN PMEMORY_AREA MemoryArea, - IN PVOID Address, - IN ULONG_PTR PhysicalAddress, - IN SWAPENTRY SwapEntry, - IN BOOLEAN Dirty) +VOID STATIC +MmFreeContinuousPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, ULONG PhysAddr, + SWAPENTRY SwapEntry, BOOLEAN Dirty) { - if (!Before) + assert(SwapEntry == 0); + if (PhysAddr != 0) { - assert(SwapEntry == 0); - if (PhysicalAddress != 0) - { - MmDereferencePage(PhysicalAddress); - } + MmDereferencePage((PVOID)PhysAddr); } } @@ -51,13 +43,13 @@ MmAllocateContiguousAlignedMemory(IN ULONG NumberOfBytes, MmLockAddressSpace(MmGetKernelAddressSpace()); Status = MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), - MEMORY_AREA_CONTINUOUS_MEMORY, - &BaseAddress, - NumberOfBytes, - 0, - &MArea, - FALSE); + MmGetKernelAddressSpace(), + MEMORY_AREA_CONTINUOUS_MEMORY, + &BaseAddress, + NumberOfBytes, + 0, + &MArea, + FALSE); MmUnlockAddressSpace(MmGetKernelAddressSpace()); if (!NT_SUCCESS(Status)) @@ -149,11 +141,11 @@ MmAllocateContiguousMemory (IN ULONG NumberOfBytes, VOID STDCALL MmFreeContiguousMemory(IN PVOID BaseAddress) { - MmFreeMemoryArea(MmGetKernelAddressSpace(), - BaseAddress, - 0, - MmFreeContinuousPage, - NULL); + MmFreeMemoryArea(MmGetKernelAddressSpace(), + BaseAddress, + 0, + MmFreeContinuousPage, + NULL); } diff --git a/reactos/ntoskrnl/mm/freelist.c b/reactos/ntoskrnl/mm/freelist.c index f44736512a6..71613868035 100644 --- a/reactos/ntoskrnl/mm/freelist.c +++ b/reactos/ntoskrnl/mm/freelist.c @@ -4,7 +4,6 @@ * FILE: ntoskrnl/mm/freelist.c * PURPOSE: Handle the list of free physical pages * PROGRAMMER: David Welch (welch@cwcom.net) - * Casper S. Hornstrup (chorns@users.sourceforge.net) * UPDATE HISTORY: * 27/05/98: Created * 18/08/98: Added a fix from Robert Bergkvist @@ -21,142 +20,98 @@ /* TYPES *******************************************************************/ +#define MM_PHYSICAL_PAGE_FREE (0x1) +#define MM_PHYSICAL_PAGE_USED (0x2) +#define MM_PHYSICAL_PAGE_BIOS (0x3) + +#define MM_PTYPE(x) ((x) & 0x3) + +typedef struct _PHYSICAL_PAGE +{ + ULONG Flags; + LIST_ENTRY ListEntry; + ULONG ReferenceCount; + SWAPENTRY SavedSwapEntry; + ULONG LockCount; + ULONG MapCount; + struct _MM_RMAP_ENTRY* RmapListHead; +} PHYSICAL_PAGE, *PPHYSICAL_PAGE; + /* GLOBALS ****************************************************************/ -PPHYSICAL_PAGE MmPageArray; +static PPHYSICAL_PAGE MmPageArray; -KSPIN_LOCK MiPageListLock; -LIST_ENTRY MiUsedPageListHeads[MC_MAXIMUM]; -LIST_ENTRY MiFreeZeroedPageListHead; -LIST_ENTRY MiFreeUnzeroedPageListHead; -LIST_ENTRY MiBiosPageListHead; -LIST_ENTRY MiStandbyPageListHead; -ULONG MiStandbyPageListSize; -LIST_ENTRY MiModifiedPageListHead; -ULONG MiModifiedPageListSize; -LIST_ENTRY MiModifiedNoWritePageListHead; -ULONG MiModifiedNoWritePageListSize; -/* LIST_ENTRY BadPageListHead; */ +static KSPIN_LOCK PageListLock; +static LIST_ENTRY UsedPageListHeads[MC_MAXIMUM]; +static LIST_ENTRY FreeZeroedPageListHead; +static LIST_ENTRY FreeUnzeroedPageListHead; +static LIST_ENTRY BiosPageListHead; /* FUNCTIONS *************************************************************/ VOID -MiAcquirePageListLock(IN ULONG PageList, - OUT PLIST_ENTRY * ListHead) +MmTransferOwnershipPage(PVOID PhysicalAddress, ULONG NewConsumer) { - KeAcquireSpinLockAtDpcLevel(&MiPageListLock); - switch (PageList) - { - case PAGE_LIST_FREE_ZEROED: - *ListHead = &MiFreeZeroedPageListHead; - break; - case PAGE_LIST_FREE_UNZEROED: - *ListHead = &MiFreeUnzeroedPageListHead; - break; - case PAGE_LIST_BIOS: - *ListHead = &MiBiosPageListHead; - break; - case PAGE_LIST_STANDBY: - *ListHead = &MiStandbyPageListHead; - break; - case PAGE_LIST_MODIFIED: - *ListHead = &MiModifiedPageListHead; - break; - case PAGE_LIST_MODIFIED_NO_WRITE: - *ListHead = &MiModifiedNoWritePageListHead; - break; - default: - DPRINT1("Bad page list type 0x%.08x\n", PageList); - KeBugCheck(0); - break; - } -} - - -VOID -MiReleasePageListLock() -{ - KeReleaseSpinLockFromDpcLevel(&MiPageListLock); -} - - -VOID -MmTransferOwnershipPage(IN ULONG_PTR PhysicalAddress, - IN ULONG NewConsumer) -{ - ULONG Start = PhysicalAddress / PAGESIZE; + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; KIRQL oldIrql; - - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); - - KeAcquireSpinLock(&MiPageListLock, &oldIrql); + + KeAcquireSpinLock(&PageListLock, &oldIrql); RemoveEntryList(&MmPageArray[Start].ListEntry); - MmPageArray[Start].Flags = MM_PHYSICAL_PAGE_USED; - InsertTailList(&MiUsedPageListHeads[NewConsumer], + InsertTailList(&UsedPageListHeads[NewConsumer], &MmPageArray[Start].ListEntry); - KeReleaseSpinLock(&MiPageListLock, oldIrql); + KeReleaseSpinLock(&PageListLock, oldIrql); } -ULONG_PTR +PVOID MmGetLRUFirstUserPage(VOID) { PLIST_ENTRY NextListEntry; - ULONG_PTR Next; + ULONG Next; PHYSICAL_PAGE* PageDescriptor; KIRQL oldIrql; - KeAcquireSpinLock(&MiPageListLock, &oldIrql); - NextListEntry = MiUsedPageListHeads[MC_USER].Flink; - if (NextListEntry == &MiUsedPageListHeads[MC_USER]) + KeAcquireSpinLock(&PageListLock, &oldIrql); + NextListEntry = UsedPageListHeads[MC_USER].Flink; + if (NextListEntry == &UsedPageListHeads[MC_USER]) { - KeReleaseSpinLock(&MiPageListLock, oldIrql); - return(0); + KeReleaseSpinLock(&PageListLock, oldIrql); + return(NULL); } PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); - //Next = ((ULONG_PTR) PageDescriptor - (ULONG_PTR)MmPageArray); - //Next = (Next / sizeof(PHYSICAL_PAGE)) * PAGESIZE; - Next = MiPageFromDescriptor(PageDescriptor); - - assertmsg(PageDescriptor->Flags == MM_PHYSICAL_PAGE_USED, - ("Page at 0x%.08x on used page list is not used.\n", Next)); - - KeReleaseSpinLock(&MiPageListLock, oldIrql); - return(Next); + Next = (ULONG)((ULONG)PageDescriptor - (ULONG)MmPageArray); + Next = (Next / sizeof(PHYSICAL_PAGE)) * PAGESIZE; + KeReleaseSpinLock(&PageListLock, oldIrql); + return((PVOID)Next); } -ULONG_PTR -MmGetLRUNextUserPage(IN ULONG_PTR PreviousPhysicalAddress) +PVOID +MmGetLRUNextUserPage(PVOID PreviousPhysicalAddress) { - ULONG Start = PreviousPhysicalAddress / PAGESIZE; + ULONG Start = (ULONG)PreviousPhysicalAddress / PAGESIZE; PLIST_ENTRY NextListEntry; - ULONG_PTR Next; + ULONG Next; PHYSICAL_PAGE* PageDescriptor; KIRQL oldIrql; - VALIDATE_PHYSICAL_ADDRESS(PreviousPhysicalAddress); - - KeAcquireSpinLock(&MiPageListLock, &oldIrql); + KeAcquireSpinLock(&PageListLock, &oldIrql); if (!(MmPageArray[Start].Flags & MM_PHYSICAL_PAGE_USED)) { - NextListEntry = MiUsedPageListHeads[MC_USER].Flink; + NextListEntry = UsedPageListHeads[MC_USER].Flink; } else { NextListEntry = MmPageArray[Start].ListEntry.Flink; } - if (NextListEntry == &MiUsedPageListHeads[MC_USER]) + if (NextListEntry == &UsedPageListHeads[MC_USER]) { - KeReleaseSpinLock(&MiPageListLock, oldIrql); - return(0); + KeReleaseSpinLock(&PageListLock, oldIrql); + return(NULL); } PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); - Next = MiPageFromDescriptor(PageDescriptor); - - assertmsg(PageDescriptor->Flags == MM_PHYSICAL_PAGE_USED, - ("Page at 0x%.08x on used page list is not used.\n", Next)); - - KeReleaseSpinLock(&MiPageListLock, oldIrql); - return(Next); + Next = (ULONG)((ULONG)PageDescriptor - (ULONG)MmPageArray); + Next = (Next / sizeof(PHYSICAL_PAGE)) * PAGESIZE; + KeReleaseSpinLock(&PageListLock, oldIrql); + return((PVOID)Next); } PVOID @@ -172,7 +127,7 @@ MmGetContinuousPages(ULONG NumberOfBytes, NrPages = PAGE_ROUND_UP(NumberOfBytes) / PAGESIZE; - KeAcquireSpinLock(&MiPageListLock, &oldIrql); + KeAcquireSpinLock(&PageListLock, &oldIrql); start = -1; length = 0; @@ -206,7 +161,7 @@ MmGetContinuousPages(ULONG NumberOfBytes, } if (start == -1 || length != NrPages) { - KeReleaseSpinLock(&MiPageListLock, oldIrql); + KeReleaseSpinLock(&PageListLock, oldIrql); return(NULL); } for (i = start; i < (start + length); i++) @@ -217,10 +172,10 @@ MmGetContinuousPages(ULONG NumberOfBytes, MmPageArray[i].LockCount = 0; MmPageArray[i].MapCount = 0; MmPageArray[i].SavedSwapEntry = 0; - InsertTailList(&MiUsedPageListHeads[MC_NPPOOL], + InsertTailList(&UsedPageListHeads[MC_NPPOOL], &MmPageArray[i].ListEntry); } - KeReleaseSpinLock(&MiPageListLock, oldIrql); + KeReleaseSpinLock(&PageListLock, oldIrql); return((PVOID)(start * 4096)); } @@ -244,7 +199,7 @@ VOID MiParseRangeToFreeList( { MmPageArray[i].Flags = MM_PHYSICAL_PAGE_FREE; MmPageArray[i].ReferenceCount = 0; - InsertTailList(&MiFreeUnzeroedPageListHead, + InsertTailList(&FreeUnzeroedPageListHead, &MmPageArray[i].ListEntry); } } @@ -276,7 +231,7 @@ VOID MiParseRangeToBiosList( { MmPageArray[i].Flags = MM_PHYSICAL_PAGE_BIOS; MmPageArray[i].ReferenceCount = 1; - InsertTailList(&MiBiosPageListHead, + InsertTailList(&BiosPageListHead, &MmPageArray[i].ListEntry); } } @@ -338,18 +293,12 @@ MmInitializePageList(PVOID FirstPhysKernelAddress, for (i = 0; i < MC_MAXIMUM; i++) { - InitializeListHead(&MiUsedPageListHeads[i]); + InitializeListHead(&UsedPageListHeads[i]); } - KeInitializeSpinLock(&MiPageListLock); - InitializeListHead(&MiFreeUnzeroedPageListHead); - InitializeListHead(&MiFreeZeroedPageListHead); - InitializeListHead(&MiBiosPageListHead); - InitializeListHead(&MiStandbyPageListHead); - MiStandbyPageListSize = 0; - InitializeListHead(&MiModifiedPageListHead); - MiModifiedPageListSize = 0; - InitializeListHead(&MiModifiedNoWritePageListHead); - MiModifiedNoWritePageListSize = 0; + KeInitializeSpinLock(&PageListLock); + InitializeListHead(&FreeUnzeroedPageListHead); + InitializeListHead(&FreeZeroedPageListHead); + InitializeListHead(&BiosPageListHead); LastKernelAddress = PAGE_ROUND_UP(LastKernelAddress); @@ -360,10 +309,10 @@ MmInitializePageList(PVOID FirstPhysKernelAddress, DPRINT("Reserved %d\n", Reserved); LastKernelAddress = PAGE_ROUND_UP(LastKernelAddress); - LastKernelAddress = ((ULONG_PTR) LastKernelAddress + (Reserved * PAGESIZE)); + LastKernelAddress = ((ULONG)LastKernelAddress + (Reserved * PAGESIZE)); LastPhysKernelAddress = (PVOID)PAGE_ROUND_UP(LastPhysKernelAddress); LastPhysKernelAddress = LastPhysKernelAddress + (Reserved * PAGESIZE); - + MmStats.NrTotalPages = 0; MmStats.NrSystemPages = 0; MmStats.NrUserPages = 0; @@ -373,11 +322,12 @@ MmInitializePageList(PVOID FirstPhysKernelAddress, for (i = 0; i < Reserved; i++) { - if (!MmIsPagePresent(NULL, (PVOID) ((ULONG_PTR)MmPageArray + (i * PAGESIZE)))) + if (!MmIsPagePresent(NULL, + (PVOID)((ULONG)MmPageArray + (i * PAGESIZE)))) { - Status = + Status = MmCreateVirtualMappingUnsafe(NULL, - (PVOID)((ULONG_PTR)MmPageArray + + (PVOID)((ULONG)MmPageArray + (i * PAGESIZE)), PAGE_READWRITE, (ULONG)(LastPhysKernelAddress @@ -397,7 +347,7 @@ MmInitializePageList(PVOID FirstPhysKernelAddress, */ MmPageArray[0].Flags = MM_PHYSICAL_PAGE_BIOS; MmPageArray[0].ReferenceCount = 0; - InsertTailList(&MiBiosPageListHead, + InsertTailList(&BiosPageListHead, &MmPageArray[0].ListEntry); /* @@ -405,27 +355,27 @@ MmInitializePageList(PVOID FirstPhysKernelAddress, */ MmPageArray[1].Flags = MM_PHYSICAL_PAGE_BIOS; MmPageArray[1].ReferenceCount = 0; - InsertTailList(&MiBiosPageListHead, + InsertTailList(&BiosPageListHead, &MmPageArray[1].ListEntry); i = 2; - if ((ULONG_PTR) FirstPhysKernelAddress < 0xa0000) + if ((ULONG)FirstPhysKernelAddress < 0xa0000) { - MmStats.NrFreePages += (((ULONG_PTR) FirstPhysKernelAddress/PAGESIZE) - 1); - for (; i<((ULONG_PTR) FirstPhysKernelAddress/PAGESIZE); i++) + MmStats.NrFreePages += (((ULONG)FirstPhysKernelAddress/PAGESIZE) - 1); + for (; i<((ULONG)FirstPhysKernelAddress/PAGESIZE); i++) { MmPageArray[i].Flags = MM_PHYSICAL_PAGE_FREE; MmPageArray[i].ReferenceCount = 0; - InsertTailList(&MiFreeUnzeroedPageListHead, + InsertTailList(&FreeUnzeroedPageListHead, &MmPageArray[i].ListEntry); } MmStats.NrSystemPages += - ((((ULONG_PTR) LastPhysKernelAddress) / PAGESIZE) - i); - for (; i<((ULONG_PTR) LastPhysKernelAddress / PAGESIZE); i++) + ((((ULONG)LastPhysKernelAddress) / PAGESIZE) - i); + for (; i<((ULONG)LastPhysKernelAddress / PAGESIZE); i++) { MmPageArray[i].Flags = MM_PHYSICAL_PAGE_USED; MmPageArray[i].ReferenceCount = 1; - InsertTailList(&MiUsedPageListHeads[MC_NPPOOL], + InsertTailList(&UsedPageListHeads[MC_NPPOOL], &MmPageArray[i].ListEntry); } MmStats.NrFreePages += ((0xa0000/PAGESIZE) - i); @@ -433,7 +383,7 @@ MmInitializePageList(PVOID FirstPhysKernelAddress, { MmPageArray[i].Flags = MM_PHYSICAL_PAGE_FREE; MmPageArray[i].ReferenceCount = 0; - InsertTailList(&MiFreeUnzeroedPageListHead, + InsertTailList(&FreeUnzeroedPageListHead, &MmPageArray[i].ListEntry); } MmStats.NrReservedPages += ((0x100000/PAGESIZE) - i); @@ -441,7 +391,7 @@ MmInitializePageList(PVOID FirstPhysKernelAddress, { MmPageArray[i].Flags = MM_PHYSICAL_PAGE_BIOS; MmPageArray[i].ReferenceCount = 1; - InsertTailList(&MiBiosPageListHead, + InsertTailList(&BiosPageListHead, &MmPageArray[i].ListEntry); } } @@ -452,7 +402,7 @@ MmInitializePageList(PVOID FirstPhysKernelAddress, { MmPageArray[i].Flags = MM_PHYSICAL_PAGE_FREE; MmPageArray[i].ReferenceCount = 0; - InsertTailList(&MiFreeUnzeroedPageListHead, + InsertTailList(&FreeUnzeroedPageListHead, &MmPageArray[i].ListEntry); } MmStats.NrReservedPages += (0x60000 / PAGESIZE); @@ -460,24 +410,24 @@ MmInitializePageList(PVOID FirstPhysKernelAddress, { MmPageArray[i].Flags = MM_PHYSICAL_PAGE_BIOS; MmPageArray[i].ReferenceCount = 1; - InsertTailList(&MiBiosPageListHead, + InsertTailList(&BiosPageListHead, &MmPageArray[i].ListEntry); } - MmStats.NrFreePages += (((ULONG_PTR) FirstPhysKernelAddress/PAGESIZE) - i); - for (; i<((ULONG_PTR) FirstPhysKernelAddress/PAGESIZE); i++) + MmStats.NrFreePages += (((ULONG)FirstPhysKernelAddress/PAGESIZE) - i); + for (; i<((ULONG)FirstPhysKernelAddress/PAGESIZE); i++) { MmPageArray[i].Flags = MM_PHYSICAL_PAGE_FREE; MmPageArray[i].ReferenceCount = 0; - InsertTailList(&MiFreeUnzeroedPageListHead, + InsertTailList(&FreeUnzeroedPageListHead, &MmPageArray[i].ListEntry); } MmStats.NrSystemPages += - (((ULONG_PTR) LastPhysKernelAddress/PAGESIZE) - i); - for (; i<((ULONG_PTR) LastPhysKernelAddress/PAGESIZE); i++) + (((ULONG)LastPhysKernelAddress/PAGESIZE) - i); + for (; i<((ULONG)LastPhysKernelAddress/PAGESIZE); i++) { MmPageArray[i].Flags = MM_PHYSICAL_PAGE_USED; MmPageArray[i].ReferenceCount = 1; - InsertTailList(&MiUsedPageListHeads[MC_NPPOOL], + InsertTailList(&UsedPageListHeads[MC_NPPOOL], &MmPageArray[i].ListEntry); } } @@ -487,7 +437,7 @@ MmInitializePageList(PVOID FirstPhysKernelAddress, { MmPageArray[i].Flags = MM_PHYSICAL_PAGE_FREE; MmPageArray[i].ReferenceCount = 0; - InsertTailList(&MiFreeUnzeroedPageListHead, + InsertTailList(&FreeUnzeroedPageListHead, &MmPageArray[i].ListEntry); } @@ -505,410 +455,306 @@ MmInitializePageList(PVOID FirstPhysKernelAddress, return((PVOID)LastKernelAddress); } - -VOID -MmSetFlagsPage(IN ULONG_PTR PhysicalAddress, - IN ULONG Flags) +VOID MmSetFlagsPage(PVOID PhysicalAddress, + ULONG Flags) { - ULONG Start = PhysicalAddress / PAGESIZE; + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; KIRQL oldIrql; - KeAcquireSpinLock(&MiPageListLock, &oldIrql); + KeAcquireSpinLock(&PageListLock, &oldIrql); MmPageArray[Start].Flags = Flags; - KeReleaseSpinLock(&MiPageListLock, oldIrql); + KeReleaseSpinLock(&PageListLock, oldIrql); } - -VOID -MmSetRmapListHeadPage(IN ULONG_PTR PhysicalAddress, - IN struct _MM_RMAP_ENTRY* ListHead) +VOID +MmSetRmapListHeadPage(PVOID PhysicalAddress, struct _MM_RMAP_ENTRY* ListHead) { - ULONG Start = PhysicalAddress / PAGESIZE; + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); - - VALIDATE_RMAP_LIST(ListHead); - - MmPageArray[Start].RmapListHead = ListHead; + MmPageArray[Start].RmapListHead = ListHead; } struct _MM_RMAP_ENTRY* -MmGetRmapListHeadPage(IN ULONG_PTR PhysicalAddress) +MmGetRmapListHeadPage(PVOID PhysicalAddress) { - ULONG Start = PhysicalAddress / PAGESIZE; - - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); - - VALIDATE_RMAP_LIST(MmPageArray[Start].RmapListHead); + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; return(MmPageArray[Start].RmapListHead); } - VOID -MmSetRmapCallback(IN ULONG_PTR PhysicalAddress, - IN PRMAP_DELETE_CALLBACK RmapDelete, - IN PVOID RmapDeleteContext) +MmMarkPageMapped(PVOID PhysicalAddress) { - ULONG Start = PhysicalAddress / PAGESIZE; - - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); - - MmPageArray[Start].RmapDelete = RmapDelete; - MmPageArray[Start].RmapDeleteContext = RmapDeleteContext; -} - - -VOID -MmGetRmapCallback(IN ULONG_PTR PhysicalAddress, - IN PRMAP_DELETE_CALLBACK *RmapDelete, - IN PVOID *RmapDeleteContext) -{ - ULONG Start = PhysicalAddress / PAGESIZE; - - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); - - *RmapDelete = MmPageArray[Start].RmapDelete; - *RmapDeleteContext = MmPageArray[Start].RmapDeleteContext; -} - - -VOID -MmMarkPageMapped(IN ULONG_PTR PhysicalAddress) -{ - ULONG Start = PhysicalAddress / PAGESIZE; - KIRQL oldIrql; - - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); - - KeAcquireSpinLock(&MiPageListLock, &oldIrql); - MmPageArray[Start].MapCount++; - KeReleaseSpinLock(&MiPageListLock, oldIrql); -} - -VOID -MmMarkPageUnmapped(IN ULONG_PTR PhysicalAddress) -{ - ULONG Start = PhysicalAddress / PAGESIZE; - KIRQL oldIrql; - - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; + KIRQL oldIrql; - KeAcquireSpinLock(&MiPageListLock, &oldIrql); - MmPageArray[Start].MapCount--; - KeReleaseSpinLock(&MiPageListLock, oldIrql); + KeAcquireSpinLock(&PageListLock, &oldIrql); + MmPageArray[Start].MapCount++; + KeReleaseSpinLock(&PageListLock, oldIrql); } -ULONG -MmGetFlagsPage(IN ULONG_PTR PhysicalAddress) +VOID +MmMarkPageUnmapped(PVOID PhysicalAddress) { - ULONG Start = PhysicalAddress / PAGESIZE; - KIRQL oldIrql; - ULONG Flags; + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; + KIRQL oldIrql; + + KeAcquireSpinLock(&PageListLock, &oldIrql); + MmPageArray[Start].MapCount--; + KeReleaseSpinLock(&PageListLock, oldIrql); +} - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); - - KeAcquireSpinLock(&MiPageListLock, &oldIrql); - Flags = MmPageArray[Start].Flags; - KeReleaseSpinLock(&MiPageListLock, oldIrql); - - return(Flags); +ULONG MmGetFlagsPage(PVOID PhysicalAddress) +{ + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; + KIRQL oldIrql; + ULONG Flags; + + KeAcquireSpinLock(&PageListLock, &oldIrql); + Flags = MmPageArray[Start].Flags; + KeReleaseSpinLock(&PageListLock, oldIrql); + + return(Flags); } -VOID -MmSetSavedSwapEntryPage(IN ULONG_PTR PhysicalAddress, - IN SWAPENTRY SavedSwapEntry) +VOID MmSetSavedSwapEntryPage(PVOID PhysicalAddress, + SWAPENTRY SavedSwapEntry) { - ULONG Start = PhysicalAddress / PAGESIZE; - KIRQL oldIrql; + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; + KIRQL oldIrql; - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); - - VALIDATE_SWAP_ENTRY(SavedSwapEntry); - - KeAcquireSpinLock(&MiPageListLock, &oldIrql); - MmPageArray[Start].SavedSwapEntry = SavedSwapEntry; - KeReleaseSpinLock(&MiPageListLock, oldIrql); + KeAcquireSpinLock(&PageListLock, &oldIrql); + MmPageArray[Start].SavedSwapEntry = SavedSwapEntry; + KeReleaseSpinLock(&PageListLock, oldIrql); } SWAPENTRY -MmGetSavedSwapEntryPage(IN ULONG_PTR PhysicalAddress) +MmGetSavedSwapEntryPage(PVOID PhysicalAddress) { - ULONG Start = PhysicalAddress / PAGESIZE; - SWAPENTRY SavedSwapEntry; - KIRQL oldIrql; - - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; + SWAPENTRY SavedSwapEntry; + KIRQL oldIrql; - KeAcquireSpinLock(&MiPageListLock, &oldIrql); - SavedSwapEntry = MmPageArray[Start].SavedSwapEntry; - KeReleaseSpinLock(&MiPageListLock, oldIrql); - - VALIDATE_SWAP_ENTRY(SavedSwapEntry); - - return(SavedSwapEntry); + KeAcquireSpinLock(&PageListLock, &oldIrql); + SavedSwapEntry = MmPageArray[Start].SavedSwapEntry; + KeReleaseSpinLock(&PageListLock, oldIrql); + + return(SavedSwapEntry); } - -VOID -MmSetSavedPageOp(IN ULONG_PTR PhysicalAddress, - IN PMM_PAGEOP PageOp) +VOID MmReferencePage(PVOID PhysicalAddress) { - ULONG Start = PhysicalAddress / PAGESIZE; - - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); - - VALIDATE_PAGEOP(PageOp); - - MmPageArray[Start].PageOp = PageOp; -} - - -PMM_PAGEOP -MmGetSavedPageOp(IN ULONG_PTR PhysicalAddress) -{ - ULONG Start = PhysicalAddress / PAGESIZE; - PMM_PAGEOP PageOp; - - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); - - PageOp = MmPageArray[Start].PageOp; - - VALIDATE_PAGEOP(PageOp); - - return(PageOp); -} - - -VOID MmReferencePage(IN ULONG_PTR PhysicalAddress) -{ - ULONG Start = PhysicalAddress / PAGESIZE; - KIRQL oldIrql; - - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; + KIRQL oldIrql; - DPRINT("MmReferencePage(PhysicalAddress %x)\n", PhysicalAddress); - - if (PhysicalAddress == 0) - { - assert(FALSE); - } - - KeAcquireSpinLock(&MiPageListLock, &oldIrql); - - if (MM_PTYPE(MmPageArray[Start].Flags) == MM_PHYSICAL_PAGE_FREE) - { - assertmsg(FALSE, ("Referencing non-used page\n")); - } - - MmPageArray[Start].ReferenceCount++; - KeReleaseSpinLock(&MiPageListLock, oldIrql); + DPRINT("MmReferencePage(PhysicalAddress %x)\n", PhysicalAddress); + + if (((ULONG)PhysicalAddress) == 0) + { + KeBugCheck(0); + } + + KeAcquireSpinLock(&PageListLock, &oldIrql); + + if (MM_PTYPE(MmPageArray[Start].Flags) != MM_PHYSICAL_PAGE_USED) + { + DbgPrint("Referencing non-used page\n"); + KeBugCheck(0); + } + + MmPageArray[Start].ReferenceCount++; + KeReleaseSpinLock(&PageListLock, oldIrql); } ULONG -MmGetReferenceCountPage(IN ULONG_PTR PhysicalAddress) +MmGetReferenceCountPage(PVOID PhysicalAddress) { - ULONG Start = PhysicalAddress / PAGESIZE; - KIRQL oldIrql; - ULONG RCount; + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; + KIRQL oldIrql; + ULONG RCount; - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); + DPRINT("MmGetReferenceCountPage(PhysicalAddress %x)\n", PhysicalAddress); - DPRINT("MmGetReferenceCountPage(PhysicalAddress %x)\n", PhysicalAddress); - - if (PhysicalAddress == 0) - { + if (((ULONG)PhysicalAddress) == 0) + { KeBugCheck(0); - } - - KeAcquireSpinLock(&MiPageListLock, &oldIrql); - - if (MM_PTYPE(MmPageArray[Start].Flags) == MM_PHYSICAL_PAGE_FREE) - { + } + + KeAcquireSpinLock(&PageListLock, &oldIrql); + + if (MM_PTYPE(MmPageArray[Start].Flags) != MM_PHYSICAL_PAGE_USED) + { DbgPrint("Getting reference count for free page\n"); KeBugCheck(0); - } - - RCount = MmPageArray[Start].ReferenceCount; - - KeReleaseSpinLock(&MiPageListLock, oldIrql); - return(RCount); + } + + RCount = MmPageArray[Start].ReferenceCount; + + KeReleaseSpinLock(&PageListLock, oldIrql); + return(RCount); } BOOLEAN -MmIsUsablePage(IN ULONG_PTR PhysicalAddress) +MmIsUsablePage(PVOID PhysicalAddress) { - ULONG Start = PhysicalAddress / PAGESIZE; + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); + DPRINT("MmGetReferenceCountPage(PhysicalAddress %x)\n", PhysicalAddress); - DPRINT("MmGetReferenceCountPage(PhysicalAddress %x)\n", PhysicalAddress); - - if (PhysicalAddress == 0) - { + if (((ULONG)PhysicalAddress) == 0) + { KeBugCheck(0); - } - - if (MM_PTYPE(MmPageArray[Start].Flags) == MM_PHYSICAL_PAGE_FREE) - { - return(FALSE); - } - - return(TRUE); + } + + if (MM_PTYPE(MmPageArray[Start].Flags) != MM_PHYSICAL_PAGE_USED && + MM_PTYPE(MmPageArray[Start].Flags) != MM_PHYSICAL_PAGE_BIOS) + { + return(FALSE); + } + + return(TRUE); } -VOID MmDereferencePage(IN ULONG_PTR PhysicalAddress) +VOID MmDereferencePage(PVOID PhysicalAddress) { - ULONG Start = PhysicalAddress / PAGESIZE; - KIRQL oldIrql; - - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; + KIRQL oldIrql; - DPRINT("MmDereferencePage(PhysicalAddress %x)\n", PhysicalAddress); - - if (PhysicalAddress == 0) - { - KeBugCheck(0); - } - - KeAcquireSpinLock(&MiPageListLock, &oldIrql); + DPRINT("MmDereferencePage(PhysicalAddress %x)\n", PhysicalAddress); - if (MM_PTYPE(MmPageArray[Start].Flags) == MM_PHYSICAL_PAGE_FREE) - { + if (((ULONG)PhysicalAddress) == 0) + { + KeBugCheck(0); + } + + KeAcquireSpinLock(&PageListLock, &oldIrql); + + + if (MM_PTYPE(MmPageArray[Start].Flags) != MM_PHYSICAL_PAGE_USED) + { DbgPrint("Dereferencing free page\n"); KeBugCheck(0); - } - - MmPageArray[Start].ReferenceCount--; - if (MmPageArray[Start].ReferenceCount == 0) + } + + MmPageArray[Start].ReferenceCount--; + if (MmPageArray[Start].ReferenceCount == 0) + { + MmStats.NrFreePages++; + MmStats.NrSystemPages--; + RemoveEntryList(&MmPageArray[Start].ListEntry); + if (MmPageArray[Start].RmapListHead != NULL) { - MmStats.NrFreePages++; - MmStats.NrSystemPages--; - RemoveEntryList(&MmPageArray[Start].ListEntry); - if (MmPageArray[Start].RmapListHead != NULL) - { - DbgPrint("Freeing page with rmap entries.\n"); - KeBugCheck(0); - } - if (MmPageArray[Start].MapCount != 0) - { - DbgPrint("Freeing mapped page (0x%x count %d)\n", - PhysicalAddress, MmPageArray[Start].MapCount); - KeBugCheck(0); - } - if (MmPageArray[Start].LockCount > 0) - { - DbgPrint("Freeing locked page\n"); - KeBugCheck(0); - } - if (MmPageArray[Start].SavedSwapEntry != 0) - { - DbgPrint("Freeing page with swap entry.\n"); - KeBugCheck(0); - } - if (MmPageArray[Start].Flags == MM_PHYSICAL_PAGE_FREE) - { - DbgPrint("Freeing page with flags %x\n", - MmPageArray[Start].Flags); - KeBugCheck(0); - } - MmPageArray[Start].Flags = MM_PHYSICAL_PAGE_FREE; - InsertTailList(&MiFreeUnzeroedPageListHead, - &MmPageArray[Start].ListEntry); + DbgPrint("Freeing page with rmap entries.\n"); + KeBugCheck(0); } - KeReleaseSpinLock(&MiPageListLock, oldIrql); + if (MmPageArray[Start].MapCount != 0) + { + DbgPrint("Freeing mapped page (0x%x count %d)\n", + PhysicalAddress, MmPageArray[Start].MapCount); + KeBugCheck(0); + } + if (MmPageArray[Start].LockCount > 0) + { + DbgPrint("Freeing locked page\n"); + KeBugCheck(0); + } + if (MmPageArray[Start].SavedSwapEntry != 0) + { + DbgPrint("Freeing page with swap entry.\n"); + KeBugCheck(0); + } + if (MmPageArray[Start].Flags != MM_PHYSICAL_PAGE_USED) + { + DbgPrint("Freeing page with flags %x\n", + MmPageArray[Start].Flags); + KeBugCheck(0); + } + MmPageArray[Start].Flags = MM_PHYSICAL_PAGE_FREE; + InsertTailList(&FreeUnzeroedPageListHead, + &MmPageArray[Start].ListEntry); + } + KeReleaseSpinLock(&PageListLock, oldIrql); } -ULONG -MiGetLockCountPage(IN ULONG_PTR PhysicalAddress) +ULONG MmGetLockCountPage(PVOID PhysicalAddress) { - ULONG Start = PhysicalAddress / PAGESIZE; - KIRQL oldIrql; - ULONG LockCount; - - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; + KIRQL oldIrql; + ULONG LockCount; - DPRINT("MmGetLockCountPage(PhysicalAddress %x)\n", PhysicalAddress); - - if (PhysicalAddress == 0) - { + DPRINT("MmGetLockCountPage(PhysicalAddress %x)\n", PhysicalAddress); + + if (((ULONG)PhysicalAddress) == 0) + { KeBugCheck(0); - } - - KeAcquireSpinLock(&MiPageListLock, &oldIrql); - - if (MM_PTYPE(MmPageArray[Start].Flags) == MM_PHYSICAL_PAGE_FREE) - { + } + + KeAcquireSpinLock(&PageListLock, &oldIrql); + + if (MM_PTYPE(MmPageArray[Start].Flags) != MM_PHYSICAL_PAGE_USED) + { DbgPrint("Getting lock count for free page\n"); KeBugCheck(0); - } - - LockCount = MmPageArray[Start].LockCount; - KeReleaseSpinLock(&MiPageListLock, oldIrql); - - return(LockCount); + } + + LockCount = MmPageArray[Start].LockCount; + KeReleaseSpinLock(&PageListLock, oldIrql); + + return(LockCount); } - -VOID -MmLockPage(IN ULONG_PTR PhysicalAddress) +VOID MmLockPage(PVOID PhysicalAddress) { - ULONG Start = PhysicalAddress / PAGESIZE; - KIRQL oldIrql; - - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; + KIRQL oldIrql; - DPRINT("MmLockPage(PhysicalAddress %x)\n", PhysicalAddress); - - if (PhysicalAddress == 0) - { + DPRINT("MmLockPage(PhysicalAddress %x)\n", PhysicalAddress); + + if (((ULONG)PhysicalAddress) == 0) + { KeBugCheck(0); - } - - KeAcquireSpinLock(&MiPageListLock, &oldIrql); - - if (MM_PTYPE(MmPageArray[Start].Flags) == MM_PHYSICAL_PAGE_FREE) - { + } + + KeAcquireSpinLock(&PageListLock, &oldIrql); + + if (MM_PTYPE(MmPageArray[Start].Flags) != MM_PHYSICAL_PAGE_USED) + { DbgPrint("Locking free page\n"); KeBugCheck(0); - } - - MmPageArray[Start].LockCount++; - KeReleaseSpinLock(&MiPageListLock, oldIrql); + } + + MmPageArray[Start].LockCount++; + KeReleaseSpinLock(&PageListLock, oldIrql); } - -VOID -MmUnlockPage(IN ULONG_PTR PhysicalAddress) +VOID MmUnlockPage(PVOID PhysicalAddress) { - ULONG Start = PhysicalAddress / PAGESIZE; - KIRQL oldIrql; - - VALIDATE_PHYSICAL_ADDRESS(PhysicalAddress); + ULONG Start = (ULONG)PhysicalAddress / PAGESIZE; + KIRQL oldIrql; - DPRINT("MmUnlockPage(PhysicalAddress %x)\n", PhysicalAddress); - - if (PhysicalAddress == 0) - { + DPRINT("MmUnlockPage(PhysicalAddress %x)\n", PhysicalAddress); + + if (((ULONG)PhysicalAddress) == 0) + { KeBugCheck(0); - } - - KeAcquireSpinLock(&MiPageListLock, &oldIrql); - - if (MM_PTYPE(MmPageArray[Start].Flags) == MM_PHYSICAL_PAGE_FREE) - { + } + + KeAcquireSpinLock(&PageListLock, &oldIrql); + + if (MM_PTYPE(MmPageArray[Start].Flags) != MM_PHYSICAL_PAGE_USED) + { DbgPrint("Unlocking free page\n"); KeBugCheck(0); - } - - MmPageArray[Start].LockCount--; - KeReleaseSpinLock(&MiPageListLock, oldIrql); + } + + MmPageArray[Start].LockCount--; + KeReleaseSpinLock(&PageListLock, oldIrql); } -ULONG_PTR +PVOID MmAllocPage(ULONG Consumer, SWAPENTRY SavedSwapEntry) { ULONG offset; @@ -924,26 +770,26 @@ MmAllocPage(ULONG Consumer, SWAPENTRY SavedSwapEntry) DPRINT("MmAllocPage()\n"); - KeAcquireSpinLock(&MiPageListLock, &oldIrql); - if (IsListEmpty(&MiFreeZeroedPageListHead)) + KeAcquireSpinLock(&PageListLock, &oldIrql); + if (IsListEmpty(&FreeZeroedPageListHead)) { - if (IsListEmpty(&MiFreeUnzeroedPageListHead)) + if (IsListEmpty(&FreeUnzeroedPageListHead)) { DPRINT1("MmAllocPage(): Out of memory\n"); - KeReleaseSpinLock(&MiPageListLock, oldIrql); - return(0); + KeReleaseSpinLock(&PageListLock, oldIrql); + return(NULL); } - ListEntry = RemoveTailList(&MiFreeUnzeroedPageListHead); + ListEntry = RemoveTailList(&FreeUnzeroedPageListHead); PageDescriptor = CONTAINING_RECORD(ListEntry, PHYSICAL_PAGE, ListEntry); - KeReleaseSpinLock(&MiPageListLock, oldIrql); + KeReleaseSpinLock(&PageListLock, oldIrql); NeedClear = TRUE; } else { - ListEntry = RemoveTailList(&MiFreeZeroedPageListHead); - KeReleaseSpinLock(&MiPageListLock, oldIrql); + ListEntry = RemoveTailList(&FreeZeroedPageListHead); + KeReleaseSpinLock(&PageListLock, oldIrql); PageDescriptor = CONTAINING_RECORD(ListEntry, PHYSICAL_PAGE, ListEntry); } @@ -958,18 +804,18 @@ MmAllocPage(ULONG Consumer, SWAPENTRY SavedSwapEntry) PageDescriptor->LockCount = 0; PageDescriptor->MapCount = 0; PageDescriptor->SavedSwapEntry = SavedSwapEntry; - ExInterlockedInsertTailList(&MiUsedPageListHeads[Consumer], ListEntry, - &MiPageListLock); - + ExInterlockedInsertTailList(&UsedPageListHeads[Consumer], ListEntry, + &PageListLock); + MmStats.NrSystemPages++; MmStats.NrFreePages--; offset = (ULONG)((ULONG)PageDescriptor - (ULONG)MmPageArray); - offset = (offset / sizeof(PHYSICAL_PAGE)) * PAGESIZE; + offset = (offset / sizeof(PHYSICAL_PAGE)) * PAGESIZE; if (NeedClear) { MiZeroPage(offset); } DPRINT("MmAllocPage() = %x\n",offset); - return(offset); + return((PVOID)offset); } diff --git a/reactos/ntoskrnl/mm/i386/page.c b/reactos/ntoskrnl/mm/i386/page.c index 89ac625c463..31c1646cf05 100644 --- a/reactos/ntoskrnl/mm/i386/page.c +++ b/reactos/ntoskrnl/mm/i386/page.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: page.c,v 1.35 2002/05/13 18:10:41 chorns Exp $ +/* $Id: page.c,v 1.36 2002/05/14 21:19:20 dwelch Exp $ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/i386/page.c @@ -39,141 +39,30 @@ /* GLOBALS *****************************************************************/ -/* See pagefile.c for the layout of a swap entry PTE */ -#define PA_BIT_PRESENT (0) -#define PA_BIT_READWRITE (1) -#define PA_BIT_USER (2) -#define PA_BIT_WT (3) -#define PA_BIT_CD (4) -#define PA_BIT_ACCESSED (5) -#define PA_BIT_DIRTY (6) -#define PA_BIT_PROTOTYPE (7) -#define PA_BIT_TRANSITION (8) -#define PA_BIT_DEMAND_ZERO (9) +#define PA_BIT_PRESENT (0) +#define PA_BIT_READWRITE (1) +#define PA_BIT_USER (2) +#define PA_BIT_WT (3) +#define PA_BIT_CD (4) +#define PA_BIT_ACCESSED (5) +#define PA_BIT_DIRTY (6) -#define PA_PRESENT (1 << PA_BIT_PRESENT) -#define PA_READWRITE (1 << PA_BIT_READWRITE) -#define PA_USER (1 << PA_BIT_USER) -#define PA_DIRTY (1 << PA_BIT_DIRTY) -#define PA_WT (1 << PA_BIT_WT) -#define PA_CD (1 << PA_BIT_CD) -#define PA_ACCESSED (1 << PA_BIT_ACCESSED) -#define PA_DIRTY (1 << PA_BIT_DIRTY) -#define PA_PROTOTYPE (1 << PA_BIT_PROTOTYPE) -#define PA_TRANSITION (1 << PA_BIT_TRANSITION) -#define PA_DEMAND_ZERO (1 << PA_BIT_DEMAND_ZERO) - -#define GET_SWAPENTRY_FROM_PTE(pte)((pte) & 0x1ffffffe) >> 1 -#define SET_SWAPENTRY_IN_PTE(pte, entry)((pte) = ((entry << 1) & 0x1ffffffe)) -#define IS_SWAPENTRY_PTE(pte)((!(Pte & PA_PRESENT)) && ((pte) & 0x1ffffffe)) +#define PA_PRESENT (1 << PA_BIT_PRESENT) +#define PA_READWRITE (1 << PA_BIT_READWRITE) +#define PA_USER (1 << PA_BIT_USER) +#define PA_DIRTY (1 << PA_BIT_DIRTY) +#define PA_WT (1 << PA_BIT_WT) +#define PA_CD (1 << PA_BIT_CD) +#define PA_ACCESSED (1 << PA_BIT_ACCESSED) +#define PA_DIRTY (1 << PA_BIT_DIRTY) #define PAGETABLE_MAP (0xf0000000) #define PAGEDIRECTORY_MAP (0xf0000000 + (PAGETABLE_MAP / (1024))) ULONG MmGlobalKernelPageDirectory[1024] = {0, }; -#ifdef DBG - -PVOID MiBreakPointAddressLow = (PVOID)0x0; -PVOID MiBreakPointAddressHigh = (PVOID)0x0; - -#endif /* DBG */ - /* FUNCTIONS ***************************************************************/ -#ifdef DBG - -VOID -MiDumpPTE(IN ULONG Value) -{ - if (Value & PA_PRESENT) - DbgPrint("Valid\n"); - else - DbgPrint("Invalid\n"); - - if (Value & PA_READWRITE) - DbgPrint("Read/Write\n"); - else - DbgPrint("Read only\n"); - - if (Value & PA_USER) - DbgPrint("User access\n"); - else - DbgPrint("System access\n"); - - if (Value & PA_WT) - DbgPrint("Write through\n"); - else - DbgPrint("Not write through\n"); - - if (Value & PA_CD) - DbgPrint("No cache\n"); - else - DbgPrint("Cache\n"); - - if (Value & PA_ACCESSED) - DbgPrint("Accessed\n"); - else - DbgPrint("Not accessed\n"); - - if (Value & PA_DIRTY) - DbgPrint("Dirty\n"); - else - DbgPrint("Clean\n"); - - if (Value & PA_PROTOTYPE) - DbgPrint("Prototype\n"); - else - DbgPrint("Not prototype\n"); - - if (Value & PA_TRANSITION) - DbgPrint("Transition\n"); - else - DbgPrint("Not transition\n"); - - if (Value & PA_DEMAND_ZERO) - DbgPrint("Demand zero\n"); - else - DbgPrint("Not demand zero\n"); -} - - -/* - * Call from a debugger to have the OS break into the - * debugger when a PTE in this range is changed - */ -VOID -DbgMmSetBreakPointAddressRange(IN PVOID LowAddress, - IN PVOID HighAddress) -{ - MiBreakPointAddressLow = LowAddress; - MiBreakPointAddressHigh = HighAddress; -} - - -/* - * Single page version of DbgSetBreakPointAddressRange() - */ -VOID -DbgMmSetBreakPointAddress(IN PVOID Address) -{ - MiBreakPointAddressLow = Address; - MiBreakPointAddressHigh = Address; -} - - -VOID -MiValidatePhysicalAddress(IN ULONG_PTR PhysicalAddress) -{ - if (!MiInitialized) - return; - - assertmsg((PhysicalAddress / PAGESIZE) < MmStats.NrTotalPages, - ("Bad physical address 0x%.08x\n", PhysicalAddress)) -} - -#endif /* DBG */ - PULONG MmGetPageDirectory(VOID) { @@ -183,7 +72,6 @@ MmGetPageDirectory(VOID) return((PULONG)page_dir); } - static ULONG ProtectToPTE(ULONG flProtect) { @@ -234,7 +122,7 @@ NTSTATUS Mmi386ReleaseMmInfo(PEPROCESS Process) { DPRINT("Mmi386ReleaseMmInfo(Process %x)\n",Process); - MmDereferencePage((ULONG_PTR) Process->Pcb.DirectoryTableBase[0]); + MmDereferencePage(Process->Pcb.DirectoryTableBase[0]); Process->Pcb.DirectoryTableBase[0] = NULL; DPRINT("Finished Mmi386ReleaseMmInfo()\n"); @@ -257,9 +145,6 @@ NTSTATUS MmCopyMmInfo(PEPROCESS Src, PEPROCESS Dest) return(STATUS_UNSUCCESSFUL); } PhysPageDirectory = (PULONG)(MmGetPhysicalAddress(PageDirectory)).u.LowPart; - - VALIDATE_PHYSICAL_ADDRESS(PhysPageDirectory); - KProcess->DirectoryTableBase[0] = PhysPageDirectory; CurrentPageDirectory = (PULONG)PAGEDIRECTORY_MAP; @@ -291,7 +176,7 @@ VOID MmDeletePageTable(PEPROCESS Process, PVOID Address) KeAttachProcess(Process); } *(ADDR_TO_PDE(Address)) = 0; - if (Address >= (PVOID) KERNEL_BASE) + if (Address >= (PVOID)KERNEL_BASE) { MmGlobalKernelPageDirectory[ADDR_TO_PDE_OFFSET(Address)] = 0; } @@ -307,13 +192,13 @@ VOID MmFreePageTable(PEPROCESS Process, PVOID Address) PEPROCESS CurrentProcess = PsGetCurrentProcess(); PULONG PageTable; ULONG i; - ULONG_PTR npage; + ULONG npage; if (Process != NULL && Process != CurrentProcess) { KeAttachProcess(Process); } - PageTable = (PULONG) PAGE_ROUND_DOWN((PVOID) ADDR_TO_PTE(Address)); + PageTable = (PULONG)PAGE_ROUND_DOWN((PVOID)ADDR_TO_PTE(Address)); for (i = 0; i < 1024; i++) { if (PageTable[i] != 0) @@ -325,11 +210,11 @@ VOID MmFreePageTable(PEPROCESS Process, PVOID Address) } npage = *(ADDR_TO_PDE(Address)); *(ADDR_TO_PDE(Address)) = 0; - if (Address >= (PVOID) KERNEL_BASE) + if (Address >= (PVOID)KERNEL_BASE) { MmGlobalKernelPageDirectory[ADDR_TO_PDE_OFFSET(Address)] = 0; } - MmDereferencePage((ULONG_PTR) PAGE_MASK(npage)); + MmDereferencePage((PVOID)PAGE_MASK(npage)); FLUSH_TLB; if (Process != NULL && Process != CurrentProcess) { @@ -343,8 +228,8 @@ NTSTATUS MmGetPageEntry2(PVOID PAddress, PULONG* Pte, BOOLEAN MayWait) */ { PULONG Pde; - ULONG_PTR Address = (ULONG)PAddress; - ULONG_PTR npage; + ULONG Address = (ULONG)PAddress; + ULONG npage; DPRINT("MmGetPageEntry(Address %x)\n", Address); @@ -360,21 +245,18 @@ NTSTATUS MmGetPageEntry2(PVOID PAddress, PULONG* Pte, BOOLEAN MayWait) else { NTSTATUS Status; - Status = MmRequestPageMemoryConsumer(MC_NPPOOL, MayWait, &npage); + Status = MmRequestPageMemoryConsumer(MC_NPPOOL, MayWait, (PVOID*)&npage); if (!NT_SUCCESS(Status)) { return(Status); } - - VALIDATE_PHYSICAL_ADDRESS(PAGE_MASK(npage)); - (*Pde) = npage | 0x7; if (Address >= KERNEL_BASE) { MmGlobalKernelPageDirectory[ADDR_TO_PDE_OFFSET(Address)] = *Pde; } - memset((PVOID) PAGE_ROUND_DOWN(ADDR_TO_PTE(Address)), 0, PAGESIZE); + memset((PVOID)PAGE_ROUND_DOWN(ADDR_TO_PTE(Address)), 0, PAGESIZE); FLUSH_TLB; } } @@ -408,7 +290,7 @@ ULONG MmGetPageEntry1(PVOID PAddress) PULONG page_dir; ULONG Address = (ULONG)PAddress; - DPRINT("MmGetPageEntry1(Address %x)\n", Address); + DPRINT("MmGetPageEntry(Address %x)\n", Address); page_dir = ADDR_TO_PDE(Address); if ((*page_dir) == 0 && @@ -445,31 +327,30 @@ ULONG MmGetPageEntryForProcess1(PEPROCESS Process, PVOID Address) } -ULONG -MmGetPhysicalAddressForProcess(IN PEPROCESS Process, - IN PVOID Address) +ULONG MmGetPhysicalAddressForProcess(PEPROCESS Process, + PVOID Address) { - ULONG PageEntry; - - PageEntry = MmGetPageEntryForProcess(Process, Address); - - VALIDATE_PHYSICAL_ADDRESS(PAGE_MASK(PageEntry)); - - return(PAGE_MASK(PageEntry)); + ULONG PageEntry; + + PageEntry = MmGetPageEntryForProcess(Process, Address); + + if (!(PageEntry & PA_PRESENT)) + { + return(0); + } + return(PAGE_MASK(PageEntry)); } VOID -MmDisableVirtualMapping(IN PEPROCESS Process, - IN PVOID Address, - OUT PBOOLEAN WasDirty, - OUT PULONG_PTR PhysicalAddr) +MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOL* WasDirty, ULONG* PhysicalAddr) /* - * FUNCTION: Disable a virtual mapping + * FUNCTION: Delete a virtual mapping */ { ULONG Pte; PULONG Pde; PEPROCESS CurrentProcess = PsGetCurrentProcess(); + BOOLEAN WasValid; /* * If we are setting a page in another process we need to be in its @@ -493,16 +374,20 @@ MmDisableVirtualMapping(IN PEPROCESS Process, } if ((*Pde) == 0) { - DPRINT1("PDE for address 0x%.08x does not exist\n", Address); KeBugCheck(0); } /* - * Reset the present bit + * Atomically set the entry to zero and get the old value. */ Pte = *ADDR_TO_PTE(Address); *ADDR_TO_PTE(Address) = Pte & (~PA_PRESENT); FLUSH_TLB; + WasValid = (PAGE_MASK(Pte) != 0); + if (!WasValid) + { + KeBugCheck(0); + } /* * If necessary go back to the original context @@ -521,18 +406,13 @@ MmDisableVirtualMapping(IN PEPROCESS Process, } if (PhysicalAddr != NULL) { - VALIDATE_PHYSICAL_ADDRESS(PAGE_MASK(Pte)); - - *PhysicalAddr = PAGE_MASK(Pte); + *PhysicalAddr = PAGE_MASK(Pte); } } VOID -MmDeleteVirtualMapping(PEPROCESS Process, - PVOID Address, - BOOLEAN FreePage, - PBOOLEAN WasDirty, - PULONG PhysicalAddr) +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOL FreePage, + BOOL* WasDirty, ULONG* PhysicalAddr) /* * FUNCTION: Delete a virtual mapping */ @@ -587,11 +467,11 @@ MmDeleteVirtualMapping(PEPROCESS Process, WasValid = (PAGE_MASK(Pte) != 0); if (WasValid) { - MmMarkPageUnmapped((ULONG_PTR) PAGE_MASK(Pte)); + MmMarkPageUnmapped((PVOID)PAGE_MASK(Pte)); } if (FreePage && WasValid) { - MmDereferencePage((ULONG_PTR) PAGE_MASK(Pte)); + MmDereferencePage((PVOID)PAGE_MASK(Pte)); } /* @@ -636,16 +516,13 @@ MmDeleteVirtualMapping(PEPROCESS Process, } if (PhysicalAddr != NULL) { - VALIDATE_PHYSICAL_ADDRESS(PAGE_MASK(Pte)); - *PhysicalAddr = PAGE_MASK(Pte); } } VOID -MmDeletePageFileMapping(IN PEPROCESS Process, - IN PVOID Address, - OUT PSWAPENTRY SwapEntry) +MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, + SWAPENTRY* SwapEntry) /* * FUNCTION: Delete a virtual mapping */ @@ -653,6 +530,7 @@ MmDeletePageFileMapping(IN PEPROCESS Process, ULONG Pte; PULONG Pde; PEPROCESS CurrentProcess = PsGetCurrentProcess(); + BOOLEAN WasValid; /* * If we are setting a page in another process we need to be in its @@ -693,7 +571,7 @@ MmDeletePageFileMapping(IN PEPROCESS Process, /* * Decrement the reference count for this page table. */ - if (Process != NULL && + if (Process != NULL && WasValid && Process->AddressSpace.PageTableRefCountTable != NULL && ADDR_TO_PAGE_TABLE(Address) < 768) { @@ -719,7 +597,7 @@ MmDeletePageFileMapping(IN PEPROCESS Process, /* * Return some information to the caller */ - *SwapEntry = GET_SWAPENTRY_FROM_PTE(Pte); + *SwapEntry = Pte >> 1; } BOOLEAN @@ -757,8 +635,8 @@ BOOLEAN MmIsPageTablePresent(PVOID PAddress) NTSTATUS MmCreatePageTable(PVOID PAddress) { PULONG page_dir; - ULONG_PTR Address = (ULONG)PAddress; - ULONG_PTR npage; + ULONG Address = (ULONG)PAddress; + ULONG npage; DPRINT("MmGetPageEntry(Address %x)\n", Address); @@ -773,16 +651,13 @@ NTSTATUS MmCreatePageTable(PVOID PAddress) if ((*page_dir) == 0) { NTSTATUS Status; - Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &npage); + Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, (PVOID*)&npage); if (!NT_SUCCESS(Status)) { return(Status); } - - VALIDATE_PHYSICAL_ADDRESS(PAGE_MASK(npage)); - (*page_dir) = npage | 0x7; - memset((PVOID) PAGE_ROUND_DOWN(ADDR_TO_PTE(Address)), 0, PAGESIZE); + memset((PVOID)PAGE_ROUND_DOWN(ADDR_TO_PTE(Address)), 0, PAGESIZE); FLUSH_TLB; } return(STATUS_SUCCESS); @@ -795,8 +670,8 @@ PULONG MmGetPageEntry(PVOID PAddress) { PULONG page_tlb; PULONG page_dir; - ULONG_PTR Address = (ULONG)PAddress; - ULONG_PTR npage; + ULONG Address = (ULONG)PAddress; + ULONG npage; DPRINT("MmGetPageEntry(Address %x)\n", Address); @@ -811,14 +686,13 @@ PULONG MmGetPageEntry(PVOID PAddress) if ((*page_dir) == 0) { NTSTATUS Status; - Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &npage); + Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, (PVOID*)&npage); if (!NT_SUCCESS(Status)) { - DPRINT1("\n"); KeBugCheck(0); } (*page_dir) = npage | 0x7; - memset((PVOID) PAGE_ROUND_DOWN(ADDR_TO_PTE(Address)), 0, PAGESIZE); + memset((PVOID)PAGE_ROUND_DOWN(ADDR_TO_PTE(Address)), 0, PAGESIZE); FLUSH_TLB; } page_tlb = ADDR_TO_PTE(Address); @@ -826,14 +700,11 @@ PULONG MmGetPageEntry(PVOID PAddress) return(page_tlb); } - -BOOLEAN -MmIsPageDirty(PEPROCESS Process, PVOID Address) +BOOLEAN MmIsPageDirty(PEPROCESS Process, PVOID Address) { return((MmGetPageEntryForProcess(Process, Address)) & PA_DIRTY); } - BOOLEAN MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address) { @@ -860,10 +731,7 @@ MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address) return(Accessed); } - -VOID -MmSetCleanPage(IN PEPROCESS Process, - IN PVOID Address) +VOID MmSetCleanPage(PEPROCESS Process, PVOID Address) { PULONG PageEntry; PEPROCESS CurrentProcess = PsGetCurrentProcess(); @@ -881,143 +749,7 @@ MmSetCleanPage(IN PEPROCESS Process, } } - -BOOLEAN -MiPageState(IN PEPROCESS Process, - IN PVOID Address, - IN ULONG PageState) -{ - PULONG PageEntry; - BOOLEAN Value; - PEPROCESS CurrentProcess = PsGetCurrentProcess(); - - if (Process != NULL && Process != CurrentProcess) - { - KeAttachProcess(Process); - } - - PageEntry = MmGetPageEntry(Address); - - switch (PageState) - { - case PAGE_STATE_VALID: - Value = ((*PageEntry) & PA_PRESENT) != 0; - break; - case PAGE_STATE_PROTOTYPE: - Value = ((*PageEntry) & PA_PROTOTYPE) != 0; - break; - case PAGE_STATE_TRANSITION: - Value = ((*PageEntry) & PA_TRANSITION) != 0; - break; - case PAGE_STATE_DEMAND_ZERO: - Value = ((*PageEntry) & PA_DEMAND_ZERO) != 0; - break; - default: - DPRINT1("Unknown page state 0x%.08x\n", PageState); - KeBugCheck(0); - break; - } - - if (Process != NULL && Process != CurrentProcess) - { - KeDetachProcess(); - } - - return Value; -} - - -VOID -MiClearPageState(IN PEPROCESS Process, - IN PVOID Address, - IN ULONG PageState) -{ - PULONG PageEntry; - PEPROCESS CurrentProcess = PsGetCurrentProcess(); - - if (Process != NULL && Process != CurrentProcess) - { - KeAttachProcess(Process); - } - PageEntry = MmGetPageEntry(Address); - - switch (PageState) - { - case PAGE_STATE_VALID: - (*PageEntry) = (*PageEntry) & (~PA_PRESENT); - break; - case PAGE_STATE_PROTOTYPE: - (*PageEntry) = (*PageEntry) & (~PA_PROTOTYPE); - break; - case PAGE_STATE_TRANSITION: - assertmsg(!((*PageEntry) & PA_PRESENT), ("Page 0x%.08x in transition is present\n", Address)); - (*PageEntry) = (*PageEntry) & (~PA_TRANSITION); - break; - case PAGE_STATE_DEMAND_ZERO: - assertmsg(!((*PageEntry) & PA_PRESENT), ("Demand zero page 0x%.08x is present\n", Address)); - (*PageEntry) = (*PageEntry) & (~PA_DEMAND_ZERO); - break; - default: - DPRINT1("Unknown page state 0x%.08x\n", PageState); - KeBugCheck(0); - break; - } - - FLUSH_TLB; - if (Process != NULL && Process != CurrentProcess) - { - KeDetachProcess(); - } -} - - -VOID -MiSetPageState(IN PEPROCESS Process, - IN PVOID Address, - IN ULONG PageState) -{ - PULONG PageEntry; - PEPROCESS CurrentProcess = PsGetCurrentProcess(); - - if (Process != NULL && Process != CurrentProcess) - { - KeAttachProcess(Process); - } - PageEntry = MmGetPageEntry(Address); - - switch (PageState) - { - case PAGE_STATE_VALID: - (*PageEntry) = (*PageEntry) | PA_PRESENT; - break; - case PAGE_STATE_PROTOTYPE: - (*PageEntry) = (*PageEntry) | PA_PROTOTYPE; - break; - case PAGE_STATE_TRANSITION: - assertmsg(!((*PageEntry) & PA_PRESENT), ("Page 0x%.08x in transition is present\n", Address)); - (*PageEntry) = (*PageEntry) | PA_TRANSITION; - break; - case PAGE_STATE_DEMAND_ZERO: - assertmsg(!((*PageEntry) & PA_PRESENT), ("Demand zero page 0x%.08x is present\n", Address)); - (*PageEntry) = (*PageEntry) | PA_DEMAND_ZERO; - break; - default: - DPRINT1("Unknown page state 0x%.08x\n", PageState); - KeBugCheck(0); - break; - } - - FLUSH_TLB; - if (Process != NULL && Process != CurrentProcess) - { - KeDetachProcess(); - } -} - - -VOID -MmSetDirtyPage(IN PEPROCESS Process, - IN PVOID Address) +VOID MmSetDirtyPage(PEPROCESS Process, PVOID Address) { PULONG PageEntry; PEPROCESS CurrentProcess = PsGetCurrentProcess(); @@ -1035,10 +767,7 @@ MmSetDirtyPage(IN PEPROCESS Process, } } - -VOID -MmEnableVirtualMapping(IN PEPROCESS Process, - IN PVOID Address) +VOID MmEnableVirtualMapping(PEPROCESS Process, PVOID Address) { PULONG PageEntry; PEPROCESS CurrentProcess = PsGetCurrentProcess(); @@ -1056,19 +785,16 @@ MmEnableVirtualMapping(IN PEPROCESS Process, } } - BOOLEAN MmIsPagePresent(PEPROCESS Process, PVOID Address) { return((MmGetPageEntryForProcess1(Process, Address)) & PA_PRESENT); } -BOOLEAN -MmIsPageSwapEntry(IN PEPROCESS Process, - IN PVOID Address) +BOOLEAN MmIsPageSwapEntry(PEPROCESS Process, PVOID Address) { ULONG Pte; Pte = MmGetPageEntryForProcess1(Process, Address); - return(IS_SWAPENTRY_PTE(Pte)); + return((!(Pte & PA_PRESENT)) && Pte != 0); } NTSTATUS @@ -1091,12 +817,12 @@ MmCreateVirtualMappingForKernel(PVOID Address, CurrentProcess = NULL; } - if (Process == NULL && Address < (PVOID) KERNEL_BASE) + if (Process == NULL && Address < (PVOID)KERNEL_BASE) { DPRINT1("No process\n"); KeBugCheck(0); } - if (Process != NULL && Address >= (PVOID) KERNEL_BASE) + if (Process != NULL && Address >= (PVOID)KERNEL_BASE) { DPRINT1("Setting kernel address with process context\n"); KeBugCheck(0); @@ -1123,7 +849,7 @@ MmCreateVirtualMappingForKernel(PVOID Address, } if (PAGE_MASK((*Pte)) != 0) { - MmMarkPageUnmapped((ULONG_PTR) PAGE_MASK((*Pte))); + MmMarkPageUnmapped((PVOID)PAGE_MASK((*Pte))); } *Pte = PhysicalAddress | Attributes; if (Process != NULL && @@ -1146,9 +872,9 @@ MmCreateVirtualMappingForKernel(PVOID Address, } NTSTATUS -MmCreatePageFileMapping(IN PEPROCESS Process, - IN PVOID Address, - IN SWAPENTRY SwapEntry) +MmCreatePageFileMapping(PEPROCESS Process, + PVOID Address, + SWAPENTRY SwapEntry) { PEPROCESS CurrentProcess; PULONG Pte; @@ -1163,12 +889,12 @@ MmCreatePageFileMapping(IN PEPROCESS Process, CurrentProcess = NULL; } - if (Process == NULL && Address < (PVOID) KERNEL_BASE) + if (Process == NULL && Address < (PVOID)KERNEL_BASE) { DPRINT1("No process\n"); KeBugCheck(0); } - if (Process != NULL && Address >= (PVOID) KERNEL_BASE) + if (Process != NULL && Address >= (PVOID)KERNEL_BASE) { DPRINT1("Setting kernel address with process context\n"); KeBugCheck(0); @@ -1194,9 +920,9 @@ MmCreatePageFileMapping(IN PEPROCESS Process, } if (PAGE_MASK((*Pte)) != 0) { - MmMarkPageUnmapped((ULONG_PTR) PAGE_MASK((*Pte))); + MmMarkPageUnmapped((PVOID)PAGE_MASK((*Pte))); } - SET_SWAPENTRY_IN_PTE(*Pte, SwapEntry); + *Pte = SwapEntry << 1; if (Process != NULL && Process->AddressSpace.PageTableRefCountTable != NULL && ADDR_TO_PAGE_TABLE(Address) < 768) @@ -1236,17 +962,17 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, CurrentProcess = NULL; } - if (Process == NULL && Address < (PVOID) KERNEL_BASE) + if (Process == NULL && Address < (PVOID)KERNEL_BASE) { DPRINT1("No process\n"); KeBugCheck(0); } - if (Process != NULL && Address >= (PVOID) KERNEL_BASE) + if (Process != NULL && Address >= (PVOID)KERNEL_BASE) { DPRINT1("Setting kernel address with process context\n"); KeBugCheck(0); } - MmMarkPageMapped(PhysicalAddress); + MmMarkPageMapped((PVOID)PhysicalAddress); Attributes = ProtectToPTE(flProtect); if (!(Attributes & PA_PRESENT) && PhysicalAddress != 0) @@ -1256,7 +982,7 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, Address, Attributes, flProtect); KeBugCheck(0); } - + if (Process != NULL && Process != CurrentProcess) { KeAttachProcess(Process); @@ -1277,24 +1003,8 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, } if (PAGE_MASK((*Pte)) != 0) { - MmMarkPageUnmapped((ULONG_PTR) PAGE_MASK((*Pte))); + MmMarkPageUnmapped((PVOID)PAGE_MASK((*Pte))); } - -#ifdef DBG - - if ((MiBreakPointAddressLow != NULL) && (MiBreakPointAddressHigh != NULL) && - ((PAGE_ROUND_DOWN(Address) >= PAGE_ROUND_DOWN(MiBreakPointAddressLow)) - && (PAGE_ROUND_DOWN(Address) < PAGE_ROUND_UP(MiBreakPointAddressHigh)))) - { - DbgPrint("Changing PTE of virtual address 0x%.08x from PTE 0x%.08x\n", Address, *Pte); - MiDumpPTE(*Pte); - DbgPrint("To 0x%.08x\n", PhysicalAddress | Attributes); - MiDumpPTE(PhysicalAddress | Attributes); - //assert(FALSE); - } - -#endif /* DBG */ - *Pte = PhysicalAddress | Attributes; if (Process != NULL && Process->AddressSpace.PageTableRefCountTable != NULL && @@ -1322,7 +1032,7 @@ MmCreateVirtualMapping(PEPROCESS Process, ULONG PhysicalAddress, BOOLEAN MayWait) { - if (!MmIsUsablePage(PhysicalAddress)) + if (!MmIsUsablePage((PVOID)PhysicalAddress)) { DPRINT1("Page at address %x not usable\n", PhysicalAddress); KeBugCheck(0); @@ -1369,15 +1079,14 @@ MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) Process, Address, flProtect); Attributes = ProtectToPTE(flProtect); - - if ((Process != NULL) && (Process != CurrentProcess)) + if (Process != CurrentProcess) { KeAttachProcess(Process); } PageEntry = MmGetPageEntry(Address); (*PageEntry) = PAGE_MASK(*PageEntry) | Attributes; FLUSH_TLB; - if ((Process != NULL) && (Process != CurrentProcess)) + if (Process != CurrentProcess) { KeDetachProcess(); } @@ -1397,8 +1106,6 @@ MmGetPhysicalAddress(PVOID vaddr) Pte = *MmGetPageEntry(vaddr); if (Pte & PA_PRESENT) { - VALIDATE_PHYSICAL_ADDRESS(PAGE_MASK(Pte)); - p.QuadPart = PAGE_MASK(Pte); } else @@ -1409,19 +1116,5 @@ MmGetPhysicalAddress(PVOID vaddr) return p; } -#ifdef DBG - -VOID -MiDumpProcessPTE(IN PEPROCESS Process, - IN PVOID Address) -{ - ULONG Value; - - Value = MmGetPageEntryForProcess1(Process, Address); - - MiDumpPTE(Value); -} - -#endif /* DBG */ /* EOF */ diff --git a/reactos/ntoskrnl/mm/kmap.c b/reactos/ntoskrnl/mm/kmap.c index 623857f8b57..b25814059c8 100644 --- a/reactos/ntoskrnl/mm/kmap.c +++ b/reactos/ntoskrnl/mm/kmap.c @@ -1,4 +1,4 @@ -/* $Id: kmap.c,v 1.15 2002/05/13 18:10:40 chorns Exp $ +/* $Id: kmap.c,v 1.16 2002/05/14 21:19:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -47,32 +47,31 @@ ExUnmapPage(PVOID Addr) KeReleaseSpinLock(&AllocMapLock, oldIrql); } -PVOID +PVOID ExAllocatePage(VOID) { - ULONG_PTR Page; + ULONG PhysPage; NTSTATUS Status; - Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &Page); + Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, (PVOID*)&PhysPage); if (!NT_SUCCESS(Status)) { return(NULL); } - return(ExAllocatePageWithPhysPage(Page)); + return(ExAllocatePageWithPhysPage(PhysPage)); } NTSTATUS -MiZeroPage(IN ULONG_PTR Page) +MiZeroPage(ULONG PhysPage) { PVOID TempAddress; - TempAddress = ExAllocatePageWithPhysPage(Page); + TempAddress = ExAllocatePageWithPhysPage(PhysPage); if (TempAddress == NULL) { return(STATUS_NO_MEMORY); } - memset(TempAddress, 0, PAGESIZE); ExUnmapPage(TempAddress); return(STATUS_SUCCESS); @@ -94,10 +93,10 @@ MiCopyFromUserPage(ULONG DestPhysPage, PVOID SourceAddress) } PVOID -ExAllocatePageWithPhysPage(IN ULONG_PTR Page) +ExAllocatePageWithPhysPage(ULONG PhysPage) { KIRQL oldlvl; - PVOID addr; + ULONG addr; ULONG i; NTSTATUS Status; @@ -108,11 +107,11 @@ ExAllocatePageWithPhysPage(IN ULONG_PTR Page) { DPRINT("i %x\n",i); AllocMap[i / 32] |= (1 << (i % 32)); - addr = (PVOID) (NonPagedPoolBase + (i*PAGESIZE)); + addr = (ULONG)(NonPagedPoolBase + (i*PAGESIZE)); Status = MmCreateVirtualMapping(NULL, - addr, + (PVOID)addr, PAGE_READWRITE | PAGE_SYSTEM, - Page, + PhysPage, FALSE); if (!NT_SUCCESS(Status)) { @@ -120,7 +119,7 @@ ExAllocatePageWithPhysPage(IN ULONG_PTR Page) KeBugCheck(0); } KeReleaseSpinLock(&AllocMapLock, oldlvl); - return(addr); + return((PVOID)addr); } } KeReleaseSpinLock(&AllocMapLock, oldlvl); diff --git a/reactos/ntoskrnl/mm/marea.c b/reactos/ntoskrnl/mm/marea.c index e2d88678767..69ab18e8632 100644 --- a/reactos/ntoskrnl/mm/marea.c +++ b/reactos/ntoskrnl/mm/marea.c @@ -1,6 +1,6 @@ /* * ReactOS kernel - * Copyright (C) 1998-2002 ReactOS Team + * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,7 +27,6 @@ /* INCLUDES *****************************************************************/ -#include #include #include #include @@ -40,13 +39,6 @@ #define TAG_MAREA TAG('M', 'A', 'R', 'E') -#ifdef DBG -PVOID MiMemoryAreaBugCheckAddress = (PVOID) NULL; -#endif /* DBG */ - -/* Define to track memory area references */ -//#define TRACK_MEMORY_AREA_REFERENCES - /* FUNCTIONS *****************************************************************/ VOID MmDumpMemoryAreas(PLIST_ENTRY ListHead) @@ -69,94 +61,8 @@ VOID MmDumpMemoryAreas(PLIST_ENTRY ListHead) DbgPrint("Finished MmDumpMemoryAreas()\n"); } -#ifdef DBG - -VOID -MiValidateMemoryAreaPTEs(IN PMEMORY_AREA MemoryArea) -{ - ULONG PteProtect; - ULONG i; - - if (!MiInitialized) - return; - - for (i = 0; i <= (MemoryArea->Length / PAGESIZE); i++) - { - if (MmIsPagePresent(MemoryArea->Process, MemoryArea->BaseAddress + (i * PAGESIZE))) - { - PteProtect = MmGetPageProtect(MemoryArea->Process, MemoryArea->BaseAddress + (i * PAGESIZE)); - if (PteProtect != MemoryArea->Attributes) - { - if (MmIsCopyOnWriteMemoryArea(MemoryArea)) - { - if ((PteProtect != PAGE_READONLY) && (PteProtect != PAGE_EXECUTE_READ)) - { - DPRINT1("COW memory area attributes 0x%.08x\n", MemoryArea->Attributes); - DbgMmDumpProtection(MemoryArea->Attributes); - DPRINT1("PTE attributes 0x%.08x\n", PteProtect); - DbgMmDumpProtection(PteProtect); - assertmsg(FALSE, ("PTE attributes and memory area protection are different. Area 0x%.08x\n", - MemoryArea->BaseAddress)); - } - } - else - { - DPRINT1("Memory area attributes 0x%.08x\n", MemoryArea->Attributes); - DbgMmDumpProtection(MemoryArea->Attributes); - DPRINT1("PTE attributes 0x%.08x\n", PteProtect); - DbgMmDumpProtection(PteProtect); - assertmsg(FALSE, ("PTE attributes and memory area protection are different. Area 0x%.08x\n", - MemoryArea->BaseAddress)); - } - } - } - } -} - - -VOID -MiValidateMemoryArea(IN PMEMORY_AREA MemoryArea) -{ - assertmsg(MemoryArea != NULL, - ("No memory area can exist at 0x%.08x\n", MemoryArea)); - - assertmsg(MemoryArea->Magic == TAG_MAREA, - ("Bad magic (0x%.08x) for memory area (0x%.08x). It should be 0x%.08x\n", - MemoryArea->Magic, MemoryArea, TAG_MAREA)); - - /* FIXME: Can cause page faults and deadlock on the address space lock */ - //MiValidateMemoryAreaPTEs(MemoryArea); -} - -#endif /* DBG */ - -VOID -MmApplyMemoryAreaProtection(IN PMEMORY_AREA MemoryArea) -{ - ULONG i; - - if (!MiInitialized) - return; - - for (i = 0; i <= (MemoryArea->Length / PAGESIZE); i++) - { - if (MmIsPagePresent(MemoryArea->Process, MemoryArea->BaseAddress + (i * PAGESIZE))) - { - MmSetPageProtect(MemoryArea->Process, - MemoryArea->BaseAddress + (i * PAGESIZE), - MemoryArea->Attributes); - } - } -} - - -/* - * NOTE: If the memory area is found, then it is referenced. The caller must - * call MmCloseMemoryArea() after use. - */ -PMEMORY_AREA -MmOpenMemoryAreaByAddress(IN PMADDRESS_SPACE AddressSpace, - IN PVOID Address) +MEMORY_AREA* MmOpenMemoryAreaByAddress(PMADDRESS_SPACE AddressSpace, + PVOID Address) { PLIST_ENTRY current_entry; MEMORY_AREA* current; @@ -164,9 +70,9 @@ MmOpenMemoryAreaByAddress(IN PMADDRESS_SPACE AddressSpace, DPRINT("MmOpenMemoryAreaByAddress(AddressSpace %x, Address %x)\n", AddressSpace, Address); - + // MmDumpMemoryAreas(&AddressSpace->MAreaListHead); - + previous_entry = &AddressSpace->MAreaListHead; current_entry = AddressSpace->MAreaListHead.Flink; while (current_entry != &AddressSpace->MAreaListHead) @@ -196,7 +102,6 @@ MmOpenMemoryAreaByAddress(IN PMADDRESS_SPACE AddressSpace, (current->BaseAddress + current->Length) > Address) { DPRINT("%s() = %x\n",__FUNCTION__,current); - MmReferenceMemoryArea(current); return(current); } if (current->BaseAddress > Address) @@ -211,10 +116,6 @@ MmOpenMemoryAreaByAddress(IN PMADDRESS_SPACE AddressSpace, return(NULL); } -/* - * NOTE: If the memory area is found, then it is referenced. The caller must - * call MmCloseMemoryArea() after use. - */ MEMORY_AREA* MmOpenMemoryAreaByRegion(PMADDRESS_SPACE AddressSpace, PVOID Address, ULONG Length) @@ -239,7 +140,6 @@ MEMORY_AREA* MmOpenMemoryAreaByRegion(PMADDRESS_SPACE AddressSpace, { DPRINT("Finished MmOpenMemoryAreaByRegion() = %x\n", current); - MmReferenceMemoryArea(current); return(current); } Extent = (ULONG)current->BaseAddress + current->Length; @@ -248,7 +148,6 @@ MEMORY_AREA* MmOpenMemoryAreaByRegion(PMADDRESS_SPACE AddressSpace, { DPRINT("Finished MmOpenMemoryAreaByRegion() = %x\n", current); - MmReferenceMemoryArea(current); return(current); } if (current->BaseAddress <= Address && @@ -256,7 +155,6 @@ MEMORY_AREA* MmOpenMemoryAreaByRegion(PMADDRESS_SPACE AddressSpace, { DPRINT("Finished MmOpenMemoryAreaByRegion() = %x\n", current); - MmReferenceMemoryArea(current); return(current); } if (current->BaseAddress >= (Address+Length)) @@ -270,14 +168,6 @@ MEMORY_AREA* MmOpenMemoryAreaByRegion(PMADDRESS_SPACE AddressSpace, return(NULL); } - -VOID -MmCloseMemoryArea(IN PMEMORY_AREA MemoryArea) -{ - MmDereferenceMemoryArea(MemoryArea); -} - - static VOID MmInsertMemoryArea(PMADDRESS_SPACE AddressSpace, MEMORY_AREA* marea) { @@ -286,7 +176,7 @@ static VOID MmInsertMemoryArea(PMADDRESS_SPACE AddressSpace, PLIST_ENTRY inserted_entry = &marea->Entry; MEMORY_AREA* current; MEMORY_AREA* next; - + DPRINT("MmInsertMemoryArea(marea %x)\n", marea); DPRINT("marea->BaseAddress %x\n", marea->BaseAddress); DPRINT("marea->Length %x\n", marea->Length); @@ -334,7 +224,7 @@ static VOID MmInsertMemoryArea(PMADDRESS_SPACE AddressSpace, } if (current->BaseAddress < marea->BaseAddress && next->BaseAddress > marea->BaseAddress) - { + { DPRINT("Inserting before %x\n", current_entry); inserted_entry->Flink = current_entry->Flink; inserted_entry->Blink = current_entry; @@ -400,75 +290,50 @@ NTSTATUS MmInitMemoryAreas(VOID) return(STATUS_SUCCESS); } -/* NOTE: The address space lock must be held when called */ -NTSTATUS -MmFreeMemoryArea(IN PMADDRESS_SPACE AddressSpace, - IN PVOID BaseAddress, - IN ULONG Length, - IN PFREE_MEMORY_AREA_PAGE_CALLBACK FreePage, - IN PVOID FreePageContext) +NTSTATUS +MmFreeMemoryArea(PMADDRESS_SPACE AddressSpace, + PVOID BaseAddress, + ULONG Length, + VOID (*FreePage)(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, + ULONG PhysAddr, SWAPENTRY SwapEntry, BOOLEAN Dirty), + PVOID FreePageContext) { - MEMORY_AREA* MemoryArea; - ULONG i; - - DPRINT("MmFreeMemoryArea(AddressSpace %x, BaseAddress %x, Length %x, " - "FreePageContext %d)\n",AddressSpace,BaseAddress,Length,FreePageContext); - - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, BaseAddress); - if (MemoryArea == NULL) - { - assertmsg(FALSE, ("Freeing non-existant memory area at 0x%.08x\n", BaseAddress)); - return(STATUS_UNSUCCESSFUL); - } + MEMORY_AREA* MemoryArea; + ULONG i; + + DPRINT("MmFreeMemoryArea(AddressSpace %x, BaseAddress %x, Length %x," + "FreePageContext %d)\n",AddressSpace,BaseAddress,Length,FreePageContext); - MmCloseMemoryArea(MemoryArea); - InterlockedDecrement(&MemoryArea->ReferenceCount); -#if 0 - assertmsg(MemoryArea->ReferenceCount == 0, - ("Memory area at address 0x%.08x has %d outstanding references\n", - BaseAddress, MemoryArea->ReferenceCount)); -#endif + MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, + BaseAddress); + if (MemoryArea == NULL) + { + KeBugCheck(0); + return(STATUS_UNSUCCESSFUL); + } for (i=0; i<(PAGE_ROUND_UP(MemoryArea->Length)/PAGESIZE); i++) { - ULONG_PTR PhysicalPage = 0; - BOOLEAN Dirty = FALSE; + ULONG PhysAddr = 0; + BOOL Dirty; SWAPENTRY SwapEntry = 0; - PVOID VirtualPage = NULL; - VirtualPage = MemoryArea->BaseAddress + (i * PAGESIZE); - -#ifdef DBG - if ((MiMemoryAreaBugCheckAddress != NULL) - && ((MiMemoryAreaBugCheckAddress >= VirtualPage) - && MiMemoryAreaBugCheckAddress < VirtualPage + PAGESIZE)) - { - assertmsg(FALSE, ("VirtualPage 0x%.08x MiMemoryAreaBugCheckAddress 0x%.08x \n", - VirtualPage)); - } -#endif - - if (FreePage != NULL) - { - FreePage(TRUE, FreePageContext, MemoryArea, - VirtualPage, 0, 0, FALSE); - } - - if (MmIsPageSwapEntry(AddressSpace->Process, VirtualPage)) + if (MmIsPageSwapEntry(AddressSpace->Process, + MemoryArea->BaseAddress + (i * PAGESIZE))) { MmDeletePageFileMapping(AddressSpace->Process, - VirtualPage, + MemoryArea->BaseAddress + (i * PAGESIZE), &SwapEntry); } else { MmDeleteVirtualMapping(AddressSpace->Process, - VirtualPage, - FALSE, &Dirty, &PhysicalPage); + MemoryArea->BaseAddress + (i*PAGESIZE), + FALSE, &Dirty, &PhysAddr); } if (FreePage != NULL) { - FreePage(FALSE, FreePageContext, MemoryArea, - VirtualPage, PhysicalPage, SwapEntry, Dirty); + FreePage(FreePageContext, MemoryArea, + MemoryArea->BaseAddress + (i * PAGESIZE), PhysAddr, SwapEntry, Dirty); } } @@ -491,7 +356,7 @@ PMEMORY_AREA MmSplitMemoryArea(PEPROCESS Process, PMEMORY_AREA Result; PMEMORY_AREA Split; - Result = ExAllocatePoolWithTag(NonPagedPool, sizeof(MEMORY_AREA), + Result = ExAllocatePoolWithTag(NonPagedPool, sizeof(MEMORY_AREA), TAG_MAREA); RtlZeroMemory(Result,sizeof(MEMORY_AREA)); Result->Type = NewType; @@ -499,9 +364,8 @@ PMEMORY_AREA MmSplitMemoryArea(PEPROCESS Process, Result->Length = Length; Result->Attributes = NewAttributes; Result->LockCount = 0; - Result->ReferenceCount = 1; Result->Process = Process; - + if (BaseAddress == OriginalMemoryArea->BaseAddress) { OriginalMemoryArea->BaseAddress = BaseAddress + Length; @@ -517,7 +381,7 @@ PMEMORY_AREA MmSplitMemoryArea(PEPROCESS Process, return(Result); } - + Split = ExAllocatePoolWithTag(NonPagedPool, sizeof(MEMORY_AREA), TAG_MAREA); RtlCopyMemory(Split,OriginalMemoryArea,sizeof(MEMORY_AREA)); @@ -530,15 +394,14 @@ PMEMORY_AREA MmSplitMemoryArea(PEPROCESS Process, return(Split); } -NTSTATUS -MmCreateMemoryArea(IN PEPROCESS Process, - IN PMADDRESS_SPACE AddressSpace, - IN ULONG Type, - IN OUT PVOID* BaseAddress, - IN ULONG Length, - IN ULONG Attributes, - OUT PMEMORY_AREA* Result, - IN BOOLEAN FixedAddress) +NTSTATUS MmCreateMemoryArea(PEPROCESS Process, + PMADDRESS_SPACE AddressSpace, + ULONG Type, + PVOID* BaseAddress, + ULONG Length, + ULONG Attributes, + MEMORY_AREA** Result, + BOOL FixedAddress) /* * FUNCTION: Create a memory area * ARGUMENTS: @@ -548,13 +411,10 @@ MmCreateMemoryArea(IN PEPROCESS Process, * Length = Length to allocate * Attributes = Protection attributes for the memory area * Result = Receives a pointer to the memory area on exit - * FixedAddress = Wether the memory area must be based at BaseAddress or not * RETURNS: Status * NOTES: Lock the address space before calling this function */ { - PMEMORY_AREA MemoryArea; - DPRINT("MmCreateMemoryArea(Type %d, BaseAddress %x," "*BaseAddress %x, Length %x, Attributes %x, Result %x)\n", Type,BaseAddress,*BaseAddress,Length,Attributes,Result); @@ -573,90 +433,27 @@ MmCreateMemoryArea(IN PEPROCESS Process, else { (*BaseAddress) = (PVOID)PAGE_ROUND_DOWN((*BaseAddress)); - MemoryArea = MmOpenMemoryAreaByRegion(AddressSpace, *BaseAddress, Length); - if (MemoryArea) + if (MmOpenMemoryAreaByRegion(AddressSpace, + *BaseAddress, + Length)!=NULL) { - MmCloseMemoryArea(MemoryArea); DPRINT("Memory area already occupied\n"); return(STATUS_CONFLICTING_ADDRESSES); } } - - DPRINT("MmCreateMemoryArea(*BaseAddress %x)\n", *BaseAddress); - + *Result = ExAllocatePoolWithTag(NonPagedPool, sizeof(MEMORY_AREA), TAG_MAREA); RtlZeroMemory(*Result,sizeof(MEMORY_AREA)); - SET_MAGIC(*Result, TAG_MAREA) (*Result)->Type = Type; (*Result)->BaseAddress = *BaseAddress; (*Result)->Length = Length; (*Result)->Attributes = Attributes; (*Result)->LockCount = 0; - (*Result)->ReferenceCount = 1; (*Result)->Process = Process; - - MmApplyMemoryAreaProtection(*Result); - + MmInsertMemoryArea(AddressSpace, *Result); DPRINT("MmCreateMemoryArea() succeeded\n"); return(STATUS_SUCCESS); } - -#ifdef DBG - -VOID -MiReferenceMemoryArea(IN PMEMORY_AREA MemoryArea, - IN LPSTR FileName, - IN ULONG LineNumber) -{ - VALIDATE_MEMORY_AREA(MemoryArea); - - InterlockedIncrement(&MemoryArea->ReferenceCount); - -#ifdef TRACK_MEMORY_AREA_REFERENCES - DbgPrint("(0x%.08x)(%s:%d) Referencing memory area 0x%.08x (New ref.count %d)\n", - KeGetCurrentThread(), FileName, LineNumber, - MemoryArea->BaseAddress, - MemoryArea->ReferenceCount); -#endif /* TRACK_MEMORY_AREA_REFERENCES */ -} - - -VOID -MiDereferenceMemoryArea(IN PMEMORY_AREA MemoryArea, - IN LPSTR FileName, - IN ULONG LineNumber) -{ - VALIDATE_MEMORY_AREA(MemoryArea); - - InterlockedDecrement(&MemoryArea->ReferenceCount); - -#ifdef TRACK_MEMORY_AREA_REFERENCES - DbgPrint("(0x%.08x)(%s:%d) Dereferencing memory area 0x%.08x (New ref.count %d)\n", - KeGetCurrentThread(), FileName, LineNumber, - MemoryArea->BaseAddress, - MemoryArea->ReferenceCount); -#endif /* TRACK_MEMORY_AREA_REFERENCES */ - - assertmsg(MemoryArea->ReferenceCount > 0, - ("No outstanding references on memory area (0x%.08x)\n", MemoryArea)); -} - -#else /* !DBG */ - -VOID -MiReferenceMemoryArea(IN PMEMORY_AREA MemoryArea) -{ - InterlockedIncrement(&MemoryArea->ReferenceCount); -} - - -VOID -MiDereferenceMemoryArea(IN PMEMORY_AREA MemoryArea) -{ - InterlockedDecrement(&MemoryArea->ReferenceCount); -} - -#endif /* !DBG */ diff --git a/reactos/ntoskrnl/mm/mdl.c b/reactos/ntoskrnl/mm/mdl.c index cae921adb43..ac5b9fc0896 100644 --- a/reactos/ntoskrnl/mm/mdl.c +++ b/reactos/ntoskrnl/mm/mdl.c @@ -1,4 +1,4 @@ -/* $Id: mdl.c,v 1.38 2002/05/13 18:10:40 chorns Exp $ +/* $Id: mdl.c,v 1.39 2002/05/14 21:19:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -28,11 +28,11 @@ PVOID MmGetMdlPageAddress(PMDL Mdl, PVOID Offset) { - PULONG_PTR MdlPages; + PULONG MdlPages; - MdlPages = (PULONG_PTR)(Mdl + 1); + MdlPages = (PULONG)(Mdl + 1); - return((PVOID) MdlPages[((ULONG_PTR) Offset) / PAGESIZE]); + return((PVOID)MdlPages[((ULONG)Offset) / PAGESIZE]); } VOID STDCALL @@ -46,8 +46,8 @@ MmUnlockPages(PMDL Mdl) * MDL is updated */ { - PULONG_PTR MdlPages; ULONG i; + PULONG MdlPages; /* * FIXME: I don't know whether this right, but it looks sensible @@ -59,18 +59,18 @@ MmUnlockPages(PMDL Mdl) } /* - * FIXME: Seems sensible + * FIXME: Seems sensible */ if (!(Mdl->MdlFlags & MDL_PAGES_LOCKED)) { return; } - MdlPages = (PULONG_PTR) (Mdl + 1); + MdlPages = (PULONG)(Mdl + 1); for (i=0; i<(PAGE_ROUND_UP(Mdl->ByteCount+Mdl->ByteOffset)/PAGESIZE); i++) { - MmUnlockPage(MdlPages[i]); - MmDereferencePage(MdlPages[i]); + MmUnlockPage((PVOID)MdlPages[i]); + MmDereferencePage((PVOID)MdlPages[i]); } Mdl->MdlFlags = Mdl->MdlFlags & (~MDL_PAGES_LOCKED); } @@ -88,7 +88,7 @@ PVOID STDCALL MmMapLockedPages(PMDL Mdl, KPROCESSOR_MODE AccessMode) { PVOID Base; ULONG i; - PULONG_PTR MdlPages; + PULONG MdlPages; MEMORY_AREA* Result; NTSTATUS Status; @@ -103,18 +103,18 @@ PVOID STDCALL MmMapLockedPages(PMDL Mdl, KPROCESSOR_MODE AccessMode) Base = NULL; Status = MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), - MEMORY_AREA_MDL_MAPPING, - &Base, - Mdl->ByteCount + Mdl->ByteOffset, - PAGE_READWRITE, - &Result, - FALSE); + MmGetKernelAddressSpace(), + MEMORY_AREA_MDL_MAPPING, + &Base, + Mdl->ByteCount + Mdl->ByteOffset, + 0, + &Result, + FALSE); if (!NT_SUCCESS(Status)) { MmUnlockAddressSpace(MmGetKernelAddressSpace()); KeBugCheck(0); - return(NULL); + return(STATUS_SUCCESS); } MmUnlockAddressSpace(MmGetKernelAddressSpace()); @@ -122,8 +122,8 @@ PVOID STDCALL MmMapLockedPages(PMDL Mdl, KPROCESSOR_MODE AccessMode) for (i=0; i<(PAGE_ROUND_UP(Mdl->ByteCount+Mdl->ByteOffset)/PAGESIZE); i++) { Status = MmCreateVirtualMapping(NULL, - (PVOID)((ULONG_PTR) Base+(i*PAGESIZE)), - Result->Attributes, + (PVOID)((ULONG)Base+(i*PAGESIZE)), + PAGE_READWRITE, MdlPages[i], TRUE); if (!NT_SUCCESS(Status)) @@ -171,16 +171,15 @@ MmUnmapLockedPages(PVOID BaseAddress, PMDL Mdl) VOID -MmBuildMdlFromPages(IN PMDL Mdl, - IN PULONG_PTR Pages) +MmBuildMdlFromPages(PMDL Mdl, PULONG Pages) { ULONG i; - PULONG_PTR MdlPages; + PULONG MdlPages; Mdl->MdlFlags = Mdl->MdlFlags | (MDL_PAGES_LOCKED | MDL_IO_PAGE_READ); - MdlPages = (PULONG_PTR) (Mdl + 1); + MdlPages = (PULONG)(Mdl + 1); for (i=0;i<(PAGE_ROUND_UP(Mdl->ByteOffset+Mdl->ByteCount)/PAGESIZE);i++) { @@ -237,14 +236,14 @@ VOID STDCALL MmProbeAndLockPages (PMDL Mdl, */ MmLockAddressSpace(&Mdl->Process->AddressSpace); - MdlPages = (ULONG *)(Mdl + 1); + MdlPages = (ULONG *)(Mdl + 1); NrPages = PAGE_ROUND_UP(Mdl->ByteOffset + Mdl->ByteCount) / PAGESIZE; for (i = 0; i < NrPages; i++) { PVOID Address; - - Address = Mdl->StartVa + (i*PAGESIZE); - + + Address = Mdl->StartVa + (i*PAGESIZE); + if (!MmIsPagePresent(NULL, Address)) { Status = MmNotPresentFault(Mode, (ULONG)Address, TRUE); @@ -252,15 +251,15 @@ VOID STDCALL MmProbeAndLockPages (PMDL Mdl, { for (j = 0; j < i; j++) { - MmUnlockPage((ULONG_PTR) MdlPages[j]); - MmDereferencePage((ULONG_PTR) MdlPages[j]); + MmUnlockPage((PVOID)MdlPages[j]); + MmDereferencePage((PVOID)MdlPages[j]); } ExRaiseStatus(Status); } } else { - MmLockPage(MmGetPhysicalAddressForProcess(NULL, Address)); + MmLockPage((PVOID)MmGetPhysicalAddressForProcess(NULL, Address)); } if ((Operation == IoWriteAccess || Operation == IoModifyAccess) && (!(MmGetPageProtect(NULL, (PVOID)Address) & PAGE_READWRITE))) @@ -270,14 +269,14 @@ VOID STDCALL MmProbeAndLockPages (PMDL Mdl, { for (j = 0; j < i; j++) { - MmUnlockPage((ULONG_PTR) MdlPages[j]); - MmDereferencePage((ULONG_PTR) MdlPages[j]); + MmUnlockPage((PVOID)MdlPages[j]); + MmDereferencePage((PVOID)MdlPages[j]); } ExRaiseStatus(Status); } } MdlPages[i] = MmGetPhysicalAddressForProcess(NULL, Address); - MmReferencePage((ULONG_PTR) MdlPages[i]); + MmReferencePage((PVOID)MdlPages[i]); } MmUnlockAddressSpace(&Mdl->Process->AddressSpace); if (Mdl->Process != CurrentProcess) @@ -371,3 +370,12 @@ MmMapMemoryDumpMdl (PVOID Unknown0) } /* EOF */ + + + + + + + + + diff --git a/reactos/ntoskrnl/mm/mm.c b/reactos/ntoskrnl/mm/mm.c index 398d1c7b0d9..3f6201dc45e 100644 --- a/reactos/ntoskrnl/mm/mm.c +++ b/reactos/ntoskrnl/mm/mm.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: mm.c,v 1.55 2002/05/13 18:10:40 chorns Exp $ +/* $Id: mm.c,v 1.56 2002/05/14 21:19:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top directory * PROJECT: ReactOS kernel @@ -41,52 +41,13 @@ /* GLOBALS *****************************************************************/ -PVOID EXPORTED MmUserProbeAddress = NULL; +PVOID EXPORTED MmUserProbeAddress = NULL; PVOID EXPORTED MmHighestUserAddress = NULL; -MM_STATS MmStats; +MM_STATS MmStats; extern PVOID MmSharedDataPagePhysicalAddress; /* FUNCTIONS ****************************************************************/ -#ifdef DBG - -VOID -DbgMmDumpProtection(IN ULONG Value) -{ - if (Value & PAGE_NOACCESS) - DbgPrint("No access\n"); - - if (Value & PAGE_GUARD) - DbgPrint("Guard\n"); - - if (Value & PAGE_READWRITE) - DbgPrint("Read/Write\n"); - - if (Value & PAGE_EXECUTE_READWRITE) - DbgPrint("Execute/Read/Write\n"); - - if (Value & PAGE_READONLY) - DbgPrint("Read only\n"); - - if (Value & PAGE_EXECUTE) - DbgPrint("Execute\n"); - - if (Value & PAGE_EXECUTE_READ) - DbgPrint("Execute/Read\n"); - - if (Value & PAGE_SYSTEM) - DbgPrint("System\n"); - - if (Value & PAGE_NOCACHE) - DbgPrint("No cache\n"); - - if (Value & PAGE_WRITETHROUGH) - DbgPrint("No cache\n"); -} - -#endif /* DBG */ - - NTSTATUS MmReleaseMemoryArea(PEPROCESS Process, PMEMORY_AREA Marea) { NTSTATUS Status; @@ -284,7 +245,7 @@ NTSTATUS MmAccessFault(KPROCESSOR_MODE Mode, NTSTATUS MmCommitPagedPoolAddress(PVOID Address) { NTSTATUS Status; - ULONG_PTR AllocatedPage; + PVOID AllocatedPage; Status = MmRequestPageMemoryConsumer(MC_PPOOL, FALSE, &AllocatedPage); if (!NT_SUCCESS(Status)) { diff --git a/reactos/ntoskrnl/mm/mminit.c b/reactos/ntoskrnl/mm/mminit.c index dbc171fceaf..9e778a45b22 100644 --- a/reactos/ntoskrnl/mm/mminit.c +++ b/reactos/ntoskrnl/mm/mminit.c @@ -1,4 +1,4 @@ -/* $Id: mminit.c,v 1.32 2002/05/13 18:10:40 chorns Exp $ +/* $Id: mminit.c,v 1.33 2002/05/14 21:19:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top directory * PROJECT: ReactOS kernel @@ -25,6 +25,11 @@ /* GLOBALS *****************************************************************/ +/* + * Size of extended memory (kb) (fixed for now) + */ +#define EXTENDED_MEMORY_SIZE (3*1024*1024) + /* * Compiler defined symbols */ @@ -43,9 +48,7 @@ static MEMORY_AREA* kernel_pool_desc = NULL; static MEMORY_AREA* kernel_shared_data_desc = NULL; static MEMORY_AREA* MiPagedPoolDescriptor = NULL; -ULONG_PTR MmSharedDataPagePhysicalAddress = 0; - -BOOLEAN MiInitialized = FALSE; +PVOID MmSharedDataPagePhysicalAddress = NULL; /* FUNCTIONS ****************************************************************/ @@ -59,14 +62,18 @@ MM_SYSTEM_SIZE STDCALL MmQuerySystemSize(VOID) return(MmSystemSize); } -VOID -MiShutdownMemoryManager() +VOID MiShutdownMemoryManager(VOID) { } -VOID -MmInitVirtualMemory(IN ULONG LastKernelAddress, - IN ULONG KernelLength) +VOID MmInitVirtualMemory(ULONG LastKernelAddress, + ULONG KernelLength) +/* + * FUNCTION: Intialize the memory areas list + * ARGUMENTS: + * bp = Pointer to the boot parameters + * kernel_len = Length of the kernel + */ { PVOID BaseAddress; ULONG Length; @@ -79,7 +86,7 @@ MmInitVirtualMemory(IN ULONG LastKernelAddress, LastKernelAddress = PAGE_ROUND_UP(LastKernelAddress); MmInitMemoryAreas(); - ExInitNonPagedPool((PVOID) (LastKernelAddress + PAGESIZE)); + ExInitNonPagedPool(LastKernelAddress + PAGESIZE); /* * Setup the system area descriptor list @@ -176,7 +183,7 @@ MmInitVirtualMemory(IN ULONG LastKernelAddress, Status = MmCreateVirtualMapping(NULL, (PVOID)KI_USER_SHARED_DATA, PAGE_READWRITE, - MmSharedDataPagePhysicalAddress, + (ULONG)MmSharedDataPagePhysicalAddress, TRUE); if (!NT_SUCCESS(Status)) { @@ -191,9 +198,6 @@ MmInitVirtualMemory(IN ULONG LastKernelAddress, MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); } -/* - * Called at DISPATCH_LEVEL - */ VOID MmInit1(ULONG FirstKrnlPhysAddr, ULONG LastKrnlPhysAddr, ULONG LastKernelAddress, @@ -237,7 +241,7 @@ VOID MmInit1(ULONG FirstKrnlPhysAddr, */ MmUserProbeAddress = (PVOID)0x7fff0000; MmHighestUserAddress = (PVOID)0x7ffeffff; - + /* * Initialize memory managment statistics */ @@ -289,7 +293,6 @@ VOID MmInit1(ULONG FirstKrnlPhysAddr, #ifdef BIOS_MEM_FIX MmStats.NrTotalPages += 16; #endif - DbgPrint("Used memory %dKb\n", (MmStats.NrTotalPages * PAGESIZE) / 1024); LastKernelAddress = (ULONG)MmInitializePageList( @@ -335,28 +338,20 @@ VOID MmInit1(ULONG FirstKrnlPhysAddr, * Intialize memory areas */ MmInitVirtualMemory(LastKernelAddress, kernel_len); - - MiInitialized = TRUE; } -/* - * Called at DISPATCH_LEVEL - */ VOID MmInit2(VOID) { - MmInitSectionImplementation(); - MmInitPagingFile(); + MmInitSectionImplementation(); + MmInitPagingFile(); } -/* - * Called at PASSIVE_LEVEL - */ VOID MmInit3(VOID) { - MmCreatePhysicalMemorySection(); - MmInitializeRmapList(); - MmInitPagerThread(); + MmInitPagerThread(); + MmCreatePhysicalMemorySection(); + MmInitializeRmapList(); - /* FIXME: Read parameters from memory */ + /* FIXME: Read parameters from memory */ } diff --git a/reactos/ntoskrnl/mm/ncache.c b/reactos/ntoskrnl/mm/ncache.c index 6382844247b..484eb96f72b 100644 --- a/reactos/ntoskrnl/mm/ncache.c +++ b/reactos/ntoskrnl/mm/ncache.c @@ -1,4 +1,4 @@ -/* $Id: ncache.c,v 1.16 2002/05/13 18:10:40 chorns Exp $ +/* $Id: ncache.c,v 1.17 2002/05/14 21:19:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -73,7 +73,7 @@ MmAllocateNonCachedMemory(IN ULONG NumberOfBytes) PAGE_WRITETHROUGH; for (i = 0; i <= (NumberOfBytes / PAGESIZE); i++) { - ULONG_PTR NPage; + PVOID NPage; Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &NPage); MmCreateVirtualMapping (NULL, @@ -85,22 +85,14 @@ MmAllocateNonCachedMemory(IN ULONG NumberOfBytes) return ((PVOID)Result); } -VOID -MmFreeNonCachedPage(IN BOOLEAN Before, - IN PVOID Context, - IN PMEMORY_AREA MemoryArea, - IN PVOID Address, - IN ULONG_PTR PhysicalAddress, - IN SWAPENTRY SwapEntry, - IN BOOLEAN Dirty) +VOID STATIC +MmFreeNonCachedPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, ULONG PhysAddr, + SWAPENTRY SwapEntry, BOOLEAN Dirty) { - if (!Before) + assert(SwapEntry == 0); + if (PhysAddr != 0) { - assert(SwapEntry == 0); - if (PhysicalAddress != 0) - { - MmDereferencePage(PhysicalAddress); - } + MmDereferencePage((PVOID)PhysAddr); } } diff --git a/reactos/ntoskrnl/mm/npool.c b/reactos/ntoskrnl/mm/npool.c index d7c42e6f4b3..04f8e073f64 100644 --- a/reactos/ntoskrnl/mm/npool.c +++ b/reactos/ntoskrnl/mm/npool.c @@ -1,4 +1,4 @@ -/* $Id: npool.c,v 1.56 2002/05/13 18:10:40 chorns Exp $ +/* $Id: npool.c,v 1.57 2002/05/14 21:19:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -78,7 +78,7 @@ ExFreeWholePageBlock(PVOID Addr); /* * Memory managment initalized symbol for the base of the pool */ -static PVOID kernel_pool_base = 0; +static unsigned int kernel_pool_base = 0; /* * Head of the list of free blocks @@ -222,7 +222,7 @@ MiAddToTagHashTable(BLOCK_HDR* block) #endif /* TAG_STATISTICS_TRACKING */ VOID -ExInitNonPagedPool(IN PVOID BaseAddress) +ExInitNonPagedPool(ULONG BaseAddress) { kernel_pool_base = BaseAddress; KeInitializeSpinLock(&MmNpoolLock); @@ -390,13 +390,13 @@ static void validate_free_list(void) KeBugCheck(KBUG_POOL_FREE_LIST_CORRUPT); } - if (base_addr < (ULONG_PTR) (kernel_pool_base) || - (base_addr+current->Size) > (ULONG_PTR) (kernel_pool_base)+NONPAGED_POOL_SIZE) + if (base_addr < (kernel_pool_base) || + (base_addr+current->Size) > (kernel_pool_base)+NONPAGED_POOL_SIZE) { DbgPrint("Block %x found outside pool area\n",current); DbgPrint("Size %d\n",current->Size); - DbgPrint("Limits are %x %x\n", kernel_pool_base, - (ULONG_PTR) kernel_pool_base + NONPAGED_POOL_SIZE); + DbgPrint("Limits are %x %x\n",kernel_pool_base, + kernel_pool_base+NONPAGED_POOL_SIZE); KeBugCheck(KBUG_POOL_FREE_LIST_CORRUPT); } blocks_seen++; @@ -442,9 +442,9 @@ static void validate_used_list(void) current); KeBugCheck(KBUG_POOL_FREE_LIST_CORRUPT); } - if (base_addr < (ULONG_PTR) (kernel_pool_base) || + if (base_addr < (kernel_pool_base) || (base_addr+current->Size) > - (ULONG_PTR) (kernel_pool_base) + NONPAGED_POOL_SIZE) + (kernel_pool_base)+NONPAGED_POOL_SIZE) { DbgPrint("Block %x found outside pool area\n",current); for(;;); @@ -567,8 +567,8 @@ free_pages(BLOCK_HDR* blk) ULONG end; ULONG i; - start = (ULONG_PTR) blk; - end = (ULONG_PTR) blk + sizeof(BLOCK_HDR) + blk->Size; + start = (ULONG)blk; + end = (ULONG)blk + sizeof(BLOCK_HDR) + blk->Size; /* * If the block doesn't contain a whole page then there is nothing to do @@ -699,15 +699,14 @@ static BLOCK_HDR* grow_kernel_pool(unsigned int size, ULONG Tag, PVOID Caller) NTSTATUS Status; KIRQL oldIrql; - start = (ULONG_PTR) MiAllocNonPagedPoolRegion(nr_pages); + start = (ULONG)MiAllocNonPagedPoolRegion(nr_pages); DPRINT("growing heap for block size %d, ",size); DPRINT("start %x\n",start); for (i=0;isize, + DPRINT("freeing block %x\n",blk); + + POOL_TRACE("ExFreePool(block %x), size %d, caller %x\n",block,blk->size, ((PULONG)&block)[-1]); KeAcquireSpinLock(&MmNpoolLock, &oldIrql); @@ -875,7 +874,7 @@ VOID STDCALL ExFreeNonPagedPool (PVOID block) } DPRINT("freeing block %x\n",blk); - + POOL_TRACE("ExFreePool(block %x), size %d, caller %x\n",block,blk->size, ((PULONG)&block)[-1]); @@ -1008,7 +1007,7 @@ PVOID STDCALL ExAllocateWholePageBlock(ULONG UserSize) { PVOID Address; - ULONG_PTR Page; + PVOID Page; ULONG i; ULONG Size; ULONG NrPages; @@ -1021,19 +1020,19 @@ ExAllocateWholePageBlock(ULONG UserSize) for (i = 0; i < NrPages; i++) { Page = MmAllocPage(MC_NPPOOL, 0); - if (Page == 0) + if (Page == NULL) { KeBugCheck(0); } MmCreateVirtualMapping(NULL, Address + (i * PAGESIZE), PAGE_READWRITE | PAGE_SYSTEM, - Page, + (ULONG)Page, TRUE); } - *((PULONG)((ULONG_PTR) Address + (NrPages * PAGESIZE) - Size)) = NrPages; - return((PVOID)((ULONG_PTR) Address + (NrPages * PAGESIZE) - UserSize)); + *((PULONG)((ULONG)Address + (NrPages * PAGESIZE) - Size)) = NrPages; + return((PVOID)((ULONG)Address + (NrPages * PAGESIZE) - UserSize)); } VOID STDCALL @@ -1041,14 +1040,14 @@ ExFreeWholePageBlock(PVOID Addr) { ULONG NrPages; - if ((ULONG_PTR)Addr < (ULONG_PTR) kernel_pool_base || - (ULONG_PTR)Addr >= ((ULONG_PTR) kernel_pool_base + NONPAGED_POOL_SIZE)) + if ((ULONG)Addr < kernel_pool_base || + (ULONG)Addr >= (kernel_pool_base + NONPAGED_POOL_SIZE)) { DbgPrint("Block %x found outside pool area\n", Addr); KeBugCheck(0); } - NrPages = *(PULONG)((ULONG_PTR) Addr - sizeof(ULONG)); - MiFreeNonPagedPoolRegion((PVOID)PAGE_ROUND_DOWN((ULONG_PTR) Addr), NrPages, TRUE); + NrPages = *(PULONG)((ULONG)Addr - sizeof(ULONG)); + MiFreeNonPagedPoolRegion((PVOID)PAGE_ROUND_DOWN((ULONG)Addr), NrPages, TRUE); } #endif /* WHOLE_PAGE_ALLOCATIONS */ diff --git a/reactos/ntoskrnl/mm/pagefile.c b/reactos/ntoskrnl/mm/pagefile.c index 5e7a89b5665..07e1ee9cc69 100644 --- a/reactos/ntoskrnl/mm/pagefile.c +++ b/reactos/ntoskrnl/mm/pagefile.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: pagefile.c,v 1.19 2002/05/13 18:10:40 chorns Exp $ +/* $Id: pagefile.c,v 1.20 2002/05/14 21:19:19 dwelch Exp $ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/pagefile.c @@ -98,53 +98,25 @@ static BYTE MmCoreDumpHeader[PAGESIZE]; /* * Translate between a swap entry and a file and offset pair. */ -#define PTE_SWAP_FILE_MASK 0x0f000000 -#define PTE_SWAP_FILE_BIT 24 -#define FILE_FROM_ENTRY(i) (((i) & PTE_SWAP_FILE_MASK) >> PTE_SWAP_FILE_BIT) +#define FILE_FROM_ENTRY(i) ((i) >> 24) #define OFFSET_FROM_ENTRY(i) (((i) & 0xffffff) - 1) -#define ENTRY_FROM_FILE_OFFSET(i, j) (((i) << PTE_SWAP_FILE_BIT) | ((j) + 1)) +#define ENTRY_FROM_FILE_OFFSET(i, j) (((i) << 24) | ((j) + 1)) /* FUNCTIONS *****************************************************************/ -#ifdef DBG - -VOID -MiValidateSwapEntry(SWAPENTRY Entry) -{ - ULONG i; - ULONG off; - - if (Entry != 0) - { - DPRINT("MiValidateSwapEntry(SwapEntry 0x%.08x)\n", Entry); - - i = FILE_FROM_ENTRY(Entry); - - assertmsg(i < MAX_PAGING_FILES, - ("Bad SwapEntry (0x%.08x). Wrong paging file number (%d, 0x%.08x)\n", Entry, i, off)); - - off = OFFSET_FROM_ENTRY(Entry); - - assertmsg(off / 32 <= PagingFileList[i]->AllocMapSize, - ("Bad SwapEntry (0x%.08x). Wrong paging file offset (%d, 0x%.08x)\n", Entry, i, off)); - } -} - -#endif - NTSTATUS MmWriteToSwapPage(SWAPENTRY SwapEntry, PMDL Mdl) { ULONG i, offset; LARGE_INTEGER file_offset; IO_STATUS_BLOCK Iosb; NTSTATUS Status; - + if (SwapEntry == 0) { KeBugCheck(0); return(STATUS_UNSUCCESSFUL); } - + i = FILE_FROM_ENTRY(SwapEntry); offset = OFFSET_FROM_ENTRY(SwapEntry); @@ -162,12 +134,6 @@ NTSTATUS MmWriteToSwapPage(SWAPENTRY SwapEntry, PMDL Mdl) file_offset.QuadPart = offset * 4096; - if (file_offset.QuadPart > PagingFileList[i]->MaximumSize.QuadPart) - { - DPRINT1("Bad swap file offset 0x%.08x\n", file_offset.u.LowPart); - KeBugCheck(0); - } - Status = IoPageWrite(PagingFileList[i]->FileObject, Mdl, &file_offset, @@ -183,10 +149,6 @@ NTSTATUS MmReadFromSwapPage(SWAPENTRY SwapEntry, PMDL Mdl) IO_STATUS_BLOCK Iosb; NTSTATUS Status; - DPRINT("MmReadFromSwapPage(SwapEntry 0x%.08x)\n", SwapEntry); - - VALIDATE_SWAP_ENTRY(SwapEntry); - if (SwapEntry == 0) { KeBugCheck(0); @@ -209,19 +171,12 @@ NTSTATUS MmReadFromSwapPage(SWAPENTRY SwapEntry, PMDL Mdl) } file_offset.QuadPart = offset * 4096; - - if (file_offset.QuadPart > PagingFileList[i]->MaximumSize.QuadPart) - { - DPRINT1("Bad swap file offset 0x%.08x\n", file_offset.u.LowPart); - KeBugCheck(0); - } Status = IoPageRead(PagingFileList[i]->FileObject, Mdl, &file_offset, &Iosb, TRUE); - DPRINT("MmReadFromSwapPage() Status 0x%.8X\n", Status); return(Status); } @@ -311,16 +266,9 @@ MmFreeSwapPage(SWAPENTRY Entry) ULONG i; ULONG off; KIRQL oldIrql; - + i = FILE_FROM_ENTRY(Entry); - - assertmsg(i < MAX_PAGING_FILES, - ("Bad SwapEntry (0x%.08x). Wrong paging file number (%d, 0x%.08x)\n", Entry, i, off)); - off = OFFSET_FROM_ENTRY(Entry); - - assertmsg(off / 32 <= PagingFileList[i]->AllocMapSize, - ("Bad SwapEntry (0x%.08x). Wrong paging file offset (%d, 0x%.08x)\n", Entry, i, off)); KeAcquireSpinLock(&PagingFileListLock, &oldIrql); if (PagingFileList[i] == NULL) @@ -328,8 +276,9 @@ MmFreeSwapPage(SWAPENTRY Entry) KeBugCheck(0); } KeAcquireSpinLockAtDpcLevel(&PagingFileList[i]->AllocMapLock); - + PagingFileList[i]->AllocMap[off / 32] &= (~(1 << (off % 32))); + PagingFileList[i]->FreePages++; PagingFileList[i]->UsedPages--; @@ -461,7 +410,6 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, SL_OPEN_PAGING_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open swap file (Status 0x%.08x)\n", Status); return(Status); } @@ -478,7 +426,6 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to write to swap file (Status 0x%.08x)\n", Status); NtClose(FileHandle); return(Status); } @@ -492,7 +439,6 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to reference swap file (Status 0x%.08x)\n", Status); NtClose(FileHandle); return(Status); } @@ -537,11 +483,16 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, MiFreeSwapPages = MiFreeSwapPages + PagingFile->FreePages; MiPagingFileCount++; KeReleaseSpinLock(&PagingFileListLock, oldIrql); - - DPRINT("Successfully opened swap file\n"); return(STATUS_SUCCESS); } /* EOF */ + + + + + + + diff --git a/reactos/ntoskrnl/mm/pageop.c b/reactos/ntoskrnl/mm/pageop.c index 82caa2804cf..9829e9254d6 100644 --- a/reactos/ntoskrnl/mm/pageop.c +++ b/reactos/ntoskrnl/mm/pageop.c @@ -1,4 +1,4 @@ -/* $Id: pageop.c,v 1.8 2002/05/13 18:10:40 chorns Exp $ +/* $Id: pageop.c,v 1.9 2002/05/14 21:19:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -29,27 +29,8 @@ PMM_PAGEOP MmPageOpHashTable[PAGEOP_HASH_TABLE_SIZE] = {NULL, } ; /* FUNCTIONS *****************************************************************/ -#ifdef DBG - VOID -MiValidatePageOp(IN PMM_PAGEOP PageOp) -{ - if (PageOp != NULL) - { - DPRINT("MiValidatePageOp(PageOp 0x%.08x)\n", PageOp); - - assertmsg(PageOp->Magic == TAG_MM_PAGEOP, - ("Bad PageOp (0x%.08x). Wrong magic (0x%.08x)\n", PageOp->Magic)); - - assertmsg((PageOp->OpType >= MM_PAGEOP_MINIMUM) && (PageOp->OpType <= MM_PAGEOP_MAXIMUM), - ("Bad PageOp (0x%.08x). Wrong type (%d)\n", PageOp->OpType)); - } -} - -#endif /* DBG */ - -VOID -MmReleasePageOp(IN PMM_PAGEOP PageOp) +MmReleasePageOp(PMM_PAGEOP PageOp) /* * FUNCTION: Release a reference to a page operation descriptor */ @@ -57,9 +38,6 @@ MmReleasePageOp(IN PMM_PAGEOP PageOp) KIRQL oldIrql; PMM_PAGEOP PrevPageOp; - assert(PageOp); - VALIDATE_PAGEOP(PageOp); - KeAcquireSpinLock(&MmPageOpHashTableLock, &oldIrql); PageOp->ReferenceCount--; if (PageOp->ReferenceCount > 0) @@ -87,31 +65,24 @@ MmReleasePageOp(IN PMM_PAGEOP PageOp) PrevPageOp = PrevPageOp->Next; } KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - CPRINT("PageOp (0x%.08x) not found\n", PageOp); KeBugCheck(0); } - PMM_PAGEOP -MmGetPageOp(IN PMEMORY_AREA MArea, - IN ULONG Pid, - IN PVOID Address, - IN PMM_SECTION_SEGMENT Segment, - IN ULONG Offset, - IN ULONG OpType) -/* - * FUNCTION: Get a page operation descriptor corresponding to - * the memory area and either the segment, offset pair or the - * pid, address pair. Create a new pageop if one does not exist. - * FIXME: Make Offset 64-bit - */ +MmGetPageOp(PMEMORY_AREA MArea, ULONG Pid, PVOID Address, + PMM_SECTION_SEGMENT Segment, ULONG Offset, ULONG OpType) + /* + * FUNCTION: Get a page operation descriptor corresponding to + * the memory area and either the segment, offset pair or the + * pid, address pair. + */ { ULONG Hash; KIRQL oldIrql; PMM_PAGEOP PageOp; /* - * Calculate the hash value for pageop structure + * Calcuate the hash value for pageop structure */ if (MArea->Type == MEMORY_AREA_SECTION_VIEW_COMMIT) { @@ -119,9 +90,6 @@ MmGetPageOp(IN PMEMORY_AREA MArea, } else { - assertmsg(((ULONG_PTR)Address % PAGESIZE) == 0, - ("Address must be page aligned (0x%.08x)\n", Address)); - Hash = (((ULONG)Pid) | (((ULONG)Address) / PAGESIZE)); } Hash = Hash % PAGEOP_HASH_TABLE_SIZE; @@ -159,8 +127,6 @@ MmGetPageOp(IN PMEMORY_AREA MArea, */ if (PageOp != NULL) { - VALIDATE_PAGEOP(PageOp); - PageOp->ReferenceCount++; KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); return(PageOp); @@ -177,8 +143,6 @@ MmGetPageOp(IN PMEMORY_AREA MArea, return(NULL); } - SET_MAGIC(PageOp, TAG_MM_PAGEOP); - if (MArea->Type != MEMORY_AREA_SECTION_VIEW_COMMIT) { PageOp->Pid = Pid; @@ -199,90 +163,14 @@ MmGetPageOp(IN PMEMORY_AREA MArea, KeInitializeEvent(&PageOp->CompletionEvent, NotificationEvent, FALSE); MmPageOpHashTable[Hash] = PageOp; - VALIDATE_PAGEOP(PageOp); - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); return(PageOp); } -PMM_PAGEOP -MmGotPageOp(IN PMEMORY_AREA MArea, - IN ULONG Pid, - IN PVOID Address, - IN PMM_SECTION_SEGMENT Segment, - IN ULONG Offset) -/* - * FUNCTION: Get a page operation descriptor corresponding to - * the memory area and either the segment, offset pair or the - * pid, address pair. Returns NULL if a pageop does not exist. - * FIXME: Make Offset 64-bit - */ -{ - ULONG Hash; - KIRQL oldIrql; - PMM_PAGEOP PageOp; - /* - * Calculate the hash value for pageop structure - */ - if (MArea->Type == MEMORY_AREA_SECTION_VIEW_COMMIT) - { - Hash = (((ULONG)Segment) | (((ULONG)Offset) / PAGESIZE)); - } - else - { - assertmsg(((ULONG_PTR)Address % PAGESIZE) == 0, - ("Address must be page aligned (0x%.08x)\n", Address)); - Hash = (((ULONG)Pid) | (((ULONG)Address) / PAGESIZE)); - } - Hash = Hash % PAGEOP_HASH_TABLE_SIZE; - KeAcquireSpinLock(&MmPageOpHashTableLock, &oldIrql); - /* - * Check for an existing pageop structure - */ - PageOp = MmPageOpHashTable[Hash]; - while (PageOp != NULL) - { - if (MArea->Type == MEMORY_AREA_SECTION_VIEW_COMMIT) - { - if (PageOp->Segment == Segment && - PageOp->Offset == Offset) - { - break; - } - } - else - { - if (PageOp->Pid == Pid && - PageOp->Address == Address) - { - break; - } - } - PageOp = PageOp->Next; - } - - /* - * If we found an existing pageop then increment the reference count - * and return it. - */ - if (PageOp != NULL) - { - VALIDATE_PAGEOP(PageOp); - PageOp->ReferenceCount++; - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return(PageOp); - } - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - - /* - * Otherwise return NULL. - */ - return(NULL); -} diff --git a/reactos/ntoskrnl/mm/ppool.c b/reactos/ntoskrnl/mm/ppool.c index f61b75098c1..d46eeaf3185 100644 --- a/reactos/ntoskrnl/mm/ppool.c +++ b/reactos/ntoskrnl/mm/ppool.c @@ -1,4 +1,4 @@ -/* $Id: ppool.c,v 1.8 2002/05/13 18:10:40 chorns Exp $ +/* $Id: ppool.c,v 1.9 2002/05/14 21:19:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -75,8 +75,6 @@ ExAllocatePagedPoolWithTag (IN POOL_TYPE PoolType, PMM_PPOOL_FREE_BLOCK_HEADER BestPreviousBlock; PVOID BlockAddress; - assert_irql(APC_LEVEL); - /* * Don't bother allocating anything for a zero-byte block. */ diff --git a/reactos/ntoskrnl/mm/rmap.c b/reactos/ntoskrnl/mm/rmap.c index 404f1c2d81e..20ae670a6eb 100644 --- a/reactos/ntoskrnl/mm/rmap.c +++ b/reactos/ntoskrnl/mm/rmap.c @@ -16,14 +16,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: rmap.c,v 1.4 2002/05/13 18:10:40 chorns Exp $ +/* $Id: rmap.c,v 1.5 2002/05/14 21:19:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/rmap.c * PURPOSE: kernel memory managment functions * PROGRAMMER: David Welch (welch@cwcom.net) - * Casper S. Hornstrup (chorns@users.sourceforge.net) * UPDATE HISTORY: * Created 27/12/01 */ @@ -44,61 +43,22 @@ typedef struct _MM_RMAP_ENTRY struct _MM_RMAP_ENTRY* Next; PEPROCESS Process; PVOID Address; - ULONG ReferenceCount; } MM_RMAP_ENTRY, *PMM_RMAP_ENTRY; /* GLOBALS ******************************************************************/ -static FAST_MUTEX MiRmapListLock; +static FAST_MUTEX RmapListLock; /* FUNCTIONS ****************************************************************/ -#ifdef DBG - -VOID -MiValidateRmapList(struct _MM_RMAP_ENTRY* RmapList) -{ - if (RmapList != NULL) - { - PMM_RMAP_ENTRY CurrentEntry = RmapList; - - while (CurrentEntry != NULL) - { - PMM_RMAP_ENTRY Entry = RmapList; - ULONG Count = 0; - - assertmsg(RmapList->ReferenceCount >= 0, ("Bad reference count %d for rmap entry\n", - RmapList->ReferenceCount)); - - while (Entry != NULL) - { - if (Entry->Process == CurrentEntry->Process) - { - Count++; - } - Entry = Entry->Next; - } - - assertmsg(Count == 1, ("%d rmap entries for process 0x%.08x\n", - Count, CurrentEntry->Process)); - - CurrentEntry = CurrentEntry->Next; - } - } -} - -#endif /* DBG */ - - VOID MmInitializeRmapList(VOID) { - ExInitializeFastMutex(&MiRmapListLock); + ExInitializeFastMutex(&RmapListLock); } - NTSTATUS -MmPageOutPhysicalAddress(ULONG_PTR PhysicalAddress) +MmPageOutPhysicalAddress(PVOID PhysicalAddress) { PMM_RMAP_ENTRY entry; PMEMORY_AREA MemoryArea; @@ -109,11 +69,11 @@ MmPageOutPhysicalAddress(ULONG_PTR PhysicalAddress) LARGE_INTEGER Offset; NTSTATUS Status; - ExAcquireFastMutex(&MiRmapListLock); + ExAcquireFastMutex(&RmapListLock); entry = MmGetRmapListHeadPage(PhysicalAddress); if (entry == NULL) { - ExReleaseFastMutex(&MiRmapListLock); + ExReleaseFastMutex(&RmapListLock); return(STATUS_UNSUCCESSFUL); } Process = entry->Process; @@ -134,8 +94,8 @@ MmPageOutPhysicalAddress(ULONG_PTR PhysicalAddress) /* * Get or create a pageop */ - PageOp = MmGetPageOp(MemoryArea, 0, 0, - MemoryArea->Data.SectionData.Segment, + PageOp = MmGetPageOp(MemoryArea, 0, 0, + MemoryArea->Data.SectionData.Segment, Offset.u.LowPart, MM_PAGEOP_PAGEOUT); if (PageOp == NULL) { @@ -147,20 +107,20 @@ MmPageOutPhysicalAddress(ULONG_PTR PhysicalAddress) { MmReleasePageOp(PageOp); MmUnlockAddressSpace(&Process->AddressSpace); - ExReleaseFastMutex(&MiRmapListLock); + ExReleaseFastMutex(&RmapListLock); return(STATUS_UNSUCCESSFUL); } - + /* * Release locks now we have a page op. */ MmUnlockAddressSpace(&Process->AddressSpace); - ExReleaseFastMutex(&MiRmapListLock); + ExReleaseFastMutex(&RmapListLock); /* * Do the actual page out work. */ - Status = MmPageOutSectionView(&Process->AddressSpace, MemoryArea, + Status = MmPageOutSectionView(&Process->AddressSpace, MemoryArea, Address, PageOp); } else if (Type == MEMORY_AREA_VIRTUAL_MEMORY) @@ -171,7 +131,7 @@ MmPageOutPhysicalAddress(ULONG_PTR PhysicalAddress) { MmReleasePageOp(PageOp); MmUnlockAddressSpace(&Process->AddressSpace); - ExReleaseFastMutex(&MiRmapListLock); + ExReleaseFastMutex(&RmapListLock); return(STATUS_UNSUCCESSFUL); } @@ -179,12 +139,12 @@ MmPageOutPhysicalAddress(ULONG_PTR PhysicalAddress) * Release locks now we have a page op. */ MmUnlockAddressSpace(&Process->AddressSpace); - ExReleaseFastMutex(&MiRmapListLock); + ExReleaseFastMutex(&RmapListLock); /* * Do the actual page out work. */ - Status = MmPageOutVirtualMemory(&Process->AddressSpace, MemoryArea, + Status = MmPageOutVirtualMemory(&Process->AddressSpace, MemoryArea, Address, PageOp); } else @@ -194,324 +154,48 @@ MmPageOutPhysicalAddress(ULONG_PTR PhysicalAddress) return(Status); } - VOID -MmReferenceRmap(IN PMM_RMAP_ENTRY RmapEntry) +MmInsertRmap(PVOID PhysicalAddress, PEPROCESS Process, PVOID Address) { - InterlockedIncrement(&RmapEntry->ReferenceCount); -} - - -VOID -MmDereferenceRmap(IN PMM_RMAP_ENTRY RmapEntry) -{ - InterlockedDecrement(&RmapEntry->ReferenceCount); - - assertmsg(RmapEntry->ReferenceCount > 0, ("Bad reference count (%d) for " - "Process (0x%.08x) Addresss (0x%.08x)\n", - RmapEntry->ReferenceCount, RmapEntry->Process, RmapEntry->Address)); -} - - -VOID -MiDisableAllRmaps(IN ULONG_PTR PhysicalAddress, - IN PBOOLEAN Modified) -{ - PMM_RMAP_ENTRY CurrentEntry; - PMM_RMAP_ENTRY NextEntry; - BOOLEAN WasDirty; - - ExAcquireFastMutex(&MiRmapListLock); - - CurrentEntry = MmGetRmapListHeadPage(PhysicalAddress); - - assertmsg(CurrentEntry != NULL, ("MiDisableAllRmaps: No rmaps.\n")) - - *Modified = FALSE; - while (CurrentEntry != NULL) - { - NextEntry = CurrentEntry->Next; - - MmLockAddressSpace(&CurrentEntry->Process->AddressSpace); - - MmDisableVirtualMapping(CurrentEntry->Process, - CurrentEntry->Address, - &WasDirty, - NULL); - - if (WasDirty) - { - *Modified = TRUE; - } - - MmUnlockAddressSpace(&CurrentEntry->Process->AddressSpace); - - CurrentEntry = NextEntry; - } - - ExReleaseFastMutex(&MiRmapListLock); -} - - -VOID -MiEnableAllRmaps(IN ULONG_PTR PhysicalAddress, - IN BOOLEAN Modified) -{ - PMM_RMAP_ENTRY CurrentEntry; - PMM_RMAP_ENTRY NextEntry; - - ExAcquireFastMutex(&MiRmapListLock); - - CurrentEntry = MmGetRmapListHeadPage(PhysicalAddress); - - assertmsg(CurrentEntry != NULL, ("MiEnableAllRmaps: No rmaps.\n")) - - while (CurrentEntry != NULL) - { - NextEntry = CurrentEntry->Next; - - MmLockAddressSpace(&CurrentEntry->Process->AddressSpace); - - MmEnableVirtualMapping(CurrentEntry->Process, - CurrentEntry->Address); - - if (Modified) - { - MmSetDirtyPage(CurrentEntry->Process, - CurrentEntry->Address); - } - - MmUnlockAddressSpace(&CurrentEntry->Process->AddressSpace); - - CurrentEntry = NextEntry; - } - - ExReleaseFastMutex(&MiRmapListLock); -} - - -VOID -MiGetDirtyAllRmaps(IN ULONG_PTR PhysicalAddress, - OUT PBOOLEAN Dirty) -{ - PMM_RMAP_ENTRY CurrentEntry; - PMM_RMAP_ENTRY NextEntry; - BOOLEAN WasDirty; - - ExAcquireFastMutex(&MiRmapListLock); - - CurrentEntry = MmGetRmapListHeadPage(PhysicalAddress); - - assertmsg(CurrentEntry != NULL, ("MiGetDirtyAllRmaps: No rmaps.\n")) - - *Dirty = FALSE; - while (CurrentEntry != NULL) - { - NextEntry = CurrentEntry->Next; - - MmLockAddressSpace(&CurrentEntry->Process->AddressSpace); - - WasDirty = MmIsPageDirty(CurrentEntry->Process, - CurrentEntry->Address); - - MmUnlockAddressSpace(&CurrentEntry->Process->AddressSpace); - - if (WasDirty) - { - *Dirty = TRUE; - } - - CurrentEntry = NextEntry; - } - - ExReleaseFastMutex(&MiRmapListLock); -} - - -VOID -MiSetDirtyAllRmaps(IN ULONG_PTR PhysicalAddress, - IN BOOLEAN Dirty) -{ - PMM_RMAP_ENTRY CurrentEntry; - PMM_RMAP_ENTRY NextEntry; - - ExAcquireFastMutex(&MiRmapListLock); - - CurrentEntry = MmGetRmapListHeadPage(PhysicalAddress); - - assertmsg(CurrentEntry != NULL, ("MiSetDirtyAllRmaps: No rmaps.\n")) - - while (CurrentEntry != NULL) - { - NextEntry = CurrentEntry->Next; - - MmLockAddressSpace(&CurrentEntry->Process->AddressSpace); - - if (Dirty) - { - MmSetDirtyPage(CurrentEntry->Process, - CurrentEntry->Address); - } - else - { - MmSetCleanPage(CurrentEntry->Process, - CurrentEntry->Address); - } - - MmUnlockAddressSpace(&CurrentEntry->Process->AddressSpace); - - CurrentEntry = NextEntry; - } - - ExReleaseFastMutex(&MiRmapListLock); -} - - -VOID -MiGetPageStateAllRmaps(IN ULONG_PTR PhysicalAddress, - IN ULONG PageState, - OUT PBOOLEAN Result) -{ - PMM_RMAP_ENTRY CurrentEntry; - PMM_RMAP_ENTRY NextEntry; - ULONG State; - - ExAcquireFastMutex(&MiRmapListLock); - - CurrentEntry = MmGetRmapListHeadPage(PhysicalAddress); - - assertmsg(CurrentEntry != NULL, ("MiGetPageStateAllRmaps: No rmaps.\n")) - - *Result = FALSE; - while (CurrentEntry != NULL) - { - NextEntry = CurrentEntry->Next; - - MmLockAddressSpace(&CurrentEntry->Process->AddressSpace); - - State = MiPageState(CurrentEntry->Process, - CurrentEntry->Address, - PageState); - - MmUnlockAddressSpace(&CurrentEntry->Process->AddressSpace); - - if (State) - { - *Result = TRUE; - } - - CurrentEntry = NextEntry; - } - - ExReleaseFastMutex(&MiRmapListLock); -} - - -VOID -MiClearPageStateAllRmaps(IN ULONG_PTR PhysicalAddress, - IN ULONG PageState) -{ - PMM_RMAP_ENTRY CurrentEntry; - PMM_RMAP_ENTRY NextEntry; - - ExAcquireFastMutex(&MiRmapListLock); - - CurrentEntry = MmGetRmapListHeadPage(PhysicalAddress); - - assertmsg(CurrentEntry != NULL, ("MiClearPageStateAllRmaps: No rmaps.\n")) - - while (CurrentEntry != NULL) - { - NextEntry = CurrentEntry->Next; - - MmLockAddressSpace(&CurrentEntry->Process->AddressSpace); - - MiClearPageState(CurrentEntry->Process, - CurrentEntry->Address, - PageState); - - MmUnlockAddressSpace(&CurrentEntry->Process->AddressSpace); - - CurrentEntry = NextEntry; - } - - ExReleaseFastMutex(&MiRmapListLock); -} - - -VOID -MiSetPageStateAllRmaps(IN ULONG_PTR PhysicalAddress, - IN ULONG PageState) -{ - PMM_RMAP_ENTRY CurrentEntry; - PMM_RMAP_ENTRY NextEntry; - - ExAcquireFastMutex(&MiRmapListLock); - - CurrentEntry = MmGetRmapListHeadPage(PhysicalAddress); - - assertmsg(CurrentEntry != NULL, ("MiSetPageStateAllRmaps: No rmaps.\n")) - - while (CurrentEntry != NULL) - { - NextEntry = CurrentEntry->Next; - - MmLockAddressSpace(&CurrentEntry->Process->AddressSpace); - - MiSetPageState(CurrentEntry->Process, - CurrentEntry->Address, - PageState); - - MmUnlockAddressSpace(&CurrentEntry->Process->AddressSpace); - - CurrentEntry = NextEntry; - } - - ExReleaseFastMutex(&MiRmapListLock); -} - - -VOID -MmInsertRmap(ULONG_PTR PhysicalAddress, PEPROCESS Process, PVOID Address) -{ - PMM_RMAP_ENTRY Current; - PMM_RMAP_ENTRY New; + PMM_RMAP_ENTRY current_entry; + PMM_RMAP_ENTRY new_entry; Address = (PVOID)PAGE_ROUND_DOWN(Address); - New = ExAllocatePool(NonPagedPool, sizeof(MM_RMAP_ENTRY)); - assert(New); - New->ReferenceCount = 1; - New->Address = Address; - New->Process = Process; - - if (MmGetPhysicalAddressForProcess(Process, Address) != - (ULONG_PTR)PhysicalAddress) + new_entry = ExAllocatePool(NonPagedPool, sizeof(MM_RMAP_ENTRY)); + if (new_entry == NULL) { - DPRINT("Insert rmap (%d, 0x%.8X) 0x%.8X which doesn't match physical " - "address 0x%.8X\n", Process->UniqueProcessId, Address, - MmGetPhysicalAddressForProcess(Process, Address), + KeBugCheck(0); + } + new_entry->Address = Address; + new_entry->Process = Process; + + if (MmGetPhysicalAddressForProcess(Process, Address) != + (ULONG)PhysicalAddress) + { + DPRINT1("Insert rmap (%d, 0x%.8X) 0x%.8X which doesn't match physical " + "address 0x%.8X\n", Process->UniqueProcessId, Address, + MmGetPhysicalAddressForProcess(Process, Address), PhysicalAddress) KeBugCheck(0); } - ExAcquireFastMutex(&MiRmapListLock); - Current = MmGetRmapListHeadPage(PhysicalAddress); - New->Next = Current; - MmSetRmapListHeadPage(PhysicalAddress, New); - MmSetRmapCallback(PhysicalAddress, NULL, NULL); - ExReleaseFastMutex(&MiRmapListLock); + ExAcquireFastMutex(&RmapListLock); + current_entry = MmGetRmapListHeadPage(PhysicalAddress); + new_entry->Next = current_entry; + MmSetRmapListHeadPage(PhysicalAddress, new_entry); + ExReleaseFastMutex(&RmapListLock); } VOID -MmDeleteAllRmaps(ULONG_PTR PhysicalAddress, PVOID Context, - VOID (*DeleteMapping)(PVOID Context, PEPROCESS Process, +MmDeleteAllRmaps(PVOID PhysicalAddress, PVOID Context, + VOID (*DeleteMapping)(PVOID Context, PEPROCESS Process, PVOID Address)) { PMM_RMAP_ENTRY current_entry; PMM_RMAP_ENTRY previous_entry; - ExAcquireFastMutex(&MiRmapListLock); + ExAcquireFastMutex(&RmapListLock); current_entry = MmGetRmapListHeadPage(PhysicalAddress); if (current_entry == NULL) { @@ -524,53 +208,44 @@ MmDeleteAllRmaps(ULONG_PTR PhysicalAddress, PVOID Context, current_entry = current_entry->Next; if (DeleteMapping) { - DeleteMapping(Context, previous_entry->Process, + DeleteMapping(Context, previous_entry->Process, previous_entry->Address); } ExFreePool(previous_entry); } MmSetRmapListHeadPage(PhysicalAddress, NULL); - ExReleaseFastMutex(&MiRmapListLock); + ExReleaseFastMutex(&RmapListLock); } - VOID -MmDeleteRmap(IN ULONG_PTR PhysicalAddress, - IN PEPROCESS Process, - IN PVOID Address) +MmDeleteRmap(PVOID PhysicalAddress, PEPROCESS Process, PVOID Address) { - PMM_RMAP_ENTRY Current; - PMM_RMAP_ENTRY Previous; + PMM_RMAP_ENTRY current_entry, previous_entry; - ExAcquireFastMutex(&MiRmapListLock); - Previous = NULL; - Current = MmGetRmapListHeadPage(PhysicalAddress); - while (Current != NULL) + ExAcquireFastMutex(&RmapListLock); + previous_entry = NULL; + current_entry = MmGetRmapListHeadPage(PhysicalAddress); + while (current_entry != NULL) { - if (Current->Process == Process && Current->Address == Address) - { - Current->ReferenceCount--; - assertmsg(Current->ReferenceCount == 0, ("Rmap has outstanding references (%d) for Page (0x%.08x) " - "Process (0x%.08x) Addresss (0x%.08x)\n", - Current->ReferenceCount, PhysicalAddress, Process, Address)); - - if (Previous == NULL) - { - MmSetRmapListHeadPage(PhysicalAddress, Current->Next); - ExReleaseFastMutex(&MiRmapListLock); - ExFreePool(Current); - } - else - { - Previous->Next = Current->Next; - ExReleaseFastMutex(&MiRmapListLock); - ExFreePool(Current); - } - return; - } - Previous = Current; - Current = Current->Next; + if (current_entry->Process == Process && + current_entry->Address == Address) + { + if (previous_entry == NULL) + { + MmSetRmapListHeadPage(PhysicalAddress, current_entry->Next); + ExReleaseFastMutex(&RmapListLock); + ExFreePool(current_entry); + } + else + { + previous_entry->Next = current_entry->Next; + ExReleaseFastMutex(&RmapListLock); + ExFreePool(current_entry); + } + return; + } + previous_entry = current_entry; + current_entry = current_entry->Next; } - assertmsg(FALSE, ("No rmap entry for Page (0x%.08x) Process (0x%.08x) Addresss (0x%.08x)\n", - PhysicalAddress, Process, Address)); + KeBugCheck(0); } diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c index f4b02358711..73b8e963523 100644 --- a/reactos/ntoskrnl/mm/section.c +++ b/reactos/ntoskrnl/mm/section.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: section.c,v 1.81 2002/05/13 18:10:40 chorns Exp $ +/* $Id: section.c,v 1.82 2002/05/14 21:19:19 dwelch Exp $ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/section.c @@ -306,7 +306,7 @@ MmUnsharePageEntrySectionSegment(PSECTION_OBJECT Section, NTSTATUS MiReadPage(PMEMORY_AREA MemoryArea, PLARGE_INTEGER Offset, - PULONG_PTR Page) + PVOID* Page) /* * FUNCTION: Read a page for a section backed memory area. * PARAMETERS: @@ -381,7 +381,7 @@ MiReadPage(PMEMORY_AREA MemoryArea, */ Addr = MmGetPhysicalAddress(BaseAddress + Offset->QuadPart - BaseOffset); - (*Page) = (ULONG_PTR)Addr.QuadPart; + (*Page) = (PVOID)(ULONG)Addr.QuadPart; MmReferencePage((*Page)); CcRosReleaseCacheSegment(Fcb->Bcb, CacheSeg, TRUE, FALSE, TRUE); @@ -423,7 +423,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace, BOOLEAN Locked) { LARGE_INTEGER Offset; - ULONG_PTR Page; + PVOID Page; NTSTATUS Status; ULONG PAddress; PSECTION_OBJECT Section; @@ -442,7 +442,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace, { if (Locked) { - MmLockPage(MmGetPhysicalAddressForProcess(NULL, Address)); + MmLockPage((PVOID)MmGetPhysicalAddressForProcess(NULL, Address)); } return(STATUS_SUCCESS); } @@ -458,7 +458,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace, Section = MemoryArea->Data.SectionData.Section; MmLockSection(Section); MmLockSectionSegment(Segment); - + /* * Get or create a page operation descriptor */ @@ -534,7 +534,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace, return(STATUS_MM_RESTART_OPERATION); } - Page = (ULONG_PTR)(PAGE_FROM_SSE(Entry)); + Page = (PVOID)(PAGE_FROM_SSE(Entry)); MmReferencePage(Page); MmSharePageEntrySectionSegment(Segment, Offset.u.LowPart); @@ -553,7 +553,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace, } if (Locked) { - MmLockPage(MmGetPhysicalAddressForProcess(NULL, Address)); + MmLockPage((PVOID)MmGetPhysicalAddressForProcess(NULL, Address)); } MmUnlockSectionSegment(Segment); MmUnlockSection(Section); @@ -627,7 +627,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace, */ if (Locked) { - MmLockPage(MmGetPhysicalAddressForProcess(NULL, Address)); + MmLockPage((PVOID)MmGetPhysicalAddressForProcess(NULL, Address)); } PageOp->Status = STATUS_SUCCESS; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); @@ -655,7 +655,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace, */ if (Locked) { - MmLockPage(MmGetPhysicalAddressForProcess(NULL, Address)); + MmLockPage((PVOID)MmGetPhysicalAddressForProcess(NULL, Address)); } /* @@ -696,7 +696,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace, (PVOID)PAGE_ROUND_DOWN(Address)); if (Locked) { - MmLockPage(MmGetPhysicalAddressForProcess(NULL, Address)); + MmLockPage((PVOID)MmGetPhysicalAddressForProcess(NULL, Address)); } /* @@ -827,7 +827,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace, } if (Locked) { - MmLockPage(MmGetPhysicalAddressForProcess(NULL, Address)); + MmLockPage((PVOID)MmGetPhysicalAddressForProcess(NULL, Address)); } PageOp->Status = STATUS_SUCCESS; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); @@ -910,7 +910,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace, } if (Locked) { - MmLockPage(MmGetPhysicalAddressForProcess(NULL, Address)); + MmLockPage((PVOID)MmGetPhysicalAddressForProcess(NULL, Address)); } PageOp->Status = STATUS_SUCCESS; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); @@ -926,17 +926,17 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace, * If the section offset is already in-memory and valid then just * take another reference to the page */ - - Page = (ULONG_PTR)PAGE_FROM_SSE(Entry); + + Page = (PVOID)PAGE_FROM_SSE(Entry); MmReferencePage(Page); MmSharePageEntrySectionSegment(Segment, Offset.QuadPart); Status = MmCreateVirtualMapping(PsGetCurrentProcess(), Address, Attributes, - Page, + (ULONG)Page, FALSE); - MmInsertRmap(Page, PsGetCurrentProcess(), + MmInsertRmap(Page, PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Address)); if (!NT_SUCCESS(Status)) { @@ -945,7 +945,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace, } if (Locked) { - MmLockPage(MmGetPhysicalAddressForProcess(NULL, Address)); + MmLockPage((PVOID)MmGetPhysicalAddressForProcess(NULL, Address)); } PageOp->Status = STATUS_SUCCESS; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); @@ -956,16 +956,16 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace, } } -NTSTATUS +NTSTATUS MmAccessFaultSectionView(PMADDRESS_SPACE AddressSpace, - MEMORY_AREA* MemoryArea, + MEMORY_AREA* MemoryArea, PVOID Address, BOOLEAN Locked) { PMM_SECTION_SEGMENT Segment; PSECTION_OBJECT Section; - ULONG_PTR OldPage; - ULONG_PTR NewPage; + ULONG OldPage; + PVOID NewPage; PVOID NewAddress; NTSTATUS Status; ULONG PAddress; @@ -1096,8 +1096,8 @@ MmAccessFaultSectionView(PMADDRESS_SPACE AddressSpace, Address, MemoryArea->Attributes, (ULONG)NewPage, - FALSE); - MmInsertRmap(NewPage, PsGetCurrentProcess(), + FALSE); + MmInsertRmap(NewPage, PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Address)); if (!NT_SUCCESS(Status)) { @@ -1106,16 +1106,16 @@ MmAccessFaultSectionView(PMADDRESS_SPACE AddressSpace, } if (Locked) { - MmLockPage(MmGetPhysicalAddressForProcess(NULL, Address)); + MmLockPage((PVOID)MmGetPhysicalAddressForProcess(NULL, Address)); } /* * Unshare the old page. */ MmUnsharePageEntrySectionSegment(Section, Segment, Offset.QuadPart, FALSE); - MmDeleteRmap(OldPage, PsGetCurrentProcess(), + MmDeleteRmap((PVOID)OldPage, PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Address)); - MmDereferencePage(OldPage); + MmDereferencePage((PVOID)OldPage); PageOp->Status = STATUS_SUCCESS; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); @@ -1127,15 +1127,15 @@ VOID MmPageOutDeleteMapping(PVOID Context, PEPROCESS Process, PVOID Address) { MM_SECTION_PAGEOUT_CONTEXT* PageOutContext; - BOOLEAN WasDirty; - ULONG_PTR PhysicalAddress; + BOOL WasDirty; + PVOID PhysicalAddress; PageOutContext = (MM_SECTION_PAGEOUT_CONTEXT*)Context; MmDeleteVirtualMapping(Process, Address, FALSE, &WasDirty, - (PULONG_PTR)&PhysicalAddress); + (PULONG)&PhysicalAddress); if (WasDirty) { PageOutContext->WasDirty = TRUE; @@ -1159,7 +1159,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace, LARGE_INTEGER Offset; PSECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; - ULONG_PTR PhysicalAddress; + PVOID PhysicalAddress; MM_SECTION_PAGEOUT_CONTEXT Context; SWAPENTRY SwapEntry; PMDL Mdl; @@ -1220,8 +1220,8 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace, AddressSpace->Process->UniqueProcessId, Address); KeBugCheck(0); } - PhysicalAddress = - MmGetPhysicalAddressForProcess(AddressSpace->Process, + PhysicalAddress = + (PVOID)MmGetPhysicalAddressForProcess(AddressSpace->Process, Address); SwapEntry = MmGetSavedSwapEntryPage(PhysicalAddress); @@ -1234,7 +1234,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace, Context.WasDirty = FALSE; if (Segment->Characteristics & IMAGE_SECTION_CHAR_BSS || IS_SWAP_FROM_SSE(Entry) || - (ULONG_PTR)(PAGE_FROM_SSE(Entry)) != PhysicalAddress) + (PVOID)(PAGE_FROM_SSE(Entry)) != PhysicalAddress) { Context.Private = Private = TRUE; } @@ -1347,7 +1347,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace, } } } - + PageOp->Status = STATUS_SUCCESS; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); @@ -1361,7 +1361,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace, if (DirectMapped && !Private) { assert(SwapEntry == 0); - MmDereferencePage(PhysicalAddress); + MmDereferencePage((PVOID)PhysicalAddress); PageOp->Status = STATUS_SUCCESS; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); @@ -1371,7 +1371,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace, /* * If necessary, allocate an entry in the paging file for this page */ - SwapEntry = MmGetSavedSwapEntryPage(PhysicalAddress); + SwapEntry = MmGetSavedSwapEntryPage((PVOID)PhysicalAddress); if (SwapEntry == 0) { SwapEntry = MmAllocSwapPage(); @@ -1453,7 +1453,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace, (ULONG)PhysicalAddress, FALSE); MmSetDirtyPage(MemoryArea->Process, Address); - MmInsertRmap(PhysicalAddress, + MmInsertRmap(PhysicalAddress, MemoryArea->Process, Address); MmSetPageEntrySectionSegment(Segment, Offset.QuadPart, @@ -2550,28 +2550,20 @@ NtMapViewOfSection(HANDLE SectionHandle, InheritDisposition, AllocationType, Protect); - + ObDereferenceObject(Section); ObDereferenceObject(Process); - + return(Status); } -VOID -MmFreeSectionPage (IN BOOLEAN Before, - IN PVOID Context, - IN PMEMORY_AREA MemoryArea, - IN PVOID Address, - IN ULONG_PTR PhysAddr, - IN SWAPENTRY SwapEntry, - IN BOOLEAN Dirty) +VOID STATIC +MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, ULONG PhysAddr, + SWAPENTRY SwapEntry, BOOLEAN Dirty) { PMEMORY_AREA MArea; ULONG Entry; - if (Before) - return; - MArea = (PMEMORY_AREA)Context; if (SwapEntry != 0) @@ -2581,9 +2573,9 @@ MmFreeSectionPage (IN BOOLEAN Before, else if (PhysAddr != 0) { ULONG Offset; - - Offset = - ((ULONG)PAGE_ROUND_DOWN(Address) - (ULONG)MArea->BaseAddress) + + + Offset = + ((ULONG)PAGE_ROUND_DOWN(Address) - (ULONG)MArea->BaseAddress) + MArea->Data.SectionData.ViewOffset; Entry = MmGetPageEntrySectionSegment(MArea->Data.SectionData.Segment, @@ -2591,14 +2583,14 @@ MmFreeSectionPage (IN BOOLEAN Before, if (IS_SWAP_FROM_SSE(Entry)) { KeBugCheck(0); - } + } else if (PhysAddr != (PAGE_FROM_SSE(Entry))) { /* * Just dereference private pages */ - MmDeleteRmap(PhysAddr, MArea->Process, Address); - MmDereferencePage(PhysAddr); + MmDeleteRmap((PVOID)PhysAddr, MArea->Process, Address); + MmDereferencePage((PVOID)PhysAddr); } else { @@ -2606,8 +2598,8 @@ MmFreeSectionPage (IN BOOLEAN Before, MArea->Data.SectionData.Segment, Offset, Dirty); - MmDeleteRmap(PhysAddr, MArea->Process, Address); - MmDereferencePage(PhysAddr); + MmDeleteRmap((PVOID)PhysAddr, MArea->Process, Address); + MmDereferencePage((PVOID)PhysAddr); } } } @@ -2624,7 +2616,7 @@ MmUnmapViewOfSection(PEPROCESS Process, KIRQL oldIrql; AddressSpace = &Process->AddressSpace; - + DPRINT("Opening memory area Process %x BaseAddress %x\n", Process, BaseAddress); MmLockAddressSpace(AddressSpace); @@ -2635,7 +2627,7 @@ MmUnmapViewOfSection(PEPROCESS Process, MmUnlockAddressSpace(AddressSpace); return(STATUS_UNSUCCESSFUL); } - + MmLockSection(MemoryArea->Data.SectionData.Section); MmLockSectionSegment(MemoryArea->Data.SectionData.Segment); Section = MemoryArea->Data.SectionData.Section; @@ -2864,7 +2856,7 @@ MmAllocateSection (IN ULONG Length) DPRINT("Result %p\n",Result); for (i = 0; (i <= (Length / PAGESIZE)); i++) { - ULONG_PTR Page; + PVOID Page; Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Page); if (!NT_SUCCESS(Status)) diff --git a/reactos/ntoskrnl/mm/slab.c b/reactos/ntoskrnl/mm/slab.c index 32d9932681d..c6f98d71e6c 100644 --- a/reactos/ntoskrnl/mm/slab.c +++ b/reactos/ntoskrnl/mm/slab.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: slab.c,v 1.3 2002/05/13 18:10:41 chorns Exp $ +/* $Id: slab.c,v 1.4 2002/05/14 21:19:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top directory * PROJECT: ReactOS kernel @@ -103,20 +103,20 @@ PSLAB_CACHE_PAGE ExGrowSlabCache(PSLAB_CACHE Slab) { PSLAB_CACHE_PAGE SlabPage; - ULONG_PTR PhysicalPage; + PVOID PhysicalPage; PVOID Page; NTSTATUS Status; ULONG i; PSLAB_CACHE_BUFCTL BufCtl; PVOID Object; - + Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &PhysicalPage); if (!NT_SUCCESS(Status)) { return(NULL); } - Page = ExAllocatePageWithPhysPage(PhysicalPage); + Page = ExAllocatePageWithPhysPage((ULONG)PhysicalPage); if (Page == NULL) { MmReleasePageMemoryConsumer(MC_NPPOOL, PhysicalPage); @@ -299,22 +299,22 @@ ExDestroySlabCache(PSLAB_CACHE Slab) while (current_entry != &Slab->PageListHead) { PVOID Base; - ULONG_PTR PhysicalPage; + PVOID PhysicalPage; current = CONTAINING_RECORD(current_entry, SLAB_CACHE_PAGE, PageListEntry); - Base = (PVOID)(current + sizeof(SLAB_CACHE_PAGE) - PAGESIZE); + Base = (PVOID)current + sizeof(SLAB_CACHE_PAGE) - PAGESIZE; if (Slab->Destructor != NULL) { for (i = 0; i < Slab->ObjectsPerPage; i++) { - Object = (PVOID)(Base + (i * Slab->ObjectSize) + - sizeof(SLAB_CACHE_BUFCTL)); + Object = Base + (i * Slab->ObjectSize) + + sizeof(SLAB_CACHE_BUFCTL); Slab->Destructor(Object, Slab->BaseSize); } } - PhysicalPage = MmGetPhysicalAddressForProcess(NULL, Base); + PhysicalPage = (PVOID)MmGetPhysicalAddressForProcess(NULL, Base); ExUnmapPage(Base); MmReleasePageMemoryConsumer(MC_NPPOOL, PhysicalPage); } diff --git a/reactos/ntoskrnl/mm/virtual.c b/reactos/ntoskrnl/mm/virtual.c index 8b76da0ab9f..49cdea7713b 100644 --- a/reactos/ntoskrnl/mm/virtual.c +++ b/reactos/ntoskrnl/mm/virtual.c @@ -1,4 +1,4 @@ -/* $Id: virtual.c,v 1.57 2002/05/13 18:10:41 chorns Exp $ +/* $Id: virtual.c,v 1.58 2002/05/14 21:19:19 dwelch Exp $ * * COPYRIGHT: See COPYING in the top directory * PROJECT: ReactOS kernel @@ -39,13 +39,13 @@ typedef struct _MM_SEGMENT /* FUNCTIONS *****************************************************************/ -PMM_SEGMENT +PMM_SEGMENT MmGetSegmentForAddress(PMEMORY_AREA MArea, PVOID Address, PVOID* PCurrentAddress) /* * FUNCTION: Get the segment corresponding to a particular memory area and - * address. + * address. * ARGUMENTS: * MArea (IN) = The memory area * Address (IN) = The address to get the segment for @@ -95,14 +95,14 @@ MmWritePageVirtualMemory(PMADDRESS_SPACE AddressSpace, } -NTSTATUS +NTSTATUS MmPageOutVirtualMemory(PMADDRESS_SPACE AddressSpace, PMEMORY_AREA MemoryArea, PVOID Address, PMM_PAGEOP PageOp) { - ULONG_PTR PhysicalAddress; - BOOLEAN WasDirty; + PVOID PhysicalAddress; + BOOL WasDirty; SWAPENTRY SwapEntry; NTSTATUS Status; PMDL Mdl; @@ -115,7 +115,7 @@ MmPageOutVirtualMemory(PMADDRESS_SPACE AddressSpace, */ if ((MemoryArea->Attributes & PAGE_READONLY) || (MemoryArea->Attributes & PAGE_EXECUTE_READ)) - { + { MmDeleteVirtualMapping(MemoryArea->Process, Address, FALSE, NULL, (PULONG)&PhysicalAddress); MmDeleteAllRmaps(PhysicalAddress, NULL, NULL); @@ -125,7 +125,7 @@ MmPageOutVirtualMemory(PMADDRESS_SPACE AddressSpace, KeBugCheck(0); } MmReleasePageMemoryConsumer(MC_USER, PhysicalAddress); - + PageOp->Status = STATUS_SUCCESS; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); MmReleasePageOp(PageOp); @@ -136,7 +136,7 @@ MmPageOutVirtualMemory(PMADDRESS_SPACE AddressSpace, * Otherwise this is read-write data */ MmDisableVirtualMapping(MemoryArea->Process, Address, - &WasDirty, (PULONG_PTR)&PhysicalAddress); + &WasDirty, (PULONG)&PhysicalAddress); if (PhysicalAddress == 0) { KeBugCheck(0); @@ -160,7 +160,7 @@ MmPageOutVirtualMemory(PMADDRESS_SPACE AddressSpace, /* * If necessary, allocate an entry in the paging file for this page */ - SwapEntry = MmGetSavedSwapEntryPage(PhysicalAddress); + SwapEntry = MmGetSavedSwapEntryPage((PVOID)PhysicalAddress); if (SwapEntry == 0) { SwapEntry = MmAllocSwapPage(); @@ -173,7 +173,7 @@ MmPageOutVirtualMemory(PMADDRESS_SPACE AddressSpace, return(STATUS_UNSUCCESSFUL); } } - + /* * Write the page to the pagefile */ @@ -182,7 +182,7 @@ MmPageOutVirtualMemory(PMADDRESS_SPACE AddressSpace, Status = MmWriteToSwapPage(SwapEntry, Mdl); if (!NT_SUCCESS(Status)) { - DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", + DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", Status); MmEnableVirtualMapping(MemoryArea->Process, Address); PageOp->Status = STATUS_UNSUCCESSFUL; @@ -208,7 +208,7 @@ MmPageOutVirtualMemory(PMADDRESS_SPACE AddressSpace, NTSTATUS MmNotPresentFaultVirtualMemory(PMADDRESS_SPACE AddressSpace, - MEMORY_AREA* MemoryArea, + MEMORY_AREA* MemoryArea, PVOID Address, BOOLEAN Locked) /* @@ -221,12 +221,12 @@ MmNotPresentFaultVirtualMemory(PMADDRESS_SPACE AddressSpace, * NOTES: This function is called with the address space lock held. */ { - ULONG_PTR Page; + PVOID Page; NTSTATUS Status; PMM_SEGMENT Segment; PVOID CurrentAddress; PMM_PAGEOP PageOp; - + /* * There is a window between taking the page fault and locking the * address space when another thread could load the page so we check @@ -236,8 +236,8 @@ MmNotPresentFaultVirtualMemory(PMADDRESS_SPACE AddressSpace, { if (Locked) { - MmLockPage(MmGetPhysicalAddressForProcess(NULL, Address)); - } + MmLockPage((PVOID)MmGetPhysicalAddressForProcess(NULL, Address)); + } return(STATUS_SUCCESS); } @@ -312,7 +312,7 @@ MmNotPresentFaultVirtualMemory(PMADDRESS_SPACE AddressSpace, MmLockAddressSpace(AddressSpace); if (Locked) { - MmLockPage(MmGetPhysicalAddressForProcess(NULL, Address)); + MmLockPage((PVOID)MmGetPhysicalAddressForProcess(NULL, Address)); } MmReleasePageOp(PageOp); return(STATUS_SUCCESS); @@ -366,7 +366,7 @@ MmNotPresentFaultVirtualMemory(PMADDRESS_SPACE AddressSpace, (ULONG)Page, TRUE); MmLockAddressSpace(AddressSpace); - } + } if (!NT_SUCCESS(Status)) { DPRINT1("MmCreateVirtualMapping failed, not out of memory\n"); @@ -384,7 +384,7 @@ MmNotPresentFaultVirtualMemory(PMADDRESS_SPACE AddressSpace, */ if (Locked) { - MmLockPage(MmGetPhysicalAddressForProcess(NULL, Address)); + MmLockPage((PVOID)MmGetPhysicalAddressForProcess(NULL, Address)); } PageOp->Status = STATUS_SUCCESS; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); @@ -420,7 +420,7 @@ MmModifyAttributes(PMADDRESS_SPACE AddressSpace, BaseAddress + (i * PAGESIZE))) { SWAPENTRY SwapEntry; - + MmDeletePageFileMapping(AddressSpace->Process, BaseAddress + (i * PAGESIZE), &SwapEntry); @@ -434,9 +434,9 @@ MmModifyAttributes(PMADDRESS_SPACE AddressSpace, FALSE, NULL, NULL); if (PhysicalAddr.u.LowPart != 0) { - MmDeleteRmap((ULONG_PTR)PhysicalAddr.u.LowPart, AddressSpace->Process, + MmDeleteRmap((PVOID)PhysicalAddr.u.LowPart, AddressSpace->Process, BaseAddress + (i * PAGESIZE)); - MmDereferencePage((ULONG_PTR)(PhysicalAddr.u.LowPart)); + MmDereferencePage((PVOID)(ULONG)(PhysicalAddr.u.LowPart)); } } } @@ -528,7 +528,7 @@ MmSplitSegment(PMADDRESS_SPACE AddressSpace, ULONG OldType; ULONG OldProtect; ULONG OldLength; - + DPRINT("MmSplitSegment()\n"); /* * Save the type and protection and length of the current segment @@ -690,7 +690,7 @@ NTSTATUS MmGatherSegment(PMADDRESS_SPACE AddressSpace, FirstSegment->Protect, Type, Protect); - + CurrentAddress = FirstAddress + FirstSegment->Length + RegionSegment->Length; } @@ -771,7 +771,7 @@ NTSTATUS MmGatherSegment(PMADDRESS_SPACE AddressSpace, OldLength, OldType, OldProtect, - Type, + Type, Protect); CurrentSegment = CONTAINING_RECORD(CurrentEntry, @@ -825,7 +825,7 @@ NTSTATUS MmComplexVirtualMemoryOperation(PMADDRESS_SPACE AddressSpace, { KeBugCheck(0); } - + if (BaseAddress >= CurrentAddress && (BaseAddress + RegionSize) <= (CurrentAddress + CurrentSegment->Length)) { @@ -879,7 +879,7 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle, * PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE, PAGE_GUARD, * PAGE_NOACCESS * REMARKS: - * This function maps to the win32 VirtualAllocEx. Virtual memory is + * This function maps to the win32 VirtualAllocEx. Virtual memory is * process based so the protocol starts with a ProcessHandle. I * splitted the functionality of obtaining the actual address and * specifying the start address in two parameters ( BaseAddress and @@ -987,7 +987,7 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle, ObDereferenceObject(Process); return(STATUS_UNSUCCESSFUL); } - + Status = MmCreateMemoryArea(Process, &Process->AddressSpace, MEMORY_AREA_VIRTUAL_MEMORY, @@ -1019,18 +1019,18 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle, { MmReserveSwapPages(RegionSize); } - + *UBaseAddress = BaseAddress; *URegionSize = RegionSize; DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); - + MmUnlockAddressSpace(AddressSpace); ObDereferenceObject(Process); return(STATUS_SUCCESS); } -NTSTATUS STDCALL +NTSTATUS STDCALL NtFlushVirtualMemory(IN HANDLE ProcessHandle, IN PVOID BaseAddress, IN ULONG NumberOfBytesToFlush, @@ -1038,34 +1038,31 @@ NtFlushVirtualMemory(IN HANDLE ProcessHandle, /* * FUNCTION: Flushes virtual memory to file * ARGUMENTS: - * ProcessHandle = Points to the process that allocated the virtual + * ProcessHandle = Points to the process that allocated the virtual * memory * BaseAddress = Points to the memory address * NumberOfBytesToFlush = Limits the range to flush, * NumberOfBytesFlushed = Actual number of bytes flushed - * RETURNS: Status + * RETURNS: Status */ { UNIMPLEMENTED; } -VOID -MmFreeVirtualMemoryPage (IN BOOLEAN Before, - IN PVOID Context, - IN PMEMORY_AREA MemoryArea, - IN PVOID Address, - IN ULONG_PTR PhysicalAddress, - IN SWAPENTRY SwapEntry, - IN BOOLEAN Dirty) + +VOID STATIC +MmFreeVirtualMemoryPage(PVOID Context, + MEMORY_AREA* MemoryArea, + PVOID Address, + ULONG PhysicalAddr, + SWAPENTRY SwapEntry, + BOOLEAN Dirty) { PEPROCESS Process = (PEPROCESS)Context; - - if (Before) - return; - - if (PhysicalAddress != 0) + + if (PhysicalAddr != 0) { - MmDeleteRmap(PhysicalAddress, Process, Address); - MmDereferencePage(PhysicalAddress); + MmDeleteRmap((PVOID)PhysicalAddr, Process, Address); + MmDereferencePage((PVOID)PhysicalAddr); } else if (SwapEntry != 0) { diff --git a/reactos/ntoskrnl/mm/wset.c b/reactos/ntoskrnl/mm/wset.c index 4a694a8513d..5e1a1537041 100644 --- a/reactos/ntoskrnl/mm/wset.c +++ b/reactos/ntoskrnl/mm/wset.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: wset.c,v 1.12 2002/05/13 18:10:41 chorns Exp $ +/* $Id: wset.c,v 1.13 2002/05/14 21:19:19 dwelch Exp $ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/wset.c @@ -41,14 +41,14 @@ NTSTATUS MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages) { - ULONG_PTR CurrentPhysicalAddress; - ULONG_PTR NextPhysicalAddress; + PVOID CurrentPhysicalAddress; + PVOID NextPhysicalAddress; NTSTATUS Status; (*NrFreedPages) = 0; CurrentPhysicalAddress = MmGetLRUFirstUserPage(); - while (CurrentPhysicalAddress != 0 && Target > 0) + while (CurrentPhysicalAddress != NULL && Target > 0) { NextPhysicalAddress = MmGetLRUNextUserPage(CurrentPhysicalAddress); diff --git a/reactos/ntoskrnl/ob/object.c b/reactos/ntoskrnl/ob/object.c index 216db503133..cc7fd880fc6 100644 --- a/reactos/ntoskrnl/ob/object.c +++ b/reactos/ntoskrnl/ob/object.c @@ -1,4 +1,4 @@ -/* $Id: object.c,v 1.48 2002/05/13 18:10:41 chorns Exp $ +/* $Id: object.c,v 1.49 2002/05/14 21:19:21 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -143,7 +143,7 @@ NTSTATUS ObFindObject(POBJECT_ATTRIBUTES ObjectAttributes, Path = ObjectAttributes->ObjectName->Buffer; - if ((Path == NULL) && (Path[0] == 0)) + if (Path[0] == 0) { *ReturnedObject = CurrentObject; return(STATUS_SUCCESS); @@ -155,8 +155,16 @@ NTSTATUS ObFindObject(POBJECT_ATTRIBUTES ObjectAttributes, return(STATUS_UNSUCCESSFUL); } + if (Path) + { RtlCreateUnicodeString (&PathString, Path); current = PathString.Buffer; + } + else + { + RtlInitUnicodeString (&PathString, NULL); + current = NULL; + } RootObject = CurrentObject; @@ -236,18 +244,15 @@ ObCreateObject(OUT PHANDLE Handle, DPRINT("ObCreateObject(Handle %x, ObjectAttributes %x, Type %x)\n", Handle, ObjectAttributes, Type); - if (ObjectAttributes != NULL && - ObjectAttributes->ObjectName != NULL && - ObjectAttributes->ObjectName->Buffer != NULL) + ObjectAttributes->ObjectName != NULL) { DPRINT("ObjectAttributes->ObjectName->Buffer %S\n", ObjectAttributes->ObjectName->Buffer); } if (ObjectAttributes != NULL && - ObjectAttributes->ObjectName != NULL && - ObjectAttributes->ObjectName->Buffer != NULL) + ObjectAttributes->ObjectName != NULL) { Status = ObFindObject(ObjectAttributes, &Parent, @@ -263,6 +268,7 @@ ObCreateObject(OUT PHANDLE Handle, { RtlInitUnicodeString(&RemainingPath, NULL); } + RtlMapGenericMask(&DesiredAccess, Type->Mapping); @@ -298,7 +304,6 @@ ObCreateObject(OUT PHANDLE Handle, Parent, RemainingPath.Buffer, ObjectAttributes); - if (!NT_SUCCESS(Status)) { if (ObjectAttached == TRUE) @@ -315,7 +320,6 @@ ObCreateObject(OUT PHANDLE Handle, return(Status); } } - RtlFreeUnicodeString( &RemainingPath ); *Object = HEADER_TO_BODY(Header); diff --git a/reactos/ntoskrnl/ps/thread.c b/reactos/ntoskrnl/ps/thread.c index b2c09168424..0cc02adb2d7 100644 --- a/reactos/ntoskrnl/ps/thread.c +++ b/reactos/ntoskrnl/ps/thread.c @@ -1,4 +1,4 @@ -/* $Id: thread.c,v 1.91 2002/05/13 18:10:41 chorns Exp $ +/* $Id: thread.c,v 1.92 2002/05/14 21:19:21 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -57,30 +57,6 @@ static GENERIC_MAPPING PiThreadMapping = {THREAD_READ, /* FUNCTIONS ***************************************************************/ -NTSTATUS -PiSetPriorityThread(IN HANDLE ThreadHandle, - IN KPRIORITY Priority) -{ - PETHREAD Thread; - NTSTATUS Status; - - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_ALL_ACCESS, - PsThreadType, - KernelMode, - (PVOID*) &Thread, - NULL); - - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - KeSetPriorityThread(&Thread->Tcb, Priority); - ObReferenceObject(Thread); - return(STATUS_SUCCESS); -} - PKTHREAD STDCALL KeGetCurrentThread(VOID) { return(KeGetCurrentKPCR()->CurrentThread); @@ -166,6 +142,23 @@ VOID PsDumpThreads(BOOLEAN IncludeSystem) static PETHREAD PsScanThreadList (KPRIORITY Priority, ULONG Affinity) { +#if 0 + PLIST_ENTRY current_entry; + PETHREAD current; + + current_entry = RemoveHeadList(&PriorityListHead[Priority]); + if (current_entry != &PriorityListHead[Priority]) + { + current = CONTAINING_RECORD(current_entry, ETHREAD, + Tcb.QueueListEntry); + } + else + { + current = NULL; + } + + return(current); +#else PLIST_ENTRY current_entry; PETHREAD current; @@ -186,6 +179,7 @@ static PETHREAD PsScanThreadList (KPRIORITY Priority, ULONG Affinity) current_entry = current_entry->Flink; } return(NULL); +#endif } @@ -600,7 +594,7 @@ PsAllocateCallbackStack(ULONG StackSize) } for (i = 0; i < (StackSize / PAGESIZE); i++) { - ULONG_PTR Page; + PVOID Page; Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Page); if (!NT_SUCCESS(Status)) { @@ -609,7 +603,7 @@ PsAllocateCallbackStack(ULONG StackSize) Status = MmCreateVirtualMapping(NULL, KernelStack + (i * PAGESIZE), PAGE_EXECUTE_READWRITE, - Page, + (ULONG)Page, TRUE); } return(KernelStack); diff --git a/reactos/ntoskrnl/rtl/mem.c b/reactos/ntoskrnl/rtl/mem.c index 63d4fc442ee..a2d9df0ab7c 100644 --- a/reactos/ntoskrnl/rtl/mem.c +++ b/reactos/ntoskrnl/rtl/mem.c @@ -1,4 +1,4 @@ -/* $Id: mem.c,v 1.12 2002/05/13 18:10:41 chorns Exp $ +/* $Id: mem.c,v 1.13 2002/05/14 21:19:21 dwelch Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -24,8 +24,6 @@ MmCopyToCaller(PVOID Dest, PVOID Src, ULONG NumberOfBytes) { NTSTATUS Status; - //assertmsg(KeGetCurrentIrql() < DISPATCH_LEVEL, ("MmCopyToCaller() called at >= DISPATCH_LEVEL\n")); - if (ExGetPreviousMode() == UserMode) { if ((ULONG)Dest >= KERNEL_BASE) @@ -47,8 +45,6 @@ MmCopyFromCaller(PVOID Dest, PVOID Src, ULONG NumberOfBytes) { NTSTATUS Status; - //assertmsg(KeGetCurrentIrql() < DISPATCH_LEVEL, ("MmCopyFromCaller() called at >= DISPATCH_LEVEL\n")); - if (ExGetPreviousMode() == UserMode) { if ((ULONG)Src >= KERNEL_BASE) diff --git a/reactos/rules.mak b/reactos/rules.mak index aea4839992a..43b1941bf64 100644 --- a/reactos/rules.mak +++ b/reactos/rules.mak @@ -20,7 +20,6 @@ endif # ifeq ($(HOST),mingw32-linux) NASM_FORMAT = win32 -PREFIX = i386-mingw32msv- EXE_POSTFIX := EXE_PREFIX := ./ DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as @@ -82,7 +81,7 @@ MC = $(TOOLS_PATH)/wmc/wmc # Maybe we can delete these soon ifeq ($(HOST),mingw32-linux) -CFLAGS := $(CFLAGS) -I$(PATH_TO_TOP)/include -march=i386 +CFLAGS := $(CFLAGS) -I$(PATH_TO_TOP)/include -pipe -march=i386 endif ifeq ($(HOST),mingw32-windows)