Changeset c431a83 in mainline for kernel

Timestamp:

2011-01-21T14:24:05Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

c2020f7

Parents:

e8ad0de (diff), aa9f0a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from usb/development

Location:

kernel/generic

Files:

• include/mm/page.h (modified) (2 diffs)
• include/syscall/syscall.h (modified) (1 diff)
• src/adt/avl.c (modified) (1 diff)
• src/mm/page.c (modified) (3 diffs)
• src/syscall/syscall.c (modified) (2 diffs)

kernel/generic/include/mm/page.h

@@ -37 +37 @@
 
 #include <typedefs.h>
+#include <proc/task.h>
 #include <mm/as.h>
 #include <memstr.h>
@@ -62 +63 @@
 extern uintptr_t hw_map(uintptr_t, size_t);
 
+extern sysarg_t sys_page_find_mapping(uintptr_t, uintptr_t *);
+
 #endif
 

kernel/generic/include/syscall/syscall.h

@@ -59 +59 @@
         SYS_AS_AREA_DESTROY,
         
+        SYS_PAGE_FIND_MAPPING,
+        
         SYS_IPC_CALL_SYNC_FAST,
         SYS_IPC_CALL_SYNC_SLOW,

kernel/generic/src/adt/avl.c

@@ -723 +723 @@
 void avltree_walk(avltree_t *t, avltree_walker_t walker, void *arg)
 {
-        _avltree_walk(t->root, walker, arg);
+        if (t->root)
+                _avltree_walk(t->root, walker, arg);
 }
 

kernel/generic/src/mm/page.c

@@ -60 +60 @@
 
 #include <mm/page.h>
+#include <genarch/mm/page_ht.h>
+#include <genarch/mm/page_pt.h>
 #include <arch/mm/page.h>
 #include <arch/mm/asid.h>
@@ -70 +72 @@
 #include <debug.h>
 #include <arch.h>
+#include <syscall/copy.h>
+#include <errno.h>
 
 /** Virtual operations for page subsystem. */
@@ -173 +177 @@
 }
 
+/** Syscall wrapper for getting mapping of a virtual page.
+ * 
+ * @retval EOK Everything went find, @p uspace_frame and @p uspace_node
+ *             contains correct values.
+ * @retval ENOENT Virtual address has no mapping.
+ */
+sysarg_t sys_page_find_mapping(uintptr_t virt_address,
+    uintptr_t *uspace_frame)
+{
+        mutex_lock(&AS->lock);
+        
+        pte_t *pte = page_mapping_find(AS, virt_address);
+        if (!PTE_VALID(pte) || !PTE_PRESENT(pte)) {
+                mutex_unlock(&AS->lock);
+                
+                return (sysarg_t) ENOENT;
+        }
+        
+        uintptr_t phys_address = PTE_GET_FRAME(pte);
+        
+        mutex_unlock(&AS->lock);
+        
+        int rc = copy_to_uspace(uspace_frame,
+            &phys_address, sizeof(phys_address));
+        if (rc != EOK) {
+                return (sysarg_t) rc;
+        }
+        
+        return EOK;
+}
+
 /** @}
  */

kernel/generic/src/syscall/syscall.c

@@ -41 +41 @@
 #include <proc/program.h>
 #include <mm/as.h>
+#include <mm/page.h>
 #include <print.h>
 #include <arch.h>
@@ -144 +145 @@
         (syshandler_t) sys_as_area_destroy,
         
+        /* Page mapping related syscalls. */
+        (syshandler_t) sys_page_find_mapping,
+        
         /* IPC related syscalls. */
         (syshandler_t) sys_ipc_call_sync_fast,