Changeset 2902e1bb in mainline for kernel/arch

Timestamp:

2012-06-13T13:17:46Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1d4024cf, 375e501

Parents:

faba839

Message:

add support for variable uspace stack size
create individual address space areas for stacks of additional threads (instead of allocating the stack from heap)
avoid memory leaks in program_create()

Location:

kernel/arch

Files:

• amd64/src/userspace.c (modified) (3 diffs)
• arm32/src/userspace.c (modified) (1 diff)
• ia32/src/userspace.c (modified) (2 diffs)
• ia64/src/ia64.c (modified) (1 diff)
• mips32/src/mips32.c (modified) (1 diff)
• mips64/src/mips64.c (modified) (1 diff)
• ppc32/src/ppc32.c (modified) (1 diff)
• sparc64/src/sun4u/sparc64.c (modified) (1 diff)
• sparc64/src/sun4v/sparc64.c (modified) (1 diff)

kernel/arch/amd64/src/userspace.c

@@ -55 +55 @@
         asm volatile (
                 "pushq %[udata_des]\n"
-                "pushq %[stack_size]\n"
+                "pushq %[stack_top]\n"
                 "pushq %[ipl]\n"
                 "pushq %[utext_des]\n"
@@ -65 +65 @@
                 "iretq\n"
                 :: [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-                   [stack_size] "r" (kernel_uarg->uspace_stack + STACK_SIZE),
+                   [stack_top] "r" ((uint8_t *) kernel_uarg->uspace_stack +
+                       kernel_uarg->uspace_stack_size),
                    [ipl] "r" (ipl),
                    [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),
@@ -74 +75 @@
         
         /* Unreachable */
-        while (1)
-                ;
+        while (1);
 }
 

kernel/arch/arm32/src/userspace.c

@@ -92 +92 @@
 
         /* set user stack */
-        ustate.sp = ((uint32_t)kernel_uarg->uspace_stack) + STACK_SIZE;
+        ustate.sp = ((uint32_t) kernel_uarg->uspace_stack) +
+            kernel_uarg->uspace_stack_size;
 
         /* set where uspace execution starts */

kernel/arch/ia32/src/userspace.c

@@ -63 +63 @@
                 
                 "pushl %[udata_des]\n"
-                "pushl %[stack_size]\n"
+                "pushl %[stack_top]\n"
                 "pushl %[ipl]\n"
                 "pushl %[utext_des]\n"
@@ -75 +75 @@
                 :
                 : [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-                  [stack_size] "r" ((uint8_t *) kernel_uarg->uspace_stack + STACK_SIZE),
+                  [stack_top] "r" ((uint8_t *) kernel_uarg->uspace_stack +
+                      kernel_uarg->uspace_stack_size),
                   [ipl] "r" (ipl),
                   [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),

kernel/arch/ia64/src/ia64.c

@@ -232 +232 @@
          *
          * When calculating stack addresses, mind the stack split between the
-         * memory stack and the RSE stack. Each occuppies STACK_SIZE / 2 bytes.
+         * memory stack and the RSE stack. Each occuppies
+         * uspace_stack_size / 2 bytes.
          */
         switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE / 2 -
+            ((uintptr_t) kernel_uarg->uspace_stack) +
+            kernel_uarg->uspace_stack_size / 2 -
             ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
-            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE / 2,
+            ((uintptr_t) kernel_uarg->uspace_stack) +
+            kernel_uarg->uspace_stack_size / 2,
             (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value);
-
-        while (1)
-                ;
+        
+        while (1);
 }
 

kernel/arch/mips32/src/mips32.c

@@ -211 +211 @@
             cp0_status_um_bit | cp0_status_ie_enabled_bit));
         cp0_epc_write((uintptr_t) kernel_uarg->uspace_entry);
-        userspace_asm(((uintptr_t) kernel_uarg->uspace_stack + STACK_SIZE),
+        userspace_asm(((uintptr_t) kernel_uarg->uspace_stack +
+            kernel_uarg->uspace_stack_size),
             (uintptr_t) kernel_uarg->uspace_uarg,
             (uintptr_t) kernel_uarg->uspace_entry);

kernel/arch/mips64/src/mips64.c

@@ -188 +188 @@
             cp0_status_um_bit | cp0_status_ie_enabled_bit));
         cp0_epc_write((uintptr_t) kernel_uarg->uspace_entry);
-        userspace_asm(((uintptr_t) kernel_uarg->uspace_stack + STACK_SIZE),
+        userspace_asm(((uintptr_t) kernel_uarg->uspace_stack +
+            kernel_uarg->uspace_stack_size),
             (uintptr_t) kernel_uarg->uspace_uarg,
             (uintptr_t) kernel_uarg->uspace_entry);

kernel/arch/ppc32/src/ppc32.c

@@ -269 +269 @@
 {
         userspace_asm((uintptr_t) kernel_uarg->uspace_uarg,
-            (uintptr_t) kernel_uarg->uspace_stack + STACK_SIZE - SP_DELTA,
+            (uintptr_t) kernel_uarg->uspace_stack +
+            kernel_uarg->uspace_stack_size - SP_DELTA,
             (uintptr_t) kernel_uarg->uspace_entry);
         

kernel/arch/sparc64/src/sun4u/sparc64.c

@@ -156 +156 @@
         (void) interrupts_disable();
         switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE
-            - (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
+            ((uintptr_t) kernel_uarg->uspace_stack) +
+            kernel_uarg->uspace_stack_size -
+            (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
             (uintptr_t) kernel_uarg->uspace_uarg);
-
-        for (;;)
-                ;
-        /* not reached */
+        
+        /* Not reached */
+        while (1);
 }
 

kernel/arch/sparc64/src/sun4v/sparc64.c

@@ -154 +154 @@
         (void) interrupts_disable();
         switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE
-            - (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
+            ((uintptr_t) kernel_uarg->uspace_stack) +
+            kernel_uarg->uspace_stack_size -
+            (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
             (uintptr_t) kernel_uarg->uspace_uarg);
-
-        for (;;)
-                ;
-        /* not reached */
+        
+        /* Not reached */
+        while (1);
 }