Changeset 2033 for Whitix/trunk/memory

Timestamp:

04/02/09 21:33:23 (3 years ago)

Author:

mwhitworth

Message:

Add stubs for memory protection functions/cases.

Files:

• Whitix/trunk/memory/mmap.c (modified) (12 diffs)

Whitix/trunk/memory/mmap.c

@@ -44 +44 @@
                 return -EFAULT;
 
-        area=VmLookupAddress(process,address);
+        area = VmLookupAddress(process, address);
         
         /* Area of memory not currently mapped? */
@@ -63 +63 @@
                 return VmProtFault(area,address);
         else
-                return VmHandleNoPage(area,address);
+                return VmHandleNoPage(area, address);
 }
 
@@ -133 +133 @@
  ***********************************************************************/
         
-void MMapFreePage(struct VMArea* area, DWORD virt)
+void MMapFreePage(DWORD virt)
 {
         struct PhysPage* page;
-
+        struct VMArea* area;
+
+//      KePrint("%s, %d: MMapFreePage(%#X)\n", current->name, current->pid, virt);
+//      SymbolPrint(__builtin_return_address(2));
         return;
 
@@ -147 +150 @@
 
                 if (page->refs == 1)
-                        VmFreeMappedPage(area->vNode, page->physAddr);
+                {
+                        area = VmLookupAddress(current, virt);
+                        
+                        if (area)
+                                VmFreeMappedPage(area->vNode, page->physAddr);
+                }
 
                 if (page->refs <= 0)
                 {
-                        KePrint("%#X, %#X: page->physAddr = %#X (%d) pid = %d\n", 
+                        KePrint("%#X, %#X: page->physAddr = %#X (refs = %d) pid = %d\n", 
                                 virt, page, page->physAddr, page->refs, current->pid);
                         cli(); hlt();
@@ -160 +168 @@
 }
 
+void MMapFreePages(DWORD start, DWORD end)
+{
+        DWORD i;
+        
+        for (i = PAGE_ALIGN(start); i < PAGE_ALIGN_UP(end); i += PAGE_SIZE)
+                MMapFreePage(i);
+}
+
 /***********************************************************************
  *
@@ -184 +200 @@
         {
                 for (i=curr->start; i< curr->start+curr->length; i+=PAGE_SIZE)
-                        MMapFreePage(curr, i);
+                        MMapFreePage(i);
 
                 MMapRemoveArea(curr);
@@ -368 +384 @@
         DWORD end=start+len;
         struct VMArea* newArea;
-
+        
         /* Just unmapping the whole area */
         if (area->start == start && area->length == len)
                 return;
-
+        
         if (start >= area->start && end == area->start+area->length)
+        {
                 area->length-=((area->start+area->length)-start);
-        else if (start == area->start && end <= area->start+area->length)
+        }else if (start == area->start && end <= area->start+area->length)
         {
                 area->offset+=(end-area->start);
@@ -394 +411 @@
 
         newArea=(struct VMArea*)MemCacheAlloc(areaCache);
+        
         if (!newArea)
                 return;
@@ -417 +435 @@
  ***********************************************************************/
 
-int MMapUnmap(struct Process* process,DWORD start,DWORD len)
+int MMapUnmap(struct Process* process,DWORD start, DWORD len)
 {
         struct VMArea* area,*next;
+        struct ListHead* lNext;
         DWORD currLen=len;
         DWORD end;
         int err=0;
+        DWORD flags;
+        
+        IrqSaveFlags(flags);
         
         /* Several sanity checks */
         if (PAGE_OFFSET(start) || start > MMAP_END || len > MMAP_END-start || !len)
-                return -EINVAL;
+        {
+                err = -EINVAL;
+                goto error;
+        }
 
         area=VmLookupAddress(process, start);
 
         if (!area)
-                return -EFAULT;
-                
+        {
+                err = -EFAULT;
+                goto error;
+        }
+                        
         end = start + len;
         
         if (area->start >= end)
-                return 0;
+        {
+                err = 0;
+                goto error;
+        }
 
         while (currLen)
@@ -444 +475 @@
                 end=(end > area->start+area->length) ? area->start+area->length : end;
 
+                lNext = &area->list.next;
                 next=ListEntry(area->list.next, struct VMArea, list);
+
+                /* TODO: Call MMapFreeArea? Check vNode refs are handled properly. */
                 ListRemove(&area->list);
 
                 MMapUnmapArea(process, area, currStart, end-currStart);
 
-                if (area->list.next == &process->areaList && currLen > 0)
+                MemCacheFree(areaCache, area);
+
+                if (lNext == &process->areaList && currLen > 0)
                 {
-                        MemCacheFree(areaCache,(void*)area);
                         err=-EINVAL;
                         goto error;
                 }
-
-                MemCacheFree(areaCache,(void*)area);
-                area=next;
+                
+                area = next;
 
                 currLen-=(end-start);
         }
+        
+        MMapFreePages(start, end);
 
 error:
+        IrqRestoreFlags(flags);
         return err;
 }
@@ -524 +561 @@
 }
 
+int MMapProtectionFixEnd(struct VMArea* area, DWORD start, int protection)
+{
+        KePrint("MMapProtectionFixEnd\n");
+        return 0;
+}
+
+int MMapProtectionFixMiddle(struct VMArea* area, DWORD start, DWORD end, int protection)
+{
+        KePrint("MMapProtectionFixMiddle\n");
+        return 0;
+}
+
 int MMapProtectionChange(struct VMArea* area, DWORD start, DWORD end, int protection)
 {
@@ -537 +586 @@
                 else
                         error = MMapProtectionFixStart(area, end, protection);
+        }else if (end == area->start + area->length)
+        {
+                error = MMapProtectionFixEnd(area, start, protection);
         }else{
-                if (protection != 4)
-                {
-                KePrint("TODO: after start, before end, %#X, %#X, %d\n", start, end, protection);
-                cli(); hlt();
-                }
+                error = MMapProtectionFixMiddle(area, start, end, protection);
         }