Index: kernel/generic/include/mm/as.h =================================================================== --- kernel/generic/include/mm/as.h (revision 0321109831bdc3ef68b98abcca525ea8d18e34a5) +++ kernel/generic/include/mm/as.h (revision da1bafb8cf9a3b3be8ef21bc114daaa476a85190) @@ -43,8 +43,8 @@ /** Address space area flags. */ -#define AS_AREA_READ 1 -#define AS_AREA_WRITE 2 -#define AS_AREA_EXEC 4 -#define AS_AREA_CACHEABLE 8 +#define AS_AREA_READ 1 +#define AS_AREA_WRITE 2 +#define AS_AREA_EXEC 4 +#define AS_AREA_CACHEABLE 8 /** Address space area info exported to userspace. */ @@ -52,10 +52,10 @@ /** Starting address */ uintptr_t start_addr; - + /** Area size */ size_t size; - + /** Area flags */ - int flags; + unsigned int flags; } as_area_info_t; @@ -75,27 +75,30 @@ * Defined to be true if user address space and kernel address space shadow each * other. - */ -#define KERNEL_ADDRESS_SPACE_SHADOWED KERNEL_ADDRESS_SPACE_SHADOWED_ARCH - -#define KERNEL_ADDRESS_SPACE_START KERNEL_ADDRESS_SPACE_START_ARCH -#define KERNEL_ADDRESS_SPACE_END KERNEL_ADDRESS_SPACE_END_ARCH -#define USER_ADDRESS_SPACE_START USER_ADDRESS_SPACE_START_ARCH -#define USER_ADDRESS_SPACE_END USER_ADDRESS_SPACE_END_ARCH - -#define USTACK_ADDRESS USTACK_ADDRESS_ARCH + * + */ +#define KERNEL_ADDRESS_SPACE_SHADOWED KERNEL_ADDRESS_SPACE_SHADOWED_ARCH + +#define KERNEL_ADDRESS_SPACE_START KERNEL_ADDRESS_SPACE_START_ARCH +#define KERNEL_ADDRESS_SPACE_END KERNEL_ADDRESS_SPACE_END_ARCH +#define USER_ADDRESS_SPACE_START USER_ADDRESS_SPACE_START_ARCH +#define USER_ADDRESS_SPACE_END USER_ADDRESS_SPACE_END_ARCH + +#define USTACK_ADDRESS USTACK_ADDRESS_ARCH /** Kernel address space. */ -#define FLAG_AS_KERNEL (1 << 0) +#define FLAG_AS_KERNEL (1 << 0) /* Address space area attributes. */ -#define AS_AREA_ATTR_NONE 0 -#define AS_AREA_ATTR_PARTIAL 1 /**< Not fully initialized area. */ +#define AS_AREA_ATTR_NONE 0 +#define AS_AREA_ATTR_PARTIAL 1 /**< Not fully initialized area. */ /** The page fault was not resolved by as_page_fault(). */ -#define AS_PF_FAULT 0 +#define AS_PF_FAULT 0 + /** The page fault was resolved by as_page_fault(). */ -#define AS_PF_OK 1 +#define AS_PF_OK 1 + /** The page fault was caused by memcpy_from_uspace() or memcpy_to_uspace(). */ -#define AS_PF_DEFER 2 +#define AS_PF_DEFER 2 /** Address space structure. @@ -105,8 +108,10 @@ * supposed to figure in the list as they are shared by all tasks and * set up during system initialization. + * */ typedef struct as { /** Protected by asidlock. */ link_t inactive_as_with_asid_link; + /** * Number of processors on wich is this address space active. @@ -114,4 +119,5 @@ */ size_t cpu_refcount; + /** * Address space identifier. @@ -120,10 +126,10 @@ */ 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; @@ -131,5 +137,5 @@ /** Non-generic content. */ as_genarch_t genarch; - + /** Architecture specific content. */ as_arch_t arch; @@ -137,8 +143,8 @@ typedef struct { - pte_t *(* page_table_create)(int flags); - void (* page_table_destroy)(pte_t *page_table); - void (* page_table_lock)(as_t *as, bool lock); - void (* page_table_unlock)(as_t *as, bool unlock); + pte_t *(* page_table_create)(unsigned int); + void (* page_table_destroy)(pte_t *); + void (* page_table_lock)(as_t *, bool); + void (* page_table_unlock)(as_t *, bool); } as_operations_t; @@ -146,10 +152,12 @@ * This structure contains information associated with the shared address space * area. + * */ typedef struct { /** This lock must be acquired only when the as_area lock is held. */ - mutex_t lock; + mutex_t lock; /** This structure can be deallocated if refcount drops to 0. */ size_t refcount; + /** * B+tree containing complete map of anonymous pages of the shared area. @@ -169,9 +177,12 @@ /** Backend data stored in address space area. */ typedef union mem_backend_data { - struct { /**< elf_backend members */ + /** elf_backend members */ + struct { elf_header_t *elf; elf_segment_header_t *segment; }; - struct { /**< phys_backend members */ + + /** phys_backend members */ + struct { uintptr_t base; size_t frames; @@ -182,15 +193,18 @@ * * Each as_area_t structure describes one contiguous area of virtual memory. + * */ typedef struct { mutex_t lock; /** Containing address space. */ - as_t *as; + as_t *as; + /** * Flags related to the memory represented by the address space area. */ - int flags; + unsigned int flags; + /** Attributes related to the address space area itself. */ - int attributes; + unsigned int attributes; /** Size of this area in multiples of PAGE_SIZE. */ size_t pages; @@ -199,5 +213,5 @@ /** Map of used space. */ btree_t used_space; - + /** * If the address space area has been shared, this pointer will @@ -205,8 +219,8 @@ */ share_info_t *sh_info; - + /** Memory backend backing this address space area. */ struct mem_backend *backend; - + /** Data to be used by the backend. */ mem_backend_data_t backend_data; @@ -215,7 +229,7 @@ /** Address space area backend structure. */ typedef struct mem_backend { - int (* page_fault)(as_area_t *area, uintptr_t addr, pf_access_t access); - void (* frame_free)(as_area_t *area, uintptr_t page, uintptr_t frame); - void (* share)(as_area_t *area); + 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; @@ -227,5 +241,5 @@ extern void as_init(void); -extern as_t *as_create(int); +extern as_t *as_create(unsigned int); extern void as_destroy(as_t *); extern void as_hold(as_t *); @@ -234,12 +248,13 @@ extern int as_page_fault(uintptr_t, pf_access_t, istate_t *); -extern as_area_t *as_area_create(as_t *, int, size_t, uintptr_t, int, - mem_backend_t *, mem_backend_data_t *); +extern as_area_t *as_area_create(as_t *, unsigned int, size_t, uintptr_t, + unsigned int, mem_backend_t *, mem_backend_data_t *); extern int as_area_destroy(as_t *, uintptr_t); -extern int as_area_resize(as_t *, uintptr_t, size_t, int); -extern int as_area_share(as_t *, uintptr_t, size_t, as_t *, uintptr_t, int); -extern int as_area_change_flags(as_t *, int, uintptr_t); - -extern int as_area_get_flags(as_area_t *); +extern int as_area_resize(as_t *, uintptr_t, size_t, unsigned int); +extern int as_area_share(as_t *, uintptr_t, size_t, as_t *, uintptr_t, + unsigned int); +extern int as_area_change_flags(as_t *, unsigned int, uintptr_t); + +extern unsigned int as_area_get_flags(as_area_t *); extern bool as_area_check_access(as_area_t *, pf_access_t); extern size_t as_area_get_size(uintptr_t); @@ -249,16 +264,21 @@ /* Interface to be implemented by architectures. */ + #ifndef as_constructor_arch -extern int as_constructor_arch(as_t *, int); +extern int as_constructor_arch(as_t *, unsigned int); #endif /* !def as_constructor_arch */ + #ifndef as_destructor_arch extern int as_destructor_arch(as_t *); #endif /* !def as_destructor_arch */ + #ifndef as_create_arch -extern int as_create_arch(as_t *, int); +extern int as_create_arch(as_t *, unsigned int); #endif /* !def as_create_arch */ + #ifndef as_install_arch extern void as_install_arch(as_t *); #endif /* !def as_install_arch */ + #ifndef as_deinstall_arch extern void as_deinstall_arch(as_t *); @@ -270,17 +290,18 @@ extern mem_backend_t phys_backend; -/** +/** * 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 *, as_t *, int); + * + */ +#define ELD_F_NONE 0 +#define ELD_F_LOADER 1 + +extern unsigned int elf_load(elf_header_t *, as_t *, unsigned int); /* Address space area related syscalls. */ -extern unative_t sys_as_area_create(uintptr_t, size_t, int); -extern unative_t sys_as_area_resize(uintptr_t, size_t, int); -extern unative_t sys_as_area_change_flags(uintptr_t, int); +extern unative_t sys_as_area_create(uintptr_t, size_t, unsigned int); +extern unative_t sys_as_area_resize(uintptr_t, size_t, unsigned int); +extern unative_t sys_as_area_change_flags(uintptr_t, unsigned int); extern unative_t sys_as_area_destroy(uintptr_t); Index: kernel/generic/include/mm/frame.h =================================================================== --- kernel/generic/include/mm/frame.h (revision 0321109831bdc3ef68b98abcca525ea8d18e34a5) +++ kernel/generic/include/mm/frame.h (revision da1bafb8cf9a3b3be8ef21bc114daaa476a85190) @@ -81,5 +81,5 @@ typedef struct { - size_t refcount; /**< Tracking of shared frames */ + size_t refcount; /**< Tracking of shared frames */ uint8_t buddy_order; /**< Buddy system block order */ link_t buddy_link; /**< Link to the next free block inside @@ -91,8 +91,8 @@ 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 + 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 + size_t busy_count; /**< Number of busy frame_t structures */ zone_flags_t flags; /**< Type of the zone */ @@ -108,5 +108,5 @@ */ typedef struct { - SPINLOCK_DECLARE(lock); + IRQ_SPINLOCK_DECLARE(lock); size_t count; zone_t info[ZONES_MAX]; Index: kernel/generic/include/mm/page.h =================================================================== --- kernel/generic/include/mm/page.h (revision 0321109831bdc3ef68b98abcca525ea8d18e34a5) +++ kernel/generic/include/mm/page.h (revision da1bafb8cf9a3b3be8ef21bc114daaa476a85190) @@ -42,8 +42,7 @@ /** Operations to manipulate page mappings. */ typedef struct { - void (* mapping_insert)(as_t *as, uintptr_t page, uintptr_t frame, - int flags); - void (* mapping_remove)(as_t *as, uintptr_t page); - pte_t *(* mapping_find)(as_t *as, uintptr_t page); + void (* mapping_insert)(as_t *, uintptr_t, uintptr_t, unsigned int); + void (* mapping_remove)(as_t *, uintptr_t); + pte_t *(* mapping_find)(as_t *, uintptr_t); } page_mapping_operations_t; @@ -51,15 +50,14 @@ extern void page_init(void); -extern void page_table_lock(as_t *as, bool lock); -extern void page_table_unlock(as_t *as, bool unlock); -extern void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame, - int flags); -extern void page_mapping_remove(as_t *as, uintptr_t page); -extern pte_t *page_mapping_find(as_t *as, uintptr_t page); -extern pte_t *page_table_create(int flags); -extern void page_table_destroy(pte_t *page_table); -extern void map_structure(uintptr_t s, size_t size); +extern void page_table_lock(as_t *, bool); +extern void page_table_unlock(as_t *, bool); +extern void page_mapping_insert(as_t *, uintptr_t, uintptr_t, unsigned int); +extern void page_mapping_remove(as_t *, uintptr_t); +extern pte_t *page_mapping_find(as_t *, uintptr_t); +extern pte_t *page_table_create(unsigned int); +extern void page_table_destroy(pte_t *); +extern void map_structure(uintptr_t, size_t); -extern uintptr_t hw_map(uintptr_t physaddr, size_t size); +extern uintptr_t hw_map(uintptr_t, size_t); #endif Index: kernel/generic/include/mm/slab.h =================================================================== --- kernel/generic/include/mm/slab.h (revision 0321109831bdc3ef68b98abcca525ea8d18e34a5) +++ kernel/generic/include/mm/slab.h (revision da1bafb8cf9a3b3be8ef21bc114daaa476a85190) @@ -84,5 +84,4 @@ } slab_mag_cache_t; - typedef struct { const char *name; @@ -94,13 +93,13 @@ size_t size; - int (*constructor)(void *obj, int kmflag); - int (*destructor)(void *obj); + int (*constructor)(void *obj, unsigned int kmflag); + size_t (*destructor)(void *obj); /** Flags changing behaviour of cache */ - int flags; + unsigned int flags; /* Computed values */ - uint8_t order; /**< Order of frames to be allocated */ - unsigned int objects; /**< Number of objects that fit in */ + uint8_t order; /**< Order of frames to be allocated */ + size_t objects; /**< Number of objects that fit in */ /* Statistics */ @@ -109,5 +108,5 @@ atomic_t cached_objs; /** How many magazines in magazines list */ - atomic_t magazine_counter; + atomic_t magazine_counter; /* Slabs */ @@ -124,10 +123,10 @@ extern slab_cache_t *slab_cache_create(const char *, size_t, size_t, - int (*)(void *, int), int (*)(void *), int); + int (*)(void *, unsigned int), size_t (*)(void *), unsigned int); extern void slab_cache_destroy(slab_cache_t *); -extern void * slab_alloc(slab_cache_t *, int); +extern void * slab_alloc(slab_cache_t *, unsigned int); extern void slab_free(slab_cache_t *, void *); -extern size_t slab_reclaim(int); +extern size_t slab_reclaim(unsigned int); /* slab subsytem initialization */ @@ -139,6 +138,6 @@ /* malloc support */ -extern void *malloc(unsigned int, int); -extern void *realloc(void *, unsigned int, int); +extern void *malloc(size_t, unsigned int); +extern void *realloc(void *, size_t, unsigned int); extern void free(void *);