Changeset aa9f0a4 in mainline

Timestamp:

2011-01-21T13:58:26Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a088d15, c431a83

Parents:

5d00e40 (diff), b93d637 (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:

Merged vojtechhorky/ - page mapping retrieval

Files:

• kernel/generic/include/mm/page.h (modified) (2 diffs)
• kernel/generic/include/syscall/syscall.h (modified) (1 diff)
• kernel/generic/src/mm/page.c (modified) (3 diffs)
• kernel/generic/src/syscall/syscall.c (modified) (2 diffs)
• uspace/app/tester/Makefile (modified) (1 diff)
• uspace/app/tester/mm/mapping1.c (added)
• uspace/app/tester/mm/mapping1.def (added)
• uspace/app/tester/tester.c (modified) (1 diff)
• uspace/app/tester/tester.h (modified) (1 diff)
• uspace/lib/c/generic/as.c (modified) (2 diffs)
• uspace/lib/c/include/as.h (modified) (1 diff)

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/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,

uspace/app/tester/Makefile

@@ -53 +53 @@
         loop/loop1.c \
         mm/malloc1.c \
+        mm/mapping1.c \
         hw/misc/virtchar1.c \
         hw/serial/serial1.c

uspace/app/tester/tester.c

@@ -62 +62 @@
 #include "loop/loop1.def"
 #include "mm/malloc1.def"
+#include "mm/mapping1.def"
 #include "hw/serial/serial1.def"
 #include "adt/usbaddrkeep.def"

uspace/app/tester/tester.h

@@ -79 +79 @@
 extern const char *test_loop1(void);
 extern const char *test_malloc1(void);
+extern const char *test_mapping1(void);
 extern const char *test_serial1(void);
 extern const char *test_usbaddrkeep(void);

uspace/lib/c/generic/as.c

@@ -35 +35 @@
 #include <as.h>
 #include <libc.h>
+#include <errno.h>
 #include <unistd.h>
 #include <align.h>
@@ -128 +129 @@
 }
 
+/** Find mapping to physical address.
+ *
+ * @param address Virtual address in question (virtual).
+ * @param[out] frame Frame address (physical).
+ * @return Error code.
+ * @retval EOK No error, @p frame holds the translation.
+ * @retval ENOENT Mapping not found.
+ */
+int as_get_physical_mapping(void *address, uintptr_t *frame)
+{
+        uintptr_t tmp_frame;
+        uintptr_t virt = (uintptr_t) address;
+        
+        int rc = (int) __SYSCALL2(SYS_PAGE_FIND_MAPPING,
+            (sysarg_t) virt, (sysarg_t) &tmp_frame);
+        if (rc != EOK) {
+                return rc;
+        }
+        
+        if (frame != NULL) {
+                *frame = tmp_frame;
+        }
+        
+        return EOK;
+}
+
 /** @}
  */

uspace/lib/c/include/as.h

@@ -47 +47 @@
 extern void *set_maxheapsize(size_t mhs);
 extern void * as_get_mappable_page(size_t sz);
+extern int as_get_physical_mapping(void *address, uintptr_t *frame);
 
 #endif