Changeset ab936440 in mainline for kernel/generic/src/mm/backend_elf.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

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

kernel/generic/src/mm/backend_elf.c

@@ -153 +153 @@
 {
         elf_segment_header_t *entry = area->backend_data.segment;
-        link_t *cur;
-        btree_node_t *leaf, *node;
+        used_space_ival_t *start;
+        used_space_ival_t *cur;
         uintptr_t start_anon = entry->p_vaddr + entry->p_filesz;
 
@@ -164 +164 @@
          */
         if (area->flags & AS_AREA_WRITE) {
-                node = list_get_instance(list_first(&area->used_space.leaf_list),
-                    btree_node_t, leaf_link);
+                start = used_space_first(&area->used_space);
         } else {
-                (void) btree_search(&area->used_space, start_anon, &leaf);
-                node = btree_leaf_node_left_neighbour(&area->used_space, leaf);
-                if (!node)
-                        node = leaf;
+                /* Find first interval containing addresses >= start_anon */
+                start = used_space_find_gteq(&area->used_space, start_anon);
         }
 
@@ -177 +174 @@
          */
         mutex_lock(&area->sh_info->lock);
-        for (cur = &node->leaf_link; cur != &area->used_space.leaf_list.head;
-            cur = cur->next) {
+        cur = start;
+        while (cur != NULL) {
+                uintptr_t base = cur->page;
+                size_t count = cur->count;
                 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];
-                        size_t count = (size_t) node->value[i];
-                        unsigned int j;
+                /*
+                 * Skip read-only areas of used space that are backed
+                 * by the ELF image.
+                 */
+                if (!(area->flags & AS_AREA_WRITE))
+                        if (base >= entry->p_vaddr &&
+                            base + P2SZ(count) <= start_anon)
+                                continue;
+
+                for (i = 0; i < count; i++) {
+                        pte_t pte;
+                        bool found;
 
                         /*
-                         * Skip read-only areas of used space that are backed
-                         * by the ELF image.
+                         * Skip read-only pages that are backed by the
+                         * ELF image.
                          */
                         if (!(area->flags & AS_AREA_WRITE))
                                 if (base >= entry->p_vaddr &&
-                                    base + P2SZ(count) <= start_anon)
+                                    base + P2SZ(i + 1) <= start_anon)
                                         continue;
 
-                        for (j = 0; j < count; j++) {
-                                pte_t pte;
-                                bool found;
-
-                                /*
-                                 * Skip read-only pages that are backed by the
-                                 * ELF image.
-                                 */
-                                if (!(area->flags & AS_AREA_WRITE))
-                                        if (base >= entry->p_vaddr &&
-                                            base + P2SZ(j + 1) <= start_anon)
-                                                continue;
-
-                                page_table_lock(area->as, false);
-                                found = page_mapping_find(area->as,
-                                    base + P2SZ(j), false, &pte);
-
-                                (void) found;
-                                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);
-                                page_table_unlock(area->as, false);
-
-                                pfn_t pfn = ADDR2PFN(PTE_GET_FRAME(&pte));
-                                frame_reference_add(pfn);
-                        }
-
+                        page_table_lock(area->as, false);
+                        found = page_mapping_find(area->as,
+                            base + P2SZ(i), false, &pte);
+
+                        (void) found;
+                        assert(found);
+                        assert(PTE_VALID(&pte));
+                        assert(PTE_PRESENT(&pte));
+
+                        as_pagemap_insert(&area->sh_info->pagemap,
+                            (base + P2SZ(i)) - area->base,
+                            PTE_GET_FRAME(&pte));
+                        page_table_unlock(area->as, false);
+
+                        pfn_t pfn = ADDR2PFN(PTE_GET_FRAME(&pte));
+                        frame_reference_add(pfn);
                 }
-        }
+
+                cur = used_space_next(cur);
+        }
+
         mutex_unlock(&area->sh_info->lock);
 }
@@ -267 +260 @@
         elf_header_t *elf = area->backend_data.elf;
         elf_segment_header_t *entry = area->backend_data.segment;
-        btree_node_t *leaf;
         uintptr_t base;
         uintptr_t frame;
@@ -301 +293 @@
         mutex_lock(&area->sh_info->lock);
         if (area->sh_info->shared) {
-                bool found = false;
-
                 /*
                  * The address space area is shared.
                  */
 
-                frame = (uintptr_t) btree_search(&area->sh_info->pagemap,
-                    upage - area->base, &leaf);
-                if (!frame) {
-                        unsigned int i;
-
-                        /*
-                         * Workaround for valid NULL address.
-                         */
-
-                        for (i = 0; i < leaf->keys; i++) {
-                                if (leaf->key[i] == upage - area->base) {
-                                        found = true;
-                                        break;
-                                }
-                        }
-                }
-                if (frame || found) {
+                errno_t rc = as_pagemap_find(&area->sh_info->pagemap,
+                    upage - area->base, &frame);
+                if (rc == EOK) {
                         frame_reference_add(ADDR2PFN(frame));
                         page_mapping_insert(AS, upage, frame,
                             as_area_get_flags(area));
-                        if (!used_space_insert(area, upage, 1))
+                        if (!used_space_insert(&area->used_space, upage, 1))
                                 panic("Cannot insert used space.");
                         mutex_unlock(&area->sh_info->lock);
@@ -415 +391 @@
         if (dirty && area->sh_info->shared) {
                 frame_reference_add(ADDR2PFN(frame));
-                btree_insert(&area->sh_info->pagemap, upage - area->base,
-                    (void *) frame, leaf);
+                as_pagemap_insert(&area->sh_info->pagemap, upage - area->base,
+                    frame);
         }
 
@@ -422 +398 @@
 
         page_mapping_insert(AS, upage, frame, as_area_get_flags(area));
-        if (!used_space_insert(area, upage, 1))
+        if (!used_space_insert(&area->used_space, upage, 1))
                 panic("Cannot insert used space.");