Set WP bit in CR0

Fix protection for paged pool
Start on cache improvements

svn path=/trunk/; revision=2438

reactos/ntoskrnl/Makefile

@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.58 2001/11/25 15:21:10 dwelch Exp $
+# $Id: Makefile,v 1.59 2001/12/27 23:56:41 dwelch Exp $
 #
 # ReactOS Operating System
 #
@@ -149,7 +149,8 @@ OBJECTS_MM = \
 	mm/mminit.o \
 	mm/kmap.o \
 	mm/mpw.o \
-	mm/pageop.o
+	mm/pageop.o \
+	mm/balance.o
 
 # I/O Subsystem (Io)
 OBJECTS_IO = \

reactos/ntoskrnl/cc/cacheman.c

@@ -35,10 +35,8 @@
 
 /* FUNCTIONS *****************************************************************/
 
-NTSTATUS 
+VOID
 CcInit(VOID)
 {
   CcInitView();
-   
-  return(STATUS_SUCCESS);
 }

reactos/ntoskrnl/cc/copy.c

@@ -1,4 +1,4 @@
-/* $Id: copy.c,v 1.1 2001/10/10 21:46:13 hbirr Exp $
+/* $Id: copy.c,v 1.2 2001/12/27 23:56:41 dwelch Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -118,10 +118,10 @@ CcCopyRead (
    if (!Wait)
    {
      KeAcquireSpinLock(&Bcb->BcbLock, &oldirql);
-     current_entry = Bcb->CacheSegmentListHead.Flink;
+     current_entry = Bcb->BcbSegmentListHead.Flink;
-     while (current_entry != &Bcb->CacheSegmentListHead)
+     while (current_entry != &Bcb->BcbSegmentListHead)
      {
-       current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbListEntry);
+       current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry);
        if (!current->Valid && current->FileOffset < ReadOffset + Length
          && current->FileOffset + Bcb->CacheSegmentSize > ReadOffset)
        {
@@ -231,10 +231,10 @@ CcCopyWrite (
    {
      // testing, if the requested datas are available
      KeAcquireSpinLock(&Bcb->BcbLock, &oldirql);
-     current_entry = Bcb->CacheSegmentListHead.Flink;
+     current_entry = Bcb->BcbSegmentListHead.Flink;
-     while (current_entry != &Bcb->CacheSegmentListHead)
+     while (current_entry != &Bcb->BcbSegmentListHead)
      {
-       CacheSeg = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbListEntry);
+       CacheSeg = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry);
        if (!CacheSeg->Valid)
        {
          if ((WriteOffset >= CacheSeg->FileOffset && WriteOffset < CacheSeg->FileOffset + Bcb->CacheSegmentSize)

reactos/ntoskrnl/cc/misc.c

@@ -15,6 +15,56 @@
 
 /* FUNCTIONS *****************************************************************/
 
