Skip to content
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

Jump to bottom

Add Result return type for tdvmcall_wrmsr, tdvmcall_rdmsr #712

Merged
merged 1 commit into from
Jun 18, 2024
Merged

Add Result return type for tdvmcall_wrmsr, tdvmcall_rdmsr #712

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
6 changes: 4 additions & 2 deletions td-exception/src/interrupt.rs
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes LGTM! Are you planning to create a separate PR to extend TdInfo struct with vcpu_index field? This is another request as part of #708

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I will submit another PR for this.

Original file line number Diff line number Diff line change
Expand Up @@ -399,13 +399,15 @@ interrupt_no_error!(virtualization, stack, {
}
}
EXIT_REASON_MSR_READ => {
let msr = tdx::tdvmcall_rdmsr(stack.scratch.rcx as u32);
let msr = tdx::tdvmcall_rdmsr(stack.scratch.rcx as u32)
.expect("fail to perform RDMSR operation\n");
stack.scratch.rax = (msr as u32 & u32::MAX) as usize; // EAX
stack.scratch.rdx = ((msr >> 32) as u32 & u32::MAX) as usize; // EDX
}
EXIT_REASON_MSR_WRITE => {
let data = stack.scratch.rax as u64 | ((stack.scratch.rdx as u64) << 32); // EDX:EAX
tdx::tdvmcall_wrmsr(stack.scratch.rcx as u32, data);
tdx::tdvmcall_wrmsr(stack.scratch.rcx as u32, data)
.expect("fail to perform WRMSR operation\n");
}
EXIT_REASON_CPUID => {
let cpuid = tdx::tdvmcall_cpuid(stack.scratch.rax as u32, stack.scratch.rcx as u32);
Expand Down
5 changes: 3 additions & 2 deletions td-payload/src/arch/x86_64/apic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ pub fn enable_apic_interrupt() {
// In x2APIC mode, SVR is mapped to MSR address 0x80f.
// Since SVR(SIVR) is not virtualized, before we implement the handling in #VE of MSRRD/WR,
// use tdvmcall instead direct read/write operation.
let svr = tdx_tdcall::tdx::tdvmcall_rdmsr(0x80f);
tdx_tdcall::tdx::tdvmcall_wrmsr(0x80f, svr | (0x1 << 8));
let svr = tdx_tdcall::tdx::tdvmcall_rdmsr(0x80f).expect("fail to perform RDMSR operation\n");
tdx_tdcall::tdx::tdvmcall_wrmsr(0x80f, svr | (0x1 << 8))
.expect("fail to perform WRMSR operation\n");
}

pub fn enable_and_hlt() {
Expand Down
12 changes: 7 additions & 5 deletions tdx-tdcall/src/tdx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ pub fn tdvmcall_mapgpa(shared: bool, paddr: u64, length: usize) -> Result<(), Td
/// Used to help perform RDMSR operation.
///
/// Details can be found in TDX GHCI spec section 'TDG.VP.VMCALL<Instruction.RDMSR>'
pub fn tdvmcall_rdmsr(index: u32) -> u64 {
pub fn tdvmcall_rdmsr(index: u32) -> Result<u64, TdVmcallError> {
let mut args = TdVmcallArgs {
r11: TDVMCALL_RDMSR,
r12: index as u64,
Expand All @@ -346,16 +346,16 @@ pub fn tdvmcall_rdmsr(index: u32) -> u64 {
let ret = td_vmcall(&mut args);

if ret != TDVMCALL_STATUS_SUCCESS {
tdvmcall_halt();
return Err(ret.into());
}

args.r11
Ok(args.r11)
}

/// Used to help perform WRMSR operation.
///
/// Details can be found in TDX GHCI spec section 'TDG.VP.VMCALL<Instruction.WRMSR>'
pub fn tdvmcall_wrmsr(index: u32, value: u64) {
pub fn tdvmcall_wrmsr(index: u32, value: u64) -> Result<(), TdVmcallError> {
let mut args = TdVmcallArgs {
r11: TDVMCALL_WRMSR,
r12: index as u64,
Expand All @@ -366,8 +366,10 @@ pub fn tdvmcall_wrmsr(index: u32, value: u64) {
let ret = td_vmcall(&mut args);

if ret != TDVMCALL_STATUS_SUCCESS {
tdvmcall_halt();
return Err(ret.into());
}

Ok(())
}

/// Used to enable the TD-guest to request the VMM to emulate the CPUID operation
Expand Down
Loading