Changeset 36e86862 in mainline

Timestamp:

2008-06-14T12:53:42Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

62cd66f

Parents:

b22304b

Message:

Maintain cache coherence when the ELF backend duplicates a frame from an
executable segment.

File:

• kernel/generic/src/mm/backend_elf.c (modified) (6 diffs)

kernel/generic/src/mm/backend_elf.c

@@ -49 +49 @@
 #include <macros.h>
 #include <arch.h>
+#include <arch/barrier.h>
 
 #ifdef CONFIG_VIRT_IDX_DCACHE
@@ -68 +69 @@
  * The address space area and page tables must be already locked.
  *
- * @param area Pointer to the address space area.
- * @param addr Faulting virtual address.
- * @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.
- *     serviced).
+ * @param area          Pointer to the address space area.
+ * @param addr          Faulting virtual address.
+ * @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. serviced).
  */
 int elf_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access)
@@ -151 +153 @@
                         memcpy((void *) PA2KA(frame),
                             (void *) (base + i * FRAME_SIZE), FRAME_SIZE);
+                        if (entry->p_flags & PF_X)
+                                smc_coherence_block(PA2KA(frame), FRAME_SIZE);
                         dirty = true;
                 } else {
@@ -188 +192 @@
                     (void *) (base + i * FRAME_SIZE + pad_lo),
                     FRAME_SIZE - pad_lo - pad_hi);
+                if (entry->p_flags & PF_X)
+                        smc_coherence_block(PA2KA(frame) + pad_lo, FRAME_SIZE -
+                            pad_lo - pad_hi);
                 memsetb((void *) PA2KA(frame), pad_lo, 0);
-                memsetb((void *) (PA2KA(frame) + FRAME_SIZE - pad_hi), pad_hi, 0);
+                memsetb((void *) (PA2KA(frame) + FRAME_SIZE - pad_hi), pad_hi,
+                    0);
                 dirty = true;
         }
@@ -213 +221 @@
  * The address space area and page tables must be already locked.
  *
- * @param area Pointer to the address space area.
- * @param page Page that is mapped to frame. Must be aligned to PAGE_SIZE.
- * @param frame Frame to be released.
+ * @param area          Pointer to the address space area.
+ * @param page          Page that is mapped to frame. Must be aligned to
+ *                      PAGE_SIZE.
+ * @param frame         Frame to be released.
  *
  */
@@ -258 +267 @@
  * 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)