- Bring back old paged pool allocator and use it for paged pool, until ARM3 pool issues are solved.

- Should fix recent regressions.


svn path=/trunk/; revision=44904

reactos/ntoskrnl/mm/ARM3/expool.c

@@ -193,6 +193,11 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType,
     KIRQL OldIrql;
     ULONG BlockSize, i;
     
+    //
+    // Check for paged pool
+    //
+    if (PoolType == PagedPool) return ExAllocatePagedPoolWithTag(PagedPool, NumberOfBytes, Tag);
+    
     //
     // Some sanity checks
     //
@@ -480,6 +485,19 @@ ExFreePoolWithTag(IN PVOID P,
     POOL_TYPE PoolType;
     PPOOL_DESCRIPTOR PoolDesc;
     BOOLEAN Combined = FALSE;
+    
+    //
+    // Check for paged pool
+    //
+    if ((P >= MmPagedPoolBase) &&
+        (P <= (PVOID)((ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize)))
+    {
+        //
+        // Use old allocator
+        //
+        ExFreePagedPool(P);
+        return;
+    }
    
     //
     // Quickly deal with big page allocations

reactos/ntoskrnl/mm/mminit.c

@@ -198,6 +198,21 @@ MiInitSystemMemoryAreas()
                                 BoundaryAddressMultiple);
     ASSERT(Status == STATUS_SUCCESS);
     
+    //
+    // And now, ReactOS paged pool
+    //
+    BaseAddress = MmPagedPoolBase;
+    Status = MmCreateMemoryArea(MmGetKernelAddressSpace(),
+                                MEMORY_AREA_PAGED_POOL | MEMORY_AREA_STATIC,
+                                &BaseAddress,
+                                MmPagedPoolSize,
+                                PAGE_READWRITE,
+                                &MArea,
+                                TRUE,
+                                0,
+                                BoundaryAddressMultiple);
+    ASSERT(Status == STATUS_SUCCESS);
+    
     //
     // Next, the KPCR
     //
@@ -272,6 +287,10 @@ MiDbgDumpAddressSpace(VOID)
             MmSystemRangeStart,
             (ULONG_PTR)MmSystemRangeStart + MmBootImageSize,
             "Boot Loaded Image");
+    DPRINT1("          0x%p - 0x%p\t%s\n",
+            MmPagedPoolBase,
+            (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize,
+            "Paged Pool");
     DPRINT1("          0x%p - 0x%p\t%s\n",
             MmPfnDatabase,
             (ULONG_PTR)MmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT),
@@ -370,13 +389,21 @@ MmInitSystem(IN ULONG Phase,
         //
         MiDbgReadyForPhysical = TRUE;
 #endif
- 
+        
+        /* Put the paged pool after the loaded modules */
+        MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MmSystemRangeStart +
+                                               MmBootImageSize);
+        MmPagedPoolSize = MM_PAGED_POOL_SIZE;
+        
         /* Intialize system memory areas */
         MiInitSystemMemoryAreas();
-        
+
         /* Dump the address space */
         MiDbgDumpAddressSpace();
-
+        
+        /* Initialize paged pool */
+        MmInitializePagedPool();
+        
         /* Initialize working sets */
         MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory);
 

reactos/ntoskrnl/ntoskrnl-generic.rbuild

@@ -414,6 +414,7 @@
 		<file>pagefile.c</file>
 		<file>pageop.c</file>
 		<file>pe.c</file>
+		<file>ppool.c</file>
 		<file>procsup.c</file>
 		<file>region.c</file>
 		<file>rmap.c</file>