/kernel/trunk/test/mm/mapping1/test.c |
---|
29,7 → 29,7 |
#include <test.h> |
#include <mm/page.h> |
#include <mm/frame.h> |
#include <mm/asid.h> |
#include <mm/as.h> |
#include <arch/mm/page.h> |
#include <arch/types.h> |
#include <debug.h> |
56,9 → 56,9 |
*((__u32 *) frame1) = VALUE1; |
printf("Mapping virtual address %P to physical address %P.\n", PAGE0, KA2PA(frame0)); |
page_mapping_insert(PAGE0, ASID_KERNEL, KA2PA(frame0), PAGE_PRESENT | PAGE_WRITE, 0); |
page_mapping_insert(AS_KERNEL, PAGE0, KA2PA(frame0), PAGE_PRESENT | PAGE_WRITE, 0); |
printf("Mapping virtual address %P to physical address %P.\n", PAGE1, KA2PA(frame1)); |
page_mapping_insert(PAGE1, ASID_KERNEL, KA2PA(frame1), PAGE_PRESENT | PAGE_WRITE, 0); |
page_mapping_insert(AS_KERNEL, PAGE1, KA2PA(frame1), PAGE_PRESENT | PAGE_WRITE, 0); |
printf("Value at virtual address %P is %L.\n", PAGE0, v0 = *((__u32 *) PAGE0)); |
printf("Value at virtual address %P is %L.\n", PAGE1, v1 = *((__u32 *) PAGE1)); |
/kernel/trunk/genarch/include/mm/page_pt.h |
---|
87,7 → 87,7 |
extern page_operations_t page_pt_operations; |
extern void page_mapping_insert_pt(__address page, __address frame, int flags, __address root); |
extern pte_t *page_mapping_find_pt(__address page, __address root); |
extern void page_mapping_insert_pt(as_t *as, __address page, __address frame, int flags, __address root); |
extern pte_t *page_mapping_find_pt(as_t *as, __address page, __address root); |
#endif |
/kernel/trunk/genarch/src/mm/page_pt.c |
---|
30,14 → 30,14 |
#include <mm/page.h> |
#include <mm/frame.h> |
#include <arch/mm/page.h> |
#include <arch/mm/asid.h> |
#include <arch/mm/as.h> |
#include <arch/types.h> |
#include <typedefs.h> |
#include <arch/asm.h> |
#include <memstr.h> |
static void pt_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root); |
static pte_t *pt_mapping_find(__address page, asid_t asid, __address root); |
static void pt_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root); |
static pte_t *pt_mapping_find(as_t *as, __address page, __address root); |
page_operations_t page_pt_operations = { |
.mapping_insert = pt_mapping_insert, |
49,13 → 49,13 |
* Map virtual address 'page' to physical address 'frame' |
* using 'flags'. |
* |
* @param as Ignored. |
* @param page Virtual address of the page to be mapped. |
* @param asid Ignored. |
* @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 pt_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root) |
void pt_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root) |
{ |
pte_t *ptl0, *ptl1, *ptl2, *ptl3; |
__address newpt; |
97,13 → 97,13 |
* |
* Find mapping for virtual page. |
* |
* @param as Ignored. |
* @param page Virtual page. |
* @param asid Ignored. |
* @param root PTL0 address if non-zero. |
* |
* @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise. |
*/ |
pte_t *pt_mapping_find(__address page, asid_t asid, __address root) |
pte_t *pt_mapping_find(as_t *as, __address page, __address root) |
{ |
pte_t *ptl0, *ptl1, *ptl2, *ptl3; |
/kernel/trunk/genarch/src/mm/page_ht.c |
---|
30,6 → 30,7 |
#include <mm/page.h> |
#include <mm/frame.h> |
#include <mm/heap.h> |
#include <mm/as.h> |
#include <arch/mm/asid.h> |
#include <arch/types.h> |
#include <typedefs.h> |
52,8 → 53,8 |
*/ |
pte_t *page_ht = NULL; |
static void ht_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root); |
static pte_t *ht_mapping_find(__address page, asid_t asid, __address root); |
static void ht_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root); |
static pte_t *ht_mapping_find(as_t *as, __address page, __address root); |
page_operations_t page_ht_operations = { |
.mapping_insert = ht_mapping_insert, |
67,13 → 68,13 |
* new mappings are appended to the end of the collision |
* chain. |
* |
* @param as Address space to which page belongs. Must be locked prior the call. |
* @param page Virtual address of the page to be mapped. |
* @param asid Address space to which page belongs. |
* @param frame Physical address of memory frame to which the mapping is done. |
* @param flags Flags to be used for mapping. |
* @param root Ignored. |
*/ |
void ht_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root) |
void ht_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root) |
{ |
pte_t *t, *u; |
ipl_t ipl; |
80,8 → 81,8 |
ipl = interrupts_disable(); |
spinlock_lock(&page_ht_lock); |
t = HT_HASH(page, asid); |
t = HT_HASH(page, as->asid); |
if (!HT_SLOT_EMPTY(t)) { |
/* |
91,7 → 92,7 |
do { |
u = t; |
if (HT_COMPARE(page, asid, t)) { |
if (HT_COMPARE(page, as->asid, t)) { |
/* |
* Nothing to do, |
* the record is already there. |
109,7 → 110,7 |
HT_SET_NEXT(u, t); |
} |
HT_SET_RECORD(t, page, asid, frame, flags); |
HT_SET_RECORD(t, page, as->asid, frame, flags); |
HT_SET_NEXT(t, NULL); |
spinlock_unlock(&page_ht_lock); |
122,22 → 123,22 |
* |
* Interrupts must be disabled. |
* |
* @param as Address space to wich page belongs. Must be locked prior the call. |
* @param page Virtual page. |
* @param asid Address space to wich page belongs. |
* @param root Ignored. |
* |
* @return NULL if there is no such mapping; requested mapping otherwise. |
*/ |
pte_t *ht_mapping_find(__address page, asid_t asid, __address root) |
pte_t *ht_mapping_find(as_t *as, __address page, __address root) |
{ |
pte_t *t; |
spinlock_lock(&page_ht_lock); |
t = HT_HASH(page, asid); |
t = HT_HASH(page, as->asid); |
if (!HT_SLOT_EMPTY(t)) { |
while (!HT_COMPARE(page, asid, t) && HT_GET_NEXT(t)) |
while (!HT_COMPARE(page, as->asid, t) && HT_GET_NEXT(t)) |
t = HT_GET_NEXT(t); |
t = HT_COMPARE(page, asid, t) ? t : NULL; |
t = HT_COMPARE(page, as->asid, t) ? t : NULL; |
} else { |
t = NULL; |
} |
/kernel/trunk/genarch/src/acpi/acpi.c |
---|
29,7 → 29,7 |
#include <genarch/acpi/acpi.h> |
#include <genarch/acpi/madt.h> |
#include <arch/bios/bios.h> |
#include <mm/asid.h> |
#include <mm/as.h> |
#include <mm/page.h> |
#include <print.h> |
79,7 → 79,7 |
static void map_sdt(struct acpi_sdt_header *sdt) |
{ |
page_mapping_insert((__address) sdt, ASID_KERNEL, (__address) sdt, PAGE_NOT_CACHEABLE, 0); |
page_mapping_insert(AS_KERNEL, (__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE, 0); |
map_structure((__address) sdt, sdt->length); |
} |
/kernel/trunk/generic/include/mm/page.h |
---|
61,8 → 61,8 |
/** Operations to manipulate page mappings. */ |
struct page_operations { |
void (* mapping_insert)(__address page, asid_t asid, __address frame, int flags, __address root); |
pte_t *(* mapping_find)(__address page, asid_t asid, __address root); |
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); |
}; |
typedef struct page_operations page_operations_t; |
69,8 → 69,8 |
extern page_operations_t *page_operations; |
extern void page_init(void); |
extern void page_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root); |
extern pte_t *page_mapping_find(__address page, asid_t asid, __address root); |
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 map_structure(__address s, size_t size); |
#endif |
/kernel/trunk/generic/include/mm/as.h |
---|
48,7 → 48,7 |
#define USTACK_ADDRESS USTACK_ADDRESS_ARCH |
#define UDATA_ADDRESS UDATA_ADDRESS_ARCH |
#define AS_KERNEL (1<<0) /**< Kernel address space. */ |
#define FLAG_AS_KERNEL (1<<0) /**< Kernel address space. */ |
enum as_area_type { |
AS_AREA_TEXT = 1, AS_AREA_DATA, AS_AREA_STACK |
84,7 → 84,9 |
asid_t asid; /**< Address space identifier. */ |
}; |
extern as_t * as_create(pte_t *ptl0, int flags); |
extern as_t *AS_KERNEL; |
extern as_t *as_create(pte_t *ptl0, 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/src/main/main.c |
---|
77,6 → 77,9 |
__address init_addr = 0; |
size_t init_size = 0; |
/** Kernel address space. */ |
as_t *AS_KERNEL = NULL; |
void main_bsp(void); |
void main_ap(void); |
152,7 → 155,10 |
* starts adding its own handlers |
*/ |
exc_init(); |
/* |
* Memory management subsystems initialization. |
*/ |
arch_pre_mm_init(); |
early_heap_init(config.heap_addr, config.heap_size + config.heap_delta); |
frame_init(); |
185,7 → 191,7 |
/* |
* Create kernel address space. |
*/ |
as = as_create(GET_PTL0_ADDRESS(), AS_KERNEL); |
as = as_create(GET_PTL0_ADDRESS(), FLAG_AS_KERNEL); |
if (!as) |
panic("can't create kernel address space\n"); |
/kernel/trunk/generic/src/mm/as.c |
---|
76,7 → 76,7 |
spinlock_initialize(&as->lock, "as_lock"); |
list_initialize(&as->as_area_head); |
if (flags & AS_KERNEL) |
if (flags & FLAG_AS_KERNEL) |
as->asid = ASID_KERNEL; |
else |
as->asid = ASID_INVALID; |
186,7 → 186,7 |
* Note: area->lock is held. |
*/ |
page_mapping_insert(page, as->asid, frame, get_area_flags(area), (__address) as->ptl0); |
page_mapping_insert(as, page, frame, get_area_flags(area), (__address) as->ptl0); |
spinlock_unlock(&area->lock); |
spinlock_unlock(&as->lock); |
266,7 → 266,7 |
* Note that TLB shootdown is not attempted as only new information is being |
* inserted into page tables. |
*/ |
page_mapping_insert(page, AS->asid, frame, get_area_flags(area), (__address) AS->ptl0); |
page_mapping_insert(AS, page, frame, get_area_flags(area), (__address) AS->ptl0); |
spinlock_unlock(&area->lock); |
spinlock_unlock(&AS->lock); |
/kernel/trunk/generic/src/mm/page.c |
---|
33,7 → 33,7 |
#include <mm/page.h> |
#include <arch/mm/page.h> |
#include <arch/mm/asid.h> |
#include <mm/asid.h> |
#include <mm/as.h> |
#include <mm/frame.h> |
#include <arch/types.h> |
#include <typedefs.h> |
48,7 → 48,7 |
void page_init(void) |
{ |
page_arch_init(); |
page_mapping_insert(0x0, 0, 0x0, PAGE_NOT_PRESENT, 0); |
page_mapping_insert(AS_KERNEL, 0x0, 0x0, PAGE_NOT_PRESENT, 0); |
} |
/** Map memory structure |
68,7 → 68,7 |
cnt = length/PAGE_SIZE + (length%PAGE_SIZE>0); |
for (i = 0; i < cnt; i++) |
page_mapping_insert(s + i*PAGE_SIZE, ASID_KERNEL, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0); |
page_mapping_insert(AS_KERNEL, s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0); |
} |
77,18 → 77,18 |
* 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. |
* @param page Virtual address of the page to be mapped. |
* @param asid Address space to wich page belongs. |
* @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(__address page, asid_t asid, __address frame, int flags, __address root) |
void page_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root) |
{ |
ASSERT(page_operations); |
ASSERT(page_operations->mapping_insert); |
page_operations->mapping_insert(page, asid, frame, flags, root); |
page_operations->mapping_insert(as, page, frame, flags, root); |
} |
/** Find mapping for virtual page |
95,16 → 95,16 |
* |
* Find mapping for virtual page. |
* |
* @param as Address space to wich page belongs must be locked prior the call. |
* @param page Virtual page. |
* @param asid Address space to wich page belongs. |
* @param root PTL0 address if non-zero. |
* |
* @return NULL if there is no such mapping; requested mapping otherwise. |
*/ |
pte_t *page_mapping_find(__address page, asid_t asid, __address root) |
pte_t *page_mapping_find(as_t *as, __address page, __address root) |
{ |
ASSERT(page_operations); |
ASSERT(page_operations->mapping_find); |
return page_operations->mapping_find(page, asid, root); |
return page_operations->mapping_find(as, page, root); |
} |
/kernel/trunk/arch/amd64/src/mm/page.c |
---|
31,7 → 31,7 |
#include <arch/mm/frame.h> |
#include <mm/page.h> |
#include <mm/frame.h> |
#include <mm/asid.h> |
#include <mm/as.h> |
#include <arch/interrupt.h> |
#include <arch/asm.h> |
#include <config.h> |
57,7 → 57,7 |
* PA2KA(identity) mapping for all frames. |
*/ |
for (cur = 0; cur < last_frame; cur += FRAME_SIZE) { |
page_mapping_insert(PA2KA(cur), ASID_KERNEL, cur, PAGE_CACHEABLE | PAGE_EXEC, KA2PA(dba)); |
page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, PAGE_CACHEABLE | PAGE_EXEC, KA2PA(dba)); |
} |
exc_register(14, "page_fault", page_fault); |
/kernel/trunk/arch/mips32/src/mm/tlb.c |
---|
339,7 → 339,7 |
/* |
* Check if the mapping exists in page tables. |
*/ |
pte = page_mapping_find(badvaddr, AS->asid, 0); |
pte = page_mapping_find(AS, badvaddr, 0); |
if (pte && pte->lo.v) { |
/* |
* Mapping found in page tables. |
356,7 → 356,7 |
* The higher-level page fault handler succeeded, |
* The mapping ought to be in place. |
*/ |
pte = page_mapping_find(badvaddr, AS->asid, 0); |
pte = page_mapping_find(AS, badvaddr, 0); |
ASSERT(pte && pte->lo.v); |
return pte; |
} |
/kernel/trunk/arch/ia32/src/smp/smp.c |
---|
44,7 → 44,7 |
#include <mm/frame.h> |
#include <mm/page.h> |
#include <mm/heap.h> |
#include <mm/asid.h> |
#include <mm/as.h> |
#include <print.h> |
#include <memstr.h> |
#include <arch/i8259.h> |
65,10 → 65,9 |
} |
if (config.cpu_count > 1) { |
page_mapping_insert((__address)l_apic, ASID_KERNEL, (__address)l_apic, |
page_mapping_insert(AS_KERNEL, (__address) l_apic, (__address) l_apic, |
PAGE_NOT_CACHEABLE, 0); |
page_mapping_insert((__address) io_apic, ASID_KERNEL, |
(__address) io_apic, |
page_mapping_insert(AS_KERNEL, (__address) io_apic, (__address) io_apic, |
PAGE_NOT_CACHEABLE, 0); |
} |
/kernel/trunk/arch/ia32/src/mm/page.c |
---|
31,7 → 31,7 |
#include <arch/mm/frame.h> |
#include <mm/frame.h> |
#include <mm/page.h> |
#include <mm/asid.h> |
#include <mm/as.h> |
#include <arch/types.h> |
#include <config.h> |
#include <func.h> |
61,7 → 61,7 |
* PA2KA(identity) mapping for all frames until last_frame. |
*/ |
for (cur = 0; cur < last_frame; cur += FRAME_SIZE) |
page_mapping_insert(PA2KA(cur), ASID_KERNEL, cur, PAGE_CACHEABLE, KA2PA(dba)); |
page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, PAGE_CACHEABLE, KA2PA(dba)); |
exc_register(14, "page_fault", page_fault); |
write_cr3(KA2PA(dba)); |
/kernel/trunk/arch/ia32/src/drivers/ega.c |
---|
29,7 → 29,7 |
#include <arch/ega.h> |
#include <putchar.h> |
#include <mm/page.h> |
#include <mm/asid.h> |
#include <mm/as.h> |
#include <arch/mm/page.h> |
#include <synch/spinlock.h> |
#include <arch/types.h> |
59,7 → 59,7 |
{ |
__u8 hi, lo; |
page_mapping_insert(PA2KA(VIDEORAM), ASID_KERNEL, VIDEORAM, PAGE_NOT_CACHEABLE, 0); |
page_mapping_insert(AS_KERNEL, PA2KA(VIDEORAM), VIDEORAM, PAGE_NOT_CACHEABLE, 0); |
outb(0x3d4,0xe); |
hi = inb(0x3d5); |
outb(0x3d4,0xf); |