[ion] 57222: [NTOSKRNL]: No longer force PAGE_READWRITE for allocations. Seems Mm is now mature enough to handle this. Tried with some winetests and they look happier.

Author: ion
Date: Sun Sep  2 20:49:31 2012
New Revision: 57222

URL: http://svn.reactos.org/svn/reactos?rev=57222&view=rev
Log:
[NTOSKRNL]: No longer force PAGE_READWRITE for allocations. Seems Mm is now mature enough to handle this. Tried with some winetests and they look happier.

Modified:
    trunk/reactos/ntoskrnl/mm/ARM3/section.c
    trunk/reactos/ntoskrnl/mm/ARM3/virtual.c
    trunk/reactos/ntoskrnl/mm/section.c

Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c?...
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sun Sep  2 20:49:31 2012
@@ -81,6 +81,29 @@
     (CHAR)MM_INVALID_PROTECTION
 };

+ULONG MmCompatibleProtectionMask[8] =
+{
+    PAGE_NOACCESS,
+    
+    PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY,
+    
+    PAGE_NOACCESS | PAGE_EXECUTE,
+    
+    PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_EXECUTE |
+    PAGE_EXECUTE_READ,
+    
+    PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_READWRITE,
+    
+    PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY,
+    
+    PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_READWRITE |
+    PAGE_EXECUTE | PAGE_EXECUTE_READ | PAGE_EXECUTE_READWRITE |
+    PAGE_EXECUTE_WRITECOPY,
+    
+    PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_EXECUTE |
+    PAGE_EXECUTE_READ | PAGE_EXECUTE_WRITECOPY
+};
+
 MMSESSION MmSession;
 KGUARDED_MUTEX MmSectionCommitMutex;
 MM_AVL_TABLE MmSectionBasedRoot;
@@ -88,6 +111,29 @@
 PVOID MmHighSectionBase;

/* PRIVATE FUNCTIONS **********************************************************/
+
+BOOLEAN
+NTAPI
+MiIsProtectionCompatible(IN ULONG SectionPageProtection,
+                         IN ULONG NewSectionPageProtection)
+{
+    ULONG ProtectionMask, CompatibleMask;
+
+    /* Calculate the protection mask and make sure it's valid */
+    ProtectionMask = MiMakeProtectionMask(SectionPageProtection);
+    if (ProtectionMask == MM_INVALID_PROTECTION)
+    {
+        DPRINT1("Invalid protection mask\n");
+        return FALSE;
+    }
+
+    /* Calculate the compatible mask */
+    CompatibleMask = MmCompatibleProtectionMask[ProtectionMask & 0x7] |
+                     PAGE_GUARD | PAGE_NOCACHE | PAGE_WRITECOMBINE;
+
+    /* See if the mapping protection is compatible with the create protection */
+    return ((CompatibleMask | NewSectionPageProtection) == CompatibleMask);
+}

ACCESS_MASK
 NTAPI
@@ -2424,9 +2470,6 @@
     NTSTATUS Status;
     PAGED_CODE();

-    /* Force PAGE_READWRITE for everything, for now */
-    Protect = PAGE_READWRITE;
-
     /* Get the segment and control area */
     Section = (PSECTION)SectionObject;
     ControlArea = Section->Segment->ControlArea;
@@ -2438,14 +2481,12 @@
     ASSERT((AllocationType & MEM_RESERVE) == 0);
     ASSERT(ControlArea->u.Flags.PhysicalMemory == 0);

-#if 0
-    /* FIXME: Check if the mapping protection is compatible with the create */
+    /* Check if the mapping protection is compatible with the create */
     if (!MiIsProtectionCompatible(Section->InitialPageProtection, Protect))
     {
         DPRINT1("Mapping protection is incompatible\n");
         return STATUS_SECTION_PROTECTION;
     }
-#endif

/* Check if the offset and size would cause an overflow */
     if (((ULONG64)SectionOffset->QuadPart + *ViewSize) <

Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c?...
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Sep  2 20:49:31 2012
@@ -3738,11 +3738,6 @@
             return STATUS_INVALID_PARAMETER_6;
         }
     }
-
-    //
-    // Force PAGE_READWRITE for everything, for now
-    //
-    Protect = PAGE_READWRITE;

/* Calculate the protection mask and make sure it's valid */
     ProtectionMask = MiMakeProtectionMask(Protect);

Modified: trunk/reactos/ntoskrnl/mm/section.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=5...
==============================================================================
--- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Sep  2 20:49:31 2012
@@ -4986,7 +4986,11 @@
 #endif
     else
     {
-        ASSERT(AllocationAttributes & SEC_PHYSICALMEMORY);
+        if ((AllocationAttributes & SEC_PHYSICALMEMORY) == 0)
+        {
+            DPRINT1("Invalid path: %lx %p %p\n", AllocationAttributes, FileObject, FileHandle);
+        }
+//        ASSERT(AllocationAttributes & SEC_PHYSICALMEMORY);
         Status = MmCreatePageFileSection(SectionObject,
                                          DesiredAccess,
                                          ObjectAttributes,