Index: kernel/generic/include/mm/buddy.h =================================================================== --- kernel/generic/include/mm/buddy.h (revision ba2be23ed5b64c117eabda6070c8ad4ea3c56df6) +++ (revision ) @@ -1,91 +1,0 @@ -/* - * Copyright (c) 2005 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup genericmm - * @{ - */ -/** @file - */ - -#ifndef KERN_BUDDY_H_ -#define KERN_BUDDY_H_ - -#include -#include - -#define BUDDY_SYSTEM_INNER_BLOCK 0xff - -struct buddy_system; - -/** Buddy system operations to be implemented by each implementation. */ -typedef struct { - /** - * Return pointer to left-side or right-side buddy for block passed as - * argument. - */ - link_t *(* find_buddy)(struct buddy_system *, link_t *); - /** - * Bisect the block passed as argument and return pointer to the new - * right-side buddy. - */ - link_t *(* bisect)(struct buddy_system *, link_t *); - /** Coalesce two buddies into a bigger block. */ - link_t *(* coalesce)(struct buddy_system *, link_t *, link_t *); - /** Set order of block passed as argument. */ - void (*set_order)(struct buddy_system *, link_t *, uint8_t); - /** Return order of block passed as argument. */ - uint8_t (*get_order)(struct buddy_system *, link_t *); - /** Mark block as busy. */ - void (*mark_busy)(struct buddy_system *, link_t *); - /** Mark block as available. */ - void (*mark_available)(struct buddy_system *, link_t *); - /** Find parent of block that has given order */ - link_t *(* find_block)(struct buddy_system *, link_t *, uint8_t); -} buddy_system_operations_t; - -typedef struct buddy_system { - /** Maximal order of block which can be stored by buddy system. */ - uint8_t max_order; - list_t *order; - buddy_system_operations_t *op; - /** Pointer to be used by the implementation. */ - void *data; -} buddy_system_t; - -extern void buddy_system_create(buddy_system_t *, uint8_t, - buddy_system_operations_t *, void *); -extern link_t *buddy_system_alloc(buddy_system_t *, uint8_t); -extern bool buddy_system_can_alloc(buddy_system_t *, uint8_t); -extern void buddy_system_free(buddy_system_t *, link_t *); -extern size_t buddy_conf_size(size_t); -extern link_t *buddy_system_alloc_block(buddy_system_t *, link_t *); - -#endif - -/** @} - */ Index: kernel/generic/include/mm/frame.h =================================================================== --- kernel/generic/include/mm/frame.h (revision ba2be23ed5b64c117eabda6070c8ad4ea3c56df6) +++ kernel/generic/include/mm/frame.h (revision d80d7a889cd4aba55293c8f66e880cafcb945168) @@ -39,6 +39,6 @@ #include #include +#include #include -#include #include #include @@ -90,24 +90,29 @@ typedef struct { - size_t refcount; /**< Tracking of shared frames */ - link_t buddy_link; /**< Link to the next free block inside - one order */ - void *parent; /**< If allocated by slab, this points there */ - uint8_t buddy_order; /**< Buddy system block order */ + size_t refcount; /**< Tracking of shared frames */ + void *parent; /**< If allocated by slab, this points there */ } frame_t; typedef struct { - pfn_t base; /**< Frame_no of the first frame - in the frames array */ - size_t count; /**< Size of zone */ - size_t free_count; /**< Number of free frame_t - structures */ - size_t busy_count; /**< Number of busy frame_t - structures */ - zone_flags_t flags; /**< Type of the zone */ + /** Frame_no of the first frame in the frames array */ + pfn_t base; - frame_t *frames; /**< Array of frame_t structures - in this zone */ - buddy_system_t *buddy_system; /**< Buddy system for the zone */ + /** Size of zone */ + size_t count; + + /** Number of free frame_t structures */ + size_t free_count; + + /** Number of busy frame_t structures */ + size_t busy_count; + + /** Type of the zone */ + zone_flags_t flags; + + /** Frame bitmap */ + bitmap_t bitmap; + + /** Array of frame_t structures in this zone */ + frame_t *frames; } zone_t; @@ -124,43 +129,9 @@ extern zones_t zones; -NO_TRACE static inline uintptr_t PFN2ADDR(pfn_t frame) -{ - return (uintptr_t) (frame << FRAME_WIDTH); -} - -NO_TRACE static inline pfn_t ADDR2PFN(uintptr_t addr) -{ - return (pfn_t) (addr >> FRAME_WIDTH); -} - -NO_TRACE static inline size_t SIZE2FRAMES(size_t size) -{ - if (size == 0) - return 0; - - return (size_t) ((size - 1) >> FRAME_WIDTH) + 1; -} - -NO_TRACE static inline size_t FRAMES2SIZE(size_t frames) -{ - return (size_t) (frames << FRAME_WIDTH); -} - -#define IS_BUDDY_ORDER_OK(index, order) \ - ((~(((sysarg_t) -1) << (order)) & (index)) == 0) -#define IS_BUDDY_LEFT_BLOCK(zone, frame) \ - (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 0) -#define IS_BUDDY_RIGHT_BLOCK(zone, frame) \ - (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1) -#define IS_BUDDY_LEFT_BLOCK_ABS(zone, frame) \ - (((frame_index_abs((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 0) -#define IS_BUDDY_RIGHT_BLOCK_ABS(zone, frame) \ - (((frame_index_abs((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1) - extern void frame_init(void); extern bool frame_adjust_zone_bounds(bool, uintptr_t *, size_t *); -extern uintptr_t frame_alloc_generic(uint8_t, frame_flags_t, uintptr_t, size_t *); -extern uintptr_t frame_alloc(uint8_t, frame_flags_t, uintptr_t); -extern uintptr_t frame_alloc_noreserve(uint8_t, frame_flags_t, uintptr_t); +extern uintptr_t frame_alloc_generic(size_t, frame_flags_t, uintptr_t, size_t *); +extern uintptr_t frame_alloc(size_t, frame_flags_t, uintptr_t); +extern uintptr_t frame_alloc_noreserve(size_t, frame_flags_t, uintptr_t); extern void frame_free_generic(uintptr_t, frame_flags_t); extern void frame_free(uintptr_t); Index: kernel/generic/include/mm/slab.h =================================================================== --- kernel/generic/include/mm/slab.h (revision ba2be23ed5b64c117eabda6070c8ad4ea3c56df6) +++ kernel/generic/include/mm/slab.h (revision d80d7a889cd4aba55293c8f66e880cafcb945168) @@ -55,5 +55,5 @@ /** Maximum wasted space we allow for cache */ #define SLAB_MAX_BADNESS(cache) \ - (((unsigned int) PAGE_SIZE << (cache)->order) >> 2) + (FRAMES2SIZE((cache)->frames) >> 2) /* slab_reclaim constants */ @@ -101,5 +101,5 @@ /* Computed values */ - uint8_t order; /**< Order of frames to be allocated */ + size_t frames; /**< Number of frames to be allocated */ size_t objects; /**< Number of objects that fit in */