Changeset dd0c8a0 in mainline for kernel/generic/src

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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/src

Files:

• adt/bitmap.c (modified) (4 diffs)
• adt/btree.c (modified) (1 diff)
• adt/hash_table.c (modified) (2 diffs)
• adt/list.c (modified) (1 diff)
• console/cmd.c (modified) (3 diffs)
• console/console.c (modified) (2 diffs)
• console/kconsole.c (modified) (3 diffs)
• cpu/cpu.c (modified) (1 diff)
• ddi/ddi.c (modified) (4 diffs)
• debug/panic.c (modified) (1 diff)
• debug/stacktrace.c (modified) (2 diffs)
• ipc/ipc.c (modified) (1 diff)
• ipc/ipcrsc.c (modified) (1 diff)
• lib/ra.c (modified) (2 diffs)
• main/main.c (modified) (1 diff)
• mm/as.c (modified) (9 diffs)
• mm/backend_anon.c (modified) (3 diffs)
• mm/backend_elf.c (modified) (2 diffs)
• mm/buddy.c (deleted)
• mm/frame.c (modified) (55 diffs)
• mm/km.c (modified) (1 diff)
• mm/page.c (modified) (3 diffs)
• mm/slab.c (modified) (12 diffs)
• proc/scheduler.c (modified) (1 diff)
• proc/task.c (modified) (2 diffs)
• proc/thread.c (modified) (3 diffs)
• synch/futex.c (modified) (1 diff)
• sysinfo/stats.c (modified) (2 diffs)
• time/clock.c (modified) (2 diffs)
• udebug/udebug.c (modified) (1 diff)
• udebug/udebug_ops.c (modified) (2 diffs)

kernel/generic/src/adt/bitmap.c

@@ -35 +35 @@
  *
  * This file implements bitmap ADT and provides functions for
- * setting and clearing ranges of bits.
+ * setting and clearing ranges of bits and for finding ranges
+ * of unset bits.
  */
 
@@ -44 +45 @@
 #include <macros.h>
 
