Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 35419: - Change STATUS_UNSUCCESSFUL to STATUS_FILE_CLOSED - Move the Irp->Cancel check after SocketAcquireStateLock to fix a possible crash - Change STATUS_INVALID_PARAMETER to STATUS_FILE_CLOSED - Move SocketAcquireStateLock in front of the check for a NULL return from LockRequest to prevent another possible crash
by cgutman＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: cgutman Date: Sun Aug 17 17:12:31 2008 New Revision: 35419 URL: http://svn.reactos.org/svn/reactos?rev=35419&view=rev Log: - Change STATUS_UNSUCCESSFUL to STATUS_FILE_CLOSED - Move the Irp->Cancel check after SocketAcquireStateLock to fix a possible crash - Change STATUS_INVALID_PARAMETER to STATUS_FILE_CLOSED - Move SocketAcquireStateLock in front of the check for a NULL return from LockRequest to prevent another possible crash Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c branches/aicom-network-fixes/drivers/network/afd/afd/lock.c branches/aicom-network-fixes/drivers/network/afd/afd/read.c branches/aicom-network-fixes/drivers/network/afd/afd/select.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Sun Aug 17 17:12:31 2008 @@ -83,19 +83,18 @@ ( PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context ) { - NTSTATUS Status = STATUS_UNSUCCESSFUL; + NTSTATUS Status = STATUS_FILE_CLOSED; PAFD_FCB FCB = (PAFD_FCB)Context; PAFD_TDI_OBJECT_QELT Qelt; - if ( Irp->Cancel ) { - /* FIXME: is this anything else we need to do? */ - FCB->ListenIrp.InFlightRequest = NULL; + if( !SocketAcquireStateLock( FCB ) ) return Status; + + FCB->ListenIrp.InFlightRequest = NULL; + + if( Irp->Cancel ) { + SocketStateUnlock( FCB ); return STATUS_SUCCESS; } - - if( !SocketAcquireStateLock( FCB ) ) return Status; - - FCB->ListenIrp.InFlightRequest = NULL; if( FCB->State == SOCKET_STATE_CLOSED ) { SocketStateUnlock( FCB ); Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Sun Aug 17 17:12:31 2008 @@ -262,7 +262,7 @@ NTSTATUS LostSocket( PIRP Irp ) { - NTSTATUS Status = STATUS_INVALID_PARAMETER; + NTSTATUS Status = STATUS_FILE_CLOSED; AFD_DbgPrint(MIN_TRACE,("Called.\n")); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] Sun Aug 17 17:12:31 2008 @@ -449,7 +449,7 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - if( !SocketAcquireStateLock( FCB ) ) return STATUS_UNSUCCESSFUL; + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; FCB->ReceiveIrp.InFlightRequest = NULL; Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] Sun Aug 17 17:12:31 2008 @@ -277,6 +277,10 @@ (PAFD_EVENT_SELECT_INFO)LockRequest( Irp, IrpSp ); PAFD_FCB FCB = FileObject->FsContext; + if( !SocketAcquireStateLock( FCB ) ) { + return LostSocket( Irp ); + } + if ( !EventSelectInfo ) { return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); @@ -284,10 +288,6 @@ AFD_DbgPrint(MID_TRACE,("Called (Event %x Triggers %x)\n", EventSelectInfo->EventObject, EventSelectInfo->Events)); - - if( !SocketAcquireStateLock( FCB ) ) { - return LostSocket( Irp ); - } FCB->EventSelectTriggers = FCB->EventsFired = 0; if( FCB->EventSelect ) ObDereferenceObject( FCB->EventSelect ); @@ -325,13 +325,13 @@ AFD_DbgPrint(MID_TRACE,("Called (FCB %x)\n", FCB)); + if( !SocketAcquireStateLock( FCB ) ) { + return LostSocket( Irp ); + } + if ( !EnumReq ) { return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); - } - - if( !SocketAcquireStateLock( FCB ) ) { - return LostSocket( Irp ); } EnumReq->PollEvents = FCB->PollState;

1 0

[cgutman] 35418: - Call SocketStateUnlock before returning - Don't complete the IRP again in the completion routine
by cgutman＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: cgutman Date: Sun Aug 17 16:48:09 2008 New Revision: 35418 URL: http://svn.reactos.org/svn/reactos?rev=35418&view=rev Log: - Call SocketStateUnlock before returning - Don't complete the IRP again in the completion routine Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] Sun Aug 17 16:48:09 2008 @@ -77,7 +77,7 @@ /* I was wrong about this before as we can have pending writes to a not * yet connected socket */ - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; AFD_DbgPrint(MID_TRACE,("Irp->IoStatus.Status = %x\n", Irp->IoStatus.Status)); @@ -108,7 +108,10 @@ if( NT_SUCCESS(Status) ) { Status = MakeSocketIntoConnection( FCB ); - if( !NT_SUCCESS(Status) ) return Status; + if( !NT_SUCCESS(Status) ) { + SocketStateUnlock( FCB ); + return Status; + } if( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]);

1 0

