Changes in kernel/generic/src/mm/backend_elf.c [32817cc:55b77d9] in mainline

File:

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

kernel/generic/src/mm/backend_elf.c

@@ -44 +44 @@
 #include <mm/page.h>
 #include <mm/reserve.h>
-#include <mm/km.h>
 #include <genarch/mm/page_pt.h>
 #include <genarch/mm/page_ht.h>
@@ -230 +229 @@
         elf_segment_header_t *entry = area->backend_data.segment;
         btree_node_t *leaf;
-        uintptr_t base;
-        uintptr_t frame;
-        uintptr_t kpage;
-        uintptr_t upage;
-        uintptr_t start_anon;
+        uintptr_t base, frame, page, start_anon;
         size_t i;
         bool dirty = false;
@@ -254 +249 @@
             (((void *) elf) + ALIGN_DOWN(entry->p_offset, PAGE_SIZE));
 
-        /* Virtual address of faulting page */
-        upage = ALIGN_DOWN(addr, PAGE_SIZE);
+        /* Virtual address of faulting page*/
+        page = ALIGN_DOWN(addr, PAGE_SIZE);
 
         /* Virtual address of the end of initialized part of segment */
@@ -269 +264 @@
                 mutex_lock(&area->sh_info->lock);
                 frame = (uintptr_t) btree_search(&area->sh_info->pagemap,
-                    upage - area->base, &leaf);
+                    page - area->base, &leaf);
                 if (!frame) {
                         unsigned int i;
@@ -278 +273 @@
 
                         for (i = 0; i < leaf->keys; i++) {
-                                if (leaf->key[i] == upage - area->base) {
+                                if (leaf->key[i] == page - area->base) {
                                         found = true;
                                         break;
@@ -286 +281 @@
                 if (frame || found) {
                         frame_reference_add(ADDR2PFN(frame));
-                        page_mapping_insert(AS, upage, frame,
+                        page_mapping_insert(AS, addr, frame,
                             as_area_get_flags(area));
-                        if (!used_space_insert(area, upage, 1))
+                        if (!used_space_insert(area, page, 1))
                                 panic("Cannot insert used space.");
                         mutex_unlock(&area->sh_info->lock);
@@ -299 +294 @@
          * mapping.
          */
-        if (upage >= entry->p_vaddr && upage + PAGE_SIZE <= start_anon) {
+        if (page >= entry->p_vaddr && page + PAGE_SIZE <= start_anon) {
                 /*
                  * Initialized portion of the segment. The memory is backed
@@ -309 +304 @@
                  */
                 if (entry->p_flags & PF_W) {
-                        kpage = km_temporary_page_get(&frame, FRAME_NO_RESERVE);
-                        memcpy((void *) kpage, (void *) (base + i * PAGE_SIZE),
-                            PAGE_SIZE);
+                        frame = (uintptr_t)frame_alloc_noreserve(ONE_FRAME, 0);
+                        memcpy((void *) PA2KA(frame),
+                            (void *) (base + i * FRAME_SIZE), FRAME_SIZE);
                         if (entry->p_flags & PF_X) {
-                                smc_coherence_block((void *) kpage, PAGE_SIZE);
+                                smc_coherence_block((void *) PA2KA(frame),
+                                    FRAME_SIZE);
                         }
-                        km_temporary_page_put(kpage);
                         dirty = true;
                 } else {
-                        pte_t *pte = page_mapping_find(AS_KERNEL,
-                            base + i * FRAME_SIZE, true);
-
-                        ASSERT(pte);
-                        ASSERT(PTE_PRESENT(pte));
-
-                        frame = PTE_GET_FRAME(pte);
+                        frame = KA2PA(base + i * FRAME_SIZE);
                 }       
-        } else if (upage >= start_anon) {
+        } else if (page >= start_anon) {
                 /*
                  * This is the uninitialized portion of the segment.
@@ -333 +322 @@
                  * and cleared.
                  */
-                kpage = km_temporary_page_get(&frame, FRAME_NO_RESERVE);
-                memsetb((void *) kpage, PAGE_SIZE, 0);
-                km_temporary_page_put(kpage);
+                frame = (uintptr_t) frame_alloc_noreserve(ONE_FRAME, 0);
+                memsetb((void *) PA2KA(frame), FRAME_SIZE, 0);
                 dirty = true;
         } else {
@@ -346 +334 @@
                  * (The segment can be and often is shorter than 1 page).
                  */
-                if (upage < entry->p_vaddr)
-                        pad_lo = entry->p_vaddr - upage;
+                if (page < entry->p_vaddr)
+                        pad_lo = entry->p_vaddr - page;
                 else
                         pad_lo = 0;
 
-                if (start_anon < upage + PAGE_SIZE)
-                        pad_hi = upage + PAGE_SIZE - start_anon;
+                if (start_anon < page + PAGE_SIZE)
+                        pad_hi = page + PAGE_SIZE - start_anon;
                 else
                         pad_hi = 0;
 
-                kpage = km_temporary_page_get(&frame, FRAME_NO_RESERVE);
-                memcpy((void *) (kpage + pad_lo),
-                    (void *) (base + i * PAGE_SIZE + pad_lo),
-                    PAGE_SIZE - pad_lo - pad_hi);
+                frame = (uintptr_t) frame_alloc_noreserve(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 *) (kpage + pad_lo), 
-                            PAGE_SIZE - pad_lo - pad_hi);
+                        smc_coherence_block((void *) (PA2KA(frame) + pad_lo), 
+                            FRAME_SIZE - pad_lo - pad_hi);
                 }
-                memsetb((void *) kpage, pad_lo, 0);
-                memsetb((void *) (kpage + PAGE_SIZE - pad_hi), pad_hi, 0);
-                km_temporary_page_put(kpage);
+                memsetb((void *) PA2KA(frame), pad_lo, 0);
+                memsetb((void *) (PA2KA(frame) + FRAME_SIZE - pad_hi), pad_hi,
+                    0);
                 dirty = true;
         }
@@ -372 +360 @@
         if (dirty && area->sh_info) {
                 frame_reference_add(ADDR2PFN(frame));
-                btree_insert(&area->sh_info->pagemap, upage - area->base,
+                btree_insert(&area->sh_info->pagemap, page - area->base,
                     (void *) frame, leaf);
         }
@@ -379 +367 @@
                 mutex_unlock(&area->sh_info->lock);
 
-        page_mapping_insert(AS, upage, frame, as_area_get_flags(area));
-        if (!used_space_insert(area, upage, 1))
+        page_mapping_insert(AS, addr, frame, as_area_get_flags(area));
+        if (!used_space_insert(area, page, 1))
                 panic("Cannot insert used space.");