general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refine log for #UD exception and file open

Browse Source
This commit is contained in:
Hui, Chunyang 2024-01-17 07:05:39 +00:00 committed by volcano
parent c2db186854
commit 879cfa58a5
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libos/src/exception/cpuid.rs
View File

@ -253,9 +253,12 @@ pub fn setup_cpuid_info() {
} }
pub fn handle_cpuid_exception(user_context: &mut CpuContext) -> Result<isize> { pub fn handle_cpuid_exception(user_context: &mut CpuContext) -> Result<isize> {
debug!("handle CPUID exception");
let leaf = user_context.rax as u32; let leaf = user_context.rax as u32;
let subleaf = user_context.rcx as u32; let subleaf = user_context.rcx as u32;
debug!(
"handle CPUID exception: leaf = 0x{:x?}, subleaf = 0x{:x?}",
leaf, subleaf
);
let cpuid_result = CPUID.get_cpuid_info(leaf, subleaf); let cpuid_result = CPUID.get_cpuid_info(leaf, subleaf);
trace!("cpuid result: {:?}", cpuid_result); trace!("cpuid result: {:?}", cpuid_result);
user_context.rax = cpuid_result.eax as u64; user_context.rax = cpuid_result.eax as u64;

3
src/libos/src/exception/syscall.rs
View File

@ -5,8 +5,6 @@ use sgx_types::*;
pub const SYSCALL_OPCODE: u16 = 0x050F; pub const SYSCALL_OPCODE: u16 = 0x050F;
pub fn handle_syscall_exception(user_context: &mut CpuContext) -> ! { pub fn handle_syscall_exception(user_context: &mut CpuContext) -> ! {
debug!("handle SYSCALL exception");
// SYSCALL instruction saves RIP into RCX and RFLAGS into R11. This is to // SYSCALL instruction saves RIP into RCX and RFLAGS into R11. This is to
// comply with hardware's behavoir. Not useful for us. // comply with hardware's behavoir. Not useful for us.
user_context.rcx = user_context.rip; user_context.rcx = user_context.rip;
@ -19,6 +17,7 @@ pub fn handle_syscall_exception(user_context: &mut CpuContext) -> ! {
let num = user_context.rax as u32; let num = user_context.rax as u32;
assert!(num != SyscallNum::HandleException as u32); assert!(num != SyscallNum::HandleException as u32);
debug!("handle SYSCALL exception: syscall number = {:?}", num);
// FIXME: occlum syscall must use Linux ABI // FIXME: occlum syscall must use Linux ABI
occlum_syscall(user_context); occlum_syscall(user_context);

2
src/libos/src/fs/file_ops/open.rs
View File

@ -19,5 +19,7 @@ pub fn do_openat(fs_path: &FsPath, flags: u32, mode: FileMode) -> Result<FileDes
let creation_flags = CreationFlags::from_bits_truncate(flags); let creation_flags = CreationFlags::from_bits_truncate(flags);
current.add_file(file_ref, creation_flags.must_close_on_spawn()) current.add_file(file_ref, creation_flags.must_close_on_spawn())
}; };
debug!("openat: result fd: {:?}", fd);
Ok(fd) Ok(fd)
} }