Changeset 2c2d54a in mainline for uspace/lib/c

Timestamp:

2016-09-02T17:58:05Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4c3602c4

Parents:

4bf0926e (diff), 3233adb (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 lp:~jakub/helenos/pager

Location:

uspace/lib/c

Files:

• generic/as.c (modified) (2 diffs)
• generic/async.c (modified) (2 diffs)
• generic/elf/elf_mod.c (modified) (1 diff)
• generic/fibril.c (modified) (1 diff)
• generic/io/chargrid.c (modified) (1 diff)
• generic/malloc.c (modified) (1 diff)
• generic/thread.c (modified) (1 diff)
• include/as.h (modified) (2 diffs)
• include/async.h (modified) (1 diff)

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 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.
@@ -55 +57 @@
  *
  */
-void *as_area_create(void *base, size_t size, unsigned int flags)
+void *as_area_create(void *base, size_t size, unsigned int flags,
+    as_area_pager_info_t *pager_info)
 {
-        return (void *) __SYSCALL4(SYS_AS_AREA_CREATE, (sysarg_t) base,
-            (sysarg_t) size, (sysarg_t) flags, (sysarg_t) __entry);
+        return (void *) __SYSCALL5(SYS_AS_AREA_CREATE, (sysarg_t) base,
+            (sysarg_t) size, (sysarg_t) flags, (sysarg_t) __entry,
+            (sysarg_t) pager_info);
 }
 

uspace/lib/c/generic/async.c

@@ -116 +116 @@
 #include <stdlib.h>
 #include <macros.h>
+#include <as.h>
+#include <abi/mm/as.h>
 #include "private/libc.h"
 
@@ -3381 +3383 @@
 }
 
+void *async_as_area_create(void *base, size_t size, unsigned int flags,
+    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/generic/elf/elf_mod.c

@@ -370 +370 @@
          */
         a = as_area_create((uint8_t *) base + bias, mem_sz,
-            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
+            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE,
+            AS_AREA_UNPAGED);
         if (a == AS_MAP_FAILED) {
                 DPRINTF("memory mapping failed (%p, %zu)\n",

uspace/lib/c/generic/fibril.c

@@ -279 +279 @@
         size_t stack_size = (stksz == FIBRIL_DFLT_STK_SIZE) ?
             stack_size_get() : stksz;
-        fibril->stack = as_area_create((void *) -1, stack_size,
+        fibril->stack = as_area_create(AS_AREA_ANY, stack_size,
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD |
-            AS_AREA_LATE_RESERVE);
+            AS_AREA_LATE_RESERVE, AS_AREA_UNPAGED);
         if (fibril->stack == (void *) -1) {
                 fibril_teardown(fibril, false);

uspace/lib/c/generic/io/chargrid.c

@@ -60 +60 @@
         if ((flags & CHARGRID_FLAG_SHARED) == CHARGRID_FLAG_SHARED) {
                 scrbuf = (chargrid_t *) as_area_create(AS_AREA_ANY, size,
-                    AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
+                    AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE,
+                    AS_AREA_UNPAGED);
                 if (scrbuf == AS_MAP_FAILED)
                         return NULL;

uspace/lib/c/generic/malloc.c

@@ -354 +354 @@
         size_t asize = ALIGN_UP(size, PAGE_SIZE);
         void *astart = as_area_create(AS_AREA_ANY, asize,
-            AS_AREA_WRITE | AS_AREA_READ | AS_AREA_CACHEABLE);
+            AS_AREA_WRITE | AS_AREA_READ | AS_AREA_CACHEABLE, AS_AREA_UNPAGED);
         if (astart == AS_MAP_FAILED)
                 return false;

uspace/lib/c/generic/thread.c

@@ -116 +116 @@
         void *stack = as_area_create(AS_AREA_ANY, stack_size,
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD |
-            AS_AREA_LATE_RESERVE);
+            AS_AREA_LATE_RESERVE, AS_AREA_UNPAGED);
         if (stack == AS_MAP_FAILED) {
                 free(uarg);

uspace/lib/c/include/as.h

@@ -38 +38 @@
 #include <sys/types.h>
 #include <abi/mm/as.h>
-#include <task.h>
 #include <libarch/config.h>
-
-#define AS_AREA_ANY    ((void *) -1)
-#define AS_MAP_FAILED  ((void *) -1)
 
 static inline size_t SIZE2PAGES(size_t size)
@@ -57 +53 @@
 }
 
-extern void *as_area_create(void *, size_t, unsigned 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 *,
+    sysarg_t, sysarg_t, sysarg_t);
+
 #endif