Changeset 32817cc in mainline for kernel/generic/src

Timestamp:

2012-01-25T22:59:35Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4dee0cb

Parents:

7943c43

Message:

Make the kernel ready for init tasks loaded to high memory.

Location:

kernel/generic/src

Files:

• lib/rd.c (modified) (1 diff)
• main/kinit.c (modified) (5 diffs)
• main/main.c (modified) (1 diff)
• mm/backend_elf.c (modified) (1 diff)
• mm/frame.c (modified) (2 diffs)

kernel/generic/src/lib/rd.c

@@ -54 +54 @@
 void init_rd(void *data, size_t size)
 {
-        uintptr_t base = KA2PA((uintptr_t) data);
+        uintptr_t base = (uintptr_t) data;
         ASSERT((base % FRAME_SIZE) == 0);
         

kernel/generic/src/main/kinit.c

@@ -57 +57 @@
 #include <mm/as.h>
 #include <mm/frame.h>
+#include <mm/km.h>
 #include <print.h>
 #include <memstr.h>
@@ -68 +69 @@
 #include <str.h>
 #include <sysinfo/stats.h>
+#include <align.h>
 
 #ifdef CONFIG_SMP
@@ -178 +180 @@
         
         for (i = 0; i < init.cnt; i++) {
-                if (init.tasks[i].addr % FRAME_SIZE) {
+                if (init.tasks[i].paddr % FRAME_SIZE) {
                         printf("init[%zu]: Address is not frame aligned\n", i);
                         programs[i].task = NULL;
@@ -199 +201 @@
                 str_cpy(namebuf + INIT_PREFIX_LEN,
                     TASK_NAME_BUFLEN - INIT_PREFIX_LEN, name);
-                
-                int rc = program_create_from_image((void *) init.tasks[i].addr,
-                    namebuf, &programs[i]);
+
+                /*
+                 * Create virtual memory mappings for init task images.
+                 */
+                size_t size = ALIGN_UP(init.tasks[i].size, PAGE_SIZE);
+                size_t offs;
+                uintptr_t page = km_page_alloc(size, PAGE_SIZE);
+                uintptr_t frame = init.tasks[i].paddr;
+
+                page_table_lock(AS_KERNEL, true);
+                for (offs = 0; offs < size; offs += PAGE_SIZE) {
+                        page_mapping_insert(AS_KERNEL, page + offs,
+                            frame + offs,
+                            PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE |
+                            PAGE_PRESENT);
+                }
+                page_table_unlock(AS_KERNEL, true);
+                
+                int rc = program_create_from_image((void *) page, namebuf,
+                    &programs[i]);
                 
                 if (rc == 0) {
@@ -224 +243 @@
                          * Assume the last task is the RAM disk.
                          */
-                        init_rd((void *) init.tasks[i].addr, init.tasks[i].size);
+                        init_rd((void *) frame, init.tasks[i].size);
                 } else
                         printf("init[%zu]: Init binary load failed (error %d)\n", i, rc);

kernel/generic/src/main/main.c

@@ -151 +151 @@
         size_t i;
         for (i = 0; i < init.cnt; i++) {
-                if (PA_OVERLAPS(config.stack_base, config.stack_size,
-                    init.tasks[i].addr, init.tasks[i].size))
-                        config.stack_base = ALIGN_UP(init.tasks[i].addr +
-                            init.tasks[i].size, config.stack_size);
+                if (overlaps(KA2PA(config.stack_base), config.stack_size,
+                    init.tasks[i].paddr, init.tasks[i].size)) {
+                        /*
+                         * The init task overlaps with the memory behind the
+                         * kernel image so it must be in low memory and we can
+                         * use PA2KA on the init task's physical address.
+                         */
+                        config.stack_base = ALIGN_UP(
+                            PA2KA(init.tasks[i].paddr) + init.tasks[i].size,
+                            config.stack_size);
+                }
         }
         

kernel/generic/src/mm/backend_elf.c

@@ -318 +318 @@
                         dirty = true;
                 } else {
-                        frame = KA2PA(base + i * FRAME_SIZE);
+                        pte_t *pte = page_mapping_find(AS_KERNEL,
+                            base + i * FRAME_SIZE, true);
+
+                        ASSERT(pte);
+                        ASSERT(PTE_PRESENT(pte));
+
+                        frame = PTE_GET_FRAME(pte);
                 }       
         } else if (upage >= start_anon) {

kernel/generic/src/mm/frame.c

@@ -924 +924 @@
                                 for (i = 0; i < init.cnt; i++)
                                         if (overlaps(addr, PFN2ADDR(confcount),
-                                            KA2PA(init.tasks[i].addr),
+                                            init.tasks[i].paddr,
                                             init.tasks[i].size)) {
                                                 overlap = true;
@@ -1251 +1251 @@
                 size_t i;
                 for (i = 0; i < init.cnt; i++) {
-                        pfn_t pfn = ADDR2PFN(KA2PA(init.tasks[i].addr));
+                        pfn_t pfn = ADDR2PFN(init.tasks[i].paddr);
                         frame_mark_unavailable(pfn,
                             SIZE2FRAMES(init.tasks[i].size));