Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 1823 → Rev 1824

/trunk/kernel/arch/xen32/src/xen32.c
36,10 → 36,12
 
#include <arch/types.h>
#include <typedefs.h>
#include <align.h>
 
#include <arch/pm.h>
 
#include <arch/drivers/xconsole.h>
#include <arch/mm/page.h>
 
#include <arch/context.h>
 
60,7 → 62,53
#include <console/console.h>
 
start_info_t start_info;
memzone_t meminfo;
 
void arch_pre_main(void)
{
xen_vm_assist(VMASST_CMD_ENABLE, VMASST_TYPE_WRITABLE_PAGETABLES);
pte_t pte;
memsetb((uintptr_t) &pte, sizeof(pte), 0);
pte.present = 1;
pte.writeable = 1;
pte.frame_address = ADDR2PFN((uintptr_t) start_info.shared_info);
xen_update_va_mapping(&shared_info, pte, UVMF_INVLPG);
/* Create identity mapping */
meminfo.start = ADDR2PFN(ALIGN_UP(KA2PA(start_info.ptl0), PAGE_SIZE)) + start_info.pt_frames;
meminfo.size = start_info.frames - meminfo.start;
meminfo.reserved = 0;
uintptr_t pa;
index_t last_ptl0 = 0;
for (pa = PFN2ADDR(meminfo.start); pa < PFN2ADDR(meminfo.start + meminfo.size); pa += FRAME_SIZE) {
uintptr_t va = PA2KA(pa);
if ((PTL0_INDEX(va) != last_ptl0) && (GET_PTL1_FLAGS(start_info.ptl0, PTL0_INDEX(va)) & PAGE_NOT_PRESENT)) {
/* New page directory entry needed */
uintptr_t tpa = PFN2ADDR(meminfo.start + meminfo.reserved);
uintptr_t tva = PA2KA(tpa);
memsetb(tva, PAGE_SIZE, 0);
pte_t *tptl3 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(start_info.ptl0, PTL0_INDEX(tva)));
SET_FRAME_FLAGS(tptl3, PTL3_INDEX(tva), PAGE_PRESENT);
SET_PTL1_ADDRESS(start_info.ptl0, PTL0_INDEX(va), tpa);
last_ptl0 = PTL0_INDEX(va);
meminfo.reserved++;
}
pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(start_info.ptl0, PTL0_INDEX(va)));
SET_FRAME_ADDRESS(ptl3, PTL3_INDEX(va), pa);
SET_FRAME_FLAGS(ptl3, PTL3_INDEX(va), PAGE_PRESENT | PAGE_WRITE);
}
}
 