[arty] 35417: Tolerate NULL SectionObjectPointer.
by arty＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: arty Date: Sun Aug 17 16:14:51 2008 New Revision: 35417 URL: http://svn.reactos.org/svn/reactos?rev=35417&view=rev Log: Tolerate NULL SectionObjectPointer. Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Sun Aug 17 16:14:51 2008 @@ -220,9 +220,10 @@ PNOCC_BCB Bcb; DPRINT("AllocateCacheSections: FileObject %x\n", FileObject); - DPRINT - ("AllocateCacheSections: FileObject->SectionObjectPointer: %x\n", - FileObject->SectionObjectPointer); + + if (!FileObject->SectionObjectPointer) + return INVALID_CACHE; + Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; if (!Map)

1 0

[arty] 35416: More WIP for newcc. Not completely working.
by arty＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: arty Date: Sun Aug 17 16:10:35 2008 New Revision: 35416 URL: http://svn.reactos.org/svn/reactos?rev=35416&view=rev Log: More WIP for newcc. Not completely working. Added: branches/arty-newcc/ntoskrnl/ntoskrnl.spec - copied unchanged from r35355, trunk/reactos/ntoskrnl/ntoskrnl.spec Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c branches/arty-newcc/ntoskrnl/cache/copysup.c branches/arty-newcc/ntoskrnl/cache/fssup.c branches/arty-newcc/ntoskrnl/cache/lazyrite.c branches/arty-newcc/ntoskrnl/cache/pinsup.c branches/arty-newcc/ntoskrnl/include/internal/cc.h branches/arty-newcc/ntoskrnl/mm/section.c Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/cache… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] Sun Aug 17 16:10:35 2008 @@ -10,7 +10,7 @@ /* INCLUDES *******************************************************************/ #include <ntoskrnl.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ @@ -20,6 +20,10 @@ PDEVICE_OBJECT NTAPI MmGetDeviceObjectForFile(IN PFILE_OBJECT FileObject); + +BOOLEAN +NTAPI +MmIsCOWAddress(PEPROCESS Process, PVOID Address); NTSTATUS NTAPI @@ -29,60 +33,85 @@ PVOID Buffer, PIO_STATUS_BLOCK ReadStatus) { - NTSTATUS Status; - PIRP Irp = NULL; - KEVENT ReadWait; - PDEVICE_OBJECT DeviceObject = MmGetDeviceObjectForFile(FileObject); - PIO_STACK_LOCATION IrpSp; - + ULONG Length = PAGE_SIZE; + NTSTATUS Status; + PIRP Irp = NULL; + KEVENT ReadWait; + PDEVICE_OBJECT DeviceObject = MmGetDeviceObjectForFile(FileObject); + PIO_STACK_LOCATION IrpSp; + KIRQL OldIrql; + + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + if (MmIsDirtyPage(PsInitialSystemProcess, Buffer) && + !MmIsCOWAddress(PsInitialSystemProcess, Buffer)) + { + DPRINT1 + ("PAGING WRITE (FLUSH) File %wZ Offset %x Length %d\n", + &FileObject->FileName, + FileOffset->u.LowPart, + Length); + + MmSetCleanPage(PsInitialSystemProcess, Buffer); + + KeLowerIrql(OldIrql); + KeInitializeEvent(&ReadWait, NotificationEvent, FALSE); Irp = IoBuildAsynchronousFsdRequest - (IRP_MJ_WRITE, - DeviceObject, - Buffer, - PAGE_SIZE, - FileOffset, - ReadStatus); + (IRP_MJ_WRITE, + DeviceObject, + Buffer, + Length, + FileOffset, + ReadStatus); if (!Irp) { - return STATUS_NO_MEMORY; + return STATUS_NO_MEMORY; } Irp->Flags |= IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE; - + ObReferenceObject(FileObject); - + Irp->UserEvent = &ReadWait; Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); IrpSp = IoGetNextIrpStackLocation(Irp); IrpSp->FileObject = FileObject; - + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { - if (!NT_SUCCESS - (KeWaitForSingleObject - (&ReadWait, - Suspended, - KernelMode, - FALSE, - NULL))) - { - DPRINT1("Warning: Failed to wait for synchronous IRP\n"); - ASSERT(FALSE); - ObDereferenceObject(FileObject); - return Status; - } - } - + if (!NT_SUCCESS + (KeWaitForSingleObject + (&ReadWait, + Suspended, + KernelMode, + FALSE, + NULL))) + { + DPRINT1("Warning: Failed to wait for synchronous IRP\n"); + ASSERT(FALSE); + ObDereferenceObject(FileObject); + return Status; + } + } + ObDereferenceObject(FileObject); + MmDeleteHyperspaceMapping(Buffer); DPRINT("Paging IO Done: %08x\n", ReadStatus->Status); - - return ReadStatus->Status; + } + else + { + ReadStatus->Status = STATUS_SUCCESS; + ReadStatus->Information = PAGE_SIZE; + KeLowerIrql(OldIrql); + } + + return ReadStatus->Status; } VOID @@ -156,6 +185,8 @@ LARGE_INTEGER ToWrite = *FileOffset; IO_STATUS_BLOCK IOSB; + DPRINT("CcFlushCache\n"); + BOOLEAN Result = CcpMapData ((PNOCC_CACHE_MAP)SectionObjectPointer->SharedCacheMap, FileOffset, @@ -170,11 +201,18 @@ ToWrite.LowPart = PAGE_ROUND_DOWN(FileOffset->LowPart); for (BufPage = BufStart; - BufPage < BufStart + PAGE_ROUND_UP(Length); - BufPage += PAGE_SIZE) - { - CcpSimpleWrite(Bcb->FileObject, &ToWrite, BufPage, &IOSB); - ToWrite.QuadPart += PAGE_SIZE; + BufPage < BufStart + PAGE_ROUND_UP(Length); + BufPage += PAGE_SIZE) + { + DPRINT + ("CcpSimpleWrite: [%wZ] %x:%d\n", + &Bcb->FileObject->FileName, + Bcb->FileOffset.LowPart, + Bcb->Length); + CcpSimpleWrite(Bcb->FileObject, &ToWrite, BufPage, &IOSB); + DPRINT + ("Page Write: %08x\n", IOSB.Status); + ToWrite.QuadPart += PAGE_SIZE; } CcUnpinData(Bcb); @@ -189,15 +227,15 @@ IoStatus->Status = IOSB.Status; IoStatus->Information = 0; } -} - + DPRINT("CcFlushCache -> %08x\n", IOSB.Status); +} + +// Always succeeds for us PVOID NTAPI CcRemapBcb(IN PVOID Bcb) { - UNIMPLEMENTED; - while (TRUE); - return NULL; + return Bcb; } @@ -205,8 +243,14 @@ NTAPI CcRepinBcb(IN PVOID Bcb) { - UNIMPLEMENTED; - while (TRUE); + PVOID TheBcb; + PNOCC_BCB RealBcb = (PNOCC_BCB)Bcb; + CcPinMappedData + (RealBcb->FileObject, + &RealBcb->FileOffset, + RealBcb->Length, + PIN_WAIT, + &TheBcb); } VOID @@ -215,8 +259,18 @@ IN BOOLEAN WriteThrough, OUT PIO_STATUS_BLOCK IoStatus) { - UNIMPLEMENTED; - while (TRUE); + PNOCC_BCB RealBcb = (PNOCC_BCB)RealBcb; + + CcUnpinData(Bcb); + + if (WriteThrough) + { + CcFlushCache + (RealBcb->FileObject->SectionObjectPointer, + &RealBcb->FileOffset, + RealBcb->Length, + IoStatus); + } } /* EOF */ Modified: branches/arty-newcc/ntoskrnl/cache/copysup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/copys… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/copysup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/copysup.c [iso-8859-1] Sun Aug 17 16:10:35 2008 @@ -25,45 +25,6 @@ #define TAG_COPY_WRITE TAG('R', 'i', 't', 'e') /* FUNCTIONS ******************************************************************/ - -NTSTATUS -NTAPI -DoDeviceRead(PFILE_OBJECT FileObject, - LARGE_INTEGER SectorBase, - PCHAR SystemBuffer, - ULONG AlignSize, - ULONG *LengthRead) -{ - IO_STATUS_BLOCK IoStatusBlock = {{0}}; - NTSTATUS Status; - KEVENT Event; - PMDL Mdl; - - /* Create an MDL for the transfer */ - Mdl = IoAllocateMdl(SystemBuffer, AlignSize, TRUE, FALSE, NULL); - MmBuildMdlForNonPagedPool(Mdl), - Mdl->MdlFlags |= (MDL_PAGES_LOCKED | MDL_IO_PAGE_READ); - - /* Setup the event */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - /* Read the page */ - Status = IoPageRead(FileObject, Mdl, &SectorBase, &Event, &IoStatusBlock); - if (Status == STATUS_PENDING) - { - /* Do the wait */ - KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - Status = IoStatusBlock.Status; - } - - /* Free the MDL */ - IoFreeMdl(Mdl); - - /* Save how much we read, if needed */ - if (LengthRead) *LengthRead = IoStatusBlock.Information; - - return Status; -} BOOLEAN NTAPI Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/fssup… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] Sun Aug 17 16:10:35 2008 @@ -17,9 +17,11 @@ PFSN_PREFETCHER_GLOBALS CcPfGlobals; extern LONG CcOutstandingDeletes; +extern KEVENT CcpLazyWriteEvent; extern VOID STDCALL CcpUnmapThread(PVOID Unused); -HANDLE CcUnmapThreadHandle; -CLIENT_ID CcUnmapThreadId; +extern VOID STDCALL CcpLazyWriteThread(PVOID Unused); +HANDLE CcUnmapThreadHandle, CcLazyWriteThreadHandle; +CLIENT_ID CcUnmapThreadId, CcLazyWriteThreadId; /* FUNCTIONS ******************************************************************/ @@ -38,6 +40,7 @@ } KeInitializeEvent(&CcDeleteEvent, SynchronizationEvent, FALSE); + KeInitializeEvent(&CcpLazyWriteEvent, SynchronizationEvent, FALSE); CcCacheBitmap->Buffer = ((PULONG)&CcCacheBitmap[1]); CcCacheBitmap->SizeOfBitMap = ROUND_UP(CACHE_NUM_SECTIONS, 32); DPRINT("Cache has %d entries\n", CcCacheBitmap->SizeOfBitMap); @@ -56,6 +59,20 @@ KEBUGCHECK(0); } + Status = PsCreateSystemThread + (&CcLazyWriteThreadHandle, + THREAD_ALL_ACCESS, + NULL, + NULL, + &CcLazyWriteThreadId, + (PKSTART_ROUTINE) CcpLazyWriteThread, + NULL); + + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(0); + } + return TRUE; } @@ -173,18 +190,15 @@ NTAPI CcGetFileObjectFromSectionPtrs(IN PSECTION_OBJECT_POINTERS SectionObjectPointer) { - UNIMPLEMENTED; - while (TRUE); - return NULL; + return ((PNOCC_CACHE_MAP)SectionObjectPointer->SharedCacheMap)->FileObject; } PFILE_OBJECT NTAPI CcGetFileObjectFromBcb(IN PVOID Bcb) { - UNIMPLEMENTED; - while (TRUE); - return NULL; + PNOCC_BCB RealBcb = (PNOCC_BCB)Bcb; + return RealBcb->FileObject; } /* EOF */ Modified: branches/arty-newcc/ntoskrnl/cache/lazyrite.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/lazyr… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/lazyrite.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/lazyrite.c [iso-8859-1] Sun Aug 17 16:10:35 2008 @@ -9,19 +9,63 @@ /* INCLUDES *******************************************************************/ #include <ntoskrnl.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ +KEVENT CcpLazyWriteEvent; + /* FUNCTIONS ******************************************************************/ + +VOID STDCALL +CcpLazyWriteThread(PVOID Unused) +{ + ULONG i; + BOOLEAN GotLock; + PNOCC_BCB RealBcb; + LARGE_INTEGER Interval; + IO_STATUS_BLOCK IoStatus; + + while (TRUE) + { + for (i = 0; i < CACHE_NUM_SECTIONS; i++) + { + RealBcb = &CcCacheSections[i]; + CcpLock(&CcMutex); + GotLock = RealBcb->RefCount == 1; + if (GotLock) RealBcb->RefCount++; + CcpUnlock(&CcMutex); + // Pinned (temporarily) + if (GotLock) + { + DPRINT("CcpLazyWrite: Flush #%x\n", i); + CcFlushCache + (RealBcb->FileObject->SectionObjectPointer, + &RealBcb->FileOffset, + RealBcb->Length, + &IoStatus); + + DPRINT + ("CcpLazyWriteThread UnmapIoStatus.Status %08x IoStatus.Information %08x\n", + IoStatus.Status, + IoStatus.Information); + + CcUnpinData(RealBcb); + DPRINT("CcpLazyWrite: done #%x\n", i); + } + } + KeSetEvent(&CcpLazyWriteEvent, IO_DISK_INCREMENT, TRUE); + Interval.QuadPart = -1000000L; + KeDelayExecutionThread(KernelMode, FALSE, &Interval); + } +} NTSTATUS NTAPI CcWaitForCurrentLazyWriterActivity(VOID) { - UNIMPLEMENTED; - while (TRUE); + KeWaitForSingleObject(&CcpLazyWriteEvent, Executive, KernelMode, FALSE, NULL); return STATUS_SUCCESS; } Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Sun Aug 17 16:10:35 2008 @@ -10,7 +10,7 @@ /* INCLUDES *******************************************************************/ #include <ntoskrnl.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ @@ -29,9 +29,11 @@ typedef struct _NOCC_UNMAP_CHAIN { - PVOID Buffer; - PVOID SectionObject; - PVOID FileObject; + PVOID Buffer; + PSECTION_OBJECT SectionObject; + PFILE_OBJECT FileObject; + LARGE_INTEGER FileOffset; + ULONG Length; } NOCC_UNMAP_CHAIN, *PNOCC_UNMAP_CHAIN; NOCC_UNMAP_CHAIN CcUnmapChain[CACHE_NUM_SECTIONS]; @@ -60,6 +62,7 @@ VOID CcpPerformUnmapWork() { NOCC_UNMAP_CHAIN WorkingOn; + IO_STATUS_BLOCK IoStatus; ULONG NumElements; KeAcquireGuardedMutex(&CcMutex); @@ -70,6 +73,12 @@ WorkingOn = CcUnmapChain[0]; RtlMoveMemory(&CcUnmapChain[0], &CcUnmapChain[1], NumElements * sizeof(NOCC_UNMAP_CHAIN)); KeReleaseGuardedMutex(&CcMutex); + CcFlushCache + (WorkingOn.FileObject->SectionObjectPointer, + &WorkingOn.FileOffset, + WorkingOn.Length, + &IoStatus); + DPRINT1("Status result from flush: %08x\n", IoStatus.Status); MmUnmapViewInSystemSpace(WorkingOn.Buffer); ObDereferenceObject(WorkingOn.SectionObject); DPRINT1("Done unmapping\n"); @@ -110,7 +119,8 @@ UnmapWork->Buffer = Bcb->BaseAddress; UnmapWork->SectionObject = Bcb->SectionObject; UnmapWork->FileObject = Bcb->FileObject; - + UnmapWork->FileOffset = Bcb->FileOffset; + UnmapWork->Length = Bcb->Length; Bcb->BaseAddress = NULL; Bcb->Length = 0; Bcb->FileOffset.QuadPart = 0; @@ -206,9 +216,18 @@ PLARGE_INTEGER FileOffset) { ULONG i = INVALID_CACHE; - PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; + PNOCC_CACHE_MAP Map; PNOCC_BCB Bcb; + DPRINT("AllocateCacheSections: FileObject %x\n", FileObject); + DPRINT + ("AllocateCacheSections: FileObject->SectionObjectPointer: %x\n", + FileObject->SectionObjectPointer); + Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; + + if (!Map) + return INVALID_CACHE; + DPRINT("Allocating Cache Section (File already has %d sections)\n", Map->NumberOfMaps); i = RtlFindClearBitsAndSet @@ -217,6 +236,8 @@ if (i != INVALID_CACHE) { + DPRINT("Setting up Bcb #%x\n", i); + Bcb = &CcCacheSections[i]; ASSERT(Bcb->RefCount < 2); @@ -229,7 +250,7 @@ ASSERT(!Bcb->RefCount); Bcb->RefCount = 1; - //DPRINT("Bcb #%x RefCount %d\n", Bcb - CcCacheSections, Bcb->RefCount); + DPRINT("Bcb #%x RefCount %d\n", Bcb - CcCacheSections, Bcb->RefCount); ObReferenceObject(SectionObject); Bcb->FileObject = FileObject; @@ -239,7 +260,11 @@ Map->NumberOfMaps++; InsertTailList(&Map->AssociatedBcb, &Bcb->ThisFileList); - + + if (!RtlTestBit(CcCacheBitmap, i)) + { + DPRINT("Somebody stoeled BCB #%x\n", i); + } ASSERT(RtlTestBit(CcCacheBitmap, i)); DPRINT("Allocated #%x\n", i); Modified: branches/arty-newcc/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… ============================================================================== --- branches/arty-newcc/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/include/internal/cc.h [iso-8859-1] Sun Aug 17 16:10:35 2008 @@ -239,9 +239,19 @@ extern KEVENT CcDeleteEvent; extern ULONG CcCacheClockHand; extern LIST_ENTRY CcPendingUnmap; +extern KEVENT CcpLazyWriteEvent; extern VOID CcpLock(); extern VOID CcpUnlock(); extern VOID CcpDereferenceCache(ULONG Sector); +BOOLEAN +NTAPI +CcpMapData +(IN PNOCC_CACHE_MAP Map, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG Flags, + OUT PVOID *BcbResult, + OUT PVOID *Buffer); #endif Modified: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] Sun Aug 17 16:10:35 2008 @@ -161,6 +161,12 @@ PDEVICE_OBJECT DeviceObject = MmGetDeviceObjectForFile(FileObject); PIO_STACK_LOCATION IrpSp; + DPRINT1 + ("PAGING READ File %wZ Offset %x Length %d\n", + &FileObject->FileName, + FileOffset->u.LowPart, + Length); + KeInitializeEvent(&ReadWait, NotificationEvent, FALSE); Irp = IoBuildAsynchronousFsdRequest @@ -226,6 +232,12 @@ PDEVICE_OBJECT DeviceObject = MmGetDeviceObjectForFile(FileObject); PIO_STACK_LOCATION IrpSp; + DPRINT1 + ("PAGING WRITE File %wZ Offset %x Length %d\n", + &FileObject->FileName, + FileOffset->u.LowPart, + Length); + KeInitializeEvent(&ReadWait, NotificationEvent, FALSE); Irp = IoBuildAsynchronousFsdRequest @@ -333,6 +345,21 @@ */ RtlCreateUnicodeString(ModuleName, L"C:\\ReactOS\\system32\\ntdll.dll"); return STATUS_SUCCESS; +} + +BOOLEAN +NTAPI +MmIsCOWAddress(IN PEPROCESS Process, IN PVOID Address) +{ + BOOLEAN IsCow = TRUE; /* Don't write unless we're sure */ + PMEMORY_AREA MemoryArea; + + MmLockAddressSpace(&Process->VadRoot); + MemoryArea = MmLocateMemoryAreaByAddress(&Process->VadRoot, Address); + ASSERT(MemoryArea); + IsCow = MemoryArea->Data.SectionData.WriteCopyView; + MmUnlockAddressSpace(&Process->VadRoot); + return IsCow; } /* Note: Mmsp prefix denotes "Memory Manager Section Private". */ @@ -3788,7 +3815,7 @@ return(Status); } -VOID static +VOID MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) {

