Changeset 5be1923 in mainline

Timestamp:

2006-03-14T12:11:28Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

d3e7ff4

Parents:

4bb4836d

Message:

Added simpler userspace starting.

Location:

generic

Files:

• include/mm/as.h (modified) (1 diff)
• include/proc/task.h (modified) (1 diff)
• src/lib/elf.c (modified) (1 diff)
• src/main/kinit.c (modified) (4 diffs)
• src/mm/as.c (modified) (1 diff)
• src/proc/task.c (modified) (4 diffs)

generic/include/mm/as.h

@@ -108 +108 @@
 extern int as_page_fault(__address page);
 extern void as_switch(as_t *old, as_t *new);
+extern void as_free(as_t *as);
 
 /* Interface to be implemented by architectures. */

generic/include/proc/task.h

@@ -50 +50 @@
 extern void task_init(void);
 extern task_t *task_create(as_t *as);
+extern task_t *task_run_program(void * program_addr);
 
 #endif

generic/src/lib/elf.c

@@ -186 +186 @@
                 return EE_UNSUPPORTED;
 
-        /*
-         * Copying the segment out is certainly necessary for segments with p_filesz < p_memsz
-         * because of the effect of .bss-like sections. For security reasons, it looks like a
-         * good idea to copy the segment anyway.
-         */
         segment_size = ALIGN_UP(max(entry->p_filesz, entry->p_memsz), PAGE_SIZE);
-        segment = malloc(segment_size, 0);
-        if (entry->p_filesz < entry->p_memsz)
+        if ((entry->p_flags & PF_W)) {
+                /* If writable, copy data (should be COW in the future) */
+                segment = malloc(segment_size, 0);
                 memsetb((__address) (segment + entry->p_filesz), segment_size - entry->p_filesz, 0);
-        memcpy(segment, (void *) (((__address) elf) + entry->p_offset), entry->p_filesz);
+                memcpy(segment, (void *) (((__address) elf) + entry->p_offset), entry->p_filesz);
+        } else /* Map identically original data */
+                segment = ((void *) elf) + entry->p_offset;
 
         a = as_area_create(as, type, SIZE2FRAMES(entry->p_memsz), entry->p_vaddr);

generic/src/main/kinit.c

@@ -28 +28 @@
 
 #include <main/kinit.h>
-#include <main/uinit.h>
 #include <config.h>
 #include <arch.h>
@@ -47 +46 @@
 #include <interrupt.h>
 #include <console/kconsole.h>
-#include <elf.h>
 #include <ipc/ns.h>
 
@@ -72 +70 @@
 {
         thread_t *t;
-        as_t *as;
-        as_area_t *a;
-        int rc;
-        task_t *u;
 
         interrupts_disable();
@@ -150 +144 @@
                 if (config.init_addr % FRAME_SIZE)
                         panic("config.init_addr is not frame aligned");
-                
-                as = as_create(0);
-                if (!as)
-                        panic("as_create\n");
 
-                rc = elf_load((elf_header_t *) config.init_addr, as);
-                if (rc != EE_OK) {
-                        printf("elf_load failed: %s\n", elf_error(rc));
-                } else {
-                        u = task_create(as);
-                        if (!u)
-                                panic("task_create\n");
-                        t = thread_create(uinit, (void *)((elf_header_t *) config.init_addr)->e_entry, u, THREAD_USER_STACK);
-                        if (!t)
-                                panic("thread_create\n");
-                
-                        /*
-                         * Create the data as_area.
-                         */
-                        a = as_area_create(as, AS_AREA_STACK, 1, USTACK_ADDRESS);
-                        if (!a)
-                                panic("as_area_create: stack\n");
-
-                        thread_ready(t);
+                if (!task_run_program((void *)config.init_addr)) {
+                        printf("Userspace not started.\n");
                 }
         }

generic/src/mm/as.c

@@ -104 +104 @@
 }
 
+/** Free Adress space */
+void as_free(as_t *as)
+{
+        ASSERT(as->refcount == 0);
+
+        /* TODO: free as_areas and other resources held by as */
+        /* TODO: free page table */
+        free(as);
+}
+
 /** Create address space area of common attributes.
  *

generic/src/proc/task.c

@@ -27 +27 @@
  */
 
+#include <main/uinit.h>
 #include <proc/thread.h>
 #include <proc/task.h>
@@ -39 +40 @@
 #include <ipc/ns.h>
 #include <memstr.h>
+
+#include <elf.h>
 
 SPINLOCK_INITIALIZE(tasks_lock);
@@ -60 +63 @@
  * @param as Task's address space.
  *
- * @return New task's structure on success, NULL on failure.
+ * @return New task's structure
  *
  */
@@ -89 +92 @@
 }
 
+/** Create new task with 1 thread and run it
+ *
+ * @return Task of the running program or NULL on error
+ */
+task_t * task_run_program(void *program_addr)
+{
+        as_t *as;
+        as_area_t *a;
+        int rc;
+        thread_t *t;
+        task_t *task;
+
+        as = as_create(0);
+
+        rc = elf_load((elf_header_t *) config.init_addr, as);
+        if (rc != EE_OK) {
+                as_free(as);
+                return NULL;
+        } 
+        
+        task = task_create(as);
+        t = thread_create(uinit, (void *)((elf_header_t *) config.init_addr)->e_entry, 
+                          task, THREAD_USER_STACK);
+        
+        /*
+         * Create the data as_area.
+         */
+        a = as_area_create(as, AS_AREA_STACK, 1, USTACK_ADDRESS);
+        
+        thread_ready(t);
+
+        return task;
+}