sim: add tests for partial ram-loading
Signed-off-by: Raef Coles <raef.coles@arm.com>
diff --git a/sim/mcuboot-sys/src/c.rs b/sim/mcuboot-sys/src/c.rs
index 5c791b8..b2dd2b8 100644
--- a/sim/mcuboot-sys/src/c.rs
+++ b/sim/mcuboot-sys/src/c.rs
@@ -64,7 +64,8 @@
/// Invoke the bootloader on this flash device.
pub fn boot_go(multiflash: &mut SimMultiFlash, areadesc: &AreaDesc,
- counter: Option<&mut i32>, catch_asserts: bool) -> BootGoResult {
+ counter: Option<&mut i32>, image_index: Option<i32>,
+ catch_asserts: bool) -> BootGoResult {
for (&dev_id, flash) in multiflash.iter_mut() {
api::set_flash(dev_id, flash);
}
@@ -83,9 +84,16 @@
flash_dev_id: 0,
image_off: 0,
};
- let result = unsafe {
- raw::invoke_boot_go(&mut sim_ctx as *mut _, &areadesc.get_c() as *const _,
- &mut rsp as *mut _) as i32
+ let result: i32 = unsafe {
+ match image_index {
+ None => raw::invoke_boot_go(&mut sim_ctx as *mut _,
+ &areadesc.get_c() as *const _,
+ &mut rsp as *mut _, -1) as i32,
+ Some(i) => raw::invoke_boot_go(&mut sim_ctx as *mut _,
+ &areadesc.get_c() as *const _,
+ &mut rsp as *mut _,
+ i as i32) as i32
+ }
};
let asserts = sim_ctx.c_asserts;
if let Some(c) = counter {
@@ -151,7 +159,7 @@
// be any way to get rid of this warning. See https://github.com/rust-lang/rust/issues/34798
// for information and tracking.
pub fn invoke_boot_go(sim_ctx: *mut CSimContext, areadesc: *const CAreaDesc,
- rsp: *mut BootRsp) -> libc::c_int;
+ rsp: *mut BootRsp, image_index: libc::c_int) -> libc::c_int;
pub fn boot_trailer_sz(min_write_sz: u32) -> u32;
pub fn boot_status_sz(min_write_sz: u32) -> u32;
diff --git a/sim/src/image.rs b/sim/src/image.rs
index cc9dd6a..bb964fa 100644
--- a/sim/src/image.rs
+++ b/sim/src/image.rs
@@ -477,7 +477,7 @@
if Caps::Bootstrap.present() {
info!("Try bootstraping image in the primary");
- if !c::boot_go(&mut flash, &self.areadesc, None, false).success() {
+ if !c::boot_go(&mut flash, &self.areadesc, None, None, false).success() {
warn!("Failed first boot");
fails += 1;
}
@@ -658,7 +658,7 @@
info!("Try norevert");
// First do a normal upgrade...
- if !c::boot_go(&mut flash, &self.areadesc, None, false).success() {
+ if !c::boot_go(&mut flash, &self.areadesc, None, None, false).success() {
warn!("Failed first boot");
fails += 1;
}
@@ -691,7 +691,7 @@
fails += 1;
}
- if !c::boot_go(&mut flash, &self.areadesc, None, false).success() {
+ if !c::boot_go(&mut flash, &self.areadesc, None, None, false).success() {
warn!("Failed second boot");
fails += 1;
}
@@ -726,7 +726,7 @@
info!("Try no downgrade");
// First, do a normal upgrade.
- if !c::boot_go(&mut flash, &self.areadesc, None, false).success() {
+ if !c::boot_go(&mut flash, &self.areadesc, None, None, false).success() {
warn!("Failed first boot");
fails += 1;
}
@@ -768,7 +768,7 @@
}
// Run the bootloader...
- if !c::boot_go(&mut flash, &self.areadesc, None, false).success() {
+ if !c::boot_go(&mut flash, &self.areadesc, None, None, false).success() {
warn!("Failed first boot");
fails += 1;
}
@@ -822,7 +822,7 @@
}
// Run the bootloader...
- if !c::boot_go(&mut flash, &self.areadesc, None, false).success() {
+ if !c::boot_go(&mut flash, &self.areadesc, None, None, false).success() {
warn!("Failed first boot");
fails += 1;
}
@@ -862,7 +862,7 @@
self.mark_upgrades(&mut flash, 1);
// Run the bootloader...
- if !c::boot_go(&mut flash, &self.areadesc, None, false).success() {
+ if !c::boot_go(&mut flash, &self.areadesc, None, None, false).success() {
warn!("Failed first boot");
fails += 1;
}
@@ -909,7 +909,7 @@
self.mark_permanent_upgrades(&mut flash, 1);
self.mark_bad_status_with_rate(&mut flash, 0, 1.0);
- let result = c::boot_go(&mut flash, &self.areadesc, None, true);
+ let result = c::boot_go(&mut flash, &self.areadesc, None, None, true);
if !result.success() {
warn!("Failed!");
fails += 1;
@@ -935,7 +935,7 @@
info!("validate primary slot enabled; \
re-run of boot_go should just work");
- if !c::boot_go(&mut flash, &self.areadesc, None, false).success() {
+ if !c::boot_go(&mut flash, &self.areadesc, None, None, false).success() {
warn!("Failed!");
fails += 1;
}
@@ -967,7 +967,8 @@
self.mark_bad_status_with_rate(&mut flash, 0, 0.5);
// Should not fail, writing to bad regions does not assert
- let asserts = c::boot_go(&mut flash, &self.areadesc, Some(&mut count), true).asserts();
+ let asserts = c::boot_go(&mut flash, &self.areadesc,
+ Some(&mut count), None, true).asserts();
if asserts != 0 {
warn!("At least one assert() was called");
fails += 1;
@@ -976,7 +977,8 @@
self.reset_bad_status(&mut flash, 0);
info!("Resuming an interrupted swap operation");
- let asserts = c::boot_go(&mut flash, &self.areadesc, None, true).asserts();
+ let asserts = c::boot_go(&mut flash, &self.areadesc, None, None,
+ true).asserts();
// This might throw no asserts, for large sector devices, where
// a single failure writing is indistinguishable from no failure,
@@ -1003,7 +1005,8 @@
self.mark_bad_status_with_rate(&mut flash, 0, 1.0);
// This is expected to fail while writing to bad regions...
- let asserts = c::boot_go(&mut flash, &self.areadesc, None, true).asserts();
+ let asserts = c::boot_go(&mut flash, &self.areadesc, None, None,
+ true).asserts();
if asserts == 0 {
warn!("No assert() detected");
fails += 1;
@@ -1023,7 +1026,7 @@
// Clone the flash so we can tell if unchanged.
let mut flash = self.flash.clone();
- let result = c::boot_go(&mut flash, &self.areadesc, None, true);
+ let result = c::boot_go(&mut flash, &self.areadesc, None, None, true);
// Ensure the boot was successful.
let resp = if let Some(resp) = result.resp() {
@@ -1057,7 +1060,8 @@
// println!("Ram: {:#?}", self.ram);
// Verify that the images area loaded into this.
- let result = ram.invoke(|| c::boot_go(&mut flash, &self.areadesc, None, true));
+ let result = ram.invoke(|| c::boot_go(&mut flash, &self.areadesc, None,
+ None, true));
if !result.success() {
error!("Failed to execute ram-load");
return true;
@@ -1085,6 +1089,50 @@
return false;
}
+ /// Test the split ram-loading.
+ pub fn run_split_ram_load(&self) -> bool {
+ if !Caps::RamLoad.present() {
+ return false;
+ }
+
+ // Clone the flash so we can tell if unchanged.
+ let mut flash = self.flash.clone();
+
+ // Setup ram based on the ram configuration we determined earlier for the images.
+ let ram = RamBlock::new(self.ram.total - RAM_LOAD_ADDR, RAM_LOAD_ADDR);
+
+ for (idx, _image) in (&self.images).iter().enumerate() {
+ // Verify that the images area loaded into this.
+ let result = ram.invoke(|| c::boot_go(&mut flash, &self.areadesc,
+ None, Some(idx as i32), true));
+ if !result.success() {
+ error!("Failed to execute ram-load");
+ return true;
+ }
+ }
+
+ // Verify each image.
+ for image in &self.images {
+ let place = self.ram.lookup(&image.slots[0]);
+ let ram_image = ram.borrow_part(place.offset as usize - RAM_LOAD_ADDR as usize,
+ place.size as usize);
+ let src_sz = image.upgrades.size();
+ if src_sz > ram_image.len() {
+ error!("Image ended up too large, nonsensical");
+ return true;
+ }
+ let src_image = &image.upgrades.plain[0..src_sz];
+ let ram_image = &ram_image[0..src_sz];
+ if ram_image != src_image {
+ error!("Image not loaded correctly");
+ return true;
+ }
+
+ }
+
+ return false;
+ }
+
/// Adds a new flash area that fails statistically
fn mark_bad_status_with_rate(&self, flash: &mut SimMultiFlash, slot: usize,
rate: f32) {
@@ -1134,7 +1182,10 @@
let mut counter = stop.unwrap_or(0);
- let (first_interrupted, count) = match c::boot_go(&mut flash, &self.areadesc, Some(&mut counter), false) {
+ let (first_interrupted, count) = match c::boot_go(&mut flash,
+ &self.areadesc,
+ Some(&mut counter),
+ None, false) {
x if x.interrupted() => (true, stop.unwrap()),
x if x.success() => (false, -counter),
x => panic!("Unknown return: {:?}", x),
@@ -1143,7 +1194,8 @@
counter = 0;
if first_interrupted {
// fl.dump();
- match c::boot_go(&mut flash, &self.areadesc, Some(&mut counter), false) {
+ match c::boot_go(&mut flash, &self.areadesc, Some(&mut counter),
+ None, false) {
x if x.interrupted() => panic!("Shouldn't stop again"),
x if x.success() => (),
x => panic!("Unknown return: {:?}", x),
@@ -1159,7 +1211,7 @@
// fl.write_file("image0.bin").unwrap();
for i in 0 .. count {
info!("Running boot pass {}", i + 1);
- assert!(c::boot_go(&mut flash, &self.areadesc, None, false).success_no_asserts());
+ assert!(c::boot_go(&mut flash, &self.areadesc, None, None, false).success_no_asserts());
}
flash
}
@@ -1169,7 +1221,8 @@
let mut fails = 0;
let mut counter = stop;
- if !c::boot_go(&mut flash, &self.areadesc, Some(&mut counter), false).interrupted() {
+ if !c::boot_go(&mut flash, &self.areadesc, Some(&mut counter), None,
+ false).interrupted() {
warn!("Should have stopped test at interruption point");
fails += 1;
}
@@ -1181,7 +1234,7 @@
fails += 1;
}
- if !c::boot_go(&mut flash, &self.areadesc, None, false).success() {
+ if !c::boot_go(&mut flash, &self.areadesc, None, None, false).success() {
warn!("Should have finished test upgrade");
fails += 1;
}
@@ -1209,12 +1262,13 @@
// Do Revert
let mut counter = stop;
- if !c::boot_go(&mut flash, &self.areadesc, Some(&mut counter), false).interrupted() {
+ if !c::boot_go(&mut flash, &self.areadesc, Some(&mut counter), None,
+ false).interrupted() {
warn!("Should have stopped revert at interruption point");
fails += 1;
}
- if !c::boot_go(&mut flash, &self.areadesc, None, false).success() {
+ if !c::boot_go(&mut flash, &self.areadesc, None, None, false).success() {
warn!("Should have finished revert upgrade");
fails += 1;
}
@@ -1241,7 +1295,7 @@
fails += 1;
}
- if !c::boot_go(&mut flash, &self.areadesc, None, false).success() {
+ if !c::boot_go(&mut flash, &self.areadesc, None, None, false).success() {
warn!("Should have finished 3rd boot");
fails += 1;
}
@@ -1270,7 +1324,8 @@
for reset in &mut resets {
let reset_counter = rng.gen_range(1 ..= remaining_ops / 2);
let mut counter = reset_counter;
- match c::boot_go(&mut flash, &self.areadesc, Some(&mut counter), false) {
+ match c::boot_go(&mut flash, &self.areadesc, Some(&mut counter),
+ None, false) {
x if x.interrupted() => (),
x => panic!("Unknown return: {:?}", x),
}
@@ -1278,7 +1333,7 @@
*reset = reset_counter;
}
- match c::boot_go(&mut flash, &self.areadesc, None, false) {
+ match c::boot_go(&mut flash, &self.areadesc, None, None, false) {
x if x.interrupted() => panic!("Should not be have been interrupted!"),
x if x.success() => (),
x => panic!("Unknown return: {:?}", x),
diff --git a/sim/tests/core.rs b/sim/tests/core.rs
index ca91bbb..defe799 100644
--- a/sim/tests/core.rs
+++ b/sim/tests/core.rs
@@ -61,6 +61,7 @@
sim_test!(direct_xip_first, make_no_upgrade_image(&NO_DEPS), run_direct_xip());
sim_test!(ram_load_first, make_no_upgrade_image(&NO_DEPS), run_ram_load());
+sim_test!(ram_load_split, make_no_upgrade_image(&NO_DEPS), run_split_ram_load());
// Test various combinations of incorrect dependencies.
test_shell!(dependency_combos, r, {