Changeset e6c4b94 in mainline for kernel/generic/src/mm/frame.c

Timestamp:

2011-11-16T19:52:33Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fadb07a

Parents:

19c8030

Message:

Adjust matching of zone flags to suport low/high memory distinction.

• Make ZONE_AVAILABLE a non-zero bit.
• Remove zone_flags_available().
• Define portion of the zone flag bits that need to match exactly. The rest of the bits in the flags need not match exactly.
• Add FRAME_HIGHMEM and ZONE_HIGHMEM.

File:

• kernel/generic/src/mm/frame.c (modified) (16 diffs)

kernel/generic/src/mm/frame.c

@@ -240 +240 @@
 NO_TRACE static bool zone_can_alloc(zone_t *zone, uint8_t order)
 {
-        return (zone_flags_available(zone->flags)
-            && buddy_system_can_alloc(zone->buddy_system, order));
+        return ((zone->flags & ZONE_AVAILABLE) &&
+            buddy_system_can_alloc(zone->buddy_system, order));
 }
 
@@ -265 +265 @@
                  * Check whether the zone meets the search criteria.
                  */
-                if ((zones.info[i].flags & flags) == flags) {
+                if (ZONE_FLAGS_MATCH(zones.info[i].flags, flags)) {
                         /*
                          * Check if the zone has 2^order frames area available.
@@ -460 +460 @@
 NO_TRACE static pfn_t zone_frame_alloc(zone_t *zone, uint8_t order)
 {
-        ASSERT(zone_flags_available(zone->flags));
+        ASSERT(zone->flags & ZONE_AVAILABLE);
         
         /* Allocate frames from zone buddy system */
@@ -490 +490 @@
 NO_TRACE static size_t zone_frame_free(zone_t *zone, size_t frame_idx)
 {
-        ASSERT(zone_flags_available(zone->flags));
+        ASSERT(zone->flags & ZONE_AVAILABLE);
         
         frame_t *frame = &zone->frames[frame_idx];
@@ -518 +518 @@
 NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t frame_idx)
 {
-        ASSERT(zone_flags_available(zone->flags));
+        ASSERT(zone->flags & ZONE_AVAILABLE);
         
         frame_t *frame = zone_get_frame(zone, frame_idx);
@@ -549 +549 @@
     buddy_system_t *buddy)
 {
-        ASSERT(zone_flags_available(zones.info[z1].flags));
-        ASSERT(zone_flags_available(zones.info[z2].flags));
+        ASSERT(zones.info[z1].flags & ZONE_AVAILABLE);
+        ASSERT(zones.info[z2].flags & ZONE_AVAILABLE);
         ASSERT(zones.info[z1].flags == zones.info[z2].flags);
         ASSERT(zones.info[z1].base < zones.info[z2].base);
@@ -645 +645 @@
 NO_TRACE static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
 {
-        ASSERT(zone_flags_available(zones.info[znum].flags));
+        ASSERT(zones.info[znum].flags & ZONE_AVAILABLE);
         
         size_t cframes = SIZE2FRAMES(zone_conf_size(count));
@@ -681 +681 @@
     size_t count)
 {
-        ASSERT(zone_flags_available(zones.info[znum].flags));
+        ASSERT(zones.info[znum].flags & ZONE_AVAILABLE);
         ASSERT(frame_idx + count < zones.info[znum].count);
         
@@ -723 +723 @@
          * set of flags
          */
-        if ((z1 >= zones.count) || (z2 >= zones.count)
-            || (z2 - z1 != 1)
-            || (!zone_flags_available(zones.info[z1].flags))
-            || (!zone_flags_available(zones.info[z2].flags))
-            || (zones.info[z1].flags != zones.info[z2].flags)) {
+        if ((z1 >= zones.count) || (z2 >= zones.count) || (z2 - z1 != 1) ||
+            (zones.info[z1].flags != zones.info[z2].flags)) {
                 ret = false;
                 goto errout;
@@ -828 +825 @@
         zone->buddy_system = buddy;
         
-        if (zone_flags_available(flags)) {
+        if (flags & ZONE_AVAILABLE) {
                 /*
                  * Compute order for buddy system and initialize
@@ -897 +894 @@
         irq_spinlock_lock(&zones.lock, true);
         
-        if (zone_flags_available(flags)) {  /* Create available zone */
+        if (flags & ZONE_AVAILABLE) {  /* Create available zone */
                 /* Theoretically we could have NULL here, practically make sure
                  * nobody tries to do that. If some platform requires, remove
@@ -1303 +1300 @@
                 *total += (uint64_t) FRAMES2SIZE(zones.info[i].count);
                 
-                if (zone_flags_available(zones.info[i].flags)) {
+                if (zones.info[i].flags & ZONE_AVAILABLE) {
                         *busy += (uint64_t) FRAMES2SIZE(zones.info[i].busy_count);
                         *free += (uint64_t) FRAMES2SIZE(zones.info[i].free_count);
@@ -1354 +1351 @@
                 irq_spinlock_unlock(&zones.lock, true);
                 
-                bool available = zone_flags_available(flags);
+                bool available = ((flags & ZONE_AVAILABLE) != 0);
                 
                 printf("%-4zu", i);
@@ -1366 +1363 @@
 #endif
                 
-                printf(" %12zu %c%c%c      ", count,
-                    available ? 'A' : ' ',
-                    (flags & ZONE_RESERVED) ? 'R' : ' ',
-                    (flags & ZONE_FIRMWARE) ? 'F' : ' ');
+                printf(" %12zu %c%c%c%c%c    ", count,
+                    available ? 'A' : '-',
+                    (flags & ZONE_RESERVED) ? 'R' : '-',
+                    (flags & ZONE_FIRMWARE) ? 'F' : '-',
+                    (flags & ZONE_LOWMEM) ? 'L' : '-',
+                    (flags & ZONE_HIGHMEM) ? 'H' : '-');
                 
                 if (available)
@@ -1411 +1410 @@
         irq_spinlock_unlock(&zones.lock, true);
         
-        bool available = zone_flags_available(flags);
+        bool available = ((flags & ZONE_AVAILABLE) != 0);
         
         uint64_t size;
@@ -1421 +1420 @@
         printf("Zone size:         %zu frames (%" PRIu64 " %s)\n", count,
             size, size_suffix);
-        printf("Zone flags:        %c%c%c\n",
-            available ? 'A' : ' ',
-            (flags & ZONE_RESERVED) ? 'R' : ' ',
-            (flags & ZONE_FIRMWARE) ? 'F' : ' ');
+        printf("Zone flags:        %c%c%c%c%c\n",
+            available ? 'A' : '-',
+            (flags & ZONE_RESERVED) ? 'R' : '-',
+            (flags & ZONE_FIRMWARE) ? 'F' : '-',
+            (flags & ZONE_LOWMEM) ? 'L' : '-',
+            (flags & ZONE_HIGHMEM) ? 'H' : '-');
         
         if (available) {