1 0

[arty] 35415: Merged files (partial) from trunk.
by arty＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: arty Date: Sun Aug 17 16:10:15 2008 New Revision: 35415 URL: http://svn.reactos.org/svn/reactos?rev=35415&view=rev Log: Merged files (partial) from trunk. Modified: branches/arty-newcc/ntoskrnl/config/cmsysini.c branches/arty-newcc/ntoskrnl/kdbg/kdb_cli.c branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild Modified: branches/arty-newcc/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/config/cmsy… ============================================================================== --- branches/arty-newcc/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/config/cmsysini.c [iso-8859-1] Sun Aug 17 16:10:15 2008 @@ -120,7 +120,7 @@ IN KPROCESSOR_MODE PreviousMode) { DPRINT1("CmpQueryKeyName() called\n"); - while (TRUE); + ASSERT(FALSE); return STATUS_SUCCESS; } Modified: branches/arty-newcc/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/kdbg/kdb_cl… ============================================================================== --- branches/arty-newcc/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Sun Aug 17 16:10:15 2008 @@ -1266,7 +1266,7 @@ if (Argc >= 2 && _stricmp(Argv[1], "list") == 0) { Entry = PsActiveProcessHead.Flink; - if (Entry == &PsActiveProcessHead) + if (!Entry || Entry == &PsActiveProcessHead) { KdbpPrint("No processes in the system!\n"); return TRUE; Modified: branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ntoskrnl-ge… ============================================================================== --- branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Aug 17 16:10:15 2008 @@ -2,7 +2,12 @@ <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <bootstrap installbase="$(CDOUTPUT)" /> - <importlibrary definition="ntoskrnl_$(ARCH).def" /> + <ifnot property="ARCH" value="arm"> + <importlibrary definition="ntoskrnl.spec.def" /> + </ifnot> + <if property="ARCH" value="arm"> + <importlibrary definition="ntoskrnl_arm.def" /> + </if> <define name="_DISABLE_TIDENTS" /> <define name="__NTOSKRNL__" /> <define name="_NTOSKRNL_" /> @@ -112,28 +117,16 @@ <file>timerobj.c</file> <file>wait.c</file> </directory> - <if property="CC" value="1"> - <directory name="cc"> - <file>cacheman.c</file> - <file>copy.c</file> - <file>fs.c</file> - <file>mdl.c</file> - <file>pin.c</file> - <file>view.c</file> - </directory> - </if> - <if property="CC" value="0"> - <directory name="cache"> - <file>cachesub.c</file> - <file>copysup.c</file> - <file>fssup.c</file> - <file>lazyrite.c</file> - <file>logsup.c</file> - <file>mdlsup.c</file> - <file>pinsup.c</file> - <file>vacbsup.c</file> - </directory> - </if> + <directory name="cache"> + <file>cachesub.c</file> + <file>copysup.c</file> + <file>fssup.c</file> + <file>lazyrite.c</file> + <file>logsup.c</file> + <file>mdlsup.c</file> + <file>pinsup.c</file> + <file>vacbsup.c</file> + </directory> <directory name="config"> <if property="ARCH" value="i386"> <directory name="i386"> @@ -479,5 +472,6 @@ <file>wmi.c</file> </directory> <file>ntoskrnl.rc</file> + <file>ntoskrnl.spec</file> <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> </group>

