Skip to content

sgxs-tools: Support AEX-Notify feature #912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jovanbulck wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −11
Open

sgxs-tools: Support AEX-Notify feature #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions intel-sgx/sgx-isa/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,13 +392,14 @@ bitflags! {
#[repr(C)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
pub struct AttributesFlags: u64 {
const INIT = 0b0000_0001;
const DEBUG = 0b0000_0010;
const MODE64BIT = 0b0000_0100;
const PROVISIONKEY = 0b0001_0000;
const EINITTOKENKEY = 0b0010_0000;
const CET = 0b0100_0000;
const KSS = 0b1000_0000;
const INIT = 0b000_0000_0001;
const DEBUG = 0b000_0000_0010;
const MODE64BIT = 0b000_0000_0100;
const PROVISIONKEY = 0b000_0001_0000;
const EINITTOKENKEY = 0b000_0010_0000;
const CET = 0b000_0100_0000;
const KSS = 0b000_1000_0000;
const AEXNOTIFY = 0b100_1000_0000;
}
}

Expand Down Expand Up @@ -451,7 +452,8 @@ impl Tcs {
bitflags! {
#[repr(C)]
pub struct TcsFlags: u64 {
const DBGOPTIN = 0b0000_0001;
const DBGOPTIN = 0b0000_0001;
const AEXNOTIFY = 0b0000_0010;
}
}

Expand Down
6 changes: 3 additions & 3 deletions intel-sgx/sgxs-tools/src/bin/sgxs-info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use std::fs::File;
use std::path::Path;

use clap::{App, Arg};
use sgx_isa::{PageType, SecinfoFlags, Tcs};
use sgx_isa::{PageType, SecinfoFlags, Tcs, TcsFlags};

use crate::sgxs_crate::sgxs::{self, SgxsRead};
use crate::sgxs_crate::util::size_fit_natural;
Expand Down Expand Up @@ -210,8 +210,8 @@ impl<'a, R: sgxs::SgxsRead + 'a> Pages<'a, R> {
Ok(self.reader.read_page()?.map(|(eadd, chunks, data)| {
let tcs_info = if eadd.secinfo.flags.page_type() == PageType::Tcs as u8 {
let tcs = Tcs::try_copy_from(&data).unwrap();
Some(format!(" [oentry=0x{:x}, ossa=0x{:x}, nssa={}]",
tcs.oentry, tcs.ossa, tcs.nssa))
Some(format!(" [oentry=0x{:x}, ossa=0x{:x}, nssa={}, aexnotify={}]",
tcs.oentry, tcs.ossa, tcs.nssa, tcs.flags.contains(TcsFlags::AEXNOTIFY)))
} else {
None
};
Expand Down