Changeset de0af3a in mainline for kernel/generic/src/mm/backend_anon.c

Timestamp:

2018-12-03T18:29:53Z (5 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

0777a933, 7be8d4d

Parents:

a0765f6

git-author:

Jiri Svoboda <jiri@…> (2018-12-03 16:53:27)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2018-12-03 18:29:53)

Message:

Use ordered dictionary for pagemap instead of B+tree

At the same time we add a little bit more abstraction around the pagemap.

File:

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

kernel/generic/src/mm/backend_anon.c

@@ -144 +144 @@
                                 assert(PTE_PRESENT(&pte));
 
-                                btree_insert(&area->sh_info->pagemap,
+                                as_pagemap_insert(&area->sh_info->pagemap,
                                     (base + P2SZ(j)) - area->base,
-                                    (void *) PTE_GET_FRAME(&pte), NULL);
+                                    PTE_GET_FRAME(&pte));
                                 page_table_unlock(area->as, false);
 
@@ -201 +201 @@
         mutex_lock(&area->sh_info->lock);
         if (area->sh_info->shared) {
-                btree_node_t *leaf;
-
                 /*
                  * The area is shared, chances are that the mapping can be found
@@ -210 +208 @@
                  * mapping, a new frame is allocated and the mapping is created.
                  */
-                frame = (uintptr_t) btree_search(&area->sh_info->pagemap,
-                    upage - area->base, &leaf);
-                if (!frame) {
-                        bool allocate = true;
-                        unsigned int i;
+                errno_t rc = as_pagemap_find(&area->sh_info->pagemap,
+                    upage - area->base, &frame);
+                if (rc != EOK) {
+                        /* Need to allocate the frame */
+                        kpage = km_temporary_page_get(&frame,
+                            FRAME_NO_RESERVE);
+                        memsetb((void *) kpage, PAGE_SIZE, 0);
+                        km_temporary_page_put(kpage);
 
                         /*
-                         * Zero can be returned as a valid frame address.
-                         * Just a small workaround.
+                         * Insert the address of the newly allocated
+                         * frame to the pagemap.
                          */
-                        for (i = 0; i < leaf->keys; i++) {
-                                if (leaf->key[i] == upage - area->base) {
-                                        allocate = false;
-                                        break;
-                                }
-                        }
-                        if (allocate) {
-                                kpage = km_temporary_page_get(&frame,
-                                    FRAME_NO_RESERVE);
-                                memsetb((void *) kpage, PAGE_SIZE, 0);
-                                km_temporary_page_put(kpage);
-
-                                /*
-                                 * Insert the address of the newly allocated
-                                 * frame to the pagemap.
-                                 */
-                                btree_insert(&area->sh_info->pagemap,
-                                    upage - area->base, (void *) frame, leaf);
-                        }
+                        as_pagemap_insert(&area->sh_info->pagemap,
+                            upage - area->base, frame);
                 }
                 frame_reference_add(ADDR2PFN(frame));