/kernel/trunk/generic/include/mm/page.h |
---|
61,8 → 61,8 |
/** Operations to manipulate page mappings. */ |
struct page_operations { |
void (* mapping_insert)(as_t *as, __address page, __address frame, int flags, __address root); |
pte_t *(* mapping_find)(as_t *as, __address page, __address root); |
void (* mapping_insert)(as_t *as, __address page, __address frame, int flags); |
pte_t *(* mapping_find)(as_t *as, __address page); |
}; |
typedef struct page_operations page_operations_t; |
69,8 → 69,9 |
extern page_operations_t *page_operations; |
extern void page_init(void); |
extern void page_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root); |
extern pte_t *page_mapping_find(as_t *as, __address page, __address root); |
extern void page_mapping_insert(as_t *as, __address page, __address frame, int flags); |
extern pte_t *page_mapping_find(as_t *as, __address page); |
extern pte_t *page_table_create(int flags); |
extern void map_structure(__address s, size_t size); |
#endif |
/kernel/trunk/generic/include/mm/as.h |
---|
80,13 → 80,24 |
SPINLOCK_DECLARE(lock); |
link_t as_area_head; |
pte_t *ptl0; |
asid_t asid; /**< Address space identifier. */ |
/** Page table pointer. Constant on architectures that use global page hash table. */ |
pte_t *page_table; |
/** Address space identifier. Constant on architectures that do not support ASIDs.*/ |
asid_t asid; |
}; |
struct as_operations { |
pte_t *(* page_table_create)(int flags); |
}; |
typedef struct as_operations as_operations_t; |
extern as_t *AS_KERNEL; |
extern as_operations_t *as_operations; |
extern as_t *as_create(pte_t *ptl0, int flags); |
extern void as_init(void); |
extern as_t *as_create(int flags); |
extern as_area_t *as_area_create(as_t *as, as_area_type_t type, size_t size, __address base); |
extern void as_set_mapping(as_t *as, __address page, __address frame); |
extern int as_page_fault(__address page); |
/kernel/trunk/generic/include/mm/buddy.h |
---|
57,5 → 57,4 |
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); |
#endif |
/kernel/trunk/generic/src/main/kinit.c |
---|
147,7 → 147,7 |
if (KA2PA(config.init_addr) % FRAME_SIZE) |
panic("config.init_addr is not frame aligned"); |
as = as_create(NULL, 0); |
as = as_create(0); |
if (!as) |
panic("as_create\n"); |
u = task_create(as); |
158,7 → 158,7 |
panic("thread_create\n"); |
/* |
* Create the text as_area and copy the userspace code there. |
* Create the text as_area and initialize its mapping. |
*/ |
frame = KA2PA(config.init_addr); |
170,6 → 170,9 |
if (!a) |
panic("as_area_create: text\n"); |
for (i = 0; i < frames; i++) |
as_set_mapping(as, UTEXT_ADDRESS + i * PAGE_SIZE, frame + i * FRAME_SIZE); |
/* |
* Create the data as_area. |
*/ |
177,13 → 180,6 |
if (!a) |
panic("as_area_create: stack\n"); |
/* |
* Initialize text area mapping. |
*/ |
for (i = 0; i < frames; i++) |
as_set_mapping(as, UTEXT_ADDRESS + i * PAGE_SIZE, frame + i * FRAME_SIZE); |
thread_ready(t); |
} |
/kernel/trunk/generic/src/main/main.c |
---|
138,7 → 138,6 |
*/ |
void main_bsp_separated_stack(void) |
{ |
as_t *as; |
task_t *k; |
thread_t *t; |
151,7 → 150,8 |
*/ |
kconsole_init(); |
/* Exception handler initialization, before architecture |
/* |
* Exception handler initialization, before architecture |
* starts adding its own handlers |
*/ |
exc_init(); |
162,6 → 162,7 |
arch_pre_mm_init(); |
early_heap_init(config.heap_addr, config.heap_size + config.heap_delta); |
frame_init(); |
as_init(); |
page_init(); |
tlb_init(); |
arch_post_mm_init(); |
189,16 → 190,9 |
printf("config.init_addr=%X, config.init_size=%d\n", config.init_addr, config.init_size); |
/* |
* Create kernel address space. |
*/ |
as = as_create(GET_PTL0_ADDRESS(), FLAG_AS_KERNEL); |
if (!as) |
panic("can't create kernel address space\n"); |
/* |
* Create kernel task. |
*/ |
k = task_create(as); |
k = task_create(AS_KERNEL); |
if (!k) |
panic("can't create kernel task\n"); |
/kernel/trunk/generic/src/mm/as.c |
---|
33,7 → 33,7 |
*/ |
#include <mm/as.h> |
#include <mm/asid.h> |
#include <arch/mm/as.h> |
#include <mm/page.h> |
#include <mm/frame.h> |
#include <mm/tlb.h> |
42,7 → 42,6 |
#include <genarch/mm/page_pt.h> |
#include <mm/asid.h> |
#include <arch/mm/asid.h> |
#include <arch/mm/as.h> |
#include <arch/types.h> |
#include <typedefs.h> |
#include <synch/spinlock.h> |
55,18 → 54,21 |
#include <arch.h> |
#include <print.h> |
#define KAS_START_INDEX PTL0_INDEX(KERNEL_ADDRESS_SPACE_START) |
#define KAS_END_INDEX PTL0_INDEX(KERNEL_ADDRESS_SPACE_END) |
#define KAS_INDICES (1+(KAS_END_INDEX-KAS_START_INDEX)) |
as_operations_t *as_operations = NULL; |
static int get_area_flags(as_area_t *a); |
/** Initialize address space subsystem. */ |
void as_init(void) |
{ |
as_arch_init(); |
AS_KERNEL = as_create(FLAG_AS_KERNEL); |
if (!AS_KERNEL) |
panic("can't create kernel address space\n"); |
} |
/** Create address space. */ |
/* |
* FIXME: this interface must be meaningful for all possible VAT |
* (Virtual Address Translation) mechanisms. |
*/ |
as_t *as_create(pte_t *ptl0, int flags) |
as_t *as_create(int flags) |
{ |
as_t *as; |
81,21 → 83,8 |
else |
as->asid = ASID_INVALID; |
as->ptl0 = ptl0; |
if (!as->ptl0) { |
pte_t *src_ptl0, *dst_ptl0; |
src_ptl0 = (pte_t *) PA2KA((__address) GET_PTL0_ADDRESS()); |
dst_ptl0 = (pte_t *) frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME, NULL); |
// memsetb((__address) dst_ptl0, PAGE_SIZE, 0); |
// memcpy((void *) &dst_ptl0[KAS_START_INDEX], (void *) &src_ptl0[KAS_START_INDEX], KAS_INDICES); |
memcpy((void *) dst_ptl0,(void *) src_ptl0, PAGE_SIZE); |
as->ptl0 = (pte_t *) KA2PA((__address) dst_ptl0); |
as->page_table = page_table_create(flags); |
} |
} |
return as; |
} |
186,7 → 175,7 |
* Note: area->lock is held. |
*/ |
page_mapping_insert(as, page, frame, get_area_flags(area), (__address) as->ptl0); |
page_mapping_insert(as, page, frame, get_area_flags(area)); |
spinlock_unlock(&area->lock); |
spinlock_unlock(&as->lock); |
266,7 → 255,7 |
* Note that TLB shootdown is not attempted as only new information is being |
* inserted into page tables. |
*/ |
page_mapping_insert(AS, page, frame, get_area_flags(area), (__address) AS->ptl0); |
page_mapping_insert(AS, page, frame, get_area_flags(area)); |
spinlock_unlock(&area->lock); |
spinlock_unlock(&AS->lock); |
286,8 → 275,8 |
ipl = interrupts_disable(); |
spinlock_lock(&as->lock); |
ASSERT(as->ptl0); |
SET_PTL0_ADDRESS(as->ptl0); |
ASSERT(as->page_table); |
SET_PTL0_ADDRESS(as->page_table); |
spinlock_unlock(&as->lock); |
interrupts_restore(ipl); |
327,3 → 316,20 |
return flags; |
} |
/** Create page table. |
* |
* Depending on architecture, create either address space |
* private or global page table. |
* |
* @param flags Flags saying whether the page table is for kernel address space. |
* |
* @return First entry of the page table. |
*/ |
pte_t *page_table_create(int flags) |
{ |
ASSERT(as_operations); |
ASSERT(as_operations->page_table_create); |
return as_operations->page_table_create(flags); |
} |
/kernel/trunk/generic/src/mm/page.c |
---|
48,7 → 48,6 |
void page_init(void) |
{ |
page_arch_init(); |
page_mapping_insert(AS_KERNEL, 0x0, 0x0, PAGE_NOT_PRESENT, 0); |
} |
/** Map memory structure |
68,7 → 67,7 |
cnt = length/PAGE_SIZE + (length%PAGE_SIZE>0); |
for (i = 0; i < cnt; i++) |
page_mapping_insert(AS_KERNEL, s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0); |
page_mapping_insert(AS_KERNEL, s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE); |
} |
77,18 → 76,19 |
* Map virtual address 'page' to physical address 'frame' |
* using 'flags'. Allocate and setup any missing page tables. |
* |
* @param as Address space to wich page belongs. Must be locked prior the call. |
* The address space must be locked and interrupts must be disabled. |
* |
* @param as Address space to wich page belongs.. |
* @param page Virtual address of the page to be mapped. |
* @param frame Physical address of memory frame to which the mapping is done. |
* @param flags Flags to be used for mapping. |
* @param root Explicit PTL0 address. |
*/ |
void page_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root) |
void page_mapping_insert(as_t *as, __address page, __address frame, int flags) |
{ |
ASSERT(page_operations); |
ASSERT(page_operations->mapping_insert); |
page_operations->mapping_insert(as, page, frame, flags, root); |
page_operations->mapping_insert(as, page, frame, flags); |
} |
/** Find mapping for virtual page |
95,16 → 95,17 |
* |
* Find mapping for virtual page. |
* |
* @param as Address space to wich page belongs must be locked prior the call. |
* The address space must be locked and interrupts must be disabled. |
* |
* @param as Address space to wich page belongs. |
* @param page Virtual page. |
* @param root PTL0 address if non-zero. |
* |
* @return NULL if there is no such mapping; requested mapping otherwise. |
*/ |
pte_t *page_mapping_find(as_t *as, __address page, __address root) |
pte_t *page_mapping_find(as_t *as, __address page) |
{ |
ASSERT(page_operations); |
ASSERT(page_operations->mapping_find); |
return page_operations->mapping_find(as, page, root); |
return page_operations->mapping_find(as, page); |
} |