Changeset ab936440 in mainline for kernel/generic/include/mm

Timestamp:

2019-02-12T20:42:42Z (7 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/include/mm/as.h (modified) (5 diffs)

kernel/generic/include/mm/as.h

@@ -45 +45 @@
 #include <synch/mutex.h>
 #include <adt/list.h>
-#include <adt/btree.h>
 #include <adt/odict.h>
 #include <lib/elf.h>
@@ -137 +136 @@
 } 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;
+
+/** Used space interval */
+typedef struct {
+        /** Containing used_space structure */
+        struct used_space *used_space;
+        /** Link to @c used_space->ivals */
+        odlink_t lused_space;
+        /** First page address */
+        uintptr_t page;
+        /** Count of pages */
+        size_t count;
+} used_space_ival_t;
+
+/** Map of used space in an address space area */
+typedef struct used_space {
+        /**
+         * Dictionary of intervals by start address.
+         * Members are of type @c used_space_ival_t.
+         */
+        odict_t ivals;
+        /** Total number of used pages. */
+        size_t pages;
+} used_space_t;
+
 /**
  * This structure contains information associated with the shared address space
@@ -150 +193 @@
         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. */
@@ -221 +262 @@
         size_t pages;
 
-        /** Number of resident pages in the area. */
-        size_t resident;
-
         /** Base address of this area. */
         uintptr_t base;
 
         /** Map of used space. */
-        btree_t used_space;
+        used_space_t used_space;
 
         /**
@@ -283 +321 @@
 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);
 extern size_t as_area_get_size(uintptr_t);
-extern bool used_space_insert(as_area_t *, uintptr_t, size_t);
-extern bool used_space_remove(as_area_t *, uintptr_t, size_t);
+extern used_space_ival_t *used_space_first(used_space_t *);
+extern used_space_ival_t *used_space_next(used_space_ival_t *);
+extern used_space_ival_t *used_space_find_gteq(used_space_t *, uintptr_t);
+extern bool used_space_insert(used_space_t *, uintptr_t, size_t);
 
 /* Interface to be implemented by architectures. */