refactor: move KVM_SET_TSS_ADDR call into Vm::arch_create

Since we issue this ioctl with a constant address, it doesn't really
matter _when_ we do it. Internally, it causes a hidden memslot of size 3
pages to be created. If we create it _after_ all other memslots, then
this ioctl can fail with EEXIST if it would overlap some pre-existing
memslot. Now, instead the creation of the overlapping memslot would fail
with EEXIST. But this is a moot point, because if Firecracker ever tried
to create a memslot that overlaps this one, something is fundamentally
broken.

Signed-off-by: Patrick Roy <[email protected]>

Author: roypat

src/vmm/src/vstate/vm/mod.rs

@@ -9,8 +9,6 @@ use kvm_bindings::{kvm_userspace_memory_region, KVM_MEM_LOG_DIRTY_PAGES};
 use kvm_ioctls::VmFd;
 use vmm_sys_util::eventfd::EventFd;
 
-#[cfg(target_arch = "x86_64")]
-use crate::utils::u64_to_usize;
 use crate::vstate::memory::{Address, GuestMemory, GuestMemoryMmap, GuestMemoryRegion};
 
 #[cfg(target_arch = "x86_64")]
@@ -68,13 +66,7 @@ impl Vm {
 
     /// Initializes the guest memory.
     pub fn memory_init(&self, guest_mem: &GuestMemoryMmap) -> Result<(), VmError> {
-        self.set_kvm_memory_regions(guest_mem)?;
-        #[cfg(target_arch = "x86_64")]
-        self.fd
-            .set_tss_address(u64_to_usize(crate::arch::x86_64::layout::KVM_TSS_ADDRESS))
-            .map_err(VmError::VmSetup)?;
-
-        Ok(())
+        self.set_kvm_memory_regions(guest_mem)
     }
 
     pub(crate) fn set_kvm_memory_regions(

src/vmm/src/vstate/vm/x86_64.rs

@@ -11,6 +11,7 @@ use kvm_ioctls::VmFd;
 use serde::{Deserialize, Serialize};
 
 use crate::arch::x86_64::msr::MsrError;
+use crate::utils::u64_to_usize;
 use crate::vstate::vm::VmError;
 
 /// Error type for [`Vm::restore_state`]
@@ -42,6 +43,8 @@ pub enum ArchVmError {
     VmSetIrqChip(kvm_ioctls::Error),
     /// Failed to get MSR index list to save into snapshots: {0}
     GetMsrsToSave(MsrError),
+    /// Failed during KVM_SET_TSS_ADDRESS: {0}
+    SetTssAddress(kvm_ioctls::Error),
 }
 
 /// Structure representing the current architecture's understand of what a "virtual machine" is.
@@ -56,6 +59,10 @@ impl ArchVm {
     pub fn new(kvm: &crate::vstate::kvm::Kvm) -> Result<ArchVm, VmError> {
         let fd = kvm.fd.create_vm().map_err(VmError::VmFd)?;
         let msrs_to_save = kvm.msrs_to_save().map_err(ArchVmError::GetMsrsToSave)?;
+
+        fd.set_tss_address(u64_to_usize(crate::arch::x86_64::layout::KVM_TSS_ADDRESS))
+            .map_err(ArchVmError::SetTssAddress)?;
+
         Ok(ArchVm { fd, msrs_to_save })
     }