From 2e4f6889160a01e29a3c156a108cc1cef445e815 Mon Sep 17 00:00:00 2001
From: Alex Zenla <alex@mycelium.engineering>
Date: Wed, 10 Jan 2024 23:28:41 -0800
Subject: [PATCH] fix loading of kernel into memory

---
 xenclient/examples/boot.rs |  9 +++------
 xenclient/src/boot.rs      | 14 ++++++++++++--
 xenclient/src/elfloader.rs |  6 +++---
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/xenclient/examples/boot.rs b/xenclient/examples/boot.rs
index 4542ce3..c8cf875 100644
--- a/xenclient/examples/boot.rs
+++ b/xenclient/examples/boot.rs
@@ -3,7 +3,7 @@ use xencall::domctl::DomainControl;
 use xencall::memory::MemoryControl;
 use xencall::sys::CreateDomain;
 use xencall::XenCall;
-use xenclient::boot::{BootImageLoader, BootSetup};
+use xenclient::boot::BootSetup;
 use xenclient::elfloader::ElfImageLoader;
 use xenclient::XenClientError;
 
@@ -17,14 +17,11 @@ fn main() -> Result<(), XenClientError> {
     let call = XenCall::open()?;
     let domctl = DomainControl::new(&call);
     let domid = domctl.create_domain(CreateDomain::default())?;
-    let domain = domctl.get_domain_info(domid)?;
-    println!("domain created: {:?}", domain);
+    println!("domain created: {:?}", domid);
     let image_loader = ElfImageLoader::load_file_kernel(kernel_image_path.as_str())?;
-    let image_info = image_loader.parse()?;
-    println!("loaded kernel image into memory: {:?}", image_info);
     let memctl = MemoryControl::new(&call);
     let mut boot = BootSetup::new(&call, &domctl, &memctl, domid);
-    boot.initialize(image_info, 512 * 1024)?;
+    boot.initialize(&image_loader, 512 * 1024)?;
     domctl.destroy_domain(domid)?;
     println!("domain destroyed: {}", domid);
     Ok(())
diff --git a/xenclient/src/boot.rs b/xenclient/src/boot.rs
index 741f5bb..6acfb78 100644
--- a/xenclient/src/boot.rs
+++ b/xenclient/src/boot.rs
@@ -5,6 +5,7 @@ use crate::sys::{
 use crate::XenClientError;
 use libc::memset;
 use std::ffi::c_void;
+use std::slice;
 use xencall::domctl::DomainControl;
 use xencall::memory::MemoryControl;
 use xencall::XenCall;
@@ -39,6 +40,8 @@ struct DomainSegment {
     _vstart: u64,
     _vend: u64,
     pfn: u64,
+    addr: u64,
+    size: u64,
     _pages: u64,
 }
 
@@ -178,13 +181,17 @@ impl BootSetup<'_> {
 
     pub fn initialize(
         &mut self,
-        image_info: BootImageInfo,
+        image_loader: &dyn BootImageLoader,
         memkb: u64,
     ) -> Result<(), XenClientError> {
+        let image_info = image_loader.parse()?;
         self.domctl.set_max_mem(self.domid, memkb)?;
         self.initialize_memory(memkb)?;
         let kernel_segment = self.alloc_segment(image_info.virt_kend - image_info.virt_kstart)?;
-        println!("kernel_segment: {:?}", kernel_segment);
+        let kernel_segment_ptr = kernel_segment.addr as *mut u8;
+        let slice =
+            unsafe { slice::from_raw_parts_mut(kernel_segment_ptr, kernel_segment.size as usize) };
+        image_loader.load(image_info, slice)?;
         Ok(())
     }
 
@@ -196,9 +203,12 @@ impl BootSetup<'_> {
             _vstart: start,
             _vend: 0,
             pfn: self.pfn_alloc_end,
+            addr: 0,
+            size,
             _pages: pages,
         };
         let ptr = self.phys.pfn_to_ptr(segment.pfn, pages)?;
+        segment.addr = ptr;
         unsafe {
             memset(ptr as *mut c_void, 0, (pages * page_size) as usize);
         }
diff --git a/xenclient/src/elfloader.rs b/xenclient/src/elfloader.rs
index adbd69b..96c0e00 100644
--- a/xenclient/src/elfloader.rs
+++ b/xenclient/src/elfloader.rs
@@ -264,19 +264,19 @@ impl BootImageLoader for ElfImageLoader {
             ));
         }
 
-        let virt_base = if virt_base == XEN_UNSET_ADDR {
+        let _virt_base = if virt_base == XEN_UNSET_ADDR {
             0
         } else {
             virt_base
         };
 
-        let paddr_offset = if paddr_offset == XEN_UNSET_ADDR {
+        let _paddr_offset = if paddr_offset == XEN_UNSET_ADDR {
             0
         } else {
             paddr_offset
         };
 
-        let virt_offset = virt_base - paddr_offset;
+        let virt_offset = 0;
         let virt_kstart = start + virt_offset;
         let virt_kend = end + virt_offset;
         let virt_entry = if entry == XEN_UNSET_ADDR {