Changeset 8b420fa in mainline

Timestamp:

2016-06-08T21:41:43Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

741b2fb1

Parents:

7510326

Message:

Make explicitly sure the userspace window buffer is properly aligned

Do not rely on the implementation of kernel malloc() to assure this.
Instead, create a dedicated slab cache with the proper alignment for
its objects and allocate UWB's from there.

Location:

kernel/arch/sparc64

Files:

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

kernel/arch/sparc64/include/arch/proc/thread.h

@@ -38 +38 @@
 #include <typedefs.h>
 #include <arch/arch.h>
+#include <mm/slab.h>
+
+extern slab_cache_t *uwb_cache;
 
 typedef struct {

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

@@ -77 +77 @@
 #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

@@ -39 +39 @@
 #include <align.h>
 
+slab_cache_t *uwb_cache = NULL;
+
 void thr_constructor_arch(thread_t *t)
 {
@@ -55 +57 @@
                  * belonging to a killed thread.
                  */
-                free((uint8_t *) ALIGN_DOWN(uw_buf, UWB_ALIGNMENT));
+                slab_free(uwb_cache, (uint8_t *) ALIGN_DOWN(uw_buf,
+                    UWB_ALIGNMENT));
         }
 }
@@ -67 +70 @@
                  * returned from the slab allocator doesn't have any.
                  */
-                t->arch.uspace_window_buffer = malloc(UWB_ASIZE, 0);
+                t->arch.uspace_window_buffer = slab_alloc(uwb_cache, 0);
         } else {
                 uintptr_t uw_buf = (uintptr_t) t->arch.uspace_window_buffer;
@@ -76 +79 @@
                  */
                 t->arch.uspace_window_buffer = (uint8_t *) ALIGN_DOWN(uw_buf,
-                    UWB_ASIZE);
+                    UWB_ALIGNMENT);
         }
 }

kernel/arch/sparc64/src/sparc64.c

@@ -35 +35 @@
 #include <arch.h>
 #include <arch/arch.h>
+#include <mm/slab.h>
+#include <config.h>
+#include <arch/proc/thread.h>
+#include <arch/trap/regwin.h>
+#include <debug.h>
 
 #define SPARC64_ARCH_OP(op)     ARCH_STRUCT_OP(sparc64_ops, op)
@@ -62 +67 @@
 {
         SPARC64_ARCH_OP(post_mm_init);
+
+        if (config.cpu_active == 1) {
+                STATIC_ASSERT(UWB_SIZE <= UWB_ALIGNMENT);
+                /* Create slab cache for the userspace window buffers */
+                uwb_cache = slab_cache_create("uwb_cache", UWB_SIZE,
+                    UWB_ALIGNMENT, NULL, NULL, SLAB_CACHE_MAGDEFERRED);
+        }
 }