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

Check the MPX status of platform before enabling

Browse Source 
Signed-off-by: yuanwu <yuan.wu@intel.com>
This commit is contained in:
yuanwu 2020-04-19 16:28:19 -04:00 committed by Tate Tian
parent 5b4b72a81a
commit ed7f83562a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libos/src/entry.rs
View File

@ -9,6 +9,7 @@ use std::sync::Once;
use util::log::LevelFilter; use util::log::LevelFilter;
use util::mem_util::from_untrusted::*; use util::mem_util::from_untrusted::*;
use util::sgx::allow_debug as sgx_allow_debug; use util::sgx::allow_debug as sgx_allow_debug;
use sgx_tse::*;
const ENCLAVE_PATH: &'static str = ".occlum/build/lib/libocclum-libos.signed.so"; const ENCLAVE_PATH: &'static str = ".occlum/build/lib/libocclum-libos.signed.so";
@ -42,8 +43,13 @@ pub extern "C" fn occlum_ecall_init(log_level: *const c_char) -> i32 {
INIT_ONCE.call_once(|| { INIT_ONCE.call_once(|| {
// Init the log infrastructure first so that log messages will be printed afterwards // Init the log infrastructure first so that log messages will be printed afterwards
util::log::init(log_level); util::log::init(log_level);
// Init MPX for SFI
//util::mpx_util::mpx_enable(); // Init MPX for SFI if MPX is available
let report = rsgx_self_report();
if (report.body.attributes.xfrm & SGX_XFRM_MPX != 0) {
util::mpx_util::mpx_enable();
}
// Register exception handlers (support cpuid & rdtsc for now) // Register exception handlers (support cpuid & rdtsc for now)
register_exception_handlers(); register_exception_handlers();