Changeset f56e897f in mainline for kernel/arch/amd64/src/mm/page.c

Timestamp:

2010-06-29T17:43:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6473d41

Parents:

e4a4b44 (diff), 793cf029 (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 mainlnie changes.

File:

• kernel/arch/amd64/src/mm/page.c (modified) (4 diffs)

kernel/arch/amd64/src/mm/page.c

@@ -39 +39 @@
 #include <mm/frame.h>
 #include <mm/as.h>
-#include <arch/interrupt.h>
 #include <arch/asm.h>
 #include <config.h>
@@ -48 +47 @@
 #include <align.h>
 
-/* Definitions for identity page mapper */
-pte_t helper_ptl1[512] __attribute__((aligned (PAGE_SIZE)));
-pte_t helper_ptl2[512] __attribute__((aligned (PAGE_SIZE)));
-pte_t helper_ptl3[512] __attribute__((aligned (PAGE_SIZE)));
-extern pte_t ptl_0; /* From boot.S */
-
-#define PTL1_PRESENT(ptl0, page) (!(GET_PTL1_FLAGS_ARCH(ptl0, PTL0_INDEX_ARCH(page)) & PAGE_NOT_PRESENT))
-#define PTL2_PRESENT(ptl1, page) (!(GET_PTL2_FLAGS_ARCH(ptl1, PTL1_INDEX_ARCH(page)) & PAGE_NOT_PRESENT))
-#define PTL3_PRESENT(ptl2, page) (!(GET_PTL3_FLAGS_ARCH(ptl2, PTL2_INDEX_ARCH(page)) & PAGE_NOT_PRESENT))
-
-#define PTL1_ADDR(ptl0, page) ((pte_t *)PA2KA(GET_PTL1_ADDRESS_ARCH(ptl0, PTL0_INDEX_ARCH(page))))
-#define PTL2_ADDR(ptl1, page) ((pte_t *)PA2KA(GET_PTL2_ADDRESS_ARCH(ptl1, PTL1_INDEX_ARCH(page))))
-#define PTL3_ADDR(ptl2, page) ((pte_t *)PA2KA(GET_PTL3_ADDRESS_ARCH(ptl2, PTL2_INDEX_ARCH(page))))
-
-#define SETUP_PTL1(ptl0, page, tgt)  {  \
-        SET_PTL1_ADDRESS_ARCH(ptl0, PTL0_INDEX_ARCH(page), (uintptr_t)KA2PA(tgt)); \
-        SET_PTL1_FLAGS_ARCH(ptl0, PTL0_INDEX_ARCH(page), PAGE_WRITE | PAGE_EXEC); \
-    }
-#define SETUP_PTL2(ptl1, page, tgt)  {  \
-        SET_PTL2_ADDRESS_ARCH(ptl1, PTL1_INDEX_ARCH(page), (uintptr_t)KA2PA(tgt)); \
-        SET_PTL2_FLAGS_ARCH(ptl1, PTL1_INDEX_ARCH(page), PAGE_WRITE | PAGE_EXEC); \
-    }
-#define SETUP_PTL3(ptl2, page, tgt)  {  \
-        SET_PTL3_ADDRESS_ARCH(ptl2, PTL2_INDEX_ARCH(page), (uintptr_t)KA2PA(tgt)); \
-        SET_PTL3_FLAGS_ARCH(ptl2, PTL2_INDEX_ARCH(page), PAGE_WRITE | PAGE_EXEC); \
-    }
-#define SETUP_FRAME(ptl3, page, tgt)  { \
-        SET_FRAME_ADDRESS_ARCH(ptl3, PTL3_INDEX_ARCH(page), (uintptr_t)KA2PA(tgt)); \
-        SET_FRAME_FLAGS_ARCH(ptl3, PTL3_INDEX_ARCH(page), PAGE_WRITE | PAGE_EXEC); \
-    }
-
-
 void page_arch_init(void)
 {
-        uintptr_t cur;
-        unsigned int i;
-        int identity_flags = PAGE_CACHEABLE | PAGE_EXEC | PAGE_GLOBAL | PAGE_WRITE;
-
         if (config.cpu_active == 1) {
+                uintptr_t cur;
+                unsigned int identity_flags =
+                    PAGE_CACHEABLE | PAGE_EXEC | PAGE_GLOBAL | PAGE_WRITE;
+                
                 page_mapping_operations = &pt_mapping_operations;
-
+                
                 page_table_lock(AS_KERNEL, true);
-
+                
                 /*
                  * PA2KA(identity) mapping for all frames.
                  */
-                for (cur = 0; cur < last_frame; cur += FRAME_SIZE) {
-                        /* Standard identity mapping */
+                for (cur = 0; cur < last_frame; cur += FRAME_SIZE)
                         page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, identity_flags);
-                }
                 
-                /* Upper kernel mapping
-                 * - from zero to top of kernel (include bottom addresses
-                 *   because some are needed for init)
-                 */
-                for (cur = PA2KA_CODE(0); cur < config.base + config.kernel_size; cur += FRAME_SIZE)
-                        page_mapping_insert(AS_KERNEL, cur, KA2PA(cur), identity_flags);
+                page_table_unlock(AS_KERNEL, true);
                 
-                for (cur = config.stack_base; cur < config.stack_base + config.stack_size; cur += FRAME_SIZE)
-                        page_mapping_insert(AS_KERNEL, cur, KA2PA(cur), identity_flags);
-                
-                for (i = 0; i < init.cnt; i++) {
-                        for (cur = init.tasks[i].addr; cur < init.tasks[i].addr + init.tasks[i].size; cur += FRAME_SIZE)
-                                page_mapping_insert(AS_KERNEL, PA2KA_CODE(KA2PA(cur)), KA2PA(cur), identity_flags);
-                }
-
-                page_table_unlock(AS_KERNEL, true);
-
                 exc_register(14, "page_fault", true, (iroutine_t) page_fault);
                 write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
@@ -122 +72 @@
 }
 
