Changeset 2057572 in mainline for uspace

Timestamp:

2007-03-27T23:40:25Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

399ece9

Parents:

8d37a06

Message:

The Ultimate Solution To Illegal Virtual Aliases.
It is better to avoid them completely than to fight them.
Switch the sparc64 port to 16K pages. The TLBs and TSBs
continue to operate with 8K pages only. Page tables and
other generic parts operate with 16K pages.

Because the MMU doesn't support 16K directly, each 16K
page is emulated by a pair of 8K pages. With 16K pages,
illegal aliases cannot be created in 16K D-cache.

Location:

uspace

Files:

• fb/ega.c (modified) (1 diff)
• fb/fb.c (modified) (2 diffs)
• fb/main.c (modified) (1 diff)
• klog/klog.c (modified) (1 diff)
• libc/arch/sparc64/_link.ld.in (modified) (3 diffs)
• libc/arch/sparc64/include/config.h (modified) (1 diff)
• libc/arch/sparc64/include/stack.h (modified) (1 diff)
• libc/generic/as.c (modified) (5 diffs)
• libc/generic/mman.c (modified) (1 diff)
• libc/generic/time.c (modified) (1 diff)
• libc/include/as.h (modified) (1 diff)
• ns/ns.c (modified) (3 diffs)
• rd/rd.c (modified) (1 diff)

uspace/fb/ega.c

@@ -316 +316 @@
 
         sz = scr_width * scr_height * 2;
-        scr_addr = as_get_mappable_page(sz, (int)
-                sysinfo_value("fb.address.color"));
+        scr_addr = as_get_mappable_page(sz);
 
         physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >>

uspace/fb/fb.c

