Changeset 992bbb97 in mainline

Timestamp:

2005-06-29T20:53:18Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ff9f858

Parents:

b60a22c

Message:

Start with generic 4-level page table interface.

Usual cleanup.

Files:

• arch/ia32/include/mm/page.h (modified) (2 diffs)
• doc/mm (added)
• include/mm/page.h (modified) (1 diff)
• src/Makefile.config (modified) (1 diff)
• test/fpu/fpu1/test.c (modified) (2 diffs)
• test/synch/rwlock5/test.c (modified) (1 diff)
• test/synch/semaphore1/test.c (modified) (1 diff)

arch/ia32/include/mm/page.h

@@ -38 +38 @@
 #define PA2KA(x)        ((x) + 0x80000000)
 
+/*
+ * Implementation of generic 4-level page table interface.
+ * IA-32 has 2-level page tables, so PTL1 and PTL2 are left out.
+ */
+#define PTL0_INDEX_ARCH(vaddr)  (((vaddr)>>22)&0x3ff)
+#define PTL1_INDEX_ARCH(vaddr)  0
+#define PTL2_INDEX_ARCH(vaddr)  0
+#define PTL3_INDEX_ARCH(vaddr)  (((vaddr)>>12)&0x3ff)
+
+#define GET_PTL1_ADDRESS_ARCH(ptl0, i)          ((pte_t *)((((pte_t *)(ptl0))[(i)].frame_address)<<12))
+#define GET_PTL2_ADDRESS_ARCH(ptl1, i)          (ptl1)
+#define GET_PTL3_ADDRESS_ARCH(ptl2, i)          (ptl2)
+#define GET_FRAME_ADDRESS_ARCH(ptl3, i)         ((__address)((((pte_t *)(ptl3))[(i)].frame_address)<<12))
+
+
 struct page_specifier {
         unsigned present : 1;
@@ -51 +66 @@
 } __attribute__ ((packed));
 
+typedef struct page_specifier   pte_t;
+
 extern void page_arch_init(void);
 

include/mm/page.h

@@ -47 +47 @@
 #define PAGE_EXEC               (1<<5)
 
+/*
+ * This is the generic 4-level page table interface.
+ * Architectures are supposed to implement *_ARCH macros.
+ */
+
+/*
+ * These macros process vaddr and extract those portions
+ * of it that function as indices to respective page tables.
+ */
+#define PTL0_INDEX(vaddr)               PTL0_INDEX_ARCH(vaddr)
+#define PTL1_INDEX(vaddr)               PTL1_INDEX_ARCH(vaddr)
+#define PTL2_INDEX(vaddr)               PTL2_INDEX_ARCH(vaddr)
+#define PTL3_INDEX(vaddr)               PTL3_INDEX_ARCH(vaddr)
+
+/*
+ * These macros traverse the 4-level tree of page tables,
+ * each descending by one level.
+ */
+#define GET_PTL1_ADDRESS(ptl0, i)       GET_PTL1_ADDRESS_ARCH(ptl0, i)
+#define GET_PTL2_ADDRESS(ptl1, i)       GET_PTL2_ADDRESS_ARCH(ptl1, i)
+#define GET_PTL3_ADDRESS(ptl2, i)       GET_PTL3_ADDRESS_ARCH(ptl2, i)
+#define GET_FRAME_ADDRESS(ptl3, i)      GET_FRAME_ADDRESS_ARCH(ptl3, i)
+
+/*
+ * These macros are provided to change shape of the 4-level
+ * tree of page tables on respective level.
+ */
+#define SET_PTL1_ADDRESS(ptl0, i, a)    SET_PTL1_ADDRESS_ARCH(ptl0, i, a)
+#define SET_PTL2_ADDRESS(ptl1, i, a)    SET_PTL2_ADDRESS_ARCH(ptl1, i, a)
+#define SET_PTL3_ADDRESS(ptl2, i, a)    SET_PTL3_ADDRESS_ARCH(ptl2, i, a)
+#define SET_FRAME_ADDRESS(ptl3, i, a)   SET_FRAME_ADDRESS_ARCH(ptl3, i, a)
+
+/*
+ * These macros are provided to set/clear various flags within the page tables.
+ */
+#define SET_PTL1_FLAGS(ptl0, i, x)      SET_PTL1_FLAGS_ARCH(ptl0, i, x)
+#define SET_PTL2_FLAGS(ptl1, i, x)      SET_PTL2_FLAGS_ARCH(ptl1, i, x)
+#define SET_PTL3_FLAGS(ptl2, i, x)      SET_PTL3_FLAGS_ARCH(ptl2, i, x)
+#define SET_FRAME_FLAGS(ptl3, i, x)     SET_FRAME_FLAGS_ARCH(ptl3, i, x)
+
+
 extern void page_init(void);
 extern void map_page_to_frame(__address page, __address frame, int flags, __address root);

src/Makefile.config

@@ -18 +18 @@
 
 # Uncomment if you want to compile in userspace support
-USERSPACE=__USERSPACE__
+#USERSPACE=__USERSPACE__
 
 # Uncomment if you want to run in the test mode
-TEST=__TEST__
+#TEST=__TEST__
 
 TEST_FILE=test.c

test/fpu/fpu1/test.c

@@ -70 +70 @@
         }
 
-        atomic_inc((int *) &threads_ok);
+        atomic_inc(&threads_ok);
 }
 
@@ -100 +100 @@
         }
 
-        atomic_inc((int *) &threads_ok);
+        atomic_inc(&threads_ok);
 }
 

test/synch/rwlock5/test.c

@@ -42 +42 @@
 
 static waitq_t can_start;
-static int items_read;
-static int items_written;
+static volatile int items_read;
+static volatile int items_written;
 
 static void writer(void *arg);

test/synch/semaphore1/test.c

@@ -43 +43 @@
 
 static waitq_t can_start;
-static int items_produced;
-static int items_consumed;
+static volatile int items_produced;
+static volatile int items_consumed;
 
 static void consumer(void *arg);