1 0

[sginsberg] 35414: - Fix comment header
by sginsberg＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: sginsberg Date: Sun Aug 17 14:23:06 2008 New Revision: 35414 URL: http://svn.reactos.org/svn/reactos?rev=35414&view=rev Log: - Fix comment header Modified: trunk/reactos/ntoskrnl/rtl/i386/stack.S Modified: trunk/reactos/ntoskrnl/rtl/i386/stack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/i386/stack.S?… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/i386/stack.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/i386/stack.S [iso-8859-1] Sun Aug 17 14:23:06 2008 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Kernel - * FILE: ntoskrnl/rtl/i386/seh.s + * FILE: ntoskrnl/rtl/i386/stack.s * PURPOSE: Stack Support for RTL * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */

1 0

[sginsberg] 35413: - Rename SeInit to SeInitSystem
by sginsberg＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: sginsberg Date: Sun Aug 17 13:34:37 2008 New Revision: 35413 URL: http://svn.reactos.org/svn/reactos?rev=35413&view=rev Log: - Rename SeInit to SeInitSystem Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=354… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sun Aug 17 13:34:37 2008 @@ -1206,7 +1206,7 @@ if (!ObInitSystem()) KEBUGCHECK(OBJECT_INITIALIZATION_FAILED); /* Load basic Security for other Managers */ - if (!SeInit()) KEBUGCHECK(SECURITY_INITIALIZATION_FAILED); + if (!SeInitSystem()) KEBUGCHECK(SECURITY_INITIALIZATION_FAILED); /* Initialize the Process Manager */ if (!PsInitSystem(LoaderBlock)) KEBUGCHECK(PROCESS_INITIALIZATION_FAILED); @@ -1532,7 +1532,7 @@ } /* Initialize the SRM in Phase 1 */ - if (!SeInit()) KEBUGCHECK(SECURITY1_INITIALIZATION_FAILED); + if (!SeInitSystem()) KEBUGCHECK(SECURITY1_INITIALIZATION_FAILED); /* Update the progress bar */ InbvUpdateProgressBar(10); Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Sun Aug 17 13:34:37 2008 @@ -86,7 +86,7 @@ /* Functions */ BOOLEAN NTAPI -SeInit(VOID); +SeInitSystem(VOID); BOOLEAN NTAPI Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Sun Aug 17 13:34:37 2008 @@ -134,7 +134,7 @@ BOOLEAN NTAPI -SeInit(VOID) +SeInitSystem(VOID) { /* Check the initialization phase */ switch (ExpInitializationPhase)

