Changeset eaeb056 in mainline for kernel/generic

Timestamp:

2011-05-22T20:05:26Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

34efa8a

Parents:

9ea8fdb4 (diff), 2bdf8313 (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.

Message:

Merge from lp:~jakub/helenos/mm.

Location:

kernel/generic

Files:

• include/mm/page.h (modified) (2 diffs)
• src/mm/as.c (modified) (4 diffs)
• src/mm/backend_anon.c (modified) (1 diff)
• src/mm/backend_elf.c (modified) (2 diffs)
• src/mm/page.c (modified) (4 diffs)
• src/synch/futex.c (modified) (2 diffs)

kernel/generic/include/mm/page.h

@@ -47 +47 @@
         void (* mapping_insert)(as_t *, uintptr_t, uintptr_t, unsigned int);
         void (* mapping_remove)(as_t *, uintptr_t);
-        pte_t *(* mapping_find)(as_t *, uintptr_t);
+        pte_t *(* mapping_find)(as_t *, uintptr_t, bool);
 } page_mapping_operations_t;
 
@@ -58 +58 @@
 extern void page_mapping_insert(as_t *, uintptr_t, uintptr_t, unsigned int);
 extern void page_mapping_remove(as_t *, uintptr_t);
-extern pte_t *page_mapping_find(as_t *, uintptr_t);
+extern pte_t *page_mapping_find(as_t *, uintptr_t, bool);
 extern pte_t *page_table_create(unsigned int);
 extern void page_table_destroy(pte_t *);

kernel/generic/src/mm/as.c

@@ -649 +649 @@
                                 for (; i < size; i++) {
                                         pte_t *pte = page_mapping_find(as,
-                                            ptr + P2SZ(i));
+                                            ptr + P2SZ(i), false);
                                         
                                         ASSERT(pte);
@@ -798 +798 @@
                         for (size = 0; size < (size_t) node->value[i]; size++) {
                                 pte_t *pte = page_mapping_find(as,
-                                     ptr + P2SZ(size));
+                                     ptr + P2SZ(size), false);
                                 
                                 ASSERT(pte);
@@ -1105 +1105 @@
                         for (size = 0; size < (size_t) node->value[i]; size++) {
                                 pte_t *pte = page_mapping_find(as,
-                                    ptr + P2SZ(size));
+                                    ptr + P2SZ(size), false);
                                 
                                 ASSERT(pte);
@@ -1241 +1241 @@
          */
         pte_t *pte;
-        if ((pte = page_mapping_find(AS, page))) {
+        if ((pte = page_mapping_find(AS, page, false))) {
                 if (PTE_PRESENT(pte)) {
                         if (((access == PF_ACCESS_READ) && PTE_READABLE(pte)) ||

kernel/generic/src/mm/backend_anon.c

@@ -122 +122 @@
                                 page_table_lock(area->as, false);
                                 pte = page_mapping_find(area->as,
-                                    base + j * PAGE_SIZE);
+                                    base + P2SZ(j), false);
                                 ASSERT(pte && PTE_VALID(pte) &&
                                     PTE_PRESENT(pte));
                                 btree_insert(&area->sh_info->pagemap,
-                                    (base + j * PAGE_SIZE) - area->base,
+                                    (base + P2SZ(j)) - area->base,
                                     (void *) PTE_GET_FRAME(pte), NULL);
                                 page_table_unlock(area->as, false);

kernel/generic/src/mm/backend_elf.c

@@ -170 +170 @@
                         if (!(area->flags & AS_AREA_WRITE))
                                 if (base >= entry->p_vaddr &&
-                                    base + count * PAGE_SIZE <= start_anon)
+                                    base + P2SZ(count) <= start_anon)
                                         continue;
                         
@@ -182 +182 @@
                                 if (!(area->flags & AS_AREA_WRITE))
                                         if (base >= entry->p_vaddr &&
-                                            base + (j + 1) * PAGE_SIZE <=
-                                            start_anon)
+                                            base + P2SZ(j + 1) <= start_anon)
                                                 continue;
                                 
                                 page_table_lock(area->as, false);
                                 pte = page_mapping_find(area->as,
-                                    base + j * PAGE_SIZE);
+                                    base + P2SZ(j), false);
                                 ASSERT(pte && PTE_VALID(pte) &&
                                     PTE_PRESENT(pte));
                                 btree_insert(&area->sh_info->pagemap,
-                                    (base + j * PAGE_SIZE) - area->base,
+                                    (base + P2SZ(j)) - area->base,
                                     (void *) PTE_GET_FRAME(pte), NULL);
                                 page_table_unlock(area->as, false);

kernel/generic/src/mm/page.c

@@ -108 +108 @@
  * using flags. Allocate and setup any missing page tables.
  *
- * @param as    Address space to wich page belongs.
+ * @param as    Address space to which page belongs.
  * @param page  Virtual address of the page to be mapped.
  * @param frame Physical address of memory frame to which the mapping is
@@ -135 +135 @@
  * this call visible.
  *
- * @param as   Address space to wich page belongs.
+ * @param as   Address space to which page belongs.
  * @param page Virtual address of the page to be demapped.
  *
@@ -152 +152 @@
 }
 
-/** Find mapping for virtual page
+/** Find mapping for virtual page.
  *
- * Find mapping for virtual page.
- *
- * @param as   Address space to wich page belongs.
- * @param page Virtual page.
+ * @param as     Address space to which page belongs.
+ * @param page   Virtual page.
+ * @param nolock True if the page tables need not be locked.
  *
  * @return NULL if there is no such mapping; requested mapping
@@ -163 +162 @@
  *
  */
-NO_TRACE pte_t *page_mapping_find(as_t *as, uintptr_t page)
+NO_TRACE pte_t *page_mapping_find(as_t *as, uintptr_t page, bool nolock)
 {
-        ASSERT(page_table_locked(as));
+        ASSERT(nolock || page_table_locked(as));
         
         ASSERT(page_mapping_operations);
         ASSERT(page_mapping_operations->mapping_find);
         
-        return page_mapping_operations->mapping_find(as, page);
+        return page_mapping_operations->mapping_find(as, page, nolock);
 }
 

kernel/generic/src/synch/futex.c

@@ -119 +119 @@
          */
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, ALIGN_DOWN(uaddr, PAGE_SIZE));
+        t = page_mapping_find(AS, ALIGN_DOWN(uaddr, PAGE_SIZE), false);
         if (!t || !PTE_VALID(t) || !PTE_PRESENT(t)) {
                 page_table_unlock(AS, true);
@@ -155 +155 @@
          */
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, ALIGN_DOWN(uaddr, PAGE_SIZE));
+        t = page_mapping_find(AS, ALIGN_DOWN(uaddr, PAGE_SIZE), false);
         if (!t || !PTE_VALID(t) || !PTE_PRESENT(t)) {
                 page_table_unlock(AS, true);