Changes in kernel/generic/src/mm/backend_anon.c [59fb782:38dc82d] in mainline

File:

• kernel/generic/src/mm/backend_anon.c (modified) (10 diffs)

kernel/generic/src/mm/backend_anon.c

@@ -76 +76 @@
         .page_fault = anon_page_fault,
         .frame_free = anon_frame_free,
+
+        .create_shared_data = NULL,
+        .destroy_shared_data = NULL
 };
 
@@ -118 +121 @@
          */
         mutex_lock(&area->sh_info->lock);
-        list_foreach(area->used_space.leaf_list, cur) {
-                btree_node_t *node;
+        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
+            node) {
                 unsigned int i;
                 
-                node = list_get_instance(cur, btree_node_t, leaf_link);
                 for (i = 0; i < node->keys; i++) {
                         uintptr_t base = node->key[i];
@@ -129 +131 @@
                         
                         for (j = 0; j < count; j++) {
-                                pte_t *pte;
+                                pte_t pte;
+                                bool found;
                         
                                 page_table_lock(area->as, false);
-                                pte = page_mapping_find(area->as,
-                                    base + P2SZ(j), false);
-                                ASSERT(pte && PTE_VALID(pte) &&
-                                    PTE_PRESENT(pte));
+                                found = page_mapping_find(area->as,
+                                    base + P2SZ(j), false, &pte);
+
+                                ASSERT(found);
+                                ASSERT(PTE_VALID(&pte));
+                                ASSERT(PTE_PRESENT(&pte));
+
                                 btree_insert(&area->sh_info->pagemap,
                                     (base + P2SZ(j)) - area->base,
-                                    (void *) PTE_GET_FRAME(pte), NULL);
+                                    (void *) PTE_GET_FRAME(&pte), NULL);
                                 page_table_unlock(area->as, false);
 
-                                pfn_t pfn = ADDR2PFN(PTE_GET_FRAME(pte));
+                                pfn_t pfn = ADDR2PFN(PTE_GET_FRAME(&pte));
                                 frame_reference_add(pfn);
                         }
@@ -191 +197 @@
                 return AS_PF_FAULT;
 
-        if (area->sh_info) {
+        mutex_lock(&area->sh_info->lock);
+        if (area->sh_info->shared) {
                 btree_node_t *leaf;
                 
@@ -201 +208 @@
                  * 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,
                     upage - area->base, &leaf);
@@ -233 +239 @@
                 }
                 frame_reference_add(ADDR2PFN(frame));
-                mutex_unlock(&area->sh_info->lock);
         } else {
 
@@ -255 +260 @@
                          * Reserve the memory for this page now.
                          */
-                        if (!reserve_try_alloc(1))
+                        if (!reserve_try_alloc(1)) {
+                                mutex_unlock(&area->sh_info->lock);
                                 return AS_PF_SILENT;
+                        }
                 }
 
@@ -263 +270 @@
                 km_temporary_page_put(kpage);
         }
+        mutex_unlock(&area->sh_info->lock);
         
         /*
@@ -295 +303 @@
                  * the normal unreserving frame_free().
                  */
-                frame_free(frame);
+                frame_free(frame, 1);
         } else {
                 /*
@@ -302 +310 @@
                  * manipulate the reserve or it would be given back twice.
                  */
-                frame_free_noreserve(frame);
+                frame_free_noreserve(frame, 1);
         }
 }