WebSVN – HelenOS – Diff – /branches/rcu/kernel/generic/src/mm/backend_anon.c

+ *
  * @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).
+ * @return AS_PF_FAULT on failure (i.e. page fault) or AS_PF_OK on success (i.e.
+ *     serviced).
  */
 int anon_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access)
+{
     uintptr_t frame;
+    bool dirty = false;
     if (!as_area_check_access(area, access))
         return AS_PF_FAULT;
     if (area->sh_info) {
         btree_node_t *leaf;
         /*
          * The area is shared, chances are that the mapping can be found
-         * in the pagemap of the address space area share info structure.
+         * in the pagemap of the address space area share info
+         * structure.
          * In the case that the pagemap does not contain the respective
          * mapping, a new frame is allocated and the mapping is created.
          */
         mutex_lock(&area->sh_info->lock);
         frame = (uintptr_t) btree_search(&area->sh_info->pagemap,
             ALIGN_DOWN(addr, PAGE_SIZE) - area->base, &leaf);
         if (!frame) {
             bool allocate = true;
             int i;
             /*
              * Zero can be returned as a valid frame address.
              * Just a small workaround.
              */
             for (i = 0; i < leaf->keys; i++) {
+                if (leaf->key[i] ==
-                if (leaf->key[i] == ALIGN_DOWN(addr, PAGE_SIZE)) {
+                    ALIGN_DOWN(addr, PAGE_SIZE)) {
                     allocate = false;
                     break;
+                }
+            }
             if (allocate) {
                 frame = (uintptr_t) frame_alloc(ONE_FRAME, 0);
                 memsetb(PA2KA(frame), FRAME_SIZE, 0);
+                dirty = true;
                 /*
-                 * Insert the address of the newly allocated frame to the pagemap.
+                 * Insert the address of the newly allocated
+                 * frame to the pagemap.
                  */
+                btree_insert(&area->sh_info->pagemap,
-                btree_insert(&area->sh_info->pagemap, ALIGN_DOWN(addr, PAGE_SIZE) - area->base, (void *) frame, leaf);
+                    ALIGN_DOWN(addr, PAGE_SIZE) - area->base,
+                    (void *) frame, leaf);
+            }
+        }
         frame_reference_add(ADDR2PFN(frame));
         mutex_unlock(&area->sh_info->lock);
     } else {
          *   do not forget to distinguish between
          *   the different causes
          */
         frame = (uintptr_t) frame_alloc(ONE_FRAME, 0);
         memsetb(PA2KA(frame), FRAME_SIZE, 0);
+        dirty = true;
+    }
     /*
      * Map 'page' to 'frame'.
-     * Note that TLB shootdown is not attempted as only new information is being
+     * Note that TLB shootdown is not attempted as only new information is
-     * inserted into page tables.
+     * being inserted into page tables.
      */
     page_mapping_insert(AS, addr, frame, as_area_get_flags(area));
     if (!used_space_insert(area, ALIGN_DOWN(addr, PAGE_SIZE), 1))
         panic("Could not insert used space.\n");
  * @param frame Frame to be released.
  */
 void anon_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame)
+{
     frame_free(frame);
-#ifdef CONFIG_VIRT_IDX_DCACHE
-    dcache_flush_frame(page, frame);
-#endif
+}
 /** Share the anonymous address space area.
+ *
  * Sharing of anonymous area is done by duplicating its entire mapping
     /*
      * Copy used portions of the area to sh_info's page map.
      */
     mutex_lock(&area->sh_info->lock);
+    for (cur = area->used_space.leaf_head.next;
-    for (cur = area->used_space.leaf_head.next; cur != &area->used_space.leaf_head; cur = cur->next) {
+        cur != &area->used_space.leaf_head; cur = cur->next) {
         btree_node_t *node;
         int i;
         node = list_get_instance(cur, btree_node_t, leaf_link);
         for (i = 0; i < node->keys; i++) {
             for (j = 0; j < count; j++) {
                 pte_t *pte;
                 page_table_lock(area->as, false);
-                pte = page_mapping_find(area->as, base + j*PAGE_SIZE);
+                pte = page_mapping_find(area->as,
+                    base + j * PAGE_SIZE);
-                ASSERT(pte && PTE_VALID(pte) && PTE_PRESENT(pte));
+                ASSERT(pte && PTE_VALID(pte) &&
+                    PTE_PRESENT(pte));
-                btree_insert(&area->sh_info->pagemap, (base + j*PAGE_SIZE) - area->base,
+                btree_insert(&area->sh_info->pagemap,
+                    (base + j * PAGE_SIZE) - area->base,
                     (void *) PTE_GET_FRAME(pte), NULL);
                 page_table_unlock(area->as, false);
-                frame_reference_add(ADDR2PFN(PTE_GET_FRAME(pte)));
+                pfn_t pfn = ADDR2PFN(PTE_GET_FRAME(pte));
+                frame_reference_add(pfn);
+            }
+        }
+    }
     mutex_unlock(&area->sh_info->lock);
+}

Subversion Repositories HelenOS

(root)/branches/rcu/kernel/generic/src/mm/backend_anon.c – Rev 2131 → 2292