Changeset ae6021d in mainline for kernel/generic/src

Timestamp:

2016-09-02T15:44:09Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e755b3f

Parents:

c1f7a315

Message:

Associate each paged as_area with its memory object upon creation

This will allow us to have one pager fibril per task rather than one
per paged area.

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (2 diffs)
• backend_user.c (modified) (3 diffs)

kernel/generic/src/mm/as.c

@@ -2187 +2187 @@
 
 sysarg_t sys_as_area_create(uintptr_t base, size_t size, unsigned int flags,
-    uintptr_t bound, int pager)
+    uintptr_t bound, as_area_pager_info_t *pager_info)
 {
         uintptr_t virt = base;
@@ -2193 +2193 @@
         mem_backend_data_t backend_data;
 
-        if (pager == AS_AREA_UNPAGED)
+        if (pager_info == AS_AREA_UNPAGED)
                 backend = &anon_backend;
         else {
                 backend = &user_backend;
-                backend_data.pager = pager;
+                if (copy_from_uspace(&backend_data.pager_info, pager_info,
+                        sizeof(as_area_pager_info_t)) != EOK) {
+                        return (sysarg_t) AS_MAP_FAILED;
+                }
         }
         as_area_t *area = as_area_create(AS, flags, size,

kernel/generic/src/mm/backend_user.c

@@ -39 +39 @@
 #include <mm/as.h>
 #include <mm/page.h>
+#include <abi/mm/as.h>
 #include <abi/ipc/methods.h>
 #include <ipc/sysipc.h>
@@ -132 +133 @@
                 return AS_PF_FAULT;
 
+        as_area_pager_info_t *pager_info = &area->backend_data.pager_info;
+
         ipc_data_t data = {};
         IPC_SET_IMETHOD(data, IPC_M_PAGE_IN);
         IPC_SET_ARG1(data, upage - area->base);
         IPC_SET_ARG2(data, PAGE_SIZE);
+        IPC_SET_ARG3(data, pager_info->id1);
+        IPC_SET_ARG4(data, pager_info->id2);
+        IPC_SET_ARG5(data, pager_info->id3);
 
-        int rc = ipc_req_internal(area->backend_data.pager, &data);
+        int rc = ipc_req_internal(pager_info->pager, &data);
 
         if (rc != EOK) {
@@ -143 +149 @@
                     "Page-in request for page %#" PRIxn
                     " at pager %d failed with error %d.",
-                    upage, area->backend_data.pager, rc);
+                    upage, pager_info->pager, rc);
                 return AS_PF_FAULT;
         }