WebSVN – HelenOS – Path Comparison – / – /trunk/kernel/ Rev 4624 and /trunk/kernel/ Rev 4625

Ignore whitespace Rev 4624 → Rev 4625

/trunk/kernel/arch/ia64/include/mm/tlb.h
92,6 → 92,7
extern void data_dirty_bit_fault(uint64_t vector, istate_t *istate);
extern void instruction_access_bit_fault(uint64_t vector, istate_t *istate);
extern void data_access_bit_fault(uint64_t vector, istate_t *istate);
extern void data_access_rights_fault(uint64_t vector, istate_t *istate);
extern void page_not_present(uint64_t vector, istate_t *istate);

#endif

 /trunk/kernel/arch/ia64/src/ivt.S
 ,7 → 536,7
     HEAVYWEIGHT_HANDLER 0x5000 page_not_present
     HEAVYWEIGHT_HANDLER 0x5100
     HEAVYWEIGHT_HANDLER 0x5200
-    HEAVYWEIGHT_HANDLER 0x5300
+    HEAVYWEIGHT_HANDLER 0x5300 data_access_rights_fault
     HEAVYWEIGHT_HANDLER 0x5400 general_exception
     HEAVYWEIGHT_HANDLER 0x5500 disabled_fp_register
     HEAVYWEIGHT_HANDLER 0x5600

 /trunk/kernel/arch/ia64/src/mm/tlb.c
 ,6 → 710,37
     page_table_unlock(AS, true);
 }
+/** Data access rights fault handler.
+ *
+ * @param vector Interruption vector.
+ * @param istate Structure with saved interruption state.
+ */
+void data_access_rights_fault(uint64_t vector, istate_t *istate)
+{
+    region_register rr;
+    rid_t rid;
+    uintptr_t va;
+    pte_t *t;
+    va = istate->cr_ifa;    /* faulting address */
+    rr.word = rr_read(VA2VRN(va));
+    rid = rr.map.rid;
+    /*
+     * Assume a write to a read-only page.
+     */
+    page_table_lock(AS, true);
+    t = page_mapping_find(AS, va);
+    ASSERT(t && t->p);
+    ASSERT(!t->w);
+    if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
+        fault_if_from_uspace(istate, "Page fault at %p.", va);
+        panic("%s: va=%p, rid=%d, iip=%p.", __func__, va, rid,
+            istate->cr_iip);
+    }
+    page_table_unlock(AS, true);
+}
 /** Page not present fault handler.
  *
  * @param vector Interruption vector.