Changeset d1e8440 in mainline

Timestamp:

2012-11-11T16:27:06Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6f5e213

Parents:

57355a40

Message:

Get rid of USTACK_ADDRESS.

• Let the kernel find a suitable address itself.
• Limit it to only one possibility using the bound argument of as_area_create().

Location:

kernel

Files:

• arch/ia64/include/mm/as.h (modified) (1 diff)
• generic/include/mm/as.h (modified) (1 diff)
• generic/src/proc/program.c (modified) (1 diff)

kernel/arch/ia64/include/mm/as.h

@@ -43 +43 @@
 #define USER_ADDRESS_SPACE_END_ARCH      UINT64_C(0xdfffffffffffffff)
 
-#define USTACK_ADDRESS_ARCH  UINT64_C(0x0000000ff0000000)
-
 typedef struct {
 } as_arch_t;

kernel/generic/include/mm/as.h

@@ -61 +61 @@
 #define USER_ADDRESS_SPACE_END      USER_ADDRESS_SPACE_END_ARCH
 
-#ifdef USTACK_ADDRESS_ARCH
-        #define USTACK_ADDRESS  USTACK_ADDRESS_ARCH
-#else
-        #define USTACK_ADDRESS  (USER_ADDRESS_SPACE_END - (STACK_SIZE - 1))
-#endif
-
 /** Kernel address space. */
 #define FLAG_AS_KERNEL  (1 << 0)

kernel/generic/src/proc/program.c

@@ -79 +79 @@
          * Create the stack address space area.
          */
-        uintptr_t virt = USTACK_ADDRESS;
+        uintptr_t virt = (uintptr_t) -1;
+        uintptr_t bound = USER_ADDRESS_SPACE_END - (STACK_SIZE_USER - 1);
+
+        /* Adjust bound to create space for the desired guard page. */
+        bound -= PAGE_SIZE;
+
         as_area_t *area = as_area_create(as,
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD |
             AS_AREA_LATE_RESERVE, STACK_SIZE_USER, AS_AREA_ATTR_NONE,
-            &anon_backend, NULL, &virt, 0);
+            &anon_backend, NULL, &virt, bound);
         if (!area) {
                 task_destroy(prg->task);