Changeset d364e94 in mainline

Timestamp:

2008-10-02T20:24:01Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1d132ae

Parents:

c2ad500

Message:

Do not allocate full page for the uspace window buffer.
Instead, allocate only the bare minimum to fit NWINDOWS - 1
uspace windows and to satisfy alignment requirements.

Location:

kernel/arch/sparc64

Files:

• include/trap/regwin.h (modified) (2 diffs)
• src/proc/thread.c (modified) (4 diffs)
• src/trap/trap_table.S (modified) (1 diff)

kernel/arch/sparc64/include/trap/regwin.h

@@ -40 +40 @@
 #include <arch/stack.h>
 #include <arch/arch.h>
+#include <align.h>
 
 #define TT_CLEAN_WINDOW                 0x24
@@ -72 +73 @@
 #define I6_OFFSET       112
 #define I7_OFFSET       120
+
+/* Uspace Window Buffer constants. */
+#define UWB_SIZE        ((NWINDOWS - 1) * STACK_WINDOW_SAVE_AREA_SIZE)
+#define UWB_ALIGNMENT   1024
+#define UWB_ASIZE       ALIGN_UP(UWB_SIZE, UWB_ALIGNMENT)
 
 #ifdef __ASM__

kernel/arch/sparc64/src/proc/thread.c

@@ -35 +35 @@
 #include <proc/thread.h>
 #include <arch/proc/thread.h>
-#include <mm/frame.h>
-#include <mm/page.h>
-#include <arch/mm/page.h>
+#include <mm/slab.h>
+#include <arch/trap/regwin.h>
 #include <align.h>
 
@@ -51 +50 @@
 {
         if (t->arch.uspace_window_buffer) {
+                uintptr_t uw_buf = (uintptr_t) t->arch.uspace_window_buffer;
                 /*
                  * Mind the possible alignment of the userspace window buffer
                  * belonging to a killed thread.
                  */
-                frame_free(KA2PA(ALIGN_DOWN((uintptr_t)
-                    t->arch.uspace_window_buffer, PAGE_SIZE)));
+                free((uint8_t *) ALIGN_DOWN(uw_buf, UWB_ALIGNMENT));
         }
 }
@@ -68 +67 @@
                  * returned from the slab allocator doesn't have any.
                  */
-                t->arch.uspace_window_buffer = frame_alloc(ONE_FRAME, FRAME_KA);
+                t->arch.uspace_window_buffer = malloc(UWB_ASIZE, 0);
         } else {
                 uintptr_t uw_buf = (uintptr_t) t->arch.uspace_window_buffer;
@@ -77 +76 @@
                  */
                 t->arch.uspace_window_buffer = (uint8_t *) ALIGN_DOWN(uw_buf,
-                    PAGE_SIZE);
+                    UWB_ASIZE);
         }
 }

kernel/arch/sparc64/src/trap/trap_table.S

@@ -749 +749 @@
          */
         clr %g4
-        set PAGE_SIZE - 1, %g5
-0:      andcc %g7, %g5, %g0                     ! PAGE_SIZE alignment check
-        bz 0f                                   ! %g7 is page-aligned, no more windows to refill
+0:      andcc %g7, UWB_ALIGNMENT - 1, %g0       ! alignment check
+        bz 0f                                   ! %g7 is UWB_ALIGNMENT-aligned, no more windows to refill
         nop