Changeset b366a6f4 in mainline for kernel/generic/src/ddi

Timestamp:

2011-06-24T15:58:01Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7250d2c

Parents:

ee2fa30a

Message:

automatic kernel console lockout

• kernel automatically relinquishes the access to the kernel console when the uspace maps the respective physical memory area
• kernel output before uspace initialization is currently broken on Ski (no physical memory area), but this is pending further unification
• kernel console devices are now independent (there is no system-wide "silent" variable), thus on multiple devices the kernel console and uspace output might be usable at the same time

Location:

kernel/generic/src/ddi

Files:

• ddi.c (modified) (4 diffs)
• irq.c (modified) (1 diff)

kernel/generic/src/ddi/ddi.c

@@ -122 +122 @@
         backend_data.frames = pages;
         
-        /* Find the zone of the physical memory */
+        /*
+         * 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.
+         */
+        
         irq_spinlock_lock(&zones.lock, true);
         size_t znum = find_zone(ADDR2PFN(pf), pages, 0);
@@ -153 +179 @@
         }
         
-        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;
@@ -188 +186 @@
             AS_AREA_ATTR_NONE, &phys_backend, &backend_data)) {
                 /*
-                 * The address space area could not have been created.
+                 * The address space area was not created.
                  * We report it using ENOMEM.
                  */
+                
+                if (parea != NULL)
+                        mutex_unlock(&parea_lock);
+                
                 return ENOMEM;
         }
@@ -197 +199 @@
          * Mapping is created on-demand during page fault.
          */
-        return 0;
+        
+        if (parea != NULL) {
+                parea->mapped = true;
+                mutex_unlock(&parea_lock);
+        }
+        
+        return EOK;
 }
 

kernel/generic/src/ddi/irq.c

@@ -275 +275 @@
 {
         /*
-         * If the kernel console is silenced,
-         * then try first the uspace handlers,
-         * eventually fall back to kernel handlers.
+         * If the kernel console override is on,
+         * then try first the kernel handlers
+         * and eventually fall back to uspace
+         * handlers.
          *
-         * If the kernel console is active,
-         * then do it the other way around.
+         * In the usual case the uspace handlers
+         * have precedence.
          */
-        if (silent) {
-                irq_t *irq = irq_dispatch_and_lock_uspace(inr);
+        
+        if (console_override) {
+                irq_t *irq = irq_dispatch_and_lock_kernel(inr);
                 if (irq)
                         return irq;
                 
-                return irq_dispatch_and_lock_kernel(inr);
-        }
-        
-        irq_t *irq = irq_dispatch_and_lock_kernel(inr);
+                return irq_dispatch_and_lock_uspace(inr);
+        }
+        
+        irq_t *irq = irq_dispatch_and_lock_uspace(inr);
         if (irq)
                 return irq;
         
-        return irq_dispatch_and_lock_uspace(inr);
+        return irq_dispatch_and_lock_kernel(inr);
 }