void arch_pre_mm_init(void)
{
pm_init();
/trunk/kernel/arch/xen32/src/boot/boot.S
32,10 → 32,11
#include <arch/pm.h>
 
.section __xen_guest
.ascii "GUEST_OS=HelenOS,"
.ascii "XEN_VER=xen-3.0,"
.ascii "HYPERCALL_PAGE=0x0000,"
.ascii "LOADER=generic"
.ascii "GUEST_OS=HelenOS,"
.ascii "XEN_VER=xen-3.0,"
.ascii "HYPERCALL_PAGE=0x0000,"
.ascii "LOADER=generic,"
.ascii "FEATURES=writable_page_tables"
.byte 0
 
.text
51,14 → 52,28
movl $START_INFO_SIZE >> 2, %ecx
cld
rep movsb
 
# switch to temporal kernel stack
movl $kernel_stack, %esp
call arch_pre_main
call main_bsp # never returns
 
cli
hlt
 
kernel_stack_bottom:
.space TEMP_STACK_SIZE
kernel_stack:
 
.section K_TEXT_START, "aw", @progbits
.global hypercall_page
.org 0
hypercall_page:
.space PAGE_SIZE
 
.global shared_info
.org 0x1000
shared_info:
.space PAGE_SIZE
/trunk/kernel/arch/xen32/src/mm/frame.c
34,120 → 34,14
*/
 
#include <mm/frame.h>
#include <arch/mm/frame.h>
#include <mm/as.h>
#include <config.h>
#include <arch/boot/boot.h>
#include <arch/hypercall.h>
#include <panic.h>
#include <debug.h>
#include <align.h>
#include <macros.h>
 
#include <console/cmd.h>
#include <console/kconsole.h>
 
uintptr_t last_frame = 0;
 
#define L0_PT_SHIFT 10
#define L3_PT_SHIFT 0
 
#define L0_PT_ENTRIES 1024
#define L3_PT_ENTRIES 1024
 
#define L0_INDEX_MASK (L0_PT_ENTRIES - 1)
#define L3_INDEX_MASK (L3_PT_ENTRIES - 1)
 
#define PFN2PTL0_INDEX(pfn) ((pfn >> L0_PT_SHIFT) & L0_INDEX_MASK)
#define PFN2PTL3_INDEX(pfn) ((pfn >> L3_PT_SHIFT) & L3_INDEX_MASK)
 
#define PAGE_MASK (~(PAGE_SIZE - 1))
 
#define _PAGE_PRESENT 0x001UL
#define _PAGE_RW 0x002UL
#define _PAGE_USER 0x004UL
#define _PAGE_PWT 0x008UL
#define _PAGE_PCD 0x010UL
#define _PAGE_ACCESSED 0x020UL
#define _PAGE_DIRTY 0x040UL
#define _PAGE_PAT 0x080UL
#define _PAGE_PSE 0x080UL
#define _PAGE_GLOBAL 0x100UL
 
#define L0_PROT (_PAGE_PRESENT | _PAGE_ACCESSED)
#define L3_PROT (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED)
 
void frame_arch_init(void)
{
if (config.cpu_active == 1) {
/* The only memory zone starts just after page table */
pfn_t start = ADDR2PFN(ALIGN_UP(KA2PA(start_info.ptl0), PAGE_SIZE)) + start_info.pt_frames;
size_t size = start_info.frames - start;
/* Create identity mapping */
pfn_t phys;
count_t count = 0;
for (phys = start; phys < start + size; phys++) {
mmu_update_t updates[L3_PT_ENTRIES];
pfn_t virt = ADDR2PFN(PA2KA(PFN2ADDR(phys)));
size_t ptl0_index = PFN2PTL0_INDEX(virt);
size_t ptl3_index = PFN2PTL3_INDEX(virt);
pte_t *ptl3 = (pte_t *) PFN2ADDR(start_info.ptl0[ptl0_index].frame_address);
if (ptl3 == 0) {
mmuext_op_t mmu_ext;
pfn_t virt2 = ADDR2PFN(PA2KA(PFN2ADDR(start)));
/* New L1 page table entry needed */
memsetb(PFN2ADDR(virt2), PAGE_SIZE, 0);
size_t ptl0_index2 = PFN2PTL0_INDEX(virt2);
size_t ptl3_index2 = PFN2PTL3_INDEX(virt2);
pte_t *ptl3_2 = (pte_t *) PFN2ADDR(start_info.ptl0[ptl0_index2].frame_address);
if (ptl3_2 == 0)
panic("Unable to find page table reference");
updates[count].ptr = (uintptr_t) &ptl3_2[ptl3_index2];
updates[count].val = PA2MA(PFN2ADDR(start)) | L0_PROT;
if (xen_mmu_update(updates, count + 1, NULL, DOMID_SELF) < 0)
panic("Unable to map new page table");
count = 0;
mmu_ext.cmd = MMUEXT_PIN_L1_TABLE;
mmu_ext.arg1.mfn = ADDR2PFN(PA2MA(PFN2ADDR(start)));
if (xen_mmuext_op(&mmu_ext, 1, NULL, DOMID_SELF) < 0)
panic("Error pinning new page table");
pte_t *ptl0 = (pte_t *) PA2MA(KA2PA(start_info.ptl0));
updates[count].ptr = (uintptr_t) &ptl0[ptl0_index];
updates[count].val = PA2MA(PFN2ADDR(start)) | L3_PROT;
if (xen_mmu_update(updates, count + 1, NULL, DOMID_SELF) < 0)
panic("Unable to update PTE for page table");
count = 0;
ptl3 = (pte_t *) PFN2ADDR(start_info.ptl0[ptl0_index].frame_address);
start++;
size--;
}
updates[count].ptr = (uintptr_t) &ptl3[ptl3_index];
updates[count].val = PA2MA(PFN2ADDR(phys)) | L3_PROT;
count++;
if ((count == L3_PT_ENTRIES) || (phys + 1 == start + size)) {
if (xen_mmu_update(updates, count, NULL, DOMID_SELF) < 0)
panic("Unable to update PTE");
count = 0;
}
}
zone_create(start, size, start, 0);
last_frame = start + size;
/* The only memory zone */
zone_create(meminfo.start, meminfo.size, meminfo.start + meminfo.reserved, 0);
frame_mark_unavailable(meminfo.start, meminfo.reserved);
}
}