Changeset ae6021d in mainline for uspace

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:

uspace

Files:

• app/tester/mm/pager1.c (modified) (1 diff)
• lib/c/generic/as.c (modified) (2 diffs)
• lib/c/generic/async.c (modified) (2 diffs)
• lib/c/include/as.h (modified) (1 diff)
• lib/c/include/async.h (modified) (1 diff)

uspace/app/tester/mm/pager1.c

@@ -51 +51 @@
         
         void *result = async_as_area_create(AS_AREA_ANY, size,
-            AS_AREA_READ | AS_AREA_CACHEABLE, vfs_pager_sess);
+            AS_AREA_READ | AS_AREA_CACHEABLE, vfs_pager_sess, 0, 0, 0);
         if (result == AS_MAP_FAILED)
                 return NULL;

uspace/lib/c/generic/as.c

@@ -45 +45 @@
 /** Create address space area.
  *
- * @param base  Starting virtual address of the area.
- *              If set to AS_AREA_ANY ((void *) -1),
- *              the kernel finds a mappable area.
- * @param size  Size of the area.
- * @param flags Flags describing type of the area.
- * @param pager If non-negative, phone to the external pager backing the area.
- *              If AS_AREA_UNPAGED (-1), the area is anonymous.
+ * @param base       Starting virtual address of the area.
+ *                   If set to AS_AREA_ANY ((void *) -1), the kernel finds a
+ *                   mappable area.
+ * @param size       Size of the area.
+ * @param flags      Flags describing type of the area.
+ * @param pager_info Pager info structure or AS_AREA_UNPAGED (NULL) if the area
+ *                   is not paged (i.e. anonymous).
  *
  * @return Starting virtual address of the created area on success.
@@ -57 +57 @@
  *
  */
-void *as_area_create(void *base, size_t size, unsigned int flags, int pager)
+void *as_area_create(void *base, size_t size, unsigned int flags,
+    as_area_pager_info_t *pager_info)
 {
         return (void *) __SYSCALL5(SYS_AS_AREA_CREATE, (sysarg_t) base,
             (sysarg_t) size, (sysarg_t) flags, (sysarg_t) __entry,
-            (sysarg_t) pager);
+            (sysarg_t) pager_info);
 }
 

uspace/lib/c/generic/async.c

@@ -117 +117 @@
 #include <macros.h>
 #include <as.h>
+#include <abi/mm/as.h>
 #include "private/libc.h"
 
@@ -3383 +3384 @@
 
 void *async_as_area_create(void *base, size_t size, unsigned int flags,
-    async_sess_t *pager)
-{
-        return as_area_create(base, size, flags, pager->phone);
+    async_sess_t *pager, sysarg_t id1, sysarg_t id2, sysarg_t id3)
+{
+        as_area_pager_info_t pager_info = {
+                .pager = pager->phone,
+                .id1 = id1,
+                .id2 = id2,
+                .id3 = id3
+        };
+        return as_area_create(base, size, flags, &pager_info);
 }
 

uspace/lib/c/include/as.h

@@ -53 +53 @@
 }
 
-extern void *as_area_create(void *, size_t, unsigned int, int);
+extern void *as_area_create(void *, size_t, unsigned int,
+    as_area_pager_info_t *);
 extern int as_area_resize(void *, size_t, unsigned int);
 extern int as_area_change_flags(void *, unsigned int);

uspace/lib/c/include/async.h

@@ -488 +488 @@
 extern void async_remote_state_release_exchange(async_exch_t *);
 
-extern void *async_as_area_create(void *, size_t, unsigned int, async_sess_t *);
+extern void *async_as_area_create(void *, size_t, unsigned int, async_sess_t *,
+    sysarg_t, sysarg_t, sysarg_t);
 
 #endif