Changeset ee454eb in mainline for kernel/arch/sparc64/src/proc

Timestamp:

2006-08-30T15:50:29Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

beb3926a

Parents:

e11ae91

Message:

sparc64 work.
More bits needed to reach the userspace milestone were added.
The preemptible_handler(), still a prototype, now contains all functionality it needs.
Some sanitation was added to functions expecting page-aligned pointers to
userspace window buffer.

Location:

kernel/arch/sparc64/src/proc

Files:

• scheduler.c (modified) (3 diffs)
• thread.c (modified) (3 diffs)

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

@@ -79 +79 @@
                  */
                 ASSERT(THREAD->arch.uspace_window_buffer);
-                uintptr_t uw_buf = (uintptr_t) THREAD->arch.uspace_window_buffer;
+                uintptr_t uw_buf = ALIGN_DOWN((uintptr_t) THREAD->arch.uspace_window_buffer, PAGE_SIZE);
                 if (!overlaps(uw_buf, PAGE_SIZE, base, 1<<KERNEL_PAGE_WIDTH)) {
                         /*
                          * The buffer is not covered by the 4M locked kernel DTLB entry.
                          */
-                        dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_NUCLEUS, (uintptr_t) uw_buf);
+                        dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_NUCLEUS, uw_buf);
                         dtlb_insert_mapping(uw_buf, KA2PA(uw_buf), PAGESIZE_8K, true, true);
                 }
@@ -127 +127 @@
                 flushw();       /* force all userspace windows into memory */
                 
-                uintptr_t uw_buf = (uintptr_t) THREAD->arch.uspace_window_buffer;
+                uintptr_t uw_buf = ALIGN_DOWN((uintptr_t) THREAD->arch.uspace_window_buffer, PAGE_SIZE);
                 if (!overlaps(uw_buf, PAGE_SIZE, base, 1<<KERNEL_PAGE_WIDTH)) {
                         /*
@@ -134 +134 @@
                          * Demap it.
                          */
-                        dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_NUCLEUS, (uintptr_t) uw_buf);
+                        dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_NUCLEUS, uw_buf);
                 }
         

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

@@ -36 +36 @@
 #include <arch/proc/thread.h>
 #include <mm/frame.h>
+#include <mm/page.h>
+#include <arch/mm/page.h>
+#include <align.h>
 
 void thr_constructor_arch(thread_t *t)
@@ -47 +50 @@
 void thr_destructor_arch(thread_t *t)
 {
-        if (t->arch.uspace_window_buffer)
-                frame_free((uintptr_t) t->arch.uspace_window_buffer);
+        if (t->arch.uspace_window_buffer) {
+                /*
+                 * Mind the possible alignment of the userspace window buffer
+                 * belonging to a killed thread.
+                 */
+                frame_free(ALIGN_DOWN((uintptr_t) t->arch.uspace_window_buffer, PAGE_SIZE));
+        }
 }
 
@@ -59 +67 @@
                  */
                 t->arch.uspace_window_buffer = frame_alloc(ONE_FRAME, 0);
+        } else {
+                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.
+                 */
+                 t->arch.uspace_window_buffer = (uint8_t *) ALIGN_DOWN(uw_buf, PAGE_SIZE);
         }
 }