vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Nographic mode, fix userspace transition by setting kernel TLS back on syscall

Browse source
This commit is contained in:
Jeremy Soller 2016-09-08 15:45:26 -06:00
parent fb0df8530d
commit a5d79d7957
6 changed files with 48 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/x86_64/src/interrupt/exception.rs
View file

@ -71,7 +71,9 @@ interrupt_error!(protection, {
});
interrupt_error!(page, {
print!("Page fault\n");
let cr2: usize;
asm!("mov rax, cr2" : "={rax}"(cr2) : : : "intel", "volatile");
println!("Page fault: {:>016X}", cr2);
stack_trace();
loop { halt(); }
});

20
arch/x86_64/src/interrupt/mod.rs
View file

@ -52,13 +52,21 @@ pub unsafe fn stack_trace() {
//Maximum 64 frames
let active_table = ActivePageTable::new();
for _frame in 0..64 {
if active_table.translate(VirtualAddress::new(rbp)).is_some() && active_table.translate(VirtualAddress::new(rbp + mem::size_of::<usize>())).is_some() {
let rip = *(rbp as *const usize).offset(1);
println!(" {:>016X}: {:>016X}", rbp, rip);
rbp = *(rbp as *const usize);
if let Some(rip_rbp) = rbp.checked_add(mem::size_of::<usize>()) {
if active_table.translate(VirtualAddress::new(rbp)).is_some() && active_table.translate(VirtualAddress::new(rip_rbp)).is_some() {
let rip = *(rip_rbp as *const usize);
if rip == 0 {
println!(" {:>016X}: EMPTY RETURN", rbp);
break;
}
println!(" {:>016X}: {:>016X}", rbp, rip);
rbp = *(rbp as *const usize);
} else {
println!(" {:>016X}: GUARD PAGE", rbp);
break;
}
} else {
println!(" {:>016X}: GUARD PAGE", rbp);
break;
println!(" {:>016X}: RBP OVERFLOW", rbp);
}
}
}

13
arch/x86_64/src/interrupt/syscall.rs
View file

@ -22,8 +22,19 @@ pub unsafe extern fn syscall() {
asm!("xchg bx, bx" : : "{rax}"(a) : : "intel", "volatile");
}
asm!("xchg bx, bx
push fs
push rax
mov rax, 0x18
mov fs, ax
pop rax"
: : : : "intel", "volatile");
inner();
// Interrupt return
asm!("iretq" : : : : "intel", "volatile");
asm!("xchg bx, bx
pop fs
iretq"
: : : : "intel", "volatile");
}