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

Timestamp:

2018-12-10T11:15:10Z (6 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

247fdea

Parents:

de9a18e

git-author:

Jiri Svoboda <jiri@…> (2018-12-05 18:39:06)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2018-12-10 11:15:10)

Message:

Replace B+tree with ordered dict. for used space

Replace the use of B+tree with ordered dictionary for used space,
adding a little bit more abstraction around used space tracking.
This allows performing TLB shootdown while shrinking an area
in a single sequence. A generic used_space_remove() is no longer
needed.

File:

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

kernel/generic/src/mm/backend_anon.c

@@ -48 +48 @@
 #include <synch/mutex.h>
 #include <adt/list.h>
-#include <adt/btree.h>
 #include <errno.h>
 #include <typedefs.h>
@@ -122 +121 @@
          */
         mutex_lock(&area->sh_info->lock);
-        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
-            node) {
-                unsigned int i;
-
-                for (i = 0; i < node->keys; i++) {
-                        uintptr_t base = node->key[i];
-                        size_t count = (size_t) node->value[i];
-                        unsigned int j;
-
-                        for (j = 0; j < count; j++) {
-                                pte_t pte;
-                                bool found;
-
-                                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));
-
-                                as_pagemap_insert(&area->sh_info->pagemap,
-                                    (base + P2SZ(j)) - area->base,
-                                    PTE_GET_FRAME(&pte));
-                                page_table_unlock(area->as, false);
-
-                                pfn_t pfn = ADDR2PFN(PTE_GET_FRAME(&pte));
-                                frame_reference_add(pfn);
-                        }
-
+        used_space_ival_t *ival = used_space_first(&area->used_space);
+        while (ival != NULL) {
+                uintptr_t base = ival->page;
+                size_t count = ival->count;
+                unsigned int j;
+
+                for (j = 0; j < count; j++) {
+                        pte_t pte;
+                        bool found;
+
+                        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));
+
+                        as_pagemap_insert(&area->sh_info->pagemap,
+                            (base + P2SZ(j)) - area->base, PTE_GET_FRAME(&pte));
+                        page_table_unlock(area->as, false);
+
+                        pfn_t pfn = ADDR2PFN(PTE_GET_FRAME(&pte));
+                        frame_reference_add(pfn);
                 }
+
+                ival = used_space_next(ival);
         }
         mutex_unlock(&area->sh_info->lock);
@@ -264 +259 @@
          */
         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.");