Changeset 20235a3 in mainline for kernel/generic

Timestamp:

2010-09-02T20:55:28Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0c39b96

Parents:

0c61955 (diff), 3249673 (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.

Location:

kernel/generic

Files:

• include/macros.h (modified) (2 diffs)
• src/main/main.c (modified) (2 diffs)
• src/mm/frame.c (modified) (6 diffs)

kernel/generic/include/macros.h

@@ -47 +47 @@
  * @param s2  Start address of the second interval.
  * @param sz2 Size of the second interval.
+ *
  */
-NO_TRACE static inline int overlaps(uintptr_t s1, size_t sz1, uintptr_t s2,
-    size_t sz2)
+NO_TRACE static inline int overlaps(uint64_t s1, uint64_t sz1, uint64_t s2,
+    uint64_t sz2)
 {
-        uintptr_t e1 = s1 + sz1;
-        uintptr_t e2 = s2 + sz2;
+        uint64_t e1 = s1 + sz1;
+        uint64_t e2 = s2 + sz2;
         
         return ((s1 < e2) && (s2 < e1));
+}
+
+/** Return true if the second interval is within the first interval.
+ *
+ * @param s1  Start address of the first interval.
+ * @param sz1 Size of the first interval.
+ * @param s2  Start address of the second interval.
+ * @param sz2 Size of the second interval.
+ *
+ */
+NO_TRACE static inline int iswithin(uint64_t s1, uint64_t sz1, uint64_t s2,
+    uint64_t sz2)
+{
+        uint64_t e1 = s1 + sz1;
+        uint64_t e2 = s2 + sz2;
+        
+        return ((s1 <= s2) && (e1 >= e2));
 }
 
@@ -74 +92 @@
 
 /* Compute overlapping of physical addresses */
-#define PA_overlaps(x, szx, y, szy) \
+#define PA_OVERLAPS(x, szx, y, szy) \
         overlaps(KA2PA((x)), (szx), KA2PA((y)), (szy))
 

kernel/generic/src/main/main.c

@@ -147 +147 @@
         size_t i;
         for (i = 0; i < init.cnt; i++) {
-                if (PA_overlaps(config.stack_base, config.stack_size,
+                if (PA_OVERLAPS(config.stack_base, config.stack_size,
                     init.tasks[i].addr, init.tasks[i].size))
                         config.stack_base = ALIGN_UP(init.tasks[i].addr +
@@ -155 +155 @@
         /* Avoid placing stack on top of boot allocations. */
         if (ballocs.size) {
-                if (PA_overlaps(config.stack_base, config.stack_size,
+                if (PA_OVERLAPS(config.stack_base, config.stack_size,
                     ballocs.base, ballocs.size))
                         config.stack_base = ALIGN_UP(ballocs.base +

kernel/generic/src/mm/frame.c

@@ -121 +121 @@
  *
  */
-NO_TRACE static size_t zones_insert_zone(pfn_t base, size_t count)
+NO_TRACE static size_t zones_insert_zone(pfn_t base, size_t count,
+    zone_flags_t flags)
 {
         if (zones.count + 1 == ZONES_MAX) {
@@ -131 +132 @@
         for (i = 0; i < zones.count; i++) {
                 /* Check for overlap */
-                if (overlaps(base, count,
-                    zones.info[i].base, zones.info[i].count)) {
-                        printf("Zone (%p, %p) overlaps with zone (%p, %p)!\n",
-                            PFN2ADDR(base), PFN2ADDR(base + count),
-                            PFN2ADDR(zones.info[i].base),
-                            PFN2ADDR(zones.info[i].base + zones.info[i].count));
+                if (overlaps(zones.info[i].base, zones.info[i].count,
+                    base, count)) {
+                        
+                        /*
+                         * If the overlaping zones are of the same type
+                         * and the new zone is completely within the previous
+                         * one, then quietly ignore the new zone.
+                         *
+                         */
+                        
+                        if ((zones.info[i].flags != flags) ||
+                            (!iswithin(zones.info[i].base, zones.info[i].count,
+                            base, count))) {
+                                printf("Zone (%p, %p) overlaps with previous zone (%p, %p)!\n",
+                                    PFN2ADDR(base), PFN2ADDR(count),
+                                    PFN2ADDR(zones.info[i].base),
+                                    PFN2ADDR(zones.info[i].count));
+                        }
+                        
                         return (size_t) -1;
                 }
@@ -147 +161 @@
         for (j = zones.count; j > i; j--) {
                 zones.info[j] = zones.info[j - 1];
-                zones.info[j].buddy_system->data =
-                    (void *) &zones.info[j - 1];
+                if (zones.info[j].buddy_system != NULL)
+                        zones.info[j].buddy_system->data =
+                            (void *) &zones.info[j];
         }
         
@@ -748 +763 @@
         for (i = z2 + 1; i < zones.count; i++) {
                 zones.info[i - 1] = zones.info[i];
-                zones.info[i - 1].buddy_system->data =
-                    (void *) &zones.info[i - 1];
+                if (zones.info[i - 1].buddy_system != NULL)
+                        zones.info[i - 1].buddy_system->data =
+                            (void *) &zones.info[i - 1];
         }
         
@@ -898 +914 @@
                 }
                 
-                size_t znum = zones_insert_zone(start, count);
+                size_t znum = zones_insert_zone(start, count, flags);
                 if (znum == (size_t) -1) {
                         irq_spinlock_unlock(&zones.lock, true);
@@ -921 +937 @@
         
         /* Non-available zone */
-        size_t znum = zones_insert_zone(start, count);
+        size_t znum = zones_insert_zone(start, count, flags);
         if (znum == (size_t) -1) {
                 irq_spinlock_unlock(&zones.lock, true);