Changeset b4ca0a9c in mainline for kernel/genarch/src

Timestamp:

2012-07-10T11:53:50Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1e01a35

Parents:

a33706e (diff), 33fc3ae (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Location:

kernel/genarch/src

Files:

• kbrd/kbrd.c (modified) (1 diff)
• mm/as_ht.c (modified) (1 diff)
• mm/page_ht.c (modified) (2 diffs)
• mm/page_pt.c (modified) (7 diffs)
• srln/srln.c (modified) (1 diff)

kernel/genarch/src/kbrd/kbrd.c

@@ -158 +158 @@
             = malloc(sizeof(kbrd_instance_t), FRAME_ATOMIC);
         if (instance) {
-                instance->thread
-                        = thread_create(kkbrd, (void *) instance, TASK, 0, "kkbrd", false);
+                instance->thread = thread_create(kkbrd, (void *) instance,
+                    TASK, THREAD_FLAG_NONE, "kkbrd");
                 
                 if (!instance->thread) {

kernel/genarch/src/mm/as_ht.c

@@ -78 +78 @@
                 hash_table_create(&page_ht, PAGE_HT_ENTRIES, 2, &ht_operations);
                 mutex_initialize(&page_ht_lock, MUTEX_PASSIVE);
-                pte_cache = slab_cache_create("pte_cache", sizeof(pte_t), 0, NULL, NULL,
-                    SLAB_CACHE_MAGDEFERRED);
+                pte_cache = slab_cache_create("pte_t", sizeof(pte_t), 0,
+                    NULL, NULL, SLAB_CACHE_MAGDEFERRED);
         }
         

kernel/genarch/src/mm/page_ht.c

@@ -45 +45 @@
 #include <typedefs.h>
 #include <arch/asm.h>
+#include <arch/barrier.h>
 #include <synch/spinlock.h>
 #include <arch.h>
@@ -207 +208 @@
                 pte->page = ALIGN_DOWN(page, PAGE_SIZE);
                 pte->frame = ALIGN_DOWN(frame, FRAME_SIZE);
+
+                write_barrier();
                 
                 hash_table_insert(&page_ht, key, &pte->link);

kernel/genarch/src/mm/page_pt.c

@@ -43 +43 @@
 #include <arch/mm/page.h>
 #include <arch/mm/as.h>
+#include <arch/barrier.h>
 #include <typedefs.h>
 #include <arch/asm.h>
@@ -86 +87 @@
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
                 SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page),
-                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_NOT_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
                     PAGE_WRITE);
+                write_barrier();
+                SET_PTL1_PRESENT(ptl0, PTL0_INDEX(page));
         }
         
@@ -98 +101 @@
                 SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
                 SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page),
-                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_NOT_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
                     PAGE_WRITE);
+                write_barrier();
+                SET_PTL2_PRESENT(ptl1, PTL1_INDEX(page));       
         }
         
@@ -110 +115 @@
                 SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
                 SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page),
-                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_NOT_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
                     PAGE_WRITE);
+                write_barrier();
+                SET_PTL3_PRESENT(ptl2, PTL2_INDEX(page));
         }
         
@@ -117 +124 @@
         
         SET_FRAME_ADDRESS(ptl3, PTL3_INDEX(page), frame);
-        SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), flags);
+        SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), flags | PAGE_NOT_PRESENT);
+        write_barrier();
+        SET_FRAME_PRESENT(ptl3, PTL3_INDEX(page));
 }
 
@@ -279 +288 @@
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT)
                 return NULL;
+
+        read_barrier();
         
         pte_t *ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page)));
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT)
                 return NULL;
+
+#if (PTL1_ENTRIES != 0)
+        read_barrier();
+#endif
         
         pte_t *ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page)));
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT)
                 return NULL;
+
+#if (PTL2_ENTRIES != 0)
+        read_barrier();
+#endif
         
         pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page)));
@@ -346 +365 @@
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(addr), KA2PA(l1));
                 SET_PTL1_FLAGS(ptl0, PTL0_INDEX(addr),
-                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
-                    PAGE_WRITE);
+                    PAGE_PRESENT | PAGE_USER | PAGE_CACHEABLE |
+                    PAGE_EXEC | PAGE_WRITE | PAGE_READ);
         }
 }

kernel/genarch/src/srln/srln.c

@@ -130 +130 @@
             = malloc(sizeof(srln_instance_t), FRAME_ATOMIC);
         if (instance) {
-                instance->thread
-                        = thread_create(ksrln, (void *) instance, TASK, 0, "ksrln", false);
+                instance->thread = thread_create(ksrln, (void *) instance,
+                    TASK, THREAD_FLAG_NONE, "ksrln");
                 
                 if (!instance->thread) {