WebSVN – HelenOS – Diff – /branches/dd/kernel/generic/src/mm/backend_elf.c

 #include <genarch/mm/page_ht.h>
 #include <align.h>
 #include <memstr.h>
 #include <macros.h>
 #include <arch.h>
+#include <arch/barrier.h>
 #ifdef CONFIG_VIRT_IDX_DCACHE
 #include <arch/mm/cache.h>
 #endif
 /** Service a page fault in the ELF backend address space area.
+ *
  * The address space area and page tables must be already locked.
+ *
- * @param area Pointer to the address space area.
+ * @param area      Pointer to the address space area.
- * @param addr Faulting virtual address.
+ * @param addr      Faulting virtual address.
- * @param access Access mode that caused the fault (i.e. read/write/exec).
+ * @param access    Access mode that caused the fault (i.e.
+ *          read/write/exec).
+ *
- * @return AS_PF_FAULT on failure (i.e. page fault) or AS_PF_OK on success (i.e.
+ * @return      AS_PF_FAULT on failure (i.e. page fault) or AS_PF_OK
- *     serviced).
+ *          on success (i.e. serviced).
  */
 int elf_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access)
+{
     elf_header_t *elf = area->backend_data.elf;
     elf_segment_header_t *entry = area->backend_data.segment;
             /*
              * Workaround for valid NULL address.
              */
             for (i = 0; i < leaf->keys; i++) {
-                if (leaf->key[i] == page) {
+                if (leaf->key[i] == page - area->base) {
                     found = true;
                     break;
+                }
+            }
+        }
         if (frame || found) {
             frame_reference_add(ADDR2PFN(frame));
             page_mapping_insert(AS, addr, frame,
                 as_area_get_flags(area));
             if (!used_space_insert(area, page, 1))
-                panic("Could not insert used space.\n");
+                panic("Cannot insert used space.");
             mutex_unlock(&area->sh_info->lock);
             return AS_PF_OK;
+        }
+    }
          */
         if (entry->p_flags & PF_W) {
             frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
             memcpy((void *) PA2KA(frame),
                 (void *) (base + i * FRAME_SIZE), FRAME_SIZE);
+            if (entry->p_flags & PF_X) {
+                smc_coherence_block((void *) PA2KA(frame),
+                    FRAME_SIZE);
+            }
             dirty = true;
         } else {
             frame = KA2PA(base + i * FRAME_SIZE);
+        }
     } else if (page >= start_anon) {
          * It is not physically present in the ELF image.
          * To resolve the situation, a frame must be allocated
          * and cleared.
          */
         frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
-        memsetb(PA2KA(frame), FRAME_SIZE, 0);
+        memsetb((void *) PA2KA(frame), FRAME_SIZE, 0);
         dirty = true;
     } else {
         size_t pad_lo, pad_hi;
         /*
          * The mixed case.
         frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
         memcpy((void *) (PA2KA(frame) + pad_lo),
             (void *) (base + i * FRAME_SIZE + pad_lo),
             FRAME_SIZE - pad_lo - pad_hi);
+        if (entry->p_flags & PF_X) {
+            smc_coherence_block((void *) (PA2KA(frame) + pad_lo),
+                FRAME_SIZE - pad_lo - pad_hi);
+        }
-        memsetb(PA2KA(frame), pad_lo, 0);
+        memsetb((void *) PA2KA(frame), pad_lo, 0);
-        memsetb(PA2KA(frame) + FRAME_SIZE - pad_hi, pad_hi, 0);
+        memsetb((void *) (PA2KA(frame) + FRAME_SIZE - pad_hi), pad_hi,
+);
         dirty = true;
+    }
     if (dirty && area->sh_info) {
         frame_reference_add(ADDR2PFN(frame));
     if (area->sh_info)
         mutex_unlock(&area->sh_info->lock);
     page_mapping_insert(AS, addr, frame, as_area_get_flags(area));
     if (!used_space_insert(area, page, 1))
-        panic("Could not insert used space.\n");
+        panic("Cannot insert used space.");
     return AS_PF_OK;
+}
 /** Free a frame that is backed by the ELF backend.
+ *
  * The address space area and page tables must be already locked.
+ *
- * @param area Pointer to the address space area.
+ * @param area      Pointer to the address space area.
- * @param page Page that is mapped to frame. Must be aligned to PAGE_SIZE.
+ * @param page      Page that is mapped to frame. Must be aligned to
+ *          PAGE_SIZE.
- * @param frame Frame to be released.
+ * @param frame     Frame to be released.
+ *
  */
 void elf_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame)
+{
     elf_header_t *elf = area->backend_data.elf;
  * Otherwise only portions of the area that are not backed by the ELF image
  * are put into the pagemap.
+ *
  * The address space and address space area must be locked prior to the call.
+ *
- * @param area Address space area.
+ * @param area      Address space area.
  */
 void elf_share(as_area_t *area)
+{
     elf_segment_header_t *entry = area->backend_data.segment;
     link_t *cur;

Subversion Repositories HelenOS

(root)/branches/dd/kernel/generic/src/mm/backend_elf.c – Rev 3022 → 4055