Changes in kernel/generic/src/ddi/ddi.c [c0699467:473d5d2] in mainline

File:

• kernel/generic/src/ddi/ddi.c (modified) (5 diffs)

kernel/generic/src/ddi/ddi.c

@@ -41 +41 @@
 
 #include <ddi/ddi.h>
+#include <ddi/ddi_arg.h>
 #include <proc/task.h>
 #include <security/cap.h>
@@ -121 +122 @@
         backend_data.frames = pages;
         
-        /*
-         * Check if the memory region is explicitly enabled
-         * for mapping by any parea structure.
-         */
-        
-        mutex_lock(&parea_lock);
-        btree_node_t *nodep;
-        parea_t *parea = (parea_t *) btree_search(&parea_btree,
-            (btree_key_t) pf, &nodep);
-        
-        if ((parea != NULL) && (parea->frames >= pages)) {
-                if ((!priv) && (!parea->unpriv)) {
-                        mutex_unlock(&parea_lock);
-                        return EPERM;
-                }
-                
-                goto map;
-        }
-        
-        parea = NULL;
-        mutex_unlock(&parea_lock);
-        
-        /*
-         * Check if the memory region is part of physical
-         * memory generally enabled for mapping.
-         */
-        
+        /* Find the zone of the physical memory */
         irq_spinlock_lock(&zones.lock, true);
         size_t znum = find_zone(ADDR2PFN(pf), pages, 0);
@@ -178 +153 @@
         }
         
+        if (zone_flags_available(zones.info[znum].flags)) {
+                /*
+                 * Frames are part of physical memory, check
+                 * if the memory region is enabled for mapping.
+                 */
+                irq_spinlock_unlock(&zones.lock, true);
+                
+                mutex_lock(&parea_lock);
+                btree_node_t *nodep;
+                parea_t *parea = (parea_t *) btree_search(&parea_btree,
+                    (btree_key_t) pf, &nodep);
+                
+                if ((!parea) || (parea->frames < pages)) {
+                        mutex_unlock(&parea_lock);
+                        return ENOENT;
+                }
+                
+                if (!priv) {
+                        if (!parea->unpriv) {
+                                mutex_unlock(&parea_lock);
+                                return EPERM;
+                        }
+                }
+                
+                mutex_unlock(&parea_lock);
+                goto map;
+        }
+        
         irq_spinlock_unlock(&zones.lock, true);
         return ENOENT;
@@ -185 +188 @@
             AS_AREA_ATTR_NONE, &phys_backend, &backend_data)) {
                 /*
-                 * The address space area was not created.
+                 * The address space area could not have been created.
                  * We report it using ENOMEM.
                  */
-                
-                if (parea != NULL)
-                        mutex_unlock(&parea_lock);
-                
                 return ENOMEM;
         }
@@ -198 +197 @@
          * Mapping is created on-demand during page fault.
          */
-        
-        if (parea != NULL) {
-                parea->mapped = true;
-                mutex_unlock(&parea_lock);
-        }
-        
-        return EOK;
+        return 0;
 }