@@ -756 +756 @@
                 /* We accept one area for data interchange */
                 if (IPC_GET_ARG1(*call) == shm_id) {
-                        void *dest = as_get_mappable_page(IPC_GET_ARG2(*call),
-                                PAGE_COLOR(IPC_GET_ARG1(*call)));
+                        void *dest = as_get_mappable_page(IPC_GET_ARG2(*call));
                         shm_size = IPC_GET_ARG2(*call);
                         if (!ipc_answer_fast(callid, 0, (sysarg_t) dest, 0)) 
@@ -1370 +1369 @@
 
         asz = fb_scanline * fb_height;
-        fb_addr = as_get_mappable_page(asz, (int)
-                sysinfo_value("fb.address.color"));
+        fb_addr = as_get_mappable_page(asz);
         
         physmem_map(fb_ph_addr, fb_addr, ALIGN_UP(asz, PAGE_SIZE) >>

uspace/fb/main.c

@@ -44 +44 @@
         void *dest;
 
-        dest = as_get_mappable_page(IPC_GET_ARG2(*call),
-                PAGE_COLOR(IPC_GET_ARG1(*call)));
+        dest = as_get_mappable_page(IPC_GET_ARG2(*call));
         if (ipc_answer_fast(callid, 0, (sysarg_t) dest, 0) == 0) {
                 if (*area)

uspace/klog/klog.c

@@ -63 +63 @@
         printf("Kernel console output.\n");
         
-        mapping = as_get_mappable_page(PAGE_SIZE, sysinfo_value("klog.fcolor"));
+        mapping = as_get_mappable_page(PAGE_SIZE);
         res = ipc_call_sync_3(PHONE_NS, IPC_M_AS_AREA_RECV, 
                               (sysarg_t) mapping, PAGE_SIZE, SERVICE_MEM_KLOG,

uspace/libc/arch/sparc64/_link.ld.in

@@ -8 +8 @@
 
 SECTIONS {
-        . = 0x2000;
+        . = 0x4000;
 
-        .init ALIGN(0x2000) : SUBALIGN(0x2000) {
+        .init ALIGN(0x4000) : SUBALIGN(0x4000) {
                 *(.init);
         } :text
@@ -18 +18 @@
         } :text
         
-        .got ALIGN(0x2000) : SUBALIGN(0x2000) {
+        .got ALIGN(0x4000) : SUBALIGN(0x4000) {
                  _gp = .;
                  *(.got*);
         } :data
-        .data ALIGN(0x2000) : SUBALIGN(0x2000) {
+        .data ALIGN(0x4000) : SUBALIGN(0x4000) {
                 *(.data);
                 *(.sdata);
@@ -42 +42 @@
         } :data
 
-        . = ALIGN(0x2000);
+        . = ALIGN(0x4000);
         _heap = .;
         

uspace/libc/arch/sparc64/include/config.h

@@ -36 +36 @@
 #define LIBC_sparc64_CONFIG_H_
 
-#define PAGE_WIDTH      13
-#define PAGE_SIZE       (1<<PAGE_WIDTH)
-#define PAGE_COLOR_BITS 1               /**< Bit 13 is the page color. */
+#define PAGE_WIDTH      14
+#define PAGE_SIZE       (1 << PAGE_WIDTH)
+#define PAGE_COLOR_BITS 0               /**< Only one page color. */
 
 #endif

uspace/libc/arch/sparc64/include/stack.h

@@ -44 +44 @@
  * 16-extended-word save area for %i[0-7] and %l[0-7] registers.
  */
-#define STACK_WINDOW_SAVE_AREA_SIZE     (16*STACK_ITEM_SIZE)
+#define STACK_WINDOW_SAVE_AREA_SIZE     (16 * STACK_ITEM_SIZE)
 
 /**

uspace/libc/generic/as.c

@@ -56 +56 @@
 {
         return (void *) __SYSCALL3(SYS_AS_AREA_CREATE, (sysarg_t ) address,
-                (sysarg_t) size, (sysarg_t) flags);
+            (sysarg_t) size, (sysarg_t) flags);
 }
 
@@ -70 +70 @@
 int as_area_resize(void *address, size_t size, int flags)
 {
-        return __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t ) address, (sysarg_t)
-                size, (sysarg_t) flags);
+        return __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t ) address,
+            (sysarg_t) size, (sysarg_t) flags);
 }
 
@@ -144 +144 @@
  *
  * @param sz Requested size of the allocation.
- * @param color Requested virtual color of the allocation.
  *
  * @return Pointer to the beginning 
@@ -151 +150 @@
  *       the pointer to last area
  */
-void *as_get_mappable_page(size_t sz, int color)
+void *as_get_mappable_page(size_t sz)
 {
         void *res;
@@ -167 +166 @@
         
         /*
-         * Make sure we allocate from naturally aligned address and a page of
-         * appropriate color.
+         * Make sure we allocate from naturally aligned address.
          */
         i = 0;
-        do {
-                if (!last_allocated) {
-                        last_allocated = (void *) ALIGN_UP((void *) &_heap +
-                                maxheapsize, asz);
-                } else {
-                        last_allocated = (void *) ALIGN_UP(((uintptr_t)
-                                last_allocated) + (int) (i > 0), asz);
-                }
-        } while ((asz < (1 << (PAGE_COLOR_BITS + PAGE_WIDTH))) &&
-                (PAGE_COLOR((uintptr_t) last_allocated) != color) &&
-                (++i < (1 << PAGE_COLOR_BITS)));
+        if (!last_allocated) {
+                last_allocated = (void *) ALIGN_UP((void *) &_heap +
+                    maxheapsize, asz);
+        } else {
+                last_allocated = (void *) ALIGN_UP(((uintptr_t)
+                    last_allocated) + (int) (i > 0), asz);
+        }
 
         res = last_allocated;

uspace/libc/generic/mman.c

@@ -37 +37 @@
 #include <unistd.h>
 
-void *mmap(void  *start, size_t length, int prot, int flags, int fd, off_t offset)
+void *mmap(void  *start, size_t length, int prot, int flags, int fd,
+    off_t offset)
 {
         if (!start)
-                start = as_get_mappable_page(length, 0);
+                start = as_get_mappable_page(length);
         
 //      if (! ((flags & MAP_SHARED) ^ (flags & MAP_PRIVATE)))

uspace/libc/generic/time.c

@@ -73 +73 @@
 
         if (!ktime) {
-                mapping = as_get_mappable_page(PAGE_SIZE, (int)
-                        sysinfo_value("clock.fcolor"));
+                mapping = as_get_mappable_page(PAGE_SIZE);
                 /* Get the mapping of kernel clock */
-                res = ipc_call_sync_3(PHONE_NS, IPC_M_AS_AREA_RECV, (sysarg_t)
-                        mapping, PAGE_SIZE, SERVICE_MEM_REALTIME, NULL, &rights,
-                        NULL);
+                res = ipc_call_sync_3(PHONE_NS, IPC_M_AS_AREA_RECV,
+                    (sysarg_t) mapping, PAGE_SIZE, SERVICE_MEM_REALTIME, NULL,
+                    &rights, NULL);
                 if (res) {
                         printf("Failed to initialize timeofday memarea\n");

uspace/libc/include/as.h

@@ -41 +41 @@
 #include <libarch/config.h>
 
-#define PAGE_COLOR(va)  (((va) >> PAGE_WIDTH) & ((1 << PAGE_COLOR_BITS) - 1))
-
 extern void *as_area_create(void *address, size_t size, int flags);
 extern int as_area_resize(void *address, size_t size, int flags);
 extern int as_area_destroy(void *address);
 extern void *set_maxheapsize(size_t mhs);
-extern void * as_get_mappable_page(size_t sz, int color);
+extern void * as_get_mappable_page(size_t sz);
 
 #endif

uspace/ns/ns.c

@@ -84 +84 @@
 static void *klogaddr = NULL;
 
-static void get_as_area(ipc_callid_t callid, ipc_call_t *call, char *name, char *colstr, void **addr)
+static void get_as_area(ipc_callid_t callid, ipc_call_t *call, char *name, void **addr)
 {
         void *ph_addr;
-        int ph_color;
 
         if (!*addr) {
@@ -95 +94 @@
                         return;
                 }
-                ph_color = (int) sysinfo_value(colstr);
-                *addr = as_get_mappable_page(PAGE_SIZE, ph_color);
+                *addr = as_get_mappable_page(PAGE_SIZE);
                 physmem_map(ph_addr, *addr, 1, AS_AREA_READ | AS_AREA_CACHEABLE);
         }
@@ -120 +118 @@
                         case SERVICE_MEM_REALTIME:
                                 get_as_area(callid, &call, "clock.faddr",
-                                        "clock.fcolor", &clockaddr);
+                                    &clockaddr);
                                 break;
                         case SERVICE_MEM_KLOG:
                                 get_as_area(callid, &call, "klog.faddr",
-                                        "klog.fcolor", &klogaddr);
+                                    &klogaddr);
                                 break;
                         default:

uspace/rd/rd.c

@@ -74 +74 @@
         size_t rd_size = sysinfo_value("rd.size");
         void * rd_ph_addr = (void *) sysinfo_value("rd.address.physical");
-        int rd_color = (int) sysinfo_value("rd.address.color");
         
         if (rd_size == 0)
                 return false;
         
-        void * rd_addr = as_get_mappable_page(rd_size, rd_color);
+        void * rd_addr = as_get_mappable_page(rd_size);
         
         physmem_map(rd_ph_addr, rd_addr, ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);