Changeset 371bd7d in mainline for kernel/generic/src/mm

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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 mainline changes.

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (5 diffs)
• backend_anon.c (modified) (1 diff)
• backend_elf.c (modified) (3 diffs)
• backend_phys.c (modified) (1 diff)
• buddy.c (modified) (1 diff)
• frame.c (modified) (1 diff)
• page.c (modified) (1 diff)
• slab.c (modified) (5 diffs)

kernel/generic/src/mm/as.c

@@ -75 +75 @@
 #include <config.h>
 #include <align.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <syscall/copy.h>
 #include <arch/interrupt.h>
@@ -784 +784 @@
 {
         as_area_t *area;
-        uintptr_t base;
         link_t *cur;
         ipl_t ipl;
@@ -813 +812 @@
                 return ENOTSUP;
         }
-
-        base = area->base;
 
         /*
@@ -952 +949 @@
         if (!THREAD)
                 return AS_PF_FAULT;
-                
-        ASSERT(AS);
-
+        
+        if (!AS)
+                return AS_PF_FAULT;
+        
         mutex_lock(&AS->lock);
-        area = find_area_and_lock(AS, page);    
+        area = find_area_and_lock(AS, page);
         if (!area) {
                 /*
@@ -1920 +1918 @@
 }
 
+/** Get list of adress space areas.
+ *
+ * @param as            Address space.
+ * @param obuf          Place to save pointer to returned buffer.
+ * @param osize         Place to save size of returned buffer.
+ */
+void as_get_area_info(as_t *as, as_area_info_t **obuf, size_t *osize)
+{
+        ipl_t ipl;
+        size_t area_cnt, area_idx, i;
+        link_t *cur;
+
+        as_area_info_t *info;
+        size_t isize;
+
+        ipl = interrupts_disable();
+        mutex_lock(&as->lock);
+
+        /* First pass, count number of areas. */
+
+        area_cnt = 0;
+
+        for (cur = as->as_area_btree.leaf_head.next;
+            cur != &as->as_area_btree.leaf_head; cur = cur->next) {
+                btree_node_t *node;
+
+                node = list_get_instance(cur, btree_node_t, leaf_link);
+                area_cnt += node->keys;
+        }
+
+        isize = area_cnt * sizeof(as_area_info_t);
+        info = malloc(isize, 0);
+
+        /* Second pass, record data. */
+
+        area_idx = 0;
+
+        for (cur = as->as_area_btree.leaf_head.next;
+            cur != &as->as_area_btree.leaf_head; cur = cur->next) {
+                btree_node_t *node;
+
+                node = list_get_instance(cur, btree_node_t, leaf_link);
+
+                for (i = 0; i < node->keys; i++) {
+                        as_area_t *area = node->value[i];
+
+                        ASSERT(area_idx < area_cnt);
+                        mutex_lock(&area->lock);
+
+                        info[area_idx].start_addr = area->base;
+                        info[area_idx].size = FRAMES2SIZE(area->pages);
+                        info[area_idx].flags = area->flags;
+                        ++area_idx;
+
+                        mutex_unlock(&area->lock);
+                }
+        }
+
+        mutex_unlock(&as->lock);
+        interrupts_restore(ipl);
+
+        *obuf = info;
+        *osize = isize;
+}
+
+
 /** Print out information about address space.
  *

kernel/generic/src/mm/backend_anon.c

@@ -47 +47 @@
 #include <adt/btree.h>
 #include <errno.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 #include <arch.h>

kernel/generic/src/mm/backend_elf.c

@@ -38 +38 @@
 #include <lib/elf.h>
 #include <debug.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/as.h>
 #include <mm/frame.h>
@@ -232 +232 @@
 void elf_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame)
 {
-        elf_header_t *elf = area->backend_data.elf;
         elf_segment_header_t *entry = area->backend_data.segment;
-        uintptr_t base, start_anon;
-        size_t i;
+        uintptr_t start_anon;
 
         ASSERT((page >= ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) &&
             (page < entry->p_vaddr + entry->p_memsz));
-        i = (page - ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) >> PAGE_WIDTH;
-        base = (uintptr_t) (((void *) elf) +
-            ALIGN_DOWN(entry->p_offset, FRAME_SIZE));
         start_anon = entry->p_vaddr + entry->p_filesz;
 
@@ -257 +252 @@
                  * lower part is backed by the ELF image and the upper is
                  * anonymous). In any case, a frame needs to be freed.
-                 */ 
+                 */
                 frame_free(frame);
         }

kernel/generic/src/mm/backend_phys.c

@@ -38 +38 @@
 
 #include <debug.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/as.h>
+#include <mm/page.h>
 #include <mm/frame.h>
 #include <mm/slab.h>

kernel/generic/src/mm/buddy.c

@@ -41 +41 @@
 #include <mm/buddy.h>
 #include <mm/frame.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <print.h>

kernel/generic/src/mm/frame.c

@@ -43 +43 @@
  */
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/frame.h>
 #include <mm/as.h>

kernel/generic/src/mm/page.c

@@ -63 +63 @@
 #include <mm/frame.h>
 #include <arch/barrier.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/asm.h>
 #include <memstr.h>

kernel/generic/src/mm/slab.c

@@ -130 +130 @@
 /** Caches for malloc */
 static slab_cache_t *malloc_caches[SLAB_MAX_MALLOC_W - SLAB_MIN_MALLOC_W + 1];
-static char *malloc_names[] =  {
+static const char *malloc_names[] =  {
         "malloc-16",
         "malloc-32",
@@ -571 +571 @@
 
 /** Initialize allocated memory as a slab cache */
-static void
-_slab_cache_create(slab_cache_t *cache, char *name, size_t size, size_t align,
-    int (*constructor)(void *obj, int kmflag), int (*destructor)(void *obj),
-    int flags)
+static void _slab_cache_create(slab_cache_t *cache, const char *name,
+    size_t size, size_t align, int (*constructor)(void *obj, int kmflag),
+    int (*destructor)(void *obj), int flags)
 {
         int pages;
@@ -631 +630 @@
 
 /** Create slab cache  */
-slab_cache_t *
-slab_cache_create(char *name, size_t size, size_t align,
+slab_cache_t *slab_cache_create(const char *name, size_t size, size_t align,
     int (*constructor)(void *obj, int kmflag), int (*destructor)(void *obj),
     int flags)
@@ -853 +851 @@
                 cache = list_get_instance(cur, slab_cache_t, link);
 
-                char *name = cache->name;
+                const char *name = cache->name;
                 uint8_t order = cache->order;
                 size_t size = cache->size;
@@ -896 +894 @@
                     NULL, NULL, SLAB_CACHE_MAGDEFERRED);
         }
-#ifdef CONFIG_DEBUG       
+#ifdef CONFIG_DEBUG
         _slab_initialized = 1;
 #endif