+/**********************************************************************
+ * NAME							INTERNAL
+ * 	CcMdlReadCompleteDev@8
+ *
+ * DESCRIPTION
+ *
+ * ARGUMENTS
+ *	MdlChain
+ *	DeviceObject
+ *	
+ * RETURN VALUE
+ * 	None.
+ *
+ * NOTE
+ * 	Used by CcMdlReadComplete@8 and FsRtl
+ */
+VOID STDCALL
+CcMdlReadCompleteDev (IN	PMDL		MdlChain,
+		      IN	PDEVICE_OBJECT	DeviceObject)
+{
+  UNIMPLEMENTED;
+}
+
+
+/**********************************************************************
+ * NAME							EXPORTED
+ * 	CcMdlReadComplete@8
+ *
+ * DESCRIPTION
+ *
+ * ARGUMENTS
+ *
+ * RETURN VALUE
+ * 	None.
+ *
+ * NOTE
+ * 	From Bo Branten's ntifs.h v13.
+ */
+VOID STDCALL
+CcMdlReadComplete (IN	PFILE_OBJECT	FileObject,
+		   IN	PMDL		MdlChain)
+{
+   PDEVICE_OBJECT	DeviceObject = NULL;
+   
+   DeviceObject = IoGetRelatedDeviceObject (FileObject);
+   /* FIXME: try fast I/O first */
+   CcMdlReadCompleteDev (MdlChain,
+			 DeviceObject);
+}
+
 VOID STDCALL
 CcSetFileSizes (
    IN PFILE_OBJECT FileObject,
@@ -37,10 +87,10 @@ CcSetFileSizes (
 
   if (FileSizes->AllocationSize.QuadPart < Bcb->AllocationSize.QuadPart)
   {
-    current_entry = Bcb->CacheSegmentListHead.Flink;
+    current_entry = Bcb->BcbSegmentListHead.Flink;
-    while (current_entry != &Bcb->CacheSegmentListHead)
+    while (current_entry != &Bcb->BcbSegmentListHead)
     {
-      current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbListEntry);
+      current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry);
       current_entry = current_entry->Flink;
       if (current->FileOffset > FileSizes->AllocationSize.QuadPart)
       {

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.29 2001/10/10 21:50:15 hbirr Exp $
+/* $Id: view.c,v 1.30 2001/12/27 23:56:41 dwelch Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -69,27 +69,13 @@
 #define TAG_CSEG  TAG('C', 'S', 'E', 'G')
 #define TAG_BCB   TAG('B', 'C', 'B', ' ')
 
-static LIST_ENTRY BcbListHead;
+static LIST_ENTRY DirtySegmentListHead;
-static KSPIN_LOCK BcbListLock;
+static LIST_ENTRY CacheSegmentListHead;
+
+static FAST_MUTEX ViewLock;
 
 /* FUNCTIONS *****************************************************************/
 
-NTSTATUS STDCALL 
-CcRosFlushCacheSegment(PCACHE_SEGMENT CacheSeg)
-/*
- * FUNCTION: Asks the FSD to flush the contents of the page back to disk
- */
-{
-   KeWaitForSingleObject(&CacheSeg->Lock,
-			 Executive,
-			 KernelMode,
-			 FALSE,
-			 NULL);
-   /* FIXME: Build an IRP_MJ_WRITE and send it to the filesystem */
-   KeSetEvent(&CacheSeg->Lock, IO_NO_INCREMENT, 0);
-   return(STATUS_NOT_IMPLEMENTED);
-}
-
 NTSTATUS STDCALL 
 CcRosReleaseCacheSegment(PBCB Bcb,
 		      PCACHE_SEGMENT CacheSeg,
@@ -100,7 +86,7 @@ CcRosReleaseCacheSegment(PBCB Bcb,
    
    CacheSeg->ReferenceCount--;
    CacheSeg->Valid = Valid;
-   KeSetEvent(&CacheSeg->Lock, IO_NO_INCREMENT, FALSE);
+   ExReleaseFastMutex(&CacheSeg->Lock);
    
    DPRINT("CcReleaseCachePage() finished\n");
    
@@ -109,54 +95,63 @@ CcRosReleaseCacheSegment(PBCB Bcb,
 
 NTSTATUS
 CcRosGetCacheSegment(PBCB Bcb,
-		  ULONG FileOffset,
+		     ULONG FileOffset,
-		  PULONG BaseOffset,
+		     PULONG BaseOffset,
-		  PVOID* BaseAddress,
+		     PVOID* BaseAddress,
-		  PBOOLEAN UptoDate,
+		     PBOOLEAN UptoDate,
-		  PCACHE_SEGMENT* CacheSeg)
+		     PCACHE_SEGMENT* CacheSeg)
 {
-   KIRQL oldirql;
    PLIST_ENTRY current_entry;
    PCACHE_SEGMENT current;
    ULONG i;
    NTSTATUS Status;
+   KIRQL oldIrql;
 
-   KeAcquireSpinLock(&Bcb->BcbLock, &oldirql);
+   /*
-   
+    * Acquire the global lock.
-   current_entry = Bcb->CacheSegmentListHead.Flink;
+    */
-   while (current_entry != &Bcb->CacheSegmentListHead)
+   ExAcquireFastMutex(&ViewLock);
+
+   /*
+    * Look for a cache segment already mapping the same data.
+    */
+   current_entry = Bcb->BcbSegmentListHead.Flink;
+   while (current_entry != &Bcb->BcbSegmentListHead)
      {
 	current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, 
-				    BcbListEntry);
+				    BcbSegmentListEntry);
 	if (current->FileOffset <= FileOffset &&
 	    (current->FileOffset + Bcb->CacheSegmentSize) > FileOffset)
 	  {
-	     current->ReferenceCount++;
+	    /*
-	     KeReleaseSpinLock(&Bcb->BcbLock, oldirql);
+	     * Make sure the cache segment can't go away outside of our control.
-	     KeWaitForSingleObject(&current->Lock,
+	     */
-				   Executive,
+	    current->ReferenceCount++;
-				   KernelMode,
+	    /*
-				   FALSE,
+	     * Release the global lock and lock the cache segment.
-				   NULL);
+	     */
-	     *UptoDate = current->Valid;
+	    ExReleaseFastMutex(&ViewLock);
-	     *BaseAddress = current->BaseAddress;
+	    ExAcquireFastMutex(&current->Lock);
-	     *CacheSeg = current;
+	    /*
-	     *BaseOffset = current->FileOffset;
+	     * Return information about the segment to the caller.
-	     return(STATUS_SUCCESS);
+	     */
+	    *UptoDate = current->Valid;
+	    *BaseAddress = current->BaseAddress;
+	    *CacheSeg = current;
+	    *BaseOffset = current->FileOffset;
+	    return(STATUS_SUCCESS);
 	  }
 	current_entry = current_entry->Flink;
      }
 
-   DPRINT("Creating new segment\n"); 
+   /*
-   
+    * Otherwise create a new segment.
-   KeReleaseSpinLock(&Bcb->BcbLock, oldirql);
+    */
-
    current = ExAllocatePoolWithTag(NonPagedPool, sizeof(CACHE_SEGMENT), 
 				   TAG_CSEG);
 
    MmLockAddressSpace(MmGetKernelAddressSpace());
    current->BaseAddress = NULL;
-
    Status = MmCreateMemoryArea(KernelMode,
 		      MmGetKernelAddressSpace(),
 		      MEMORY_AREA_CACHE_SEGMENT,
@@ -172,11 +167,18 @@ CcRosGetCacheSegment(PBCB Bcb,
      }
    		
    current->Valid = FALSE;
+   current->Dirty = FALSE;
    current->FileOffset = ROUND_DOWN(FileOffset, Bcb->CacheSegmentSize);
    current->Bcb = Bcb;
-   KeInitializeEvent(&current->Lock, SynchronizationEvent, FALSE);
+   ExInitializeFastMutex(&current->Lock);
    current->ReferenceCount = 1;
-   InsertTailList(&Bcb->CacheSegmentListHead, &current->BcbListEntry);
+   KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql);
+   InsertTailList(&Bcb->BcbSegmentListHead, &current->BcbSegmentListEntry);
+   KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
+   InsertTailList(&CacheSegmentListHead, &current->CacheSegmentListEntry);
+   current->DirtySegmentListEntry.Flink = current->DirtySegmentListEntry.Blink = NULL;
+   ExAcquireFastMutex(&current->Lock);
+   ExReleaseFastMutex(&ViewLock);
    *UptoDate = current->Valid;
    *BaseAddress = current->BaseAddress;
    *CacheSeg = current;
@@ -240,6 +242,7 @@ CcRosFreeCacheSegment(PBCB Bcb, PCACHE_SEGMENT CacheSeg)
  */
 {
   DPRINT("Freeing cache segment %x\n", CacheSeg);
+  RemoveEntryList(&CacheSeg->CacheSegmentListEntry);
   MmFreeMemoryArea(MmGetKernelAddressSpace(),
 		   CacheSeg->BaseAddress,
 		   Bcb->CacheSegmentSize,
@@ -262,20 +265,21 @@ CcRosReleaseFileCache(PFILE_OBJECT FileObject, PBCB Bcb)
 
    MmFreeSectionSegments(Bcb->FileObject);
    
-   current_entry = Bcb->CacheSegmentListHead.Flink;
+   /*
-   while (current_entry != &Bcb->CacheSegmentListHead)
+    * Release all cache segments.
+    */
+   current_entry = Bcb->BcbSegmentListHead.Flink;
+   while (current_entry != &Bcb->BcbSegmentListHead)
      {
 	current = 
-	  CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbListEntry);
+	  CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry);
 	current_entry = current_entry->Flink;
 	CcRosFreeCacheSegment(Bcb, current);
      }
 
    ObDereferenceObject (Bcb->FileObject);
    ExFreePool(Bcb);
-   
+
-   DPRINT("CcRosReleaseFileCache() finished\n");
-   
    return(STATUS_SUCCESS);
 }
 
@@ -286,9 +290,7 @@ CcRosInitializeFileCache(PFILE_OBJECT FileObject,
 /*
  * FUNCTION: Initializes a BCB for a file object
  */
-{
+{   
-   DPRINT("CcRosInitializeFileCache(FileObject %x)\n",FileObject);
-   
    (*Bcb) = ExAllocatePoolWithTag(NonPagedPool, sizeof(BCB), TAG_BCB);
    if ((*Bcb) == NULL)
      {
@@ -300,76 +302,34 @@ CcRosInitializeFileCache(PFILE_OBJECT FileObject,
 			      NULL,
 			      KernelMode);
    (*Bcb)->FileObject = FileObject;
-   InitializeListHead(&(*Bcb)->CacheSegmentListHead);
-   KeInitializeSpinLock(&(*Bcb)->BcbLock);
    (*Bcb)->CacheSegmentSize = CacheSegmentSize;
    if (FileObject->FsContext)
-   {
+     {
-     (*Bcb)->AllocationSize = ((REACTOS_COMMON_FCB_HEADER*)FileObject->FsContext)->AllocationSize;
+       (*Bcb)->AllocationSize = 
-     (*Bcb)->FileSize = ((REACTOS_COMMON_FCB_HEADER*)FileObject->FsContext)->FileSize;
+	 ((REACTOS_COMMON_FCB_HEADER*)FileObject->FsContext)->AllocationSize;
-   }
+       (*Bcb)->FileSize = ((REACTOS_COMMON_FCB_HEADER*)FileObject->FsContext)->FileSize;
-
+     }
-   DPRINT("Finished CcRosInitializeFileCache() = %x\n", *Bcb);
+   KeInitializeSpinLock(&(*Bcb)->BcbLock);
+   InitializeListHead(&(*Bcb)->BcbSegmentListHead);
    
    return(STATUS_SUCCESS);
 }
 
-
-/**********************************************************************
- * NAME							INTERNAL
- * 	CcMdlReadCompleteDev@8
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *	MdlChain
- *	DeviceObject
- *	
- * RETURN VALUE
- * 	None.
- *
- * NOTE
- * 	Used by CcMdlReadComplete@8 and FsRtl
- */
-VOID STDCALL
-CcMdlReadCompleteDev (IN	PMDL		MdlChain,
-		      IN	PDEVICE_OBJECT	DeviceObject)
-{
-  UNIMPLEMENTED;
-}
-
-
-/**********************************************************************
- * NAME							EXPORTED
- * 	CcMdlReadComplete@8
- *
- * DESCRIPTION
- *
- * ARGUMENTS
- *
- * RETURN VALUE
- * 	None.
- *
- * NOTE
- * 	From Bo Branten's ntifs.h v13.
- */
-VOID STDCALL
-CcMdlReadComplete (IN	PFILE_OBJECT	FileObject,
-		   IN	PMDL		MdlChain)
-{
-   PDEVICE_OBJECT	DeviceObject = NULL;
-   
-   DeviceObject = IoGetRelatedDeviceObject (FileObject);
-   /* FIXME: try fast I/O first */
-   CcMdlReadCompleteDev (MdlChain,
-			 DeviceObject);
-}
-
 VOID
 CcInitView(VOID)
 {
-  InitializeListHead(&BcbListHead);
+  DPRINT1("CcInitView()\n");
-  KeInitializeSpinLock(&BcbListLock);
+  InitializeListHead(&CacheSegmentListHead);
+  InitializeListHead(&DirtySegmentListHead);
+  ExInitializeFastMutex(&ViewLock);
 }
 
 /* EOF */
+
+
+
+
+
+
+
+

reactos/ntoskrnl/ex/fmutex.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: fmutex.c,v 1.11 2001/12/20 03:56:09 dwelch Exp $
+/* $Id: fmutex.c,v 1.12 2001/12/27 23:56:42 dwelch Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ex/fmutex.c
@@ -39,17 +39,17 @@
 VOID FASTCALL
 ExAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex)
 {
+  InterlockedIncrement(&FastMutex->Contention);
   while (InterlockedExchange(&FastMutex->Count, 0) == 0)
-     {
+     {       
-       FastMutex->Contention++;
        KeWaitForSingleObject(&FastMutex->Event,
 			     Executive,
 			     KernelMode,
 			     FALSE,
-			     NULL);
+			     NULL);      
-       FastMutex->Contention--;
      }
-   FastMutex->Owner = KeGetCurrentThread();
+  InterlockedDecrement(&FastMutex->Contention);
+  FastMutex->Owner = KeGetCurrentThread();
 }
 
 VOID FASTCALL
@@ -57,8 +57,11 @@ ExReleaseFastMutexUnsafe(PFAST_MUTEX FastMutex)
 {
   assert(FastMutex->Owner == KeGetCurrentThread());
   FastMutex->Owner = NULL;
+  if (FastMutex->Contention > 0)
+    {
+      KeSetEvent(&FastMutex->Event, 0, FALSE);
+    }
   InterlockedExchange(&FastMutex->Count, 1);
-  KeSetEvent(&FastMutex->Event, 0, FALSE);
 }
 
 /* EOF */

reactos/ntoskrnl/include/internal/cc.h

@@ -1,28 +1,41 @@
 #ifndef __INCLUDE_INTERNAL_CC_H
 #define __INCLUDE_INTERNAL_CC_H
-/* $Id: cc.h,v 1.6 2001/10/10 21:55:13 hbirr Exp $ */
+/* $Id: cc.h,v 1.7 2001/12/27 23:56:42 dwelch Exp $ */
 #include <ddk/ntifs.h>
 
 typedef struct _BCB
 {
-  LIST_ENTRY CacheSegmentListHead;
+  LIST_ENTRY BcbSegmentListHead;
   PFILE_OBJECT FileObject;
-  KSPIN_LOCK BcbLock;
   ULONG CacheSegmentSize;
   LARGE_INTEGER AllocationSize;
   LARGE_INTEGER FileSize;
+  KSPIN_LOCK BcbLock;
 } BCB;
 
 typedef struct _CACHE_SEGMENT
 {
+  /* Base address of the region where the cache segment data is mapped. */
   PVOID BaseAddress;
+  /* Memory area representing the region where the cache segment data is mapped. */
   struct _MEMORY_AREA* MemoryArea;
+  /* Are the contents of the cache segment data valid. */
   BOOLEAN Valid;
-  LIST_ENTRY BcbListEntry;
+  /* Are the contents of the cache segment data newer than those on disk. */
+  BOOLEAN Dirty;
+  /* Entry in the list of segments for this BCB. */
+  LIST_ENTRY BcbSegmentListEntry;
+  /* Entry in the list of segments which are dirty. */
   LIST_ENTRY DirtySegmentListEntry;
+  /* Entry in the list of segments. */
+  LIST_ENTRY CacheSegmentListEntry;
+  /* Offset in the file which this cache segment maps. */
   ULONG FileOffset;
-  KEVENT Lock;
+  /* Lock. */
+  FAST_MUTEX Lock;
+  /* Number of references. */
   ULONG ReferenceCount;
+  /* Pointer to the BCB for the file which this cache segment maps data for. */
   PBCB Bcb;
 } CACHE_SEGMENT;
 
@@ -46,4 +59,6 @@ NTSTATUS ReadCacheSegment(PCACHE_SEGMENT CacheSeg);
 
 NTSTATUS WriteCacheSegment(PCACHE_SEGMENT CacheSeg);
 
+VOID CcInit(VOID);
+
 #endif

reactos/ntoskrnl/ke/i386/multiboot.S

@@ -188,10 +188,10 @@ _multiboot_entry:
 	movl	%eax, %cr3
 
 	/*
-	 * Enable paging
+	 * Enable paging and set write protect
 	 */
 	movl	%cr0, %eax
-	orl	$0x80000000, %eax
+	orl	$0x80010000, %eax
 	movl	%eax, %cr0
 
 	/*

reactos/ntoskrnl/ke/main.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: main.c,v 1.109 2001/11/25 15:21:10 dwelch Exp $
+/* $Id: main.c,v 1.110 2001/12/27 23:56:42 dwelch Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/main.c
@@ -39,6 +39,7 @@
 #include <internal/ke.h>
 #include <internal/io.h>
 #include <internal/po.h>
+#include <internal/cc.h>
 //#include <internal/se.h>
 #include <napi/shared_data.h>
 #include <internal/v86m.h>
@@ -1026,6 +1027,7 @@ ExpInitializeExecutive(VOID)
   CmInitializeRegistry();
   NtInit();
   MmInit3();
+  CcInit();
   
   /* Report all resources used by hal */
   HalReportResourceUsage();

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.50 2001/12/20 03:56:09 dwelch Exp $
+/* $Id: mm.c,v 1.51 2001/12/27 23:56:42 dwelch Exp $
  *
  * COPYRIGHT:   See COPYING in the top directory
  * PROJECT:     ReactOS kernel 
@@ -249,7 +249,7 @@ NTSTATUS MmCommitPagedPoolAddress(PVOID Address)
   Status = 
     MmCreateVirtualMapping(NULL,
 			   (PVOID)PAGE_ROUND_DOWN(Address),
-			   PAGE_READONLY,
+			   PAGE_READWRITE,
 			   (ULONG)AllocatedPage);  
   return(Status);
 }