Skip to content

Commit

Permalink
Propagate MemoryFault exit reason in KVM_RUN
Browse files Browse the repository at this point in the history
Signed-off-by: Nikita Kalyazin <kalyazin@amazon.com>
  • Loading branch information
kalyazin committed Aug 1, 2024
1 parent 60536c5 commit c9b9036
Showing 1 changed file with 36 additions and 1 deletion.
37 changes: 36 additions & 1 deletion src/ioctls/vcpu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,15 @@ pub enum VcpuExit<'a> {
X86Rdmsr(ReadMsrExit<'a>),
/// Corresponds to KVM_EXIT_X86_WRMSR.
X86Wrmsr(WriteMsrExit<'a>),
/// Corresponds to KVM_EXIT_MEMORY_FAULT.
MemoryFault {
/// flags
flags: u64,
/// gpa
gpa: u64,
/// size
size: u64,
},
/// Corresponds to an exit reason that is unknown from the current version
/// of the kvm-ioctls crate. Let the consumer decide about what to do with
/// it.
Expand Down Expand Up @@ -1569,7 +1578,33 @@ impl VcpuFd {
r => Ok(VcpuExit::Unsupported(r)),
}
} else {
Err(errno::Error::last())
let errno = errno::Error::last();
// From https://docs.kernel.org/virt/kvm/api.html#kvm-run :
//
// KVM_EXIT_MEMORY_FAULT is unique among all KVM exit reasons in that it accompanies
// a return code of ‘-1’, not ‘0’! errno will always be set to EFAULT or EHWPOISON
// when KVM exits with KVM_EXIT_MEMORY_FAULT, userspace should assume kvm_run.exit_reason
// is stale/undefined for all other error numbers.
if ret == -1
&& (errno == errno::Error::new(libc::EFAULT)
|| errno == errno::Error::new(libc::EHWPOISON))
{
let run = self.kvm_run_ptr.as_mut_ref();
if run.exit_reason == KVM_EXIT_MEMORY_FAULT {
// SAFETY: Safe because the exit_reason (which comes from the kernel) told us
// which union field to use.
let fault = unsafe { &mut run.__bindgen_anon_1.memory_fault };
Ok(VcpuExit::MemoryFault {
flags: fault.flags,
gpa: fault.gpa,
size: fault.size,
})
} else {
Err(errno)
}
} else {
Err(errno)
}
}
}

Expand Down

0 comments on commit c9b9036

Please sign in to comment.