Skip to content

Introduce a separate KVM error variant of HyperlightError. #771

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

Merged
merged 1 commit into from
Aug 8, 2025
Merged

Introduce a separate KVM error variant of HyperlightError. #771

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
24 changes: 17 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/hyperlight_host/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ tracing-log = "0.2.0"
tracing-core = "0.1.34"
hyperlight-common = { workspace = true, default-features = true, features = [ "std" ] }
hyperlight-guest-tracing = { workspace = true, default-features = true, optional = true }
vmm-sys-util = "0.14.0"
vmm-sys-util = "0.15.0"
crossbeam-channel = "0.5.15"
thiserror = "2.0.12"
chrono = { version = "0.4", optional = true }
Expand Down
5 changes: 5 additions & 0 deletions src/hyperlight_host/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ pub enum HyperlightError {
#[error("Conversion of str data to json failed")]
JsonConversionFailure(#[from] serde_json::Error),

/// KVM Error Occurred
#[error("KVM Error {0:?}")]
#[cfg(kvm)]
KVMError(#[from] kvm_ioctls::Error),

/// An attempt to get a lock from a Mutex failed.
#[error("Unable to lock resource")]
LockAttemptFailed(String),
Expand Down
15 changes: 7 additions & 8 deletions src/hyperlight_host/src/hypervisor/hyperv_linux.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ use mshv_bindings::{
hv_register_name, hv_register_name_HV_X64_REGISTER_RAX, hv_register_name_HV_X64_REGISTER_RBP,
hv_register_name_HV_X64_REGISTER_RCX, hv_register_name_HV_X64_REGISTER_RSP,
};
use mshv_ioctls::{Mshv, MshvError, VcpuFd, VmFd};
use mshv_ioctls::{Mshv, VcpuFd, VmFd};
use tracing::{Span, instrument};
#[cfg(crashdump)]
use {super::crashdump, std::path::Path};
Expand Down Expand Up @@ -794,9 +794,7 @@ impl Hypervisor for HypervLinuxDriver {
.load(Ordering::Relaxed)
|| debug_interrupt
{
Err(MshvError::Errno(vmm_sys_util::errno::Error::new(
libc::EINTR,
)))
Err(mshv_ioctls::MshvError::from(libc::EINTR))
} else {
#[cfg(feature = "trace_guest")]
if self.trace_info.guest_start_epoch.is_none() {
Expand Down Expand Up @@ -847,7 +845,7 @@ impl Hypervisor for HypervLinuxDriver {
HyperlightExit::Halt()
}
IO_PORT_INTERCEPT_MESSAGE => {
let io_message = m.to_ioport_info()?;
let io_message = m.to_ioport_info().map_err(mshv_ioctls::MshvError::from)?;
let port_number = io_message.port_number;
let rip = io_message.header.rip;
let rax = io_message.rax;
Expand All @@ -861,7 +859,7 @@ impl Hypervisor for HypervLinuxDriver {
)
}
UNMAPPED_GPA_MESSAGE => {
let mimo_message = m.to_memory_info()?;
let mimo_message = m.to_memory_info().map_err(mshv_ioctls::MshvError::from)?;
let addr = mimo_message.guest_physical_address;
crate::debug!(
"mshv MMIO unmapped GPA -Details: Address: {} \n {:#?}",
Expand All @@ -871,7 +869,7 @@ impl Hypervisor for HypervLinuxDriver {
HyperlightExit::Mmio(addr)
}
INVALID_GPA_ACCESS_MESSAGE => {
let mimo_message = m.to_memory_info()?;
let mimo_message = m.to_memory_info().map_err(mshv_ioctls::MshvError::from)?;
let gpa = mimo_message.guest_physical_address;
let access_info = MemoryRegionFlags::try_from(mimo_message)?;
crate::debug!(
Expand All @@ -896,7 +894,8 @@ impl Hypervisor for HypervLinuxDriver {
EXCEPTION_INTERCEPT => {
// Extract exception info from the message so we can figure out
// more information about the vCPU state
let ex_info = match m.to_exception_info() {
let ex_info = match m.to_exception_info().map_err(mshv_ioctls::MshvError::from)
{
Ok(info) => info,
Err(e) => {
log_then_return!("Error converting to exception info: {:?}", e);
Expand Down
Loading