-#define ALL_ONES        0xff
-#define ALL_ZEROES      0x00
+#define ALL_ONES    0xff
+#define ALL_ZEROES  0x00
+
+/** Unchecked version of bitmap_get()
+ *
+ * This version of bitmap_get() does not do any boundary checks.
+ *
+ * @param bitmap  Bitmap to access.
+ * @param element Element to access.
+ *
+ * @return Bit value of the element in the bitmap.
+ *
+ */
+static unsigned int bitmap_get_fast(bitmap_t *bitmap, size_t element)
+{
+        size_t byte = element / BITMAP_ELEMENT;
+        uint8_t mask = 1 << (element & BITMAP_REMAINER);
+        
+        return !!((bitmap->bits)[byte] & mask);
+}
+
+/** Get bitmap size
+ *
+ * Return the size (in bytes) required for the bitmap.
+ *
+ * @param elements   Number bits stored in bitmap.
+ *
+ * @return Size (in bytes) required for the bitmap.
+ *
+ */
+size_t bitmap_size(size_t elements)
+{
+        size_t size = elements / BITMAP_ELEMENT;
+        
+        if ((elements % BITMAP_ELEMENT) != 0)
+                size++;
+        
+        return size;
+}
 
 /** Initialize bitmap.
@@ -51 +89 @@
  * No portion of the bitmap is set or cleared by this function.
  *
- * @param bitmap        Bitmap structure.
- * @param map           Address of the memory used to hold the map.
- * @param bits          Number of bits stored in bitmap.
- */
-void bitmap_initialize(bitmap_t *bitmap, uint8_t *map, size_t bits)
-{
-        bitmap->map = map;
-        bitmap->bits = bits;
+ * @param bitmap     Bitmap structure.
+ * @param elements   Number of bits stored in bitmap.
+ * @param data       Address of the memory used to hold the map.
+ *                   The optional 2nd level bitmap follows the 1st
+ *                   level bitmap.
+ *
+ */
+void bitmap_initialize(bitmap_t *bitmap, size_t elements, void *data)
+{
+        bitmap->elements = elements;
+        bitmap->bits = (uint8_t *) data;
+        bitmap->next_fit = 0;
 }
 
 /** Set range of bits.
  *
- * @param bitmap        Bitmap structure.
- * @param start         Starting bit.
- * @param bits          Number of bits to set.
- */
-void bitmap_set_range(bitmap_t *bitmap, size_t start, size_t bits)
-{
-        size_t i = 0;
-        size_t aligned_start;
-        size_t lub;     /* leading unaligned bits */
-        size_t amb;     /* aligned middle bits */
-        size_t tab;     /* trailing aligned bits */
-        
-        ASSERT(start + bits <= bitmap->bits);
-        
-        aligned_start = ALIGN_UP(start, 8);
-        lub = min(aligned_start - start, bits);
-        amb = bits > lub ? bits - lub : 0;
-        tab = amb % 8;
-        
-        if (!bits)
+ * @param bitmap Bitmap structure.
+ * @param start  Starting bit.
+ * @param count  Number of bits to set.
+ *
+ */
+void bitmap_set_range(bitmap_t *bitmap, size_t start, size_t count)
+{
+        ASSERT(start + count <= bitmap->elements);
+        
+        if (count == 0)
                 return;
-
-        if (start + bits < aligned_start) {
+        
+        size_t start_byte = start / BITMAP_ELEMENT;
+        size_t aligned_start = ALIGN_UP(start, BITMAP_ELEMENT);
+        
+        /* Leading unaligned bits */
+        size_t lub = min(aligned_start - start, count);
+        
+        /* Aligned middle bits */
+        size_t amb = (count > lub) ? (count - lub) : 0;
+        
+        /* Trailing aligned bits */
+        size_t tab = amb % BITMAP_ELEMENT;
+        
+        if (start + count < aligned_start) {
                 /* Set bits in the middle of byte. */
-                bitmap->map[start / 8] |= ((1 << lub) - 1) << (start & 7);
+                bitmap->bits[start_byte] |=
+                    ((1 << lub) - 1) << (start & BITMAP_REMAINER);
                 return;
         }
@@ -93 +138 @@
         if (lub) {
                 /* Make sure to set any leading unaligned bits. */
-                bitmap->map[start / 8] |= ~((1 << (8 - lub)) - 1);
-        }
-        for (i = 0; i < amb / 8; i++) {
+                bitmap->bits[start_byte] |=
+                    ~((1 << (BITMAP_ELEMENT - lub)) - 1);
+        }
+        
+        size_t i;
+        
+        for (i = 0; i < amb / BITMAP_ELEMENT; i++) {
                 /* The middle bits can be set byte by byte. */
-                bitmap->map[aligned_start / 8 + i] = ALL_ONES;
-        }
+                bitmap->bits[aligned_start / BITMAP_ELEMENT + i] =
+                    ALL_ONES;
+        }
+        
         if (tab) {
                 /* Make sure to set any trailing aligned bits. */
-                bitmap->map[aligned_start / 8 + i] |= (1 << tab) - 1;
-        }
-        
+                bitmap->bits[aligned_start / BITMAP_ELEMENT + i] |=
+                    (1 << tab) - 1;
+        }
 }
 
 /** Clear range of bits.
  *
- * @param bitmap        Bitmap structure.
- * @param start         Starting bit.
- * @param bits          Number of bits to clear.
- */
-void bitmap_clear_range(bitmap_t *bitmap, size_t start, size_t bits)
-{
-        size_t i = 0;
-        size_t aligned_start;
-        size_t lub;     /* leading unaligned bits */
-        size_t amb;     /* aligned middle bits */
-        size_t tab;     /* trailing aligned bits */
-        
-        ASSERT(start + bits <= bitmap->bits);
-        
-        aligned_start = ALIGN_UP(start, 8);
-        lub = min(aligned_start - start, bits);
-        amb = bits > lub ? bits - lub : 0;
-        tab = amb % 8;
-
-        if (!bits)
+ * @param bitmap Bitmap structure.
+ * @param start  Starting bit.
+ * @param count  Number of bits to clear.
+ *
+ */
+void bitmap_clear_range(bitmap_t *bitmap, size_t start, size_t count)
+{
+        ASSERT(start + count <= bitmap->elements);
+        
+        if (count == 0)
                 return;
-
-        if (start + bits < aligned_start) {
+        
+        size_t start_byte = start / BITMAP_ELEMENT;
+        size_t aligned_start = ALIGN_UP(start, BITMAP_ELEMENT);
+        
+        /* Leading unaligned bits */
+        size_t lub = min(aligned_start - start, count);
+        
+        /* Aligned middle bits */
+        size_t amb = (count > lub) ? (count - lub) : 0;
+        
+        /* Trailing aligned bits */
+        size_t tab = amb % BITMAP_ELEMENT;
+        
+        if (start + count < aligned_start) {
                 /* Set bits in the middle of byte */
-                bitmap->map[start / 8] &= ~(((1 << lub) - 1) << (start & 7));
+                bitmap->bits[start_byte] &=
+                    ~(((1 << lub) - 1) << (start & BITMAP_REMAINER));
                 return;
         }
-
+        
         if (lub) {
                 /* Make sure to clear any leading unaligned bits. */
-                bitmap->map[start / 8] &= (1 << (8 - lub)) - 1;
-        }
-        for (i = 0; i < amb / 8; i++) {
+                bitmap->bits[start_byte] &=
+                    (1 << (BITMAP_ELEMENT - lub)) - 1;
+        }
+        
+        size_t i;
+        
+        for (i = 0; i < amb / BITMAP_ELEMENT; i++) {
                 /* The middle bits can be cleared byte by byte. */
-                bitmap->map[aligned_start / 8 + i] = ALL_ZEROES;
-        }
+                bitmap->bits[aligned_start / BITMAP_ELEMENT + i] =
+                    ALL_ZEROES;
+        }
+        
         if (tab) {
                 /* Make sure to clear any trailing aligned bits. */
-                bitmap->map[aligned_start / 8 + i] &= ~((1 << tab) - 1);
-        }
-
+                bitmap->bits[aligned_start / BITMAP_ELEMENT + i] &=
+                    ~((1 << tab) - 1);
+        }
+        
+        bitmap->next_fit = start_byte;
 }
 
 /** Copy portion of one bitmap into another bitmap.
  *
- * @param dst           Destination bitmap.
- * @param src           Source bitmap.
- * @param bits          Number of bits to copy.
- */
-void bitmap_copy(bitmap_t *dst, bitmap_t *src, size_t bits)
-{
+ * @param dst   Destination bitmap.
+ * @param src   Source bitmap.
+ * @param count Number of bits to copy.
+ *
+ */
+void bitmap_copy(bitmap_t *dst, bitmap_t *src, size_t count)
+{
+        ASSERT(count <= dst->elements);
+        ASSERT(count <= src->elements);
+        
         size_t i;
         
-        ASSERT(bits <= dst->bits);
-        ASSERT(bits <= src->bits);
-        
-        for (i = 0; i < bits / 8; i++)
-                dst->map[i] = src->map[i];
-        
-        if (bits % 8) {
-                bitmap_clear_range(dst, i * 8, bits % 8);
-                dst->map[i] |= src->map[i] & ((1 << (bits % 8)) - 1);
-        }
+        for (i = 0; i < count / BITMAP_ELEMENT; i++)
+                dst->bits[i] = src->bits[i];
+        
+        if (count % BITMAP_ELEMENT) {
+                bitmap_clear_range(dst, i * BITMAP_ELEMENT,
+                    count % BITMAP_ELEMENT);
+                dst->bits[i] |= src->bits[i] &
+                    ((1 << (count % BITMAP_ELEMENT)) - 1);
+        }
+}
+
+static int constraint_satisfy(size_t index, size_t base, size_t constraint)
+{
+        return (((base + index) & constraint) == 0);
+}
+
+/** Find a continuous zero bit range
+ *
+ * Find a continuous zero bit range in the bitmap. The address
+ * computed as the sum of the index of the first zero bit and
+ * the base argument needs to be compliant with the constraint
+ * (those bits that are set in the constraint cannot be set in
+ * the address).
+ *
+ * If the index argument is non-NULL, the continuous zero range
+ * is set and the index of the first bit is stored to index.
+ * Otherwise the bitmap stays untouched.
+ *
+ * @param bitmap     Bitmap structure.
+ * @param count      Number of continuous zero bits to find.
+ * @param base       Address of the first bit in the bitmap.
+ * @param prefered   Prefered address to start searching from.
+ * @param constraint Constraint for the address of the first zero bit.
+ * @param index      Place to store the index of the first zero
+ *                   bit. Can be NULL (in which case the bitmap
+ *                   is not modified).
+ *
+ * @return Non-zero if a continuous range of zero bits satisfying
+ *         the constraint has been found.
+ * @return Zero otherwise.
+ *
+ */
+int bitmap_allocate_range(bitmap_t *bitmap, size_t count, size_t base,
+    size_t prefered, size_t constraint, size_t *index)
+{
+        if (count == 0)
+                return false;
+        
+        size_t size = bitmap_size(bitmap->elements);
+        size_t next_fit = bitmap->next_fit;
+        
+        /*
+         * Adjust the next-fit value according to the address
+         * the caller prefers to start the search at.
+         */
+        if ((prefered > base) && (prefered < base + bitmap->elements)) {
+                size_t prefered_fit = (prefered - base) / BITMAP_ELEMENT;
+                
+                if (prefered_fit > next_fit)
+                        next_fit = prefered_fit;
+        }
+        
+        for (size_t pos = 0; pos < size; pos++) {
+                size_t byte = (next_fit + pos) % size;
+                
+                /* Skip if the current byte has all bits set */
+                if (bitmap->bits[byte] == ALL_ONES)
+                        continue;
+                
+                size_t byte_bit = byte * BITMAP_ELEMENT;
+                
+                for (size_t bit = 0; bit < BITMAP_ELEMENT; bit++) {
+                        size_t i = byte_bit + bit;
+                        
+                        if (i >= bitmap->elements)
+                                break;
+                        
+                        if (!constraint_satisfy(i, base, constraint))
+                                continue;
+                        
+                        if (!bitmap_get_fast(bitmap, i)) {
+                                size_t continuous = 1;
+                                
+                                for (size_t j = 1; j < count; j++) {
+                                        if ((i + j < bitmap->elements) &&
+                                            (!bitmap_get_fast(bitmap, i + j)))
+                                                continuous++;
+                                        else
+                                                break;
+                                }
+                                
+                                if (continuous == count) {
+                                        if (index != NULL) {
+                                                bitmap_set_range(bitmap, i, count);
+                                                bitmap->next_fit = i / BITMAP_ELEMENT;
+                                                *index = i;
+                                        }
+                                        
+                                        return true;
+                                } else
+                                        i += continuous;
+                        }
+                }
+        }
+        
+        return false;
 }
 

kernel/generic/src/adt/btree.c

@@ -1031 +1031 @@
         
         printf("Printing list of leaves:\n");
-        list_foreach(t->leaf_list, cur) {
-                btree_node_t *node;
-                
-                node = list_get_instance(cur, btree_node_t, leaf_link);
-                
+        list_foreach(t->leaf_list, leaf_link, btree_node_t, node) {
                 ASSERT(node);
                 

kernel/generic/src/adt/hash_table.c

@@ -117 +117 @@
         ASSERT(chain < h->entries);
         
-        list_foreach(h->entry[chain], cur) {
+        link_t *cur = list_first(&h->entry[chain]);
+        while (cur != NULL) {
                 if (h->op->compare(key, h->max_keys, cur)) {
                         /*
@@ -124 +125 @@
                         return cur;
                 }
+                cur = list_next(cur, &h->entry[chain]);
         }
         

kernel/generic/src/adt/list.c

@@ -101 +101 @@
         unsigned int count = 0;
         
-        list_foreach(*list, link) {
+        link_t *link = list_first(list);
+        while (link != NULL) {
                 count++;
+                link = list_next(link, list);
         }
         

kernel/generic/src/console/cmd.c

@@ -656 +656 @@
         
         size_t len = 0;
-        list_foreach(cmd_list, cur) {
-                cmd_info_t *hlp;
-                hlp = list_get_instance(cur, cmd_info_t, link);
-                
+        list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 spinlock_lock(&hlp->lock);
                 if (str_length(hlp->name) > len)
@@ -672 +669 @@
         }
         
-        list_foreach(cmd_list, cur) {
-                cmd_info_t *hlp;
-                hlp = list_get_instance(cur, cmd_info_t, link);
-                
+        list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 spinlock_lock(&hlp->lock);
                 printf("%-*s %s\n", _len, hlp->name, hlp->description);
@@ -912 +906 @@
         spinlock_lock(&cmd_lock);
         
-        list_foreach(cmd_list, cur) {
-                cmd_info_t *hlp;
-                
-                hlp = list_get_instance(cur, cmd_info_t, link);
+        list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 spinlock_lock(&hlp->lock);
                 

kernel/generic/src/console/console.c

@@ -125 +125 @@
 static void stdout_write(outdev_t *dev, wchar_t ch)
 {
-        list_foreach(dev->list, cur) {
-                outdev_t *sink = list_get_instance(cur, outdev_t, link);
+        list_foreach(dev->list, link, outdev_t, sink) {
                 if ((sink) && (sink->op->write))
                         sink->op->write(sink, ch);
@@ -134 +133 @@
 static void stdout_redraw(outdev_t *dev)
 {
-        list_foreach(dev->list, cur) {
-                outdev_t *sink = list_get_instance(cur, outdev_t, link);
+        list_foreach(dev->list, link, outdev_t, sink) {
                 if ((sink) && (sink->op->redraw))
                         sink->op->redraw(sink);

kernel/generic/src/console/kconsole.c

@@ -53 +53 @@
 #include <func.h>
 #include <str.h>
-#include <macros.h>
 #include <sysinfo/sysinfo.h>
 #include <ddi/device.h>
@@ -119 +118 @@
          * Make sure the command is not already listed.
          */
-        list_foreach(cmd_list, cur) {
-                cmd_info_t *hlp = list_get_instance(cur, cmd_info_t, link);
-                
+        list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 if (hlp == cmd) {
                         /* The command is already there. */
@@ -613 +610 @@
         cmd_info_t *cmd = NULL;
         
-        list_foreach(cmd_list, cur) {
-                cmd_info_t *hlp = list_get_instance(cur, cmd_info_t, link);
+        list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 spinlock_lock(&hlp->lock);
                 

kernel/generic/src/cpu/cpu.c

@@ -73 +73 @@
                 size_t i;
                 for (i = 0; i < config.cpu_count; i++) {
-                        cpus[i].stack = (uint8_t *) frame_alloc(STACK_FRAMES,
-                            FRAME_LOWMEM | FRAME_KA | FRAME_ATOMIC);
+                        uintptr_t stack_phys = frame_alloc(STACK_FRAMES,
+                            FRAME_LOWMEM | FRAME_ATOMIC, STACK_SIZE - 1);
+                        if (!stack_phys)
+                                panic("Cannot allocate CPU stack.");
+                        
+                        cpus[i].stack = (uint8_t *) PA2KA(stack_phys);
                         cpus[i].id = i;
                         
                         irq_spinlock_initialize(&cpus[i].lock, "cpus[].lock");
                         
-                        unsigned int j;
-                        for (j = 0; j < RQ_COUNT; j++) {
+                        for (unsigned int j = 0; j < RQ_COUNT; j++) {
                                 irq_spinlock_initialize(&cpus[i].rq[j].lock, "cpus[].rq[].lock");
                                 list_initialize(&cpus[i].rq[j].rq);

kernel/generic/src/ddi/ddi.c

@@ -314 +314 @@
 
 NO_TRACE static int dmamem_map(uintptr_t virt, size_t size, unsigned int map_flags,
-    unsigned int flags, void **phys)
+    unsigned int flags, uintptr_t *phys)
 {
         ASSERT(TASK);
@@ -322 +322 @@
 }
 
-NO_TRACE static int dmamem_map_anonymous(size_t size, unsigned int map_flags,
-    unsigned int flags, void **phys, uintptr_t *virt, uintptr_t bound)
+NO_TRACE static int dmamem_map_anonymous(size_t size, uintptr_t constraint,
+    unsigned int map_flags, unsigned int flags, uintptr_t *phys,
+    uintptr_t *virt, uintptr_t bound)
 {
         ASSERT(TASK);
         
-        size_t pages = SIZE2FRAMES(size);
-        uint8_t order;
-        
-        /* We need the 2^order >= pages */
-        if (pages == 1)
-                order = 0;
-        else
-                order = fnzb(pages - 1) + 1;
-        
-        *phys = frame_alloc_noreserve(order, 0);
-        if (*phys == NULL)
+        size_t frames = SIZE2FRAMES(size);
+        *phys = frame_alloc(frames, FRAME_NO_RESERVE, constraint);
+        if (*phys == 0)
                 return ENOMEM;
         
         mem_backend_data_t backend_data;
-        backend_data.base = (uintptr_t) *phys;
-        backend_data.frames = pages;
+        backend_data.base = *phys;
+        backend_data.frames = frames;
         
         if (!as_area_create(TASK->as, map_flags, size,
             AS_AREA_ATTR_NONE, &phys_backend, &backend_data, virt, bound)) {
-                frame_free_noreserve((uintptr_t) *phys);
+                frame_free_noreserve(*phys, frames);
                 return ENOMEM;
         }
@@ -373 +366 @@
                  */
                 
-                void *phys;
+                uintptr_t phys;
                 int rc = dmamem_map((uintptr_t) virt_ptr, size, map_flags,
                     flags, &phys);
@@ -390 +383 @@
                  */
                 
-                void *phys;
+                uintptr_t constraint;
+                int rc = copy_from_uspace(&constraint, phys_ptr,
+                    sizeof(constraint));
+                if (rc != EOK)
+                        return rc;
+                
+                uintptr_t phys;
                 uintptr_t virt = (uintptr_t) -1;
-                int rc = dmamem_map_anonymous(size, map_flags, flags,
+                rc = dmamem_map_anonymous(size, constraint, map_flags, flags,
                     &phys, &virt, bound);
                 if (rc != EOK)

kernel/generic/src/debug/panic.c

@@ -96 +96 @@
         printf("THE=%p: ", THE);
         if (THE != NULL) {
-                printf("pe=%" PRIun " thr=%p task=%p cpu=%p as=%p"
+                printf("pd=%" PRIun " thread=%p task=%p cpu=%p as=%p"
                     " magic=%#" PRIx32 "\n", THE->preemption_disabled,
                     THE->thread, THE->task, THE->cpu, THE->as, THE->magic);
+                
+                if (THE->thread != NULL)
+                        printf("thread=\"%s\"\n", THE->thread->name);
+                
+                if (THE->task != NULL)
+                        printf("task=\"%s\"\n", THE->task->name);
         } else
                 printf("invalid\n");

kernel/generic/src/debug/stacktrace.c

@@ -39 +39 @@
 #include <print.h>
 
-#define STACK_FRAMES_MAX        20
+#define STACK_FRAMES_MAX  20
 
 void stack_trace_ctx(stack_trace_ops_t *ops, stack_trace_context_t *ctx)
@@ -49 +49 @@
         uintptr_t pc;
         
-        while (cnt++ < STACK_FRAMES_MAX &&
-            ops->stack_trace_context_validate(ctx)) {
+        while ((cnt++ < STACK_FRAMES_MAX) &&
+            (ops->stack_trace_context_validate(ctx))) {
                 if (ops->symbol_resolve &&
                     ops->symbol_resolve(ctx->pc, &symbol, &offset)) {

kernel/generic/src/ipc/ipc.c

@@ -774 +774 @@
 static void ipc_print_call_list(list_t *list)
 {
-        list_foreach(*list, cur) {
-                call_t *call = list_get_instance(cur, call_t, ab_link);
-                
+        list_foreach(*list, ab_link, call_t, call) {
 #ifdef __32_BITS__
                 printf("%10p ", call);

kernel/generic/src/ipc/ipcrsc.c

@@ -151 +151 @@
         irq_spinlock_lock(&TASK->answerbox.lock, true);
         
-        list_foreach(TASK->answerbox.dispatched_calls, lst) {
-                call_t *call = list_get_instance(lst, call_t, ab_link);
+        list_foreach(TASK->answerbox.dispatched_calls, ab_link, call_t, call) {
                 if ((sysarg_t) call == callid) {
                         result = call;

kernel/generic/src/lib/ra.c

@@ -391 +391 @@
 
         irq_spinlock_lock(&arena->lock, true);
-        list_foreach(arena->spans, cur) {
-                ra_span_t *span = list_get_instance(cur, ra_span_t, span_link);
-
+        list_foreach(arena->spans, span_link, ra_span_t, span) {
                 base = ra_span_alloc(span, size, alignment);
                 if (base)
@@ -407 +405 @@
 {
         irq_spinlock_lock(&arena->lock, true);
-        list_foreach(arena->spans, cur) {
-                ra_span_t *span = list_get_instance(cur, ra_span_t, span_link);
-
+        list_foreach(arena->spans, span_link, ra_span_t, span) {
                 if (iswithin(span->base, span->size, base, size)) {
                         ra_span_free(span, base, size);

kernel/generic/src/main/main.c

@@ -89 +89 @@
 #include <lib/ra.h>
 
+/* Ensure [u]int*_t types are of correct size.
+ *
+ * Probably, this is not the best place for such tests
+ * but this file is compiled on all architectures.
+ */
+#define CHECK_INT_TYPE_(signness, size) \
+        STATIC_ASSERT_VERBOSE(sizeof(signness##size##_t) * 8 == size, \
+            #signness #size "_t does not have " #size " bits");
+
+#define CHECK_INT_TYPE(size) \
+        CHECK_INT_TYPE_(int, size); \
+        CHECK_INT_TYPE_(uint, size)
+
+CHECK_INT_TYPE(8);
+CHECK_INT_TYPE(16);
+CHECK_INT_TYPE(32);
+CHECK_INT_TYPE(64);
+
 /** Global configuration structure. */
 config_t config = {

kernel/generic/src/mm/as.c

@@ -488 +488 @@
         
         /* Eventually check the addresses behind each area */
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node =
-                    list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t, node) {
                 
                 for (btree_key_t i = 0; i < node->keys; i++) {
@@ -904 +902 @@
                  * reference from all frames found there.
                  */
-                list_foreach(sh_info->pagemap.leaf_list, cur) {
-                        btree_node_t *node
-                            = list_get_instance(cur, btree_node_t, leaf_link);
+                list_foreach(sh_info->pagemap.leaf_list, leaf_link,
+                    btree_node_t, node) {
                         btree_key_t i;
                         
                         for (i = 0; i < node->keys; i++)
-                                frame_free((uintptr_t) node->value[i]);
+                                frame_free((uintptr_t) node->value[i], 1);
                 }
                 
@@ -956 +953 @@
          * Visit only the pages mapped by used_space B+tree.
          */
-        list_foreach(area->used_space.leaf_list, cur) {
-                btree_node_t *node;
+        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 
-                node = list_get_instance(cur, btree_node_t, leaf_link);
                 for (i = 0; i < node->keys; i++) {
                         uintptr_t ptr = node->key[i];
@@ -1238 +1234 @@
         size_t used_pages = 0;
         
-        list_foreach(area->used_space.leaf_list, cur) {
-                btree_node_t *node
-                    = list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 
@@ -1264 +1259 @@
         size_t frame_idx = 0;
         
-        list_foreach(area->used_space.leaf_list, cur) {
-                btree_node_t *node = list_get_instance(cur, btree_node_t,
-                    leaf_link);
+        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 
@@ -1316 +1310 @@
         frame_idx = 0;
         
-        list_foreach(area->used_space.leaf_list, cur) {
-                btree_node_t *node
-                    = list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 
@@ -2182 +2175 @@
         size_t area_cnt = 0;
         
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node =
-                    list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
+            node) {
                 area_cnt += node->keys;
         }
@@ -2195 +2187 @@
         size_t area_idx = 0;
         
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node =
-                    list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 
@@ -2231 +2222 @@
         
         /* Print out info about address space areas */
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node
-                    = list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 

kernel/generic/src/mm/backend_anon.c

@@ -118 +118 @@
          */
         mutex_lock(&area->sh_info->lock);
-        list_foreach(area->used_space.leaf_list, cur) {
-                btree_node_t *node;
+        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
+            node) {
                 unsigned int i;
                 
-                node = list_get_instance(cur, btree_node_t, leaf_link);
                 for (i = 0; i < node->keys; i++) {
                         uintptr_t base = node->key[i];
@@ -295 +294 @@
                  * the normal unreserving frame_free().
                  */
-                frame_free(frame);
+                frame_free(frame, 1);
         } else {
                 /*
@@ -302 +301 @@
                  * manipulate the reserve or it would be given back twice.
                  */
-                frame_free_noreserve(frame);
+                frame_free_noreserve(frame, 1);
         }
 }

kernel/generic/src/mm/backend_elf.c

@@ -429 +429 @@
                          * data.
                          */
-                        frame_free_noreserve(frame);
+                        frame_free_noreserve(frame, 1);
                 }
         } else {
@@ -437 +437 @@
                  * anonymous). In any case, a frame needs to be freed.
                  */
-                frame_free_noreserve(frame);
+                frame_free_noreserve(frame, 1);
         }
 }

kernel/generic/src/mm/frame.c

@@ -38 +38 @@
  *
  * This file contains the physical frame allocator and memory zone management.
- * The frame allocator is built on top of the buddy allocator.
- *
- * @see buddy.c
+ * The frame allocator is built on top of the two-level bitmap structure.
+ *
  */
 
@@ -92 +91 @@
 }
 
-NO_TRACE static inline size_t make_frame_index(zone_t *zone, frame_t *frame)
-{
-        return (frame - zone->frames);
-}
-
 /** Initialize frame structure.
  *
@@ -104 +98 @@
 NO_TRACE static void frame_initialize(frame_t *frame)
 {
-        frame->refcount = 1;
-        frame->buddy_order = 0;
+        frame->refcount = 0;
+        frame->parent = NULL;
 }
 
@@ -161 +155 @@
         
         /* Move other zones up */
-        size_t j;
-        for (j = zones.count; j > i; j--) {
+        for (size_t j = zones.count; j > i; j--)
                 zones.info[j] = zones.info[j - 1];
-                if (zones.info[j].buddy_system != NULL)
-                        zones.info[j].buddy_system->data =
-                            (void *) &zones.info[j];
-        }
         
         zones.count++;
@@ -237 +226 @@
 }
 
-/** @return True if zone can allocate specified order */
-NO_TRACE static bool zone_can_alloc(zone_t *zone, uint8_t order)
-{
+/** @return True if zone can allocate specified number of frames */
+NO_TRACE static bool zone_can_alloc(zone_t *zone, size_t count,
+    pfn_t constraint)
+{
+        /*
+         * The function bitmap_allocate_range() does not modify
+         * the bitmap if the last argument is NULL.
+         */
+        
         return ((zone->flags & ZONE_AVAILABLE) &&
-            buddy_system_can_alloc(zone->buddy_system, order));
-}
-
-/** Find a zone that can allocate order frames.
+            bitmap_allocate_range(&zone->bitmap, count, zone->base,
+            FRAME_LOWPRIO, constraint, NULL));
+}
+
+/** Find a zone that can allocate specified number of frames
+ *
+ * This function searches among all zones. Assume interrupts are
+ * disabled and zones lock is locked.
+ *
+ * @param count      Number of free frames we are trying to find.
+ * @param flags      Required flags of the zone.
+ * @param constraint Indication of bits that cannot be set in the
+ *                   physical frame number of the first allocated frame.
+ * @param hint       Preferred zone.
+ *
+ * @return Zone that can allocate specified number of frames.
+ * @return -1 if no zone can satisfy the request.
+ *
+ */
+NO_TRACE static size_t find_free_zone_all(size_t count, zone_flags_t flags,
+    pfn_t constraint, size_t hint)
+{
+        for (size_t pos = 0; pos < zones.count; pos++) {
+                size_t i = (pos + hint) % zones.count;
+                
+                /* Check whether the zone meets the search criteria. */
+                if (!ZONE_FLAGS_MATCH(zones.info[i].flags, flags))
+                        continue;
+                
+                /* Check if the zone can satisfy the allocation request. */
+                if (zone_can_alloc(&zones.info[i], count, constraint))
+                        return i;
+        }
+        
+        return (size_t) -1;
+}
+
+/** Check if frame range  priority memory
+ *
+ * @param pfn   Starting frame.
+ * @param count Number of frames.
+ *
+ * @return True if the range contains only priority memory.
+ *
+ */
+NO_TRACE static bool is_high_priority(pfn_t base, size_t count)
+{
+        return (base + count <= FRAME_LOWPRIO);
+}
+
+/** Find a zone that can allocate specified number of frames
+ *
+ * This function ignores zones that contain only high-priority
+ * memory. Assume interrupts are disabled and zones lock is locked.
+ *
+ * @param count      Number of free frames we are trying to find.
+ * @param flags      Required flags of the zone.
+ * @param constraint Indication of bits that cannot be set in the
+ *                   physical frame number of the first allocated frame.
+ * @param hint       Preferred zone.
+ *
+ * @return Zone that can allocate specified number of frames.
+ * @return -1 if no low-priority zone can satisfy the request.
+ *
+ */
+NO_TRACE static size_t find_free_zone_lowprio(size_t count, zone_flags_t flags,
+    pfn_t constraint, size_t hint)
+{       
+        for (size_t pos = 0; pos < zones.count; pos++) {
+                size_t i = (pos + hint) % zones.count;
+                
+                /* Skip zones containing only high-priority memory. */
+                if (is_high_priority(zones.info[i].base, zones.info[i].count))
+                        continue;
+                
+                /* Check whether the zone meets the search criteria. */
+                if (!ZONE_FLAGS_MATCH(zones.info[i].flags, flags))
+                        continue;
+                
+                /* Check if the zone can satisfy the allocation request. */
+                if (zone_can_alloc(&zones.info[i], count, constraint))
+                        return i;
+        }
+        
+        return (size_t) -1;
+}
+
+/** Find a zone that can allocate specified number of frames
  *
  * Assume interrupts are disabled and zones lock is
  * locked.
  *
- * @param order Size (2^order) of free space we are trying to find.
- * @param flags Required flags of the target zone.
- * @param hind  Preferred zone.
- *
- */
-NO_TRACE static size_t find_free_zone(uint8_t order, zone_flags_t flags,
-    size_t hint)
+ * @param count      Number of free frames we are trying to find.
+ * @param flags      Required flags of the target zone.
+ * @param constraint Indication of bits that cannot be set in the
+ *                   physical frame number of the first allocated frame.
+ * @param hint       Preferred zone.
+ *
+ * @return Zone that can allocate specified number of frames.
+ * @return -1 if no zone can satisfy the request.
+ *
+ */
+NO_TRACE static size_t find_free_zone(size_t count, zone_flags_t flags,
+    pfn_t constraint, size_t hint)
 {
         if (hint >= zones.count)
                 hint = 0;
         
-        size_t i = hint;
-        do {
-                /*
-                 * Check whether the zone meets the search criteria.
-                 */
-                if (ZONE_FLAGS_MATCH(zones.info[i].flags, flags)) {
-                        /*
-                         * Check if the zone has 2^order frames area available.
-                         */
-                        if (zone_can_alloc(&zones.info[i], order))
-                                return i;
-                }
-                
-                i++;
-                if (i >= zones.count)
-                        i = 0;
-                
-        } while (i != hint);
-        
-        return (size_t) -1;
-}
-
-/**************************/
-/* Buddy system functions */
-/**************************/
-
-/** Buddy system find_block implementation.
- *
- * Find block that is parent of current list.
- * That means go to lower addresses, until such block is found
- *
- * @param order Order of parent must be different then this
- *              parameter!!
- *
- */
-NO_TRACE static link_t *zone_buddy_find_block(buddy_system_t *buddy,
-    link_t *child, uint8_t order)
-{
-        frame_t *frame = list_get_instance(child, frame_t, buddy_link);
-        zone_t *zone = (zone_t *) buddy->data;
-        
-        size_t index = frame_index(zone, frame);
-        do {
-                if (zone->frames[index].buddy_order != order)
-                        return &zone->frames[index].buddy_link;
-        } while (index-- > 0);
-        
-        return NULL;
-}
-
-/** Buddy system find_buddy implementation.
- *
- * @param buddy Buddy system.
- * @param block Block for which buddy should be found.
- *
- * @return Buddy for given block if found.
- *
- */
-NO_TRACE static link_t *zone_buddy_find_buddy(buddy_system_t *buddy,
-    link_t *block)
-{
-        frame_t *frame = list_get_instance(block, frame_t, buddy_link);
-        zone_t *zone = (zone_t *) buddy->data;
-        ASSERT(IS_BUDDY_ORDER_OK(frame_index_abs(zone, frame),
-            frame->buddy_order));
-        
-        bool is_left = IS_BUDDY_LEFT_BLOCK_ABS(zone, frame);
-        
-        size_t index;
-        if (is_left) {
-                index = (frame_index(zone, frame)) +
-                    (1 << frame->buddy_order);
-        } else {  /* is_right */
-                index = (frame_index(zone, frame)) -
-                    (1 << frame->buddy_order);
-        }
-        
-        if (frame_index_valid(zone, index)) {
-                if ((zone->frames[index].buddy_order == frame->buddy_order) &&
-                    (zone->frames[index].refcount == 0)) {
-                        return &zone->frames[index].buddy_link;
-                }
-        }
-        
-        return NULL;
-}
-
-/** Buddy system bisect implementation.
- *
- * @param buddy Buddy system.
- * @param block Block to bisect.
- *
- * @return Right block.
- *
- */
-NO_TRACE static link_t *zone_buddy_bisect(buddy_system_t *buddy, link_t *block)
-{
-        frame_t *frame_l = list_get_instance(block, frame_t, buddy_link);
-        frame_t *frame_r = (frame_l + (1 << (frame_l->buddy_order - 1)));
-        
-        return &frame_r->buddy_link;
-}
-
-/** Buddy system coalesce implementation.
- *
- * @param buddy   Buddy system.
- * @param block_1 First block.
- * @param block_2 First block's buddy.
- *
- * @return Coalesced block (actually block that represents lower
- *         address).
- *
- */
-NO_TRACE static link_t *zone_buddy_coalesce(buddy_system_t *buddy,
-    link_t *block_1, link_t *block_2)
-{
-        frame_t *frame1 = list_get_instance(block_1, frame_t, buddy_link);
-        frame_t *frame2 = list_get_instance(block_2, frame_t, buddy_link);
-        
-        return ((frame1 < frame2) ? block_1 : block_2);
-}
-
-/** Buddy system set_order implementation.
- *
- * @param buddy Buddy system.
- * @param block Buddy system block.
- * @param order Order to set.
- *
- */
-NO_TRACE static void zone_buddy_set_order(buddy_system_t *buddy, link_t *block,
-    uint8_t order)
-{
-        list_get_instance(block, frame_t, buddy_link)->buddy_order = order;
-}
-
-/** Buddy system get_order implementation.
- *
- * @param buddy Buddy system.
- * @param block Buddy system block.
- *
- * @return Order of block.
- *
- */
-NO_TRACE static uint8_t zone_buddy_get_order(buddy_system_t *buddy,
-    link_t *block)
-{
-        return list_get_instance(block, frame_t, buddy_link)->buddy_order;
-}
-
-/** Buddy system mark_busy implementation.
- *
- * @param buddy Buddy system.
- * @param block Buddy system block.
- *
- */
-NO_TRACE static void zone_buddy_mark_busy(buddy_system_t *buddy, link_t *block)
-{
-        list_get_instance(block, frame_t, buddy_link)->refcount = 1;
-}
-
-/** Buddy system mark_available implementation.
- *
- * @param buddy Buddy system.
- * @param block Buddy system block.
- *
- */
-NO_TRACE static void zone_buddy_mark_available(buddy_system_t *buddy,
-    link_t *block)
-{
-        list_get_instance(block, frame_t, buddy_link)->refcount = 0;
-}
-
-static buddy_system_operations_t zone_buddy_system_operations = {
-        .find_buddy = zone_buddy_find_buddy,
-        .bisect = zone_buddy_bisect,
-        .coalesce = zone_buddy_coalesce,
-        .set_order = zone_buddy_set_order,
-        .get_order = zone_buddy_get_order,
-        .mark_busy = zone_buddy_mark_busy,
-        .mark_available = zone_buddy_mark_available,
-        .find_block = zone_buddy_find_block
-};
+        /*
+         * Prefer zones with low-priority memory over
+         * zones with high-priority memory.
+         */
+        
+        size_t znum = find_free_zone_lowprio(count, flags, constraint, hint);
+        if (znum != (size_t) -1)
+                return znum;
+        
+        /* Take all zones into account */
+        return find_free_zone_all(count, flags, constraint, hint);
+}
 
 /******************/
@@ -447 +361 @@
 /******************/
 
+/** Return frame from zone. */
+NO_TRACE static frame_t *zone_get_frame(zone_t *zone, size_t index)
+{
+        ASSERT(index < zone->count);
+        
+        return &zone->frames[index];
+}
+
 /** Allocate frame in particular zone.
  *
@@ -452 +374 @@
  * Panics if allocation is impossible.
  *
- * @param zone  Zone to allocate from.
- * @param order Allocate exactly 2^order frames.
+ * @param zone       Zone to allocate from.
+ * @param count      Number of frames to allocate
+ * @param constraint Indication of bits that cannot be set in the
+ *                   physical frame number of the first allocated frame.
  *
  * @return Frame index in zone.
  *
  */
-NO_TRACE static pfn_t zone_frame_alloc(zone_t *zone, uint8_t order)
+NO_TRACE static size_t zone_frame_alloc(zone_t *zone, size_t count,
+    pfn_t constraint)
 {
         ASSERT(zone->flags & ZONE_AVAILABLE);
         
-        /* Allocate frames from zone buddy system */
-        link_t *link = buddy_system_alloc(zone->buddy_system, order);
-        
-        ASSERT(link);
+        /* Allocate frames from zone */
+        size_t index;
+        int avail = bitmap_allocate_range(&zone->bitmap, count, zone->base,
+            FRAME_LOWPRIO, constraint, &index);
+        
+        ASSERT(avail);
+        
+        /* Update frame reference count */
+        for (size_t i = 0; i < count; i++) {
+                frame_t *frame = zone_get_frame(zone, index + i);
+                
+                ASSERT(frame->refcount == 0);
+                frame->refcount = 1;
+        }
         
         /* Update zone information. */
-        zone->free_count -= (1 << order);
-        zone->busy_count += (1 << order);
-        
-        /* Frame will be actually a first frame of the block. */
-        frame_t *frame = list_get_instance(link, frame_t, buddy_link);
-        
-        /* Get frame address */
-        return make_frame_index(zone, frame);
+        zone->free_count -= count;
+        zone->busy_count += count;
+        
+        return index;
 }
 
@@ -482 +413 @@
  * Assume zone is locked and is available for deallocation.
  *
- * @param zone      Pointer to zone from which the frame is to be freed.
- * @param frame_idx Frame index relative to zone.
- *
- * @return          Number of freed frames.
- *
- */
-NO_TRACE static size_t zone_frame_free(zone_t *zone, size_t frame_idx)
+ * @param zone  Pointer to zone from which the frame is to be freed.
+ * @param index Frame index relative to zone.
+ *
+ * @return Number of freed frames.
+ *
+ */
+NO_TRACE static size_t zone_frame_free(zone_t *zone, size_t index)
 {
         ASSERT(zone->flags & ZONE_AVAILABLE);
         
-        frame_t *frame = &zone->frames[frame_idx];
-        size_t size = 0;
-        
-        ASSERT(frame->refcount);
+        frame_t *frame = zone_get_frame(zone, index);
+        
+        ASSERT(frame->refcount > 0);
         
         if (!--frame->refcount) {
-                size = 1 << frame->buddy_order;
-                buddy_system_free(zone->buddy_system, &frame->buddy_link);              
+                bitmap_set(&zone->bitmap, index, 0);
+                
                 /* Update zone information. */
-                zone->free_count += size;
-                zone->busy_count -= size;
-        }
-        
-        return size;
-}
-
-/** Return frame from zone. */
-NO_TRACE static frame_t *zone_get_frame(zone_t *zone, size_t frame_idx)
-{
-        ASSERT(frame_idx < zone->count);
-        return &zone->frames[frame_idx];
+                zone->free_count++;
+                zone->busy_count--;
+                
+                return 1;
+        }
+        
+        return 0;
 }
 
 /** Mark frame in zone unavailable to allocation. */
-NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t frame_idx)
+NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t index)
 {
         ASSERT(zone->flags & ZONE_AVAILABLE);
         
-        frame_t *frame = zone_get_frame(zone, frame_idx);
-        if (frame->refcount)
+        frame_t *frame = zone_get_frame(zone, index);
+        if (frame->refcount > 0)
                 return;
         
-        link_t *link __attribute__ ((unused));
-        
-        link = buddy_system_alloc_block(zone->buddy_system,
-            &frame->buddy_link);
-        
-        ASSERT(link);
+        frame->refcount = 1;
+        bitmap_set_range(&zone->bitmap, index, 1);
+        
         zone->free_count--;
         reserve_force_alloc(1);
@@ -536 +458 @@
 /** Merge two zones.
  *
- * Expect buddy to point to space at least zone_conf_size large.
  * Assume z1 & z2 are locked and compatible and zones lock is
  * locked.
  *
- * @param z1     First zone to merge.
- * @param z2     Second zone to merge.
- * @param old_z1 Original date of the first zone.
- * @param buddy  Merged zone buddy.
+ * @param z1       First zone to merge.
+ * @param z2       Second zone to merge.
+ * @param old_z1   Original data of the first zone.
+ * @param confdata Merged zone configuration data.
  *
  */
 NO_TRACE static void zone_merge_internal(size_t z1, size_t z2, zone_t *old_z1,
-    buddy_system_t *buddy)
+    void *confdata)
 {
         ASSERT(zones.info[z1].flags & ZONE_AVAILABLE);
@@ -562 +483 @@
         zones.info[z1].free_count += zones.info[z2].free_count;
         zones.info[z1].busy_count += zones.info[z2].busy_count;
-        zones.info[z1].buddy_system = buddy;
-        
-        uint8_t order = fnzb(zones.info[z1].count);
-        buddy_system_create(zones.info[z1].buddy_system, order,
-            &zone_buddy_system_operations, (void *) &zones.info[z1]);
-        
-        zones.info[z1].frames =
-            (frame_t *) ((uint8_t *) zones.info[z1].buddy_system
-            + buddy_conf_size(order));
-        
-        /* This marks all frames busy */
-        size_t i;
-        for (i = 0; i < zones.info[z1].count; i++)
-                frame_initialize(&zones.info[z1].frames[i]);
-        
-        /* Copy frames from both zones to preserve full frame orders,
-         * parents etc. Set all free frames with refcount = 0 to 1, because
-         * we add all free frames to buddy allocator later again, clearing
-         * order to 0. Don't set busy frames with refcount = 0, as they
-         * will not be reallocated during merge and it would make later
-         * problems with allocation/free.
+        
+        bitmap_initialize(&zones.info[z1].bitmap, zones.info[z1].count,
+            confdata + (sizeof(frame_t) * zones.info[z1].count));
+        bitmap_clear_range(&zones.info[z1].bitmap, 0, zones.info[z1].count);
+        
+        zones.info[z1].frames = (frame_t *) confdata;
+        
+        /*
+         * Copy frames and bits from both zones to preserve parents, etc.
          */
-        for (i = 0; i < old_z1->count; i++)
+        
+        for (size_t i = 0; i < old_z1->count; i++) {
+                bitmap_set(&zones.info[z1].bitmap, i,
+                    bitmap_get(&old_z1->bitmap, i));
                 zones.info[z1].frames[i] = old_z1->frames[i];
-        
-        for (i = 0; i < zones.info[z2].count; i++)
-                zones.info[z1].frames[base_diff + i]
-                    = zones.info[z2].frames[i];
-        
-        i = 0;
-        while (i < zones.info[z1].count) {
-                if (zones.info[z1].frames[i].refcount) {
-                        /* Skip busy frames */
-                        i += 1 << zones.info[z1].frames[i].buddy_order;
-                } else {
-                        /* Free frames, set refcount = 1
-                         * (all free frames have refcount == 0, we need not
-                         * to check the order)
-                         */
-                        zones.info[z1].frames[i].refcount = 1;
-                        zones.info[z1].frames[i].buddy_order = 0;
-                        i++;
-                }
-        }
-        
-        /* Add free blocks from the original zone z1 */
-        while (zone_can_alloc(old_z1, 0)) {
-                /* Allocate from the original zone */
-                pfn_t frame_idx = zone_frame_alloc(old_z1, 0);
-                
-                /* Free the frame from the merged zone */
-                frame_t *frame = &zones.info[z1].frames[frame_idx];
-                frame->refcount = 0;
-                buddy_system_free(zones.info[z1].buddy_system, &frame->buddy_link);
-        }
-        
-        /* Add free blocks from the original zone z2 */
-        while (zone_can_alloc(&zones.info[z2], 0)) {
-                /* Allocate from the original zone */
-                pfn_t frame_idx = zone_frame_alloc(&zones.info[z2], 0);
-                
-                /* Free the frame from the merged zone */
-                frame_t *frame = &zones.info[z1].frames[base_diff + frame_idx];
-                frame->refcount = 0;
-                buddy_system_free(zones.info[z1].buddy_system, &frame->buddy_link);
+        }
+        
+        for (size_t i = 0; i < zones.info[z2].count; i++) {
+                bitmap_set(&zones.info[z1].bitmap, base_diff + i,
+                    bitmap_get(&zones.info[z2].bitmap, i));
+                zones.info[z1].frames[base_diff + i] =
+                    zones.info[z2].frames[i];
         }
 }
@@ -649 +527 @@
         size_t cframes = SIZE2FRAMES(zone_conf_size(count));
         
-        if ((pfn < zones.info[znum].base)
-            || (pfn >= zones.info[znum].base + zones.info[znum].count))
+        if ((pfn < zones.info[znum].base) ||
+            (pfn >= zones.info[znum].base + zones.info[znum].count))
                 return;
         
-        frame_t *frame __attribute__ ((unused));
-
-        frame = &zones.info[znum].frames[pfn - zones.info[znum].base];
-        ASSERT(!frame->buddy_order);
-        
-        size_t i;
-        for (i = 0; i < cframes; i++) {
-                zones.info[znum].busy_count++;
+        for (size_t i = 0; i < cframes; i++)
                 (void) zone_frame_free(&zones.info[znum],
                     pfn - zones.info[znum].base + i);
-        }
-}
-
-/** Reduce allocated block to count of order 0 frames.
- *
- * The allocated block needs 2^order frames. Reduce all frames
- * in the block to order 0 and free the unneeded frames. This means that
- * when freeing the previously allocated block starting with frame_idx,
- * you have to free every frame.
- *
- * @param znum      Zone.
- * @param frame_idx Index the first frame of the block.
- * @param count     Allocated frames in block.
- *
- */
-NO_TRACE static void zone_reduce_region(size_t znum, pfn_t frame_idx,
-    size_t count)
-{
-        ASSERT(zones.info[znum].flags & ZONE_AVAILABLE);
-        ASSERT(frame_idx + count < zones.info[znum].count);
-        
-        uint8_t order = zones.info[znum].frames[frame_idx].buddy_order;
-        ASSERT((size_t) (1 << order) >= count);
-        
-        /* Reduce all blocks to order 0 */
-        size_t i;
-        for (i = 0; i < (size_t) (1 << order); i++) {
-                frame_t *frame = &zones.info[znum].frames[i + frame_idx];
-                frame->buddy_order = 0;
-                if (!frame->refcount)
-                        frame->refcount = 1;
-                ASSERT(frame->refcount == 1);
-        }
-        
-        /* Free unneeded frames */
-        for (i = count; i < (size_t) (1 << order); i++)
-                (void) zone_frame_free(&zones.info[znum], i + frame_idx);
 }
 
@@ -719 +553 @@
         bool ret = true;
         
-        /* We can join only 2 zones with none existing inbetween,
+        /*
+         * We can join only 2 zones with none existing inbetween,
          * the zones have to be available and with the same
          * set of flags
@@ -733 +568 @@
             + zones.info[z2].count));
         
-        uint8_t order;
-        if (cframes == 1)
-                order = 0;
-        else
-                order = fnzb(cframes - 1) + 1;
-        
         /* Allocate merged zone data inside one of the zones */
         pfn_t pfn;
-        if (zone_can_alloc(&zones.info[z1], order)) {
-                pfn = zones.info[z1].base + zone_frame_alloc(&zones.info[z1], order);
-        } else if (zone_can_alloc(&zones.info[z2], order)) {
-                pfn = zones.info[z2].base + zone_frame_alloc(&zones.info[z2], order);
+        if (zone_can_alloc(&zones.info[z1], cframes, 0)) {
+                pfn = zones.info[z1].base +
+                    zone_frame_alloc(&zones.info[z1], cframes, 0);
+        } else if (zone_can_alloc(&zones.info[z2], cframes, 0)) {
+                pfn = zones.info[z2].base +
+                    zone_frame_alloc(&zones.info[z2], cframes, 0);
         } else {
                 ret = false;
@@ -752 +583 @@
         /* Preserve original data from z1 */
         zone_t old_z1 = zones.info[z1];
-        old_z1.buddy_system->data = (void *) &old_z1;
         
         /* Do zone merging */
-        buddy_system_t *buddy = (buddy_system_t *) PA2KA(PFN2ADDR(pfn));
-        zone_merge_internal(z1, z2, &old_z1, buddy);
-        
-        /* Free unneeded config frames */
-        zone_reduce_region(z1, pfn - zones.info[z1].base, cframes);
+        zone_merge_internal(z1, z2, &old_z1, (void *) PA2KA(PFN2ADDR(pfn)));
         
         /* Subtract zone information from busy frames */
@@ -772 +598 @@
         
         /* Move zones down */
-        size_t i;
-        for (i = z2 + 1; i < zones.count; i++) {
+        for (size_t i = z2 + 1; i < zones.count; i++)
                 zones.info[i - 1] = zones.info[i];
-                if (zones.info[i - 1].buddy_system != NULL)
-                        zones.info[i - 1].buddy_system->data =
-                            (void *) &zones.info[i - 1];
-        }
         
         zones.count--;
@@ -797 +618 @@
 void zone_merge_all(void)
 {
-        size_t i = 0;
+        size_t i = 1;
+        
         while (i < zones.count) {
-                if (!zone_merge(i, i + 1))
+                if (!zone_merge(i - 1, i))
                         i++;
         }
@@ -806 +628 @@
 /** Create new frame zone.
  *
- * @param zone  Zone to construct.
- * @param buddy Address of buddy system configuration information.
- * @param start Physical address of the first frame within the zone.
- * @param count Count of frames in zone.
- * @param flags Zone flags.
+ * @param zone     Zone to construct.
+ * @param start    Physical address of the first frame within the zone.
+ * @param count    Count of frames in zone.
+ * @param flags    Zone flags.
+ * @param confdata Configuration data of the zone.
  *
  * @return Initialized zone.
  *
  */
-NO_TRACE static void zone_construct(zone_t *zone, buddy_system_t *buddy,
-    pfn_t start, size_t count, zone_flags_t flags)
+NO_TRACE static void zone_construct(zone_t *zone, pfn_t start, size_t count,
+    zone_flags_t flags, void *confdata)
 {
         zone->base = start;
@@ -823 +645 @@
         zone->free_count = count;
         zone->busy_count = 0;
-        zone->buddy_system = buddy;
         
         if (flags & ZONE_AVAILABLE) {
                 /*
-                 * Compute order for buddy system and initialize
+                 * Initialize frame bitmap (located after the array of
+                 * frame_t structures in the configuration space).
                  */
-                uint8_t order = fnzb(count);
-                buddy_system_create(zone->buddy_system, order,
-                    &zone_buddy_system_operations, (void *) zone);
-                
-                /* Allocate frames _after_ the confframe */
-                
-                /* Check sizes */
-                zone->frames = (frame_t *) ((uint8_t *) zone->buddy_system +
-                    buddy_conf_size(order));
-                
-                size_t i;
-                for (i = 0; i < count; i++)
+                
+                bitmap_initialize(&zone->bitmap, count, confdata +
+                    (sizeof(frame_t) * count));
+                bitmap_clear_range(&zone->bitmap, 0, count);
+                
+                /*
+                 * Initialize the array of frame_t structures.
+                 */
+                
+                zone->frames = (frame_t *) confdata;
+                
+                for (size_t i = 0; i < count; i++)
                         frame_initialize(&zone->frames[i]);
-                
-                /* Stuffing frames */
-                for (i = 0; i < count; i++) {
-                        zone->frames[i].refcount = 0;
-                        buddy_system_free(zone->buddy_system, &zone->frames[i].buddy_link);
-                }
-        } else
+        } else {
+                bitmap_initialize(&zone->bitmap, 0, NULL);
                 zone->frames = NULL;
+        }
 }
 
@@ -861 +679 @@
 size_t zone_conf_size(size_t count)
 {
-        return (count * sizeof(frame_t) + buddy_conf_size(fnzb(count)));
+        return (count * sizeof(frame_t) + bitmap_size(count));
 }
 
@@ -867 +685 @@
 pfn_t zone_external_conf_alloc(size_t count)
 {
-        size_t size = zone_conf_size(count);
-        size_t order = ispwr2(size) ? fnzb(size) : (fnzb(size) + 1);
-
-        return ADDR2PFN((uintptr_t) frame_alloc(order - FRAME_WIDTH,
-            FRAME_LOWMEM | FRAME_ATOMIC));
+        size_t frames = SIZE2FRAMES(zone_conf_size(count));
+        
+        return ADDR2PFN((uintptr_t)
+            frame_alloc(frames, FRAME_LOWMEM | FRAME_ATOMIC, 0));
 }
 
@@ -879 +696 @@
  * @param count     Size of zone in frames.
  * @param confframe Where configuration frames are supposed to be.
- *                  Automatically checks, that we will not disturb the
+ *                  Automatically checks that we will not disturb the
  *                  kernel and possibly init. If confframe is given
  *                  _outside_ this zone, it is expected, that the area is
@@ -896 +713 @@
         
         if (flags & ZONE_AVAILABLE) {  /* Create available zone */
-                /* Theoretically we could have NULL here, practically make sure
+                /*
+                 * Theoretically we could have NULL here, practically make sure
                  * nobody tries to do that. If some platform requires, remove
                  * the assert
                  */
                 ASSERT(confframe != ADDR2PFN((uintptr_t ) NULL));
-
+                
                 /* Update the known end of physical memory. */
                 config.physmem_end = max(config.physmem_end, PFN2ADDR(start + count));
                 
-                /* If confframe is supposed to be inside our zone, then make sure
+                /*
+                 * If confframe is supposed to be inside our zone, then make sure
                  * it does not span kernel & init
                  */
                 size_t confcount = SIZE2FRAMES(zone_conf_size(count));
+                
                 if ((confframe >= start) && (confframe < start + count)) {
                         for (; confframe < start + count; confframe++) {
@@ -921 +741 @@
                                 
                                 bool overlap = false;
-                                size_t i;
-                                for (i = 0; i < init.cnt; i++)
+                                for (size_t i = 0; i < init.cnt; i++) {
                                         if (overlaps(addr, PFN2ADDR(confcount),
                                             init.tasks[i].paddr,
@@ -929 +748 @@
                                                 break;
                                         }
+                                }
+                                
                                 if (overlap)
                                         continue;
@@ -945 +766 @@
                 }
                 
-                buddy_system_t *buddy = (buddy_system_t *) PA2KA(PFN2ADDR(confframe));
-                zone_construct(&zones.info[znum], buddy, start, count, flags);
+                void *confdata = (void *) PA2KA(PFN2ADDR(confframe));
+                zone_construct(&zones.info[znum], start, count, flags, confdata);
                 
                 /* If confdata in zone, mark as unavailable */
                 if ((confframe >= start) && (confframe < start + count)) {
-                        size_t i;
-                        for (i = confframe; i < confframe + confcount; i++)
+                        for (size_t i = confframe; i < confframe + confcount; i++)
                                 zone_mark_unavailable(&zones.info[znum],
                                     i - zones.info[znum].base);
@@ -967 +787 @@
                 return (size_t) -1;
         }
-        zone_construct(&zones.info[znum], NULL, start, count, flags);
+        
+        zone_construct(&zones.info[znum], start, count, flags, NULL);
         
         irq_spinlock_unlock(&zones.lock, true);
@@ -1009 +830 @@
 }
 
-/** Allocate power-of-two frames of physical memory.
- *
- * @param order Allocate exactly 2^order frames.
- * @param flags Flags for host zone selection and address processing.
- * @param pzone Preferred zone.
+/** Allocate frames of physical memory.
+ *
+ * @param count      Number of continuous frames to allocate.
+ * @param flags      Flags for host zone selection and address processing.
+ * @param constraint Indication of physical address bits that cannot be
+ *                   set in the address of the first allocated frame.
+ * @param pzone      Preferred zone.
  *
  * @return Physical address of the allocated frame.
  *
  */
-void *frame_alloc_generic(uint8_t order, frame_flags_t flags, size_t *pzone)
-{
-        size_t size = ((size_t) 1) << order;
+uintptr_t frame_alloc_generic(size_t count, frame_flags_t flags,
+    uintptr_t constraint, size_t *pzone)
+{
+        ASSERT(count > 0);
+        
         size_t hint = pzone ? (*pzone) : 0;
+        pfn_t frame_constraint = ADDR2PFN(constraint);
         
         /*
          * If not told otherwise, we must first reserve the memory.
          */
-        if (!(flags & FRAME_NO_RESERVE)) 
-                reserve_force_alloc(size);
-
+        if (!(flags & FRAME_NO_RESERVE))
+                reserve_force_alloc(count);
+        
 loop:
         irq_spinlock_lock(&zones.lock, true);
@@ -1035 +861 @@
          * First, find suitable frame zone.
          */
-        size_t znum = find_free_zone(order,
-            FRAME_TO_ZONE_FLAGS(flags), hint);
-        
-        /* If no memory, reclaim some slab memory,
-           if it does not help, reclaim all */
+        size_t znum = find_free_zone(count, FRAME_TO_ZONE_FLAGS(flags),
+            frame_constraint, hint);
+        
+        /*
+         * If no memory, reclaim some slab memory,
+         * if it does not help, reclaim all.
+         */
         if ((znum == (size_t) -1) && (!(flags & FRAME_NO_RECLAIM))) {
                 irq_spinlock_unlock(&zones.lock, true);
@@ -1046 +874 @@
                 
                 if (freed > 0)
-                        znum = find_free_zone(order,
-                            FRAME_TO_ZONE_FLAGS(flags), hint);
+                        znum = find_free_zone(count, FRAME_TO_ZONE_FLAGS(flags),
+                            frame_constraint, hint);
                 
                 if (znum == (size_t) -1) {
@@ -1055 +883 @@
                         
                         if (freed > 0)
-                                znum = find_free_zone(order,
-                                    FRAME_TO_ZONE_FLAGS(flags), hint);
+                                znum = find_free_zone(count, FRAME_TO_ZONE_FLAGS(flags),
+                                    frame_constraint, hint);
                 }
         }
@@ -1063 +891 @@
                 if (flags & FRAME_ATOMIC) {
                         irq_spinlock_unlock(&zones.lock, true);
+                        
                         if (!(flags & FRAME_NO_RESERVE))
-                                reserve_free(size);
-                        return NULL;
+                                reserve_free(count);
+                        
+                        return 0;
                 }
                 
@@ -1075 +905 @@
                 
                 if (!THREAD)
-                        panic("Cannot wait for memory to become available.");
+                        panic("Cannot wait for %zu frames to become available "
+                            "(%zu available).", count, avail);
                 
                 /*
@@ -1082 +913 @@
                 
 #ifdef CONFIG_DEBUG
-                printf("Thread %" PRIu64 " waiting for %zu frames, "
-                    "%zu available.\n", THREAD->tid, size, avail);
+                printf("Thread %" PRIu64 " waiting for %zu frames "
+                    "(%zu available).\n", THREAD->tid, count, avail);
 #endif
                 
                 /*
-                 * Since the mem_avail_mtx is an active mutex, we need to disable interrupts
-                 * to prevent deadlock with TLB shootdown.
+                 * Since the mem_avail_mtx is an active mutex, we need to
+                 * disable interrupts to prevent deadlock with TLB shootdown.
                  */
                 ipl_t ipl = interrupts_disable();
@@ -1094 +925 @@
                 
                 if (mem_avail_req > 0)
-                        mem_avail_req = min(mem_avail_req, size);
+                        mem_avail_req = min(mem_avail_req, count);
                 else
-                        mem_avail_req = size;
+                        mem_avail_req = count;
+                
                 size_t gen = mem_avail_gen;
                 
@@ -1112 +944 @@
         }
         
-        pfn_t pfn = zone_frame_alloc(&zones.info[znum], order)
-            + zones.info[znum].base;
+        pfn_t pfn = zone_frame_alloc(&zones.info[znum], count,
+            frame_constraint) + zones.info[znum].base;
         
         irq_spinlock_unlock(&zones.lock, true);
@@ -1120 +952 @@
                 *pzone = znum;
         
-        if (flags & FRAME_KA)
-                return (void *) PA2KA(PFN2ADDR(pfn));
-        
-        return (void *) PFN2ADDR(pfn);
-}
-
-void *frame_alloc(uint8_t order, frame_flags_t flags)
-{
-        return frame_alloc_generic(order, flags, NULL);
-}
-
-void *frame_alloc_noreserve(uint8_t order, frame_flags_t flags)
-{
-        return frame_alloc_generic(order, flags | FRAME_NO_RESERVE, NULL);
-}
-
-/** Free a frame.
- *
- * Find respective frame structure for supplied physical frame address.
- * Decrement frame reference count. If it drops to zero, move the frame
- * structure to free list.
- *
- * @param frame Physical Address of of the frame to be freed.
+        return PFN2ADDR(pfn);
+}
+
+uintptr_t frame_alloc(size_t count, frame_flags_t flags, uintptr_t constraint)
+{
+        return frame_alloc_generic(count, flags, constraint, NULL);
+}
+
+/** Free frames of physical memory.
+ *
+ * Find respective frame structures for supplied physical frames.
+ * Decrement each frame reference count. If it drops to zero, mark
+ * the frames as available.
+ *
+ * @param start Physical Address of the first frame to be freed.
+ * @param count Number of frames to free.
  * @param flags Flags to control memory reservation.
  *
  */
-void frame_free_generic(uintptr_t frame, frame_flags_t flags)
-{
-        size_t size;
+void frame_free_generic(uintptr_t start, size_t count, frame_flags_t flags)
+{
+        size_t freed = 0;
         
         irq_spinlock_lock(&zones.lock, true);
         
-        /*
-         * First, find host frame zone for addr.
-         */
-        pfn_t pfn = ADDR2PFN(frame);
-        size_t znum = find_zone(pfn, 1, 0);
-
-        ASSERT(znum != (size_t) -1);
-        
-        size = zone_frame_free(&zones.info[znum], pfn - zones.info[znum].base);
+        for (size_t i = 0; i < count; i++) {
+                /*
+                 * First, find host frame zone for addr.
+                 */
+                pfn_t pfn = ADDR2PFN(start) + i;
+                size_t znum = find_zone(pfn, 1, 0);
+                
+                ASSERT(znum != (size_t) -1);
+                
+                freed += zone_frame_free(&zones.info[znum],
+                    pfn - zones.info[znum].base);
+        }
         
         irq_spinlock_unlock(&zones.lock, true);
@@ -1166 +994 @@
         /*
          * Signal that some memory has been freed.
+         * Since the mem_avail_mtx is an active mutex,
+         * we need to disable interruptsto prevent deadlock
+         * with TLB shootdown.
          */
-
-        
-        /*
-         * Since the mem_avail_mtx is an active mutex, we need to disable interrupts
-         * to prevent deadlock with TLB shootdown.
-         */
+        
         ipl_t ipl = interrupts_disable();
         mutex_lock(&mem_avail_mtx);
+        
         if (mem_avail_req > 0)
-                mem_avail_req -= min(mem_avail_req, size);
+                mem_avail_req -= min(mem_avail_req, freed);
         
         if (mem_avail_req == 0) {
@@ -1182 +1009 @@
                 condvar_broadcast(&mem_avail_cv);
         }
+        
         mutex_unlock(&mem_avail_mtx);
         interrupts_restore(ipl);
         
         if (!(flags & FRAME_NO_RESERVE))
-                reserve_free(size);
-}
-
-void frame_free(uintptr_t frame)
-{
-        frame_free_generic(frame, 0);
-}
-
-void frame_free_noreserve(uintptr_t frame)
-{
-        frame_free_generic(frame, FRAME_NO_RESERVE);
+                reserve_free(freed);
+}
+
+void frame_free(uintptr_t frame, size_t count)
+{
+        frame_free_generic(frame, count, 0);
+}
+
+void frame_free_noreserve(uintptr_t frame, size_t count)
+{
+        frame_free_generic(frame, count, FRAME_NO_RESERVE);
 }
 
@@ -1230 +1058 @@
         irq_spinlock_lock(&zones.lock, true);
         
-        size_t i;
-        for (i = 0; i < count; i++) {
+        for (size_t i = 0; i < count; i++) {
                 size_t znum = find_zone(start + i, 1, 0);
+                
                 if (znum == (size_t) -1)  /* PFN not found */
                         continue;
@@ -1257 +1085 @@
         /* Tell the architecture to create some memory */
         frame_low_arch_init();
+        
         if (config.cpu_active == 1) {
                 frame_mark_unavailable(ADDR2PFN(KA2PA(config.base)),
@@ -1263 +1092 @@
                     SIZE2FRAMES(config.stack_size));
                 
-                size_t i;
-                for (i = 0; i < init.cnt; i++) {
-                        pfn_t pfn = ADDR2PFN(init.tasks[i].paddr);
-                        frame_mark_unavailable(pfn,
+                for (size_t i = 0; i < init.cnt; i++)
+                        frame_mark_unavailable(ADDR2PFN(init.tasks[i].paddr),
                             SIZE2FRAMES(init.tasks[i].size));
-                }
                 
                 if (ballocs.size)
@@ -1274 +1100 @@
                             SIZE2FRAMES(ballocs.size));
                 
-                /* Black list first frame, as allocating NULL would
+                /*
+                 * Blacklist first frame, as allocating NULL would
                  * fail in some places
                  */
                 frame_mark_unavailable(0, 1);
         }
+        
         frame_high_arch_init();
 }
@@ -1284 +1112 @@
 /** Adjust bounds of physical memory region according to low/high memory split.
  *
- * @param low[in]       If true, the adjustment is performed to make the region
- *                      fit in the low memory. Otherwise the adjustment is
- *                      performed to make the region fit in the high memory.
- * @param basep[inout]  Pointer to a variable which contains the region's base
- *                      address and which may receive the adjusted base address.
- * @param sizep[inout]  Pointer to a variable which contains the region's size
- *                      and which may receive the adjusted size.
- * @retun               True if the region still exists even after the
- *                      adjustment, false otherwise.
+ * @param low[in]      If true, the adjustment is performed to make the region
+ *                     fit in the low memory. Otherwise the adjustment is
+ *                     performed to make the region fit in the high memory.
+ * @param basep[inout] Pointer to a variable which contains the region's base
+ *                     address and which may receive the adjusted base address.
+ * @param sizep[inout] Pointer to a variable which contains the region's size
+ *                     and which may receive the adjusted size.
+ *
+ * @return True if the region still exists even after the adjustment.
+ * @return False otherwise.
+ *
  */
 bool frame_adjust_zone_bounds(bool low, uintptr_t *basep, size_t *sizep)
 {
         uintptr_t limit = KA2PA(config.identity_base) + config.identity_size;
-
+        
         if (low) {
                 if (*basep > limit)
                         return false;
+                
                 if (*basep + *sizep > limit)
                         *sizep = limit - *basep;
@@ -1306 +1137 @@
                 if (*basep + *sizep <= limit)
                         return false;
+                
                 if (*basep <= limit) {
                         *sizep -= limit - *basep;
@@ -1311 +1143 @@
                 }
         }
+        
         return true;
 }
@@ -1322 +1155 @@
         
         uint64_t total = 0;
-        size_t i;
-        for (i = 0; i < zones.count; i++)
+        
+        for (size_t i = 0; i < zones.count; i++)
                 total += (uint64_t) FRAMES2SIZE(zones.info[i].count);
         
@@ -1346 +1179 @@
         *free = 0;
         
-        size_t i;
-        for (i = 0; i < zones.count; i++) {
+        for (size_t i = 0; i < zones.count; i++) {
                 *total += (uint64_t) FRAMES2SIZE(zones.info[i].count);
                 
@@ -1375 +1207 @@
         /*
          * Because printing may require allocation of memory, we may not hold
-         * the frame allocator locks when printing zone statistics.  Therefore,
+         * the frame allocator locks when printing zone statistics. Therefore,
          * we simply gather the statistics under the protection of the locks and
          * print the statistics when the locks have been released.
@@ -1384 +1216 @@
          */
         
-        size_t i;
-        for (i = 0;; i++) {
+        size_t free_lowmem = 0;
+        size_t free_highmem = 0;
+        size_t free_highprio = 0;
+        
+        for (size_t i = 0;; i++) {
                 irq_spinlock_lock(&zones.lock, true);
                 
@@ -1393 +1228 @@
                 }
                 
-                uintptr_t base = PFN2ADDR(zones.info[i].base);
+                pfn_t fbase = zones.info[i].base;
+                uintptr_t base = PFN2ADDR(fbase);
                 size_t count = zones.info[i].count;
                 zone_flags_t flags = zones.info[i].flags;
@@ -1399 +1235 @@
                 size_t busy_count = zones.info[i].busy_count;
                 
+                bool available = ((flags & ZONE_AVAILABLE) != 0);
+                bool lowmem = ((flags & ZONE_LOWMEM) != 0);
+                bool highmem = ((flags & ZONE_HIGHMEM) != 0);
+                bool highprio = is_high_priority(fbase, count);
+                
+                if (available) {
+                        if (lowmem)
+                                free_lowmem += free_count;
+                        
+                        if (highmem)
+                                free_highmem += free_count;
+                        
+                        if (highprio) {
+                                free_highprio += free_count;
+                        } else {
+                                /*
+                                 * Walk all frames of the zone and examine
+                                 * all high priority memory to get accurate
+                                 * statistics.
+                                 */
+                                
+                                for (size_t index = 0; index < count; index++) {
+                                        if (is_high_priority(fbase + index, 0)) {
+                                                if (!bitmap_get(&zones.info[i].bitmap, index))
+                                                        free_highprio++;
+                                        } else
+                                                break;
+                                }
+                        }
+                }
+                
                 irq_spinlock_unlock(&zones.lock, true);
-                
-                bool available = ((flags & ZONE_AVAILABLE) != 0);
                 
                 printf("%-4zu", i);
@@ -1426 +1291 @@
                 printf("\n");
         }
+        
+        printf("\n");
+        
+        uint64_t size;
+        const char *size_suffix;
+        
+        bin_order_suffix(FRAMES2SIZE(free_lowmem), &size, &size_suffix,
+            false);
+        printf("Available low memory:    %zu frames (%" PRIu64 " %s)\n",
+            free_lowmem, size, size_suffix);
+        
+        bin_order_suffix(FRAMES2SIZE(free_highmem), &size, &size_suffix,
+            false);
+        printf("Available high memory:   %zu frames (%" PRIu64 " %s)\n",
+            free_highmem, size, size_suffix);
+        
+        bin_order_suffix(FRAMES2SIZE(free_highprio), &size, &size_suffix,
+            false);
+        printf("Available high priority: %zu frames (%" PRIu64 " %s)\n",
+            free_highprio, size, size_suffix);
 }
 
@@ -1438 +1323 @@
         size_t znum = (size_t) -1;
         
-        size_t i;
-        for (i = 0; i < zones.count; i++) {
+        for (size_t i = 0; i < zones.count; i++) {
                 if ((i == num) || (PFN2ADDR(zones.info[i].base) == num)) {
                         znum = i;
@@ -1452 +1336 @@
         }
         
-        uintptr_t base = PFN2ADDR(zones.info[i].base);
-        zone_flags_t flags = zones.info[i].flags;
-        size_t count = zones.info[i].count;
-        size_t free_count = zones.info[i].free_count;
-        size_t busy_count = zones.info[i].busy_count;
+        size_t free_lowmem = 0;
+        size_t free_highmem = 0;
+        size_t free_highprio = 0;
+        
+        pfn_t fbase = zones.info[znum].base;
+        uintptr_t base = PFN2ADDR(fbase);
+        zone_flags_t flags = zones.info[znum].flags;
+        size_t count = zones.info[znum].count;
+        size_t free_count = zones.info[znum].free_count;
+        size_t busy_count = zones.info[znum].busy_count;
+        
+        bool available = ((flags & ZONE_AVAILABLE) != 0);
+        bool lowmem = ((flags & ZONE_LOWMEM) != 0);
+        bool highmem = ((flags & ZONE_HIGHMEM) != 0);
+        bool highprio = is_high_priority(fbase, count);
+        
+        if (available) {
+                if (lowmem)
+                        free_lowmem = free_count;
+                
+                if (highmem)
+                        free_highmem = free_count;
+                
+                if (highprio) {
+                        free_highprio = free_count;
+                } else {
+                        /*
+                         * Walk all frames of the zone and examine
+                         * all high priority memory to get accurate
+                         * statistics.
+                         */
+                        
+                        for (size_t index = 0; index < count; index++) {
+                                if (is_high_priority(fbase + index, 0)) {
+                                        if (!bitmap_get(&zones.info[znum].bitmap, index))
+                                                free_highprio++;
+                                } else
+                                        break;
+                        }
+                }
+        }
         
         irq_spinlock_unlock(&zones.lock, true);
-        
-        bool available = ((flags & ZONE_AVAILABLE) != 0);
         
         uint64_t size;
         const char *size_suffix;
+        
         bin_order_suffix(FRAMES2SIZE(count), &size, &size_suffix, false);
         
-        printf("Zone number:       %zu\n", znum);
-        printf("Zone base address: %p\n", (void *) base);
-        printf("Zone size:         %zu frames (%" PRIu64 " %s)\n", count,
+        printf("Zone number:             %zu\n", znum);
+        printf("Zone base address:       %p\n", (void *) base);
+        printf("Zone size:               %zu frames (%" PRIu64 " %s)\n", count,
             size, size_suffix);
-        printf("Zone flags:        %c%c%c%c%c\n",
+        printf("Zone flags:              %c%c%c%c%c\n",
             available ? 'A' : '-',
             (flags & ZONE_RESERVED) ? 'R' : '-',
@@ -1480 +1399 @@
                 bin_order_suffix(FRAMES2SIZE(busy_count), &size, &size_suffix,
                     false);
-                printf("Allocated space:   %zu frames (%" PRIu64 " %s)\n",
+                printf("Allocated space:         %zu frames (%" PRIu64 " %s)\n",
                     busy_count, size, size_suffix);
+                
                 bin_order_suffix(FRAMES2SIZE(free_count), &size, &size_suffix,
                     false);
-                printf("Available space:   %zu frames (%" PRIu64 " %s)\n",
+                printf("Available space:         %zu frames (%" PRIu64 " %s)\n",
                     free_count, size, size_suffix);
+                
+                bin_order_suffix(FRAMES2SIZE(free_lowmem), &size, &size_suffix,
+                    false);
+                printf("Available low memory:    %zu frames (%" PRIu64 " %s)\n",
+                    free_lowmem, size, size_suffix);
+                
+                bin_order_suffix(FRAMES2SIZE(free_highmem), &size, &size_suffix,
+                    false);
+                printf("Available high memory:   %zu frames (%" PRIu64 " %s)\n",
+                    free_highmem, size, size_suffix);
+                
+                bin_order_suffix(FRAMES2SIZE(free_highprio), &size, &size_suffix,
+                    false);
+                printf("Available high priority: %zu frames (%" PRIu64 " %s)\n",
+                    free_highprio, size, size_suffix);
         }
 }

kernel/generic/src/mm/km.c

@@ -239 +239 @@
 uintptr_t km_temporary_page_get(uintptr_t *framep, frame_flags_t flags)
 {
-        uintptr_t frame;
-        uintptr_t page;
-
         ASSERT(THREAD);
         ASSERT(framep);
         ASSERT(!(flags & ~(FRAME_NO_RESERVE | FRAME_ATOMIC)));
-
+        
         /*
          * Allocate a frame, preferably from high memory.
          */
-        frame = (uintptr_t) frame_alloc(ONE_FRAME,
-            FRAME_HIGHMEM | FRAME_ATOMIC | flags); 
+        uintptr_t page;
+        uintptr_t frame =
+            frame_alloc(1, FRAME_HIGHMEM | FRAME_ATOMIC | flags, 0);
         if (frame) {
                 page = km_map(frame, PAGE_SIZE,
                     PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
-                ASSERT(page);   // FIXME
+                
+                // FIXME
+                ASSERT(page);
         } else {
-                frame = (uintptr_t) frame_alloc(ONE_FRAME,
-                    FRAME_LOWMEM | flags);
+                frame = frame_alloc(1, FRAME_LOWMEM | flags, 0);
                 if (!frame)
                         return (uintptr_t) NULL;
+                
                 page = PA2KA(frame);
         }
-
+        
         *framep = frame;
-        return page;    
+        return page;
 }
 

kernel/generic/src/mm/page.c

@@ -169 +169 @@
 }
 
-int page_find_mapping(uintptr_t virt, void **phys)
+int page_find_mapping(uintptr_t virt, uintptr_t *phys)
 {
         page_table_lock(AS, true);
@@ -179 +179 @@
         }
         
-        *phys = (void *) PTE_GET_FRAME(pte) +
+        *phys = PTE_GET_FRAME(pte) +
             (virt - ALIGN_DOWN(virt, PAGE_SIZE));
         
@@ -193 +193 @@
  *
  */
-sysarg_t sys_page_find_mapping(uintptr_t virt, void *phys_ptr)
-{
-        void *phys;
+sysarg_t sys_page_find_mapping(uintptr_t virt, uintptr_t *phys_ptr)
+{
+        uintptr_t phys;
         int rc = page_find_mapping(virt, &phys);
         if (rc != EOK)

kernel/generic/src/mm/slab.c

@@ -182 +182 @@
         size_t zone = 0;
         
-        void *data = frame_alloc_generic(cache->order, FRAME_KA | flags, &zone);
-        if (!data) {
+        uintptr_t data_phys =
+            frame_alloc_generic(cache->frames, flags, 0, &zone);
+        if (!data_phys)
                 return NULL;
-        }
+        
+        void *data = (void *) PA2KA(data_phys);
         
         slab_t *slab;
@@ -193 +195 @@
                 slab = slab_alloc(slab_extern_cache, flags);
                 if (!slab) {
-                        frame_free(KA2PA(data));
+                        frame_free(KA2PA(data), cache->frames);
                         return NULL;
                 }
         } else {
-                fsize = (PAGE_SIZE << cache->order);
+                fsize = FRAMES2SIZE(cache->frames);
                 slab = data + fsize - sizeof(*slab);
         }
@@ -203 +205 @@
         /* Fill in slab structures */
         size_t i;
-        for (i = 0; i < ((size_t) 1 << cache->order); i++)
+        for (i = 0; i < cache->frames; i++)
                 frame_set_parent(ADDR2PFN(KA2PA(data)) + i, slab, zone);
         
@@ -225 +227 @@
 NO_TRACE static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
 {
-        frame_free(KA2PA(slab->start));
+        frame_free(KA2PA(slab->start), slab->cache->frames);
         if (!(cache->flags & SLAB_CACHE_SLINSIDE))
                 slab_free(slab_extern_cache, slab);
@@ -231 +233 @@
         atomic_dec(&cache->allocated_slabs);
         
-        return (1 << cache->order);
+        return cache->frames;
 }
 
@@ -558 +560 @@
 {
         if (cache->flags & SLAB_CACHE_SLINSIDE)
-                return ((PAGE_SIZE << cache->order)
-                    - sizeof(slab_t)) / cache->size;
+                return (FRAMES2SIZE(cache->frames) - sizeof(slab_t)) /
+                    cache->size;
         else
-                return (PAGE_SIZE << cache->order) / cache->size;
+                return FRAMES2SIZE(cache->frames) / cache->size;
 }
 
@@ -570 +572 @@
 {
         size_t objects = comp_objects(cache);
-        size_t ssize = PAGE_SIZE << cache->order;
+        size_t ssize = FRAMES2SIZE(cache->frames);
         
         if (cache->flags & SLAB_CACHE_SLINSIDE)
@@ -634 +636 @@
                 cache->flags |= SLAB_CACHE_SLINSIDE;
         
-        /* Minimum slab order */
-        size_t pages = SIZE2FRAMES(cache->size);
-        
-        /* We need the 2^order >= pages */
-        if (pages == 1)
-                cache->order = 0;
-        else
-                cache->order = fnzb(pages - 1) + 1;
+        /* Minimum slab frames */
+        cache->frames = SIZE2FRAMES(cache->size);
         
         while (badness(cache) > SLAB_MAX_BADNESS(cache))
-                cache->order += 1;
+                cache->frames <<= 1;
         
         cache->objects = comp_objects(cache);
@@ -810 +806 @@
         
         size_t frames = 0;
-        list_foreach(slab_cache_list, cur) {
-                slab_cache_t *cache = list_get_instance(cur, slab_cache_t, link);
+        list_foreach(slab_cache_list, link, slab_cache_t, cache) {
                 frames += _slab_reclaim(cache, flags);
         }
@@ -871 +866 @@
                 
                 const char *name = cache->name;
-                uint8_t order = cache->order;
+                size_t frames = cache->frames;
                 size_t size = cache->size;
                 size_t objects = cache->objects;
@@ -881 +876 @@
                 irq_spinlock_unlock(&slab_cache_lock, true);
                 
-                printf("%-18s %8zu %8u %8zu %8ld %8ld %8ld %-5s\n",
-                    name, size, (1 << order), objects, allocated_slabs,
+                printf("%-18s %8zu %8zu %8zu %8ld %8ld %8ld %-5s\n",
+                    name, size, frames, objects, allocated_slabs,
                     cached_objs, allocated_objs,
                     flags & SLAB_CACHE_SLINSIDE ? "in" : "out");
@@ -936 +931 @@
         irq_spinlock_lock(&slab_cache_lock, false);
         
-        list_foreach(slab_cache_list, cur) {
-                slab_cache_t *slab = list_get_instance(cur, slab_cache_t, link);
+        list_foreach(slab_cache_list, link, slab_cache_t, slab) {
                 if ((slab->flags & SLAB_CACHE_MAGDEFERRED) !=
                     SLAB_CACHE_MAGDEFERRED)

kernel/generic/src/proc/scheduler.c

@@ -739 +739 @@
                         
                         printf("\trq[%u]: ", i);
-                        list_foreach(cpus[cpu].rq[i].rq, cur) {
-                                thread_t *thread = list_get_instance(cur,
-                                    thread_t, rq_link);
+                        list_foreach(cpus[cpu].rq[i].rq, rq_link, thread_t,
+                            thread) {
                                 printf("%" PRIu64 "(%s) ", thread->tid,
                                     thread_states[thread->state]);

kernel/generic/src/proc/task.c

@@ -452 +452 @@
         
         /* Current values of threads */
-        list_foreach(task->threads, cur) {
-                thread_t *thread = list_get_instance(cur, thread_t, th_link);
-                
+        list_foreach(task->threads, th_link, thread_t, thread) {
                 irq_spinlock_lock(&thread->lock, false);
                 
@@ -484 +482 @@
          */
         
-        list_foreach(task->threads, cur) {
-                thread_t *thread = list_get_instance(cur, thread_t, th_link);
+        list_foreach(task->threads, th_link, thread_t, thread) {
                 bool sleeping = false;
                 

kernel/generic/src/proc/thread.c

@@ -192 +192 @@
         kmflags &= ~FRAME_HIGHMEM;
         
-        thread->kstack = (uint8_t *) frame_alloc(STACK_FRAMES, FRAME_KA | kmflags);
-        if (!thread->kstack) {
+        uintptr_t stack_phys =
+            frame_alloc(STACK_FRAMES, kmflags, STACK_SIZE - 1);
+        if (!stack_phys) {
 #ifdef CONFIG_FPU
                 if (thread->saved_fpu_context)
@@ -201 +202 @@
         }
         
+        thread->kstack = (uint8_t *) PA2KA(stack_phys);
+        
 #ifdef CONFIG_UDEBUG
         mutex_initialize(&thread->udebug.lock, MUTEX_PASSIVE);
@@ -216 +219 @@
         thr_destructor_arch(thread);
         
-        frame_free(KA2PA(thread->kstack));
+        frame_free(KA2PA(thread->kstack), STACK_FRAMES);
         
 #ifdef CONFIG_FPU

kernel/generic/src/synch/futex.c

@@ -274 +274 @@
         mutex_lock(&TASK->futexes_lock);
 
-        list_foreach(TASK->futexes.leaf_list, cur) {
-                btree_node_t *node;
+        list_foreach(TASK->futexes.leaf_list, leaf_link, btree_node_t, node) {
                 unsigned int i;
                 
-                node = list_get_instance(cur, btree_node_t, leaf_link);
                 for (i = 0; i < node->keys; i++) {
                         futex_t *ftx;

kernel/generic/src/sysinfo/stats.c

@@ -175 +175 @@
         
         /* Walk the B+ tree and count pages */
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node =
-                    list_get_instance(cur, btree_node_t, leaf_link);
-                
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
+            node) {
                 unsigned int i;
                 for (i = 0; i < node->keys; i++) {
@@ -218 +216 @@
         
         /* Walk the B+ tree and count pages */
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node =
-                    list_get_instance(cur, btree_node_t, leaf_link);
-                
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t, node) {
                 unsigned int i;
                 for (i = 0; i < node->keys; i++) {

kernel/generic/src/time/clock.c

@@ -81 +81 @@
 void clock_counter_init(void)
 {
-        void *faddr = frame_alloc(ONE_FRAME, FRAME_ATOMIC);
-        if (!faddr)
+        uintptr_t faddr = frame_alloc(1, FRAME_ATOMIC, 0);
+        if (faddr == 0)
                 panic("Cannot allocate page for clock.");
         
@@ -91 +91 @@
         uptime->useconds = 0;
         
-        clock_parea.pbase = (uintptr_t) faddr;
+        clock_parea.pbase = faddr;
         clock_parea.frames = 1;
         clock_parea.unpriv = true;

kernel/generic/src/udebug/udebug.c

@@ -406 +406 @@
         
         /* Finish debugging of all userspace threads */
-        list_foreach(task->threads, cur) {
-                thread_t *thread = list_get_instance(cur, thread_t, th_link);
-                
+        list_foreach(task->threads, th_link, thread_t, thread) {
                 mutex_lock(&thread->udebug.lock);
                 

kernel/generic/src/udebug/udebug_ops.c

@@ -196 +196 @@
         /* Set udebug.active on all of the task's userspace threads. */
         
-        list_foreach(TASK->threads, cur) {
-                thread_t *thread = list_get_instance(cur, thread_t, th_link);
-                
+        list_foreach(TASK->threads, th_link, thread_t, thread) {
                 mutex_lock(&thread->udebug.lock);
                 if (thread->uspace) {
@@ -389 +387 @@
         
         /* FIXME: make sure the thread isn't past debug shutdown... */
-        list_foreach(TASK->threads, cur) {
-                thread_t *thread = list_get_instance(cur, thread_t, th_link);
-                
+        list_foreach(TASK->threads, th_link, thread_t, thread) {
                 irq_spinlock_lock(&thread->lock, false);
                 bool uspace = thread->uspace;