qiurui
/
asterinas
mirror of https://github.com/asterinas/asterinas.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix minor bugs in TDX env

This commit is contained in:
Hsy-Intel 2024-10-10 01:49:01 -04:00 committed by Tate, Hongliang Tian
parent 090149eed7
commit c28cec2c6a
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/src/device/tdxguest/mod.rs
View File

@ -82,7 +82,8 @@ impl FileIo for TdxGuest {
fn handle_get_report(arg: usize) -> Result<i32> {
const SHARED_BIT: u8 = 51;
const SHARED_MASK: u64 = 1u64 << SHARED_BIT;
let user_space = get_current_userspace!();
let current_task = ostd::task::Task::current().unwrap();
let user_space = CurrentUserSpace::new(&current_task);
let user_request: TdxReportRequest = user_space.read_val(arg)?;
let vm_segment = FrameAllocOptions::new(2)

12
ostd/src/arch/x86/kernel/apic/ioapic.rs
View File

@ -164,9 +164,8 @@ pub fn init() {
#[cfg(feature = "cvm_guest")]
// SAFETY:
// This is safe because we are ensuring that the `IO_APIC_DEFAULT_ADDRESS` is a valid MMIO address before this operation.
// The `IO_APIC_DEFAULT_ADDRESS` is a well-known address used for IO APICs in x86 systems, and it is page-aligned, which is a requirement for the `unprotect_gpa_range` function.
// The `IO_APIC_DEFAULT_ADDRESS` is a well-known address used for IO APICs in x86 systems.
// We are also ensuring that we are only unprotecting a single page.
// Therefore, we are not causing any undefined behavior or violating any of the requirements of the `unprotect_gpa_range` function.
if tdx_is_enabled() {
unsafe {
tdx_guest::unprotect_gpa_range(IO_APIC_DEFAULT_ADDRESS, 1).unwrap();
@ -197,6 +196,15 @@ pub fn init() {
let mut vec = Vec::new();
for id in 0..apic.io_apics.len() {
let io_apic = apic.io_apics.get(id).unwrap();
#[cfg(feature = "cvm_guest")]
// SAFETY:
// This is safe because we are ensuring that the `io_apic.address` is a valid MMIO address before this operation.
// We are also ensuring that we are only unprotecting a single page.
if tdx_is_enabled() {
unsafe {
tdx_guest::unprotect_gpa_range(io_apic.address as usize, 1).unwrap();
}
}
let interrupt_base = io_apic.global_system_interrupt_base;
let mut io_apic = unsafe { IoApicAccess::new(io_apic.address as usize) };
io_apic.set_id(id as u8);