Changeset de0af3a in mainline for kernel/generic/include/mm/as.h

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/include/mm/as.h (modified) (3 diffs)

kernel/generic/include/mm/as.h

@@ -137 +137 @@
 } as_operations_t;
 
+/** Single anonymous page mapping. */
+typedef struct {
+        /** Containing pagemap structure */
+        struct as_pagemap *pagemap;
+        /** Link to @c shinfo->pagemap ordered dictionary */
+        odlink_t lpagemap;
+        /** Virtual address */
+        uintptr_t vaddr;
+        /** Physical frame address */
+        uintptr_t frame;
+} as_page_mapping_t;
+
+/** Map of anonymous pages in a shared area. */
+typedef struct as_pagemap {
+        /**
+         * Dictionary ordered by virtual address. Members are of type
+         * as_page_mapping_t
+         */
+        odict_t map;
+} as_pagemap_t;
+
 /**
  * This structure contains information associated with the shared address space
@@ -150 +171 @@
         bool shared;
 
-        /**
-         * B+tree containing complete map of anonymous pages of the shared area.
-         */
-        btree_t pagemap;
+        /** Complete map of anonymous pages of the shared area. */
+        as_pagemap_t pagemap;
 
         /** Address space area backend. */
@@ -283 +302 @@
 extern as_area_t *as_area_next(as_area_t *);
 
+extern void as_pagemap_initialize(as_pagemap_t *);
+extern void as_pagemap_finalize(as_pagemap_t *);
+extern as_page_mapping_t *as_pagemap_first(as_pagemap_t *);
+extern as_page_mapping_t *as_pagemap_next(as_page_mapping_t *);
+extern errno_t as_pagemap_find(as_pagemap_t *, uintptr_t, uintptr_t *);
+extern void as_pagemap_insert(as_pagemap_t *, uintptr_t, uintptr_t);
+extern void as_pagemap_remove(as_page_mapping_t *);
+
 extern unsigned int as_area_get_flags(as_area_t *);
 extern bool as_area_check_access(as_area_t *, pf_access_t);