-
-/** Identity page mapper
- *
- * We need to map whole physical memory identically before the page subsystem
- * is initializaed. This thing clears page table and fills in the specific
- * items.
- */
-void ident_page_fault(unsigned int n, istate_t *istate)
-{
-        uintptr_t page;
-        static uintptr_t oldpage = 0;
-        pte_t *aptl_1, *aptl_2, *aptl_3;
-
-        page = read_cr2();
-        if (oldpage) {
-                /* Unmap old address */
-                aptl_1 = PTL1_ADDR(&ptl_0, oldpage);
-                aptl_2 = PTL2_ADDR(aptl_1, oldpage);
-                aptl_3 = PTL3_ADDR(aptl_2, oldpage);
-
-                SET_FRAME_FLAGS_ARCH(aptl_3, PTL3_INDEX_ARCH(oldpage), PAGE_NOT_PRESENT);
-                if (KA2PA(aptl_3) == KA2PA(helper_ptl3))
-                        SET_PTL3_FLAGS_ARCH(aptl_2, PTL2_INDEX_ARCH(oldpage), PAGE_NOT_PRESENT);
-                if (KA2PA(aptl_2) == KA2PA(helper_ptl2))
-                        SET_PTL2_FLAGS_ARCH(aptl_1, PTL1_INDEX_ARCH(oldpage), PAGE_NOT_PRESENT);
-                if (KA2PA(aptl_1) == KA2PA(helper_ptl1))
-                        SET_PTL1_FLAGS_ARCH(&ptl_0, PTL0_INDEX_ARCH(oldpage), PAGE_NOT_PRESENT);
-        }
-        if (PTL1_PRESENT(&ptl_0, page))
-                aptl_1 = PTL1_ADDR(&ptl_0, page);
-        else {
-                SETUP_PTL1(&ptl_0, page, helper_ptl1);
-                aptl_1 = helper_ptl1;
-        }
-            
-        if (PTL2_PRESENT(aptl_1, page)) 
-                aptl_2 = PTL2_ADDR(aptl_1, page);
-        else {
-                SETUP_PTL2(aptl_1, page, helper_ptl2);
-                aptl_2 = helper_ptl2;
-        }
-
-        if (PTL3_PRESENT(aptl_2, page))
-                aptl_3 = PTL3_ADDR(aptl_2, page);
-        else {
-                SETUP_PTL3(aptl_2, page, helper_ptl3);
-                aptl_3 = helper_ptl3;
-        }
-        
-        SETUP_FRAME(aptl_3, page, page);
-
-        oldpage = page;
-}
-
-
 void page_fault(unsigned int n, istate_t *istate)
 {
-        uintptr_t page;
-        pf_access_t access;
-        
-        page = read_cr2();
+        uintptr_t page = read_cr2();
         
         if (istate->error_word & PFERR_CODE_RSVD)
                 panic("Reserved bit set in page table entry.");
+        
+        pf_access_t access;
         
         if (istate->error_word & PFERR_CODE_RW)
@@ -200 +94 @@
 }
 
-
 uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {
         if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
-                panic("Unable to map physical memory %p (%d bytes).", physaddr,
+                panic("Unable to map physical memory %p (%" PRIs " bytes).", physaddr,
                     size);
         
         uintptr_t virtaddr = PA2KA(last_frame);
         pfn_t i;
-
+        
         page_table_lock(AS_KERNEL, true);
+        
         for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)
                 page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i), physaddr + PFN2ADDR(i), PAGE_NOT_CACHEABLE | PAGE_WRITE);
+        
         page_table_unlock(AS_KERNEL, true);