Changeset efdfebc in mainline for kernel/generic/src/mm/as.c

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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 mainline changes.

File:

• kernel/generic/src/mm/as.c (modified) (14 diffs)

kernel/generic/src/mm/as.c

@@ -285 +285 @@
 /** Check area conflicts with other areas.
  *
- * @param as    Address space.
- * @param addr  Starting virtual address of the area being tested.
- * @param count Number of pages in the area being tested.
- * @param avoid Do not touch this area.
+ * @param as      Address space.
+ * @param addr    Starting virtual address of the area being tested.
+ * @param count   Number of pages in the area being tested.
+ * @param guarded True if the area being tested is protected by guard pages.
+ * @param avoid   Do not touch this area.
  *
  * @return True if there is no conflict, false otherwise.
@@ -294 +295 @@
  */
 NO_TRACE static bool check_area_conflicts(as_t *as, uintptr_t addr,
-    size_t count, as_area_t *avoid)
+    size_t count, bool guarded, as_area_t *avoid)
 {
         ASSERT((addr % PAGE_SIZE) == 0);
         ASSERT(mutex_locked(&as->lock));
+
+        /*
+         * If the addition of the supposed area address and size overflows,
+         * report conflict.
+         */
+        if (overflows_into_positive(addr, P2SZ(count)))
+                return false;
         
         /*
@@ -304 +312 @@
         if (overlaps(addr, P2SZ(count), (uintptr_t) NULL, PAGE_SIZE))
                 return false;
-        
+
         /*
          * The leaf node is found in O(log n), where n is proportional to
@@ -328 +336 @@
                 if (area != avoid) {
                         mutex_lock(&area->lock);
-                        
+
+                        /*
+                         * If at least one of the two areas are protected
+                         * by the AS_AREA_GUARD flag then we must be sure
+                         * that they are separated by at least one unmapped
+                         * page.
+                         */
+                        int const gp = (guarded || 
+                            (area->flags & AS_AREA_GUARD)) ? 1 : 0;
+                        
+                        /*
+                         * The area comes from the left neighbour node, which
+                         * means that there already are some areas in the leaf
+                         * node, which in turn means that adding gp is safe and
+                         * will not cause an integer overflow.
+                         */
                         if (overlaps(addr, P2SZ(count), area->base,
+                            P2SZ(area->pages + gp))) {
+                                mutex_unlock(&area->lock);
+                                return false;
+                        }
+                        
+                        mutex_unlock(&area->lock);
+                }
+        }
+        
+        node = btree_leaf_node_right_neighbour(&as->as_area_btree, leaf);
+        if (node) {
+                area = (as_area_t *) node->value[0];
+                
+                if (area != avoid) {
+                        int gp;
+
+                        mutex_lock(&area->lock);
+
+                        gp = (guarded || (area->flags & AS_AREA_GUARD)) ? 1 : 0;
+                        if (gp && overflows(addr, P2SZ(count))) {
+                                /*
+                                 * Guard page not needed if the supposed area
+                                 * is adjacent to the end of the address space.
+                                 * We already know that the following test is
+                                 * going to fail...
+                                 */
+                                gp--;
+                        }
+                        
+                        if (overlaps(addr, P2SZ(count + gp), area->base,
                             P2SZ(area->pages))) {
                                 mutex_unlock(&area->lock);
@@ -339 +392 @@
         }
         
-        node = btree_leaf_node_right_neighbour(&as->as_area_btree, leaf);
-        if (node) {
-                area = (as_area_t *) node->value[0];
-                
-                if (area != avoid) {
-                        mutex_lock(&area->lock);
-                        
-                        if (overlaps(addr, P2SZ(count), area->base,
-                            P2SZ(area->pages))) {
-                                mutex_unlock(&area->lock);
-                                return false;
-                        }
-                        
-                        mutex_unlock(&area->lock);
-                }
-        }
-        
         /* Second, check the leaf node. */
         btree_key_t i;
         for (i = 0; i < leaf->keys; i++) {
                 area = (as_area_t *) leaf->value[i];
+                int agp;
+                int gp;
                 
                 if (area == avoid)
@@ -365 +403 @@
                 
                 mutex_lock(&area->lock);
-                
-                if (overlaps(addr, P2SZ(count), area->base,
-                    P2SZ(area->pages))) {
+
+                gp = (guarded || (area->flags & AS_AREA_GUARD)) ? 1 : 0;
+                agp = gp;
+
+                /*
+                 * Sanitize the two possible unsigned integer overflows.
+                 */
+                if (gp && overflows(addr, P2SZ(count)))
+                        gp--;
+                if (agp && overflows(area->base, P2SZ(area->pages)))
+                        agp--;
+
+                if (overlaps(addr, P2SZ(count + gp), area->base,
+                    P2SZ(area->pages + agp))) {
                         mutex_unlock(&area->lock);
                         return false;
@@ -392 +441 @@
  * this function.
  *
- * @param as    Address space.
- * @param bound Lowest address bound.
- * @param size  Requested size of the allocation.
+ * @param as      Address space.
+ * @param bound   Lowest address bound.
+ * @param size    Requested size of the allocation.
+ * @param guarded True if the allocation must be protected by guard pages.
  *
  * @return Address of the beginning of unmapped address space area.
@@ -401 +451 @@
  */
 NO_TRACE static uintptr_t as_get_unmapped_area(as_t *as, uintptr_t bound,
-    size_t size)
+    size_t size, bool guarded)
 {
         ASSERT(mutex_locked(&as->lock));
@@ -423 +473 @@
         /* First check the bound address itself */
         uintptr_t addr = ALIGN_UP(bound, PAGE_SIZE);
-        if ((addr >= bound) &&
-            (check_area_conflicts(as, addr, pages, NULL)))
-                return addr;
+        if (addr >= bound) {
+                if (guarded) {
+                        /* Leave an unmapped page between the lower
+                         * bound and the area's start address.
+                         */
+                        addr += P2SZ(1);
+                }
+
+                if (check_area_conflicts(as, addr, pages, guarded, NULL))
+                        return addr;
+        }
         
         /* Eventually check the addresses behind each area */
@@ -439 +497 @@
                         addr =
                             ALIGN_UP(area->base + P2SZ(area->pages), PAGE_SIZE);
+
+                        if (guarded || area->flags & AS_AREA_GUARD) {
+                                /* We must leave an unmapped page
+                                 * between the two areas.
+                                 */
+                                addr += P2SZ(1);
+                        }
+
                         bool avail =
                             ((addr >= bound) && (addr >= area->base) &&
-                            (check_area_conflicts(as, addr, pages, area)));
+                            (check_area_conflicts(as, addr, pages, guarded, area)));
                         
                         mutex_unlock(&area->lock);
@@ -481 +547 @@
         if (size == 0)
                 return NULL;
-        
+
         size_t pages = SIZE2FRAMES(size);
         
@@ -487 +553 @@
         if ((flags & AS_AREA_EXEC) && (flags & AS_AREA_WRITE))
                 return NULL;
+
+        bool const guarded = flags & AS_AREA_GUARD;
         
         mutex_lock(&as->lock);
         
         if (*base == (uintptr_t) -1) {
-                *base = as_get_unmapped_area(as, bound, size);
+                *base = as_get_unmapped_area(as, bound, size, guarded);
                 if (*base == (uintptr_t) -1) {
                         mutex_unlock(&as->lock);
@@ -497 +565 @@
                 }
         }
-        
-        if (!check_area_conflicts(as, *base, pages, NULL)) {
+
+        if (overflows_into_positive(*base, size))
+                return NULL;
+
+        if (!check_area_conflicts(as, *base, pages, guarded, NULL)) {
                 mutex_unlock(&as->lock);
                 return NULL;
@@ -776 +847 @@
                 /*
                  * Growing the area.
+                 */
+
+                if (overflows_into_positive(address, P2SZ(pages)))
+                        return EINVAL;
+
+                /*
                  * Check for overlaps with other address space areas.
                  */
-                if (!check_area_conflicts(as, address, pages, area)) {
+                bool const guarded = area->flags & AS_AREA_GUARD;
+                if (!check_area_conflicts(as, address, pages, guarded, area)) {
                         mutex_unlock(&area->lock);
                         mutex_unlock(&as->lock);