Changeset 59fb782 in mainline for kernel/arch/mips32/src/mm/tlb.c

Timestamp:

2013-03-24T19:38:18Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d965dc3

Parents:

119b46e

Message:

Unify the use of virtual addresses and virtual page addresses in mm code.

• as_page_fault() accepts faulting address (if available) and propagates the faulting page further along
• backends' page_fault() handlers assume page fault address
• page_mapping_create/destroy/find() accept addresses, but pass only page and frame addresses along
• as_area_create(), as_area_resize() now test whether the address is page-aligned
• renames of various variables to better fit their purpose (address vs. page)
• no need to align the addresses in mips32 TLB exception handlers now

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