Index: kernel/generic/include/mm/as.h =================================================================== --- kernel/generic/include/mm/as.h (revision 55132b820fb53298e1e5905e0b9d45a6fcb6064b) +++ kernel/generic/include/mm/as.h (revision 8a2474fad8c6f15ac127f4f7f43d7fbb10e8e39f) @@ -238,7 +238,11 @@ /** Address space area backend structure. */ typedef struct mem_backend { + bool (* create)(as_area_t *); + bool (* resize)(as_area_t *, size_t); + void (* share)(as_area_t *); + void (* destroy)(as_area_t *); + int (* page_fault)(as_area_t *, uintptr_t, pf_access_t); void (* frame_free)(as_area_t *, uintptr_t, uintptr_t); - void (* share)(as_area_t *); } mem_backend_t; Index: kernel/generic/include/mm/frame.h =================================================================== --- kernel/generic/include/mm/frame.h (revision 55132b820fb53298e1e5905e0b9d45a6fcb6064b) +++ kernel/generic/include/mm/frame.h (revision 8a2474fad8c6f15ac127f4f7f43d7fbb10e8e39f) @@ -62,16 +62,18 @@ /** Convert the frame address to kernel VA. */ -#define FRAME_KA 0x01 +#define FRAME_KA 0x1 /** Do not panic and do not sleep on failure. */ -#define FRAME_ATOMIC 0x02 +#define FRAME_ATOMIC 0x2 /** Do not start reclaiming when no free memory. */ -#define FRAME_NO_RECLAIM 0x04 +#define FRAME_NO_RECLAIM 0x4 +/** Do not reserve / unreserve memory. */ +#define FRAME_NO_RESERVE 0x8 typedef uint8_t zone_flags_t; /** Available zone (free for allocation) */ -#define ZONE_AVAILABLE 0x00 +#define ZONE_AVAILABLE 0x0 /** Zone is reserved (not available for allocation) */ -#define ZONE_RESERVED 0x08 +#define ZONE_RESERVED 0x8 /** Zone is used by firmware (not available for allocation) */ #define ZONE_FIRMWARE 0x10 @@ -85,5 +87,5 @@ uint8_t buddy_order; /**< Buddy system block order */ link_t buddy_link; /**< Link to the next free block inside - one order */ + one order */ void *parent; /**< If allocated by slab, this points there */ } frame_t; @@ -91,14 +93,14 @@ typedef struct { pfn_t base; /**< Frame_no of the first frame - in the frames array */ + in the frames array */ size_t count; /**< Size of zone */ size_t free_count; /**< Number of free frame_t - structures */ + structures */ size_t busy_count; /**< Number of busy frame_t - structures */ + structures */ zone_flags_t flags; /**< Type of the zone */ frame_t *frames; /**< Array of frame_t structures - in this zone */ + in this zone */ buddy_system_t *buddy_system; /**< Buddy system for the zone */ } zone_t; @@ -146,21 +148,22 @@ ((~(((sysarg_t) -1) << (order)) & (index)) == 0) #define IS_BUDDY_LEFT_BLOCK(zone, frame) \ - (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x01) == 0) + (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 0) #define IS_BUDDY_RIGHT_BLOCK(zone, frame) \ - (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x01) == 1) + (((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) & 0x01) == 0) + (((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) & 0x01) == 1) - -#define frame_alloc(order, flags) \ - frame_alloc_generic(order, flags, NULL) + (((frame_index_abs((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1) extern void frame_init(void); extern void *frame_alloc_generic(uint8_t, frame_flags_t, size_t *); +extern void *frame_alloc(uint8_t, frame_flags_t); +extern void *frame_alloc_noreserve(uint8_t, frame_flags_t); +extern void frame_free_generic(uintptr_t, frame_flags_t); extern void frame_free(uintptr_t); +extern void frame_free_noreserve(uintptr_t); extern void frame_reference_add(pfn_t); -extern size_t find_zone(pfn_t frame, size_t count, size_t hint); +extern size_t find_zone(pfn_t, size_t, size_t); extern size_t zone_create(pfn_t, size_t, pfn_t, zone_flags_t); extern void *frame_get_parent(pfn_t, size_t); Index: kernel/generic/include/mm/reserve.h =================================================================== --- kernel/generic/include/mm/reserve.h (revision 8a2474fad8c6f15ac127f4f7f43d7fbb10e8e39f) +++ kernel/generic/include/mm/reserve.h (revision 8a2474fad8c6f15ac127f4f7f43d7fbb10e8e39f) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2011 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_RESERVE_H_ +#define KERN_RESERVE_H_ + +#include + +extern bool reserve_try_alloc(size_t); +extern void reserve_force_alloc(size_t); +extern void reserve_free(size_t); + +#endif + +/** @} + */