| /branches/network/kernel/generic/include/mm/as.h |
|---|
| 53,10 → 53,6 |
| #include <adt/btree.h> |
| #include <lib/elf.h> |
| #ifdef __OBJC__ |
| #include <lib/objc.h> |
| #endif |
| /** |
| * Defined to be true if user address space and kernel address space shadow each |
| * other. |
| 84,47 → 80,6 |
| /** The page fault was caused by memcpy_from_uspace() or memcpy_to_uspace(). */ |
| #define AS_PF_DEFER 2 |
| #ifdef __OBJC__ |
| @interface as_t : base_t { |
| @public |
| /** Protected by asidlock. */ |
| link_t inactive_as_with_asid_link; |
| /** |
| * Number of processors on wich is this address space active. |
| * Protected by asidlock. |
| */ |
| count_t cpu_refcount; |
| /** |
| * Address space identifier. |
| * Constant on architectures that do not support ASIDs. |
| * Protected by asidlock. |
| */ |
| asid_t asid; |
| /** Number of references (i.e tasks that reference this as). */ |
| atomic_t refcount; |
| mutex_t lock; |
| /** B+tree of address space areas. */ |
| btree_t as_area_btree; |
| /** Non-generic content. */ |
| as_genarch_t genarch; |
| /** Architecture specific content. */ |
| as_arch_t arch; |
| } |
| + (pte_t *) page_table_create: (int) flags; |
| + (void) page_table_destroy: (pte_t *) page_table; |
| - (void) page_table_lock: (bool) _lock; |
| - (void) page_table_unlock: (bool) unlock; |
| @end |
| #else |
| /** Address space structure. |
| * |
| * as_t contains the list of as_areas of userspace accessible |
| 168,7 → 123,6 |
| void (* page_table_lock)(as_t *as, bool lock); |
| void (* page_table_unlock)(as_t *as, bool unlock); |
| } as_operations_t; |
| #endif |
| /** |
| * This structure contains information associated with the shared address space |
| 249,10 → 203,7 |
| extern as_t *AS_KERNEL; |
| #ifndef __OBJC__ |
| extern as_operations_t *as_operations; |
| #endif |
| extern link_t inactive_as_with_asid_head; |
| extern void as_init(void); |
| 269,6 → 220,7 |
| extern int as_area_resize(as_t *as, uintptr_t address, size_t size, int flags); |
| int as_area_share(as_t *src_as, uintptr_t src_base, size_t acc_size, |
| as_t *dst_as, uintptr_t dst_base, int dst_flags_mask); |
| extern int as_area_change_flags(as_t *as, int flags, uintptr_t address); |
| extern int as_area_get_flags(as_area_t *area); |
| extern bool as_area_check_access(as_area_t *area, pf_access_t access); |
| 299,11 → 251,19 |
| extern mem_backend_t elf_backend; |
| extern mem_backend_t phys_backend; |
| extern int elf_load(elf_header_t *header, as_t *as); |
| /** |
| * This flags is passed when running the loader, otherwise elf_load() |
| * would return with a EE_LOADER error code. |
| */ |
| #define ELD_F_NONE 0 |
| #define ELD_F_LOADER 1 |
| extern unsigned int elf_load(elf_header_t *header, as_t *as, int flags); |
| /* Address space area related syscalls. */ |
| extern unative_t sys_as_area_create(uintptr_t address, size_t size, int flags); |
| extern unative_t sys_as_area_resize(uintptr_t address, size_t size, int flags); |
| extern unative_t sys_as_area_change_flags(uintptr_t address, int flags); |
| extern unative_t sys_as_area_destroy(uintptr_t address); |
| /* Introspection functions. */ |
| /branches/network/kernel/generic/include/mm/page.h |
|---|
| 39,11 → 39,6 |
| #include <mm/as.h> |
| #include <memstr.h> |
| /** |
| * Macro for computing page color. |
| */ |
| #define PAGE_COLOR(va) (((va) >> PAGE_WIDTH) & ((1 << PAGE_COLOR_BITS) - 1)) |
| /** Operations to manipulate page mappings. */ |
| typedef struct { |
| void (* mapping_insert)(as_t *as, uintptr_t page, uintptr_t frame, |
| /branches/network/kernel/generic/include/mm/frame.h |
|---|
| 57,15 → 57,14 |
| /** Maximum number of zones in system. */ |
| #define ZONES_MAX 16 |
| /** If possible, merge with neighbouring zones. */ |
| #define ZONE_JOIN 0x1 |
| /** Convert the frame address to kernel va. */ |
| #define FRAME_KA 0x1 |
| /** Do not panic and do not sleep on failure. */ |
| #define FRAME_ATOMIC 0x2 |
| #define FRAME_ATOMIC 0x2 |
| /** Do not start reclaiming when no free memory. */ |
| #define FRAME_NO_RECLAIM 0x4 |
| #define FRAME_NO_RECLAIM 0x4 |
| /** Do not allocate above 4 GiB. */ |
| #define FRAME_LOW_4_GiB 0x8 |
| static inline uintptr_t PFN2ADDR(pfn_t frame) |
| { |
| 90,30 → 89,30 |
| } |
| #define IS_BUDDY_ORDER_OK(index, order) \ |
| ((~(((unative_t) -1) << (order)) & (index)) == 0) |
| ((~(((unative_t) -1) << (order)) & (index)) == 0) |
| #define IS_BUDDY_LEFT_BLOCK(zone, frame) \ |
| (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 0) |
| (((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) |
| (((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) |
| (((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) |
| (((frame_index_abs((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1) |
| #define frame_alloc(order, flags) \ |
| frame_alloc_generic(order, flags, NULL) |
| frame_alloc_generic(order, flags, NULL) |
| extern void frame_init(void); |
| extern void *frame_alloc_generic(uint8_t order, int flags, unsigned int *pzone); |
| extern void frame_free(uintptr_t frame); |
| extern void frame_reference_add(pfn_t pfn); |
| extern void *frame_alloc_generic(uint8_t, int, unsigned int *); |
| extern void frame_free(uintptr_t); |
| extern void frame_reference_add(pfn_t); |
| extern int zone_create(pfn_t start, count_t count, pfn_t confframe, int flags); |
| extern void *frame_get_parent(pfn_t frame, unsigned int hint); |
| extern void frame_set_parent(pfn_t frame, void *data, unsigned int hint); |
| extern void frame_mark_unavailable(pfn_t start, count_t count); |
| extern uintptr_t zone_conf_size(count_t count); |
| extern void zone_merge(unsigned int z1, unsigned int z2); |
| extern int zone_create(pfn_t, count_t, pfn_t, int); |
| extern void *frame_get_parent(pfn_t, unsigned int); |
| extern void frame_set_parent(pfn_t, void *, unsigned int); |
| extern void frame_mark_unavailable(pfn_t, count_t); |
| extern uintptr_t zone_conf_size(count_t); |
| extern void zone_merge(unsigned int, unsigned int); |
| extern void zone_merge_all(void); |
| extern uint64_t zone_total_size(void); |
| 121,7 → 120,7 |
| * Console functions |
| */ |
| extern void zone_print_list(void); |
| extern void zone_print_one(unsigned int znum); |
| extern void zone_print_one(unsigned int); |
| #endif |
| /branches/network/kernel/generic/include/mm/buddy.h |
|---|
| 66,7 → 66,6 |
| 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); |
| void (* print_id)(struct buddy_system *, link_t *); |
| } buddy_system_operations_t; |
| typedef struct buddy_system { |
| 78,14 → 77,13 |
| void *data; |
| } buddy_system_t; |
| extern void buddy_system_create(buddy_system_t *b, uint8_t max_order, |
| buddy_system_operations_t *op, void *data); |
| extern link_t *buddy_system_alloc(buddy_system_t *b, uint8_t i); |
| extern bool buddy_system_can_alloc(buddy_system_t *b, uint8_t order); |
| extern void buddy_system_free(buddy_system_t *b, link_t *block); |
| extern void buddy_system_structure_print(buddy_system_t *b, size_t elem_size); |
| extern size_t buddy_conf_size(int max_order); |
| extern link_t *buddy_system_alloc_block(buddy_system_t *b, link_t *block); |
| 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(int); |
| extern link_t *buddy_system_alloc_block(buddy_system_t *, link_t *); |
| #endif |
| /branches/network/kernel/generic/include/mm/slab.h |
|---|
| 53,7 → 53,8 |
| #define SLAB_INSIDE_SIZE (PAGE_SIZE >> 3) |
| /** Maximum wasted space we allow for cache */ |
| #define SLAB_MAX_BADNESS(cache) ((PAGE_SIZE << (cache)->order) >> 2) |
| #define SLAB_MAX_BADNESS(cache) \ |
| (((unsigned int) PAGE_SIZE << (cache)->order) >> 2) |
| /* slab_reclaim constants */ |
| 99,8 → 100,8 |
| int flags; |
| /* Computed values */ |
| uint8_t order; /**< Order of frames to be allocated */ |
| int objects; /**< Number of objects that fit in */ |
| uint8_t order; /**< Order of frames to be allocated */ |
| unsigned int objects; /**< Number of objects that fit in */ |
| /* Statistics */ |
| atomic_t allocated_slabs; |
| 121,14 → 122,13 |
| slab_mag_cache_t *mag_cache; |
| } slab_cache_t; |
| extern slab_cache_t * slab_cache_create(char *name, size_t size, size_t align, |
| int (*constructor)(void *obj, int kmflag), int (*destructor)(void *obj), |
| int flags); |
| extern void slab_cache_destroy(slab_cache_t *cache); |
| extern slab_cache_t *slab_cache_create(char *, size_t, size_t, |
| int (*)(void *, int), int (*)(void *), int); |
| extern void slab_cache_destroy(slab_cache_t *); |
| extern void * slab_alloc(slab_cache_t *cache, int flags); |
| extern void slab_free(slab_cache_t *cache, void *obj); |
| extern count_t slab_reclaim(int flags); |
| extern void * slab_alloc(slab_cache_t *, int); |
| extern void slab_free(slab_cache_t *, void *); |
| extern count_t slab_reclaim(int); |
| /* slab subsytem initialization */ |
| extern void slab_cache_init(void); |
| 138,9 → 138,9 |
| extern void slab_print_list(void); |
| /* malloc support */ |
| extern void * malloc(unsigned int size, int flags); |
| extern void * realloc(void *ptr, unsigned int size, int flags); |
| extern void free(void *ptr); |
| extern void *malloc(unsigned int, int); |
| extern void *realloc(void *, unsigned int, int); |
| extern void free(void *); |
| #endif |
| /** @} |