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

File:

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

kernel/generic/src/mm/backend_elf.c

@@ -75 +75 @@
         .page_fault = elf_page_fault,
         .frame_free = elf_frame_free,
-
-        .create_shared_data = NULL,
-        .destroy_shared_data = NULL
 };
 
@@ -184 +181 @@
                         
                         for (j = 0; j < count; j++) {
-                                pte_t pte;
-                                bool found;
+                                pte_t *pte;
                         
                                 /*
@@ -197 +193 @@
                                 
                                 page_table_lock(area->as, false);
-                                found = page_mapping_find(area->as,
-                                    base + P2SZ(j), false, &pte);
-
-                                ASSERT(found);
-                                ASSERT(PTE_VALID(&pte));
-                                ASSERT(PTE_PRESENT(&pte));
-
+                                pte = page_mapping_find(area->as,
+                                    base + P2SZ(j), false);
+                                ASSERT(pte && PTE_VALID(pte) &&
+                                    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);
                         }
@@ -281 +274 @@
         start_anon = entry->p_vaddr + entry->p_filesz;
 
-        mutex_lock(&area->sh_info->lock);
-        if (area->sh_info->shared) {
+        if (area->sh_info) {
                 bool found = false;
 
@@ -289 +281 @@
                  */
                 
+                mutex_lock(&area->sh_info->lock);
                 frame = (uintptr_t) btree_search(&area->sh_info->pagemap,
                     upage - area->base, &leaf);
@@ -339 +332 @@
                         dirty = true;
                 } else {
-                        pte_t pte;
-                        bool found;
-
-                        found = page_mapping_find(AS_KERNEL,
-                            base + i * FRAME_SIZE, true, &pte);
-
-                        ASSERT(found);
-                        ASSERT(PTE_PRESENT(&pte));
-
-                        frame = PTE_GET_FRAME(&pte);
+                        pte_t *pte = page_mapping_find(AS_KERNEL,
+                            base + i * FRAME_SIZE, true);
+
+                        ASSERT(pte);
+                        ASSERT(PTE_PRESENT(pte));
+
+                        frame = PTE_GET_FRAME(pte);
                 }       
         } else if (upage >= start_anon) {
@@ -394 +384 @@
         }
 
-        if (dirty && area->sh_info->shared) {
+        if (dirty && area->sh_info) {
                 frame_reference_add(ADDR2PFN(frame));
                 btree_insert(&area->sh_info->pagemap, upage - area->base,
@@ -400 +390 @@
         }
 
-        mutex_unlock(&area->sh_info->lock);
+        if (area->sh_info)
+                mutex_unlock(&area->sh_info->lock);
 
         page_mapping_insert(AS, upage, frame, as_area_get_flags(area));
@@ -438 +429 @@
                          * data.
                          */
-                        frame_free_noreserve(frame, 1);
+                        frame_free_noreserve(frame);
                 }
         } else {
@@ -446 +437 @@
                  * anonymous). In any case, a frame needs to be freed.
                  */
-                frame_free_noreserve(frame, 1);
+                frame_free_noreserve(frame);
         }
 }