Changeset f18d01b6 in mainline

Timestamp:

2013-09-11T18:09:18Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d5f774f6

Parents:

5759975a

Message:

allocate frames for the page tables on naturally aligned addresses

Location:

kernel/genarch

Files:

• include/genarch/mm/page_pt.h (modified) (1 diff)
• src/mm/as_pt.c (modified) (2 diffs)
• src/mm/page_pt.c (modified) (3 diffs)

kernel/genarch/include/genarch/mm/page_pt.h

@@ -63 +63 @@
 #define PTL2_FRAMES  PTL2_FRAMES_ARCH
 #define PTL3_FRAMES  PTL3_FRAMES_ARCH
+
+/* Table sizes in each level (in bytes) */
+#define PTL0_SIZE  FRAMES2SIZE(PTL0_FRAMES)
+#define PTL1_SIZE  FRAMES2SIZE(PTL1_FRAMES)
+#define PTL2_SIZE  FRAMES2SIZE(PTL2_FRAMES)
+#define PTL3_SIZE  FRAMES2SIZE(PTL3_FRAMES)
 
 /*

kernel/genarch/src/mm/as_pt.c

@@ -74 +74 @@
 {
         pte_t *dst_ptl0 = (pte_t *)
-            PA2KA(frame_alloc(PTL0_FRAMES, FRAME_LOWMEM, 0));
-        size_t table_size = FRAMES2SIZE(PTL0_FRAMES);
+            PA2KA(frame_alloc(PTL0_FRAMES, FRAME_LOWMEM, PTL0_SIZE - 1));
         
         if (flags & FLAG_AS_KERNEL)
-                memsetb(dst_ptl0, table_size, 0);
+                memsetb(dst_ptl0, PTL0_SIZE, 0);
         else {
                 /*
@@ -94 +93 @@
                     &dst_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
                 
-                memsetb(dst_ptl0, table_size, 0);
+                memsetb(dst_ptl0, PTL0_SIZE, 0);
                 memcpy((void *) dst, (void *) src,
-                    table_size - (src - (uintptr_t) src_ptl0));
+                    PTL0_SIZE - (src - (uintptr_t) src_ptl0));
                 
                 mutex_unlock(&AS_KERNEL->lock);

kernel/genarch/src/mm/page_pt.c

@@ -83 +83 @@
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
                 pte_t *newpt = (pte_t *)
-                    PA2KA(frame_alloc(PTL1_FRAMES, FRAME_LOWMEM, 0));
-                memsetb(newpt, FRAMES2SIZE(PTL1_FRAMES), 0);
+                    PA2KA(frame_alloc(PTL1_FRAMES, FRAME_LOWMEM, PTL1_SIZE - 1));
+                memsetb(newpt, PTL1_SIZE, 0);
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
                 SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page),
@@ -102 +102 @@
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
                 pte_t *newpt = (pte_t *)
-                    PA2KA(frame_alloc(PTL2_FRAMES, FRAME_LOWMEM, 0));
-                memsetb(newpt, FRAMES2SIZE(PTL2_FRAMES), 0);
+                    PA2KA(frame_alloc(PTL2_FRAMES, FRAME_LOWMEM, PTL2_SIZE - 1));
+                memsetb(newpt, PTL2_SIZE, 0);
                 SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
                 SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page),
@@ -119 +119 @@
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
                 pte_t *newpt = (pte_t *)
-                    PA2KA(frame_alloc(PTL3_FRAMES, FRAME_LOWMEM, 0));
-                memsetb(newpt, FRAMES2SIZE(PTL3_FRAMES), 0);
+                    PA2KA(frame_alloc(PTL3_FRAMES, FRAME_LOWMEM, PTL2_SIZE - 1));
+                memsetb(newpt, PTL2_SIZE, 0);
                 SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
                 SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page),