Changeset 6aeca0d in mainline for uspace/lib/c

Timestamp:

2016-08-28T11:27:42Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f2c3fed

Parents:

1e5d01b

Message:

Make as_area_create() accept phone to external pager

Location:

uspace/lib/c

Files:

• generic/as.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)

uspace/lib/c/generic/as.c

@@ -50 +50 @@
  * @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.
  *
  * @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, int pager)
 {
-        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);
 }
 

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

@@ -44 +44 @@
 #define AS_MAP_FAILED  ((void *) -1)
 
+#define AS_AREA_UNPAGED -1
+
 static inline size_t SIZE2PAGES(size_t size)
 {
@@ -57 +59 @@
 }
 
-extern void *as_area_create(void *, size_t, unsigned int);
+extern void *as_area_create(void *, size_t, unsigned int, int);
 extern int as_area_resize(void *, size_t, unsigned int);
 extern int as_area_change_flags(void *, unsigned int);