From c9b903633535071174e4f75b15c6de358370aadc Mon Sep 17 00:00:00 2001
From: Nikita Kalyazin <kalyazin@amazon.com>
Date: Thu, 1 Aug 2024 11:32:20 +0000
Subject: [PATCH] Propagate MemoryFault exit reason in KVM_RUN

Signed-off-by: Nikita Kalyazin <kalyazin@amazon.com>
---
 src/ioctls/vcpu.rs | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/ioctls/vcpu.rs b/src/ioctls/vcpu.rs
index afa75ada..b0cd092e 100644
--- a/src/ioctls/vcpu.rs
+++ b/src/ioctls/vcpu.rs
@@ -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.
@@ -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)
+            }
         }
     }