Changeset 8fe2c9bd in mainline for kernel/arch/mips32/src/mm/tlb.c

Timestamp:

2013-03-22T12:30:41Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

119b46e

Parents:

89f61be

Message:

Do not pass badvaddr but rather the page address in TLB exceptions.

The unaligned badvaddr was causing problems in connection with the
backend_phys and our mips32 PTE format. The combination resulted in
non-aligned frame addresses in the PTE. This showed, for example, when
loading some tasks from the RAM disk: tasks crashed due to wrongly
loaded sections.

File:

• kernel/arch/mips32/src/mm/tlb.c (modified) (8 diffs)

kernel/arch/mips32/src/mm/tlb.c

@@ -94 +94 @@
         entry_lo_t lo;
         uintptr_t badvaddr;
+        uintptr_t page;
         pte_t *pte;
         
         badvaddr = cp0_badvaddr_read();
-
-        pte = page_mapping_find(AS, badvaddr, true);
+        page = ALIGN_DOWN(badvaddr, PAGE_SIZE);
+
+        pte = page_mapping_find(AS, page, true);
         if (pte && pte->p) {
                 /*
@@ -123 +125 @@
         }
 
-        (void) as_page_fault(badvaddr, PF_ACCESS_READ, istate);
+        (void) as_page_fault(page, PF_ACCESS_READ, istate);
 }
 
@@ -135 +137 @@
         tlb_index_t index;
         uintptr_t badvaddr;
+        uintptr_t page;
         pte_t *pte;
 
@@ -158 +161 @@
 
         badvaddr = cp0_badvaddr_read();
-
-        pte = page_mapping_find(AS, badvaddr, true);
+        page = ALIGN_DOWN(badvaddr, PAGE_SIZE);
+
+        pte = page_mapping_find(AS, page, true);
         if (pte && pte->p) {
                 /*
@@ -185 +189 @@
         }
 
-        (void) as_page_fault(badvaddr, PF_ACCESS_READ, istate);
+        (void) as_page_fault(page, PF_ACCESS_READ, istate);
 }
 
@@ -197 +201 @@
         tlb_index_t index;
         uintptr_t badvaddr;
+        uintptr_t page;
         pte_t *pte;
 
         badvaddr = cp0_badvaddr_read();
+        page = ALIGN_DOWN(badvaddr, PAGE_SIZE);
 
         /*
@@ -221 +227 @@
         }
 
-        pte = page_mapping_find(AS, badvaddr, true);
+        pte = page_mapping_find(AS, page, true);
         if (pte && pte->p && pte->w) {
                 /*
@@ -248 +254 @@
         }
 
-        (void) as_page_fault(badvaddr, PF_ACCESS_WRITE, istate);
+        (void) as_page_fault(page, PF_ACCESS_WRITE, istate);
 }