Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-08 21:06:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the #VE irq issue causing TDX CI failure

Browse Source
This commit is contained in:
Hsy-Intel 2025-02-11 21:01:29 -05:00 committed by Tate, Hongliang Tian
parent decfcbecaf
commit b007e334b8
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ostd/src/arch/x86/cpu/mod.rs
View File

@ -40,7 +40,7 @@ cfg_if! {
if #[cfg(feature = "cvm_guest")] {
mod tdx;
use tdx::handle_virtualization_exception;
use tdx::VirtualizationExceptionHandler;
}
}
@ -132,8 +132,11 @@ impl UserContextApiInternal for UserContext {
match CpuException::to_cpu_exception(self.user_context.trap_num as u16) {
#[cfg(feature = "cvm_guest")]
Some(CpuException::VIRTUALIZATION_EXCEPTION) => {
let ve_handler = VirtualizationExceptionHandler::new();
// Check out the doc of `VirtualizationExceptionHandler::new` to
// see why IRQs must enabled _after_ instantiating a `VirtualizationExceptionHandler`.
crate::arch::irq::enable_local();
handle_virtualization_exception(self);
ve_handler.handle(self);
}
Some(exception) if exception.typ().is_fatal_or_trap() => {
crate::arch::irq::enable_local();

35
ostd/src/arch/x86/cpu/tdx.rs
View File

@ -1,14 +1,37 @@
// SPDX-License-Identifier: MPL-2.0
use tdx_guest::{handle_virtual_exception as do_handle_virtual_exception, tdcall, TdxTrapFrame};
use tdx_guest::{
handle_virtual_exception as do_handle_virtual_exception, tdcall, TdgVeInfo, TdxTrapFrame,
};
use crate::cpu::{RawGeneralRegs, UserContext};
pub(crate) fn handle_virtualization_exception(user_context: &mut UserContext) {
let ve_info = tdcall::get_veinfo().expect("#VE handler: fail to get VE info\n");
let mut generalrags_wrapper = GeneralRegsWrapper(&mut *user_context.general_regs_mut());
do_handle_virtual_exception(&mut generalrags_wrapper, &ve_info);
*user_context.general_regs_mut() = *generalrags_wrapper.0;
pub(crate) struct VirtualizationExceptionHandler {
ve_info: TdgVeInfo,
}
impl VirtualizationExceptionHandler {
/// Creates a VE handler.
///
/// It is important that such a handler is created immediately after a VE happens,
/// before the local IRQs are re-enabled. This is because the handler needs to retrieve more information
/// about the last VE from the trusted Intel TDX module. If another VE happens, the information about
/// the last one held by Intel TDX module would be overridden and lost!
///
/// This constructor method retrieves the VE information from
/// Intel TDX module and saved into the newly-created instance.
/// So after instantiating a `VirtualizationExceptionHandler`,
/// we won't need to worry about triggering a new VE.
pub fn new() -> Self {
let ve_info = tdcall::get_veinfo().expect("#VE handler: fail to get VE info\n");
Self { ve_info }
}
pub fn handle(&self, ctx: &mut UserContext) {
let mut generalrags_wrapper = GeneralRegsWrapper(&mut *ctx.general_regs_mut());
do_handle_virtual_exception(&mut generalrags_wrapper, &self.ve_info);
*ctx.general_regs_mut() = *generalrags_wrapper.0;
}
}
struct GeneralRegsWrapper<'a>(&'a mut RawGeneralRegs);