1 0

[hpoussin] 35412: Device type can be undefined if kbdclass or mouclass is not loaded.
by hpoussin＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: hpoussin Date: Sun Aug 17 13:11:32 2008 New Revision: 35412 URL: http://svn.reactos.org/svn/reactos?rev=35412&view=rev Log: Device type can be undefined if kbdclass or mouclass is not loaded. Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] Sun Aug 17 13:11:32 2008 @@ -617,8 +617,8 @@ } default: { - ERR_(I8042PRT, "Unknown FDO type %u\n", DeviceExtension->Type); - ASSERT(FALSE); + WARN_(I8042PRT, "Unknown FDO type %u\n", DeviceExtension->Type); + ASSERT(!(PortDeviceExtension->Flags & KEYBOARD_CONNECTED) || !(PortDeviceExtension->Flags & MOUSE_CONNECTED)); Status = STATUS_INVALID_DEVICE_REQUEST; } }

1 0

[sginsberg] 35411: - Move kernel mode implementation of RtlpGetStackLimits from crt to ntoskrnl
by sginsberg＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: sginsberg Date: Sun Aug 17 13:01:49 2008 New Revision: 35411 URL: http://svn.reactos.org/svn/reactos?rev=35411&view=rev Log: - Move kernel mode implementation of RtlpGetStackLimits from crt to ntoskrnl Added: trunk/reactos/ntoskrnl/rtl/i386/ (with props) trunk/reactos/ntoskrnl/rtl/i386/stack.S (with props) Modified: trunk/reactos/lib/sdk/crt/except/i386/seh.s trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/lib/sdk/crt/except/i386/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/i386/se… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/i386/seh.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/i386/seh.s [iso-8859-1] Sun Aug 17 13:01:49 2008 @@ -438,31 +438,3 @@ pop ebp ret .endfunc - -// -// -// REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME -// -// -.func RtlpGetStackLimits@8 -.globl _RtlpGetStackLimits@8 -_RtlpGetStackLimits@8: - - /* Get the current thread */ - mov eax, [fs:KPCR_CURRENT_THREAD] - - /* Get the stack limits */ - mov ecx, [eax+KTHREAD_STACK_LIMIT] - mov edx, [eax+KTHREAD_INITIAL_STACK] - sub edx, SIZEOF_FX_SAVE_AREA - - /* Return them */ - mov eax, [esp+4] - mov [eax], ecx - - mov eax, [esp+8] - mov [eax], edx - - /* return */ - ret 8 -.endfunc Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Aug 17 13:01:49 2008 @@ -442,6 +442,11 @@ <file>rtlexcpt.c</file> </directory> </if> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>stack.S</file> + </directory> + </if> <file>libsupp.c</file> <file>misc.c</file> </directory> Propchange: trunk/reactos/ntoskrnl/rtl/i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Aug 17 13:01:49 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/ntoskrnl/rtl/i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/ntoskrnl/rtl/i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/ntoskrnl/rtl/i386/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/ntoskrnl/rtl/i386/stack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/i386/stack.S?… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/i386/stack.S (added) +++ trunk/reactos/ntoskrnl/rtl/i386/stack.S [iso-8859-1] Sun Aug 17 13:01:49 2008 @@ -1,0 +1,37 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: ntoskrnl/rtl/i386/seh.s + * PURPOSE: Stack Support for RTL + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ndk/asm.h> +.intel_syntax noprefix + +/* FUNCTIONS *****************************************************************/ + +.func RtlpGetStackLimits@8 +.globl _RtlpGetStackLimits@8 +_RtlpGetStackLimits@8: + + /* Get the current thread */ + mov eax, [fs:KPCR_CURRENT_THREAD] + + /* Get the stack limits */ + mov ecx, [eax+KTHREAD_STACK_LIMIT] + mov edx, [eax+KTHREAD_INITIAL_STACK] + sub edx, SIZEOF_FX_SAVE_AREA + + /* Return them */ + mov eax, [esp+4] + mov [eax], ecx + + mov eax, [esp+8] + mov [eax], edx + + /* return */ + ret 8 +.endfunc Propchange: trunk/reactos/ntoskrnl/rtl/i386/stack.S ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sginsberg] 35410: - Remove dead code
by sginsberg＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: sginsberg Date: Sun Aug 17 12:38:28 2008 New Revision: 35410 URL: http://svn.reactos.org/svn/reactos?rev=35410&view=rev Log: - Remove dead code Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sun Aug 17 12:38:28 2008 @@ -1063,13 +1063,6 @@ PFN_TYPE NTAPI -MmChangeHyperspaceMapping( - PVOID Address, - PFN_TYPE Page -); - -PFN_TYPE -NTAPI MmDeleteHyperspaceMapping(PVOID Address); NTSTATUS @@ -1218,13 +1211,6 @@ VOID NTAPI MmReferencePageUnsafe(PFN_TYPE Page); - -BOOLEAN -NTAPI -MmIsAccessedAndResetAccessPage( - struct _EPROCESS *Process, - PVOID Address -); ULONG NTAPI Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sun Aug 17 12:38:28 2008 @@ -62,25 +62,6 @@ BOOLEAN MmUnmapPageTable(PULONG Pt); -ULONG_PTR -NTAPI -MiFlushTlbIpiRoutine(ULONG_PTR Address) -{ - if (Address == (ULONG_PTR)-1) - { - KeFlushCurrentTb(); - } - else if (Address == (ULONG_PTR)-2) - { - KeFlushCurrentTb(); - } - else - { - __invlpg((PVOID)Address); - } - return 0; -} - VOID MiFlushTlb(PULONG Pt, PVOID Address) { @@ -89,8 +70,6 @@ __invlpg(Address); } } - - PULONG MmGetPageDirectory(VOID) @@ -264,50 +243,6 @@ { KEBUGCHECK(0); // MmGlobalKernelPageDirectory[ADDR_TO_PDE_OFFSET(Address)] = 0; - } - if (Process != NULL && Process != CurrentProcess) - { - KeDetachProcess(); - } -} - -VOID -NTAPI -MmFreePageTable(PEPROCESS Process, PVOID Address) -{ - PEPROCESS CurrentProcess = PsGetCurrentProcess(); - ULONG i; - PFN_TYPE Pfn; - PULONG PageTable; - - DPRINT("ProcessId %d, Address %x\n", Process->UniqueProcessId, Address); - if (Process != NULL && Process != CurrentProcess) - { - KeAttachProcess(&Process->Pcb); - } - - PageTable = (PULONG)PAGE_ROUND_DOWN((PVOID)MiAddressToPte(Address)); - for (i = 0; i < 1024; i++) - { - if (PageTable[i] != 0) - { - DbgPrint("Page table entry not clear at %x/%x (is %x)\n", - ((ULONG)Address / (4*1024*1024)), i, PageTable[i]); - KEBUGCHECK(0); - } - } - Pfn = MiAddressToPde(Address)->u.Hard.PageFrameNumber; - MiAddressToPde(Address)->u.Long = 0; - MiFlushTlb((PULONG)MiAddressToPde(Address), MiAddressToPte(Address)); - - if (Address >= MmSystemRangeStart) - { - // MmGlobalKernelPageDirectory[ADDR_TO_PDE_OFFSET(Address)] = 0; - KEBUGCHECK(0); - } - else - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); } if (Process != NULL && Process != CurrentProcess) { @@ -637,42 +572,6 @@ return MmGetPageEntryForProcess(Process, Address) & PA_DIRTY ? TRUE : FALSE; } -BOOLEAN -NTAPI -MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address) -{ - PULONG Pt; - ULONG Pte; - - if (Address < MmSystemRangeStart && Process == NULL) - { - DPRINT1("MmIsAccessedAndResetAccessPage is called for user space without a process.\n"); - KEBUGCHECK(0); - } - - Pt = MmGetPageTableForProcess(Process, Address, FALSE); - if (Pt == NULL) - { - KEBUGCHECK(0); - } - - do - { - Pte = *Pt; - } while (Pte != InterlockedCompareExchangePte(Pt, Pte & ~PA_ACCESSED, Pte)); - - if (Pte & PA_ACCESSED) - { - MiFlushTlb(Pt, Address); - return TRUE; - } - else - { - MmUnmapPageTable(Pt); - return FALSE; - } -} - VOID NTAPI MmSetCleanPage(PEPROCESS Process, PVOID Address) @@ -1232,22 +1131,6 @@ Address = (PVOID)((ULONG_PTR)HYPERSPACE + i * PAGE_SIZE); __invlpg(Address); return Address; -} - -PFN_TYPE -NTAPI -MmChangeHyperspaceMapping(PVOID Address, PFN_TYPE NewPage) -{ - PFN_TYPE Pfn; - ULONG Entry; - - ASSERT (IS_HYPERSPACE(Address)); - - Entry = InterlockedExchangePte(MiAddressToPte(Address), PFN_TO_PTE(NewPage) | PA_PRESENT | PA_READWRITE); - Pfn = PTE_TO_PFN(Entry); - - __invlpg(Address); - return Pfn; } PFN_TYPE

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs