mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
stress test fastspace allocation and regeneration
- confirmed that log entries regenerate on trigger - confirmed that fastspace cache regenerates and contains a new subset of blank pages.
This commit is contained in:
parent
93ee050079
commit
185d629b98
2 changed files with 62 additions and 44 deletions
|
|
@ -855,6 +855,7 @@ impl PddbOs {
|
||||||
pub fn try_fast_space_alloc(&mut self) -> Option<PhysPage> {
|
pub fn try_fast_space_alloc(&mut self) -> Option<PhysPage> {
|
||||||
// 1. Confirm that the fspace_log_next_addr is valid. If not, regenerate it, or fail.
|
// 1. Confirm that the fspace_log_next_addr is valid. If not, regenerate it, or fail.
|
||||||
if !self.fast_space_ensure_next_log() {
|
if !self.fast_space_ensure_next_log() {
|
||||||
|
log::warn!("Couldn't ensure fast space log entry: {}", self.fspace_log_len);
|
||||||
None
|
None
|
||||||
} else {
|
} else {
|
||||||
// 2. find the first page that is Free or Dirty. The order is already randomized, so we can do a stupid linear search.
|
// 2. find the first page that is Free or Dirty. The order is already randomized, so we can do a stupid linear search.
|
||||||
|
|
@ -893,8 +894,14 @@ impl PddbOs {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if maybe_alloc.is_none() {
|
||||||
|
log::warn!("Ran out of free space. fspace cache entries: {}", self.fspace_cache.len());
|
||||||
|
for entry in self.fspace_cache.iter() {
|
||||||
|
log::info!("{:?}", entry);
|
||||||
|
}
|
||||||
|
}
|
||||||
if let Some(alloc) = maybe_alloc {
|
if let Some(alloc) = maybe_alloc {
|
||||||
assert!(self.fspace_cache.replace(alloc).is_some(), "inconsistent state: we found a free page, but later when we tried to update it, it wasn't there!");
|
assert!(self.fspace_cache.remove(&alloc), "inconsistent state: we found a free page, but later when we tried to update it, it wasn't there!");
|
||||||
}
|
}
|
||||||
maybe_alloc
|
maybe_alloc
|
||||||
}
|
}
|
||||||
|
|
@ -904,9 +911,10 @@ impl PddbOs {
|
||||||
// update the fspace cache
|
// update the fspace cache
|
||||||
pp.set_space_state(SpaceState::Dirty);
|
pp.set_space_state(SpaceState::Dirty);
|
||||||
pp.set_journal(pp.journal() + 1);
|
pp.set_journal(pp.journal() + 1);
|
||||||
if self.fspace_cache.contains(&pp) {
|
|
||||||
self.fspace_cache.replace(pp.clone());
|
// re-cycle the space into the fspace_cache
|
||||||
}
|
self.fspace_cache.insert(pp.clone());
|
||||||
|
|
||||||
// commit the free'd block to the journal
|
// commit the free'd block to the journal
|
||||||
self.syskey_ensure();
|
self.syskey_ensure();
|
||||||
let cipher = self.cipher_ecb.as_ref().expect("Inconsistent internal state - syskey_ensure() failed");
|
let cipher = self.cipher_ecb.as_ref().expect("Inconsistent internal state - syskey_ensure() failed");
|
||||||
|
|
@ -931,56 +939,65 @@ impl PddbOs {
|
||||||
/// This is a "look before you leap" function that will potentially pause all system operations
|
/// This is a "look before you leap" function that will potentially pause all system operations
|
||||||
/// and do a deep scan for space if the required amount is not available.
|
/// and do a deep scan for space if the required amount is not available.
|
||||||
pub fn ensure_fast_space_alloc(&mut self, pages: usize, cache: &Vec::<BasisCacheEntry>) -> bool {
|
pub fn ensure_fast_space_alloc(&mut self, pages: usize, cache: &Vec::<BasisCacheEntry>) -> bool {
|
||||||
|
const BUFFER: usize = 1; // a bit of slop in the trigger point
|
||||||
|
log::trace!("alloc fast_space_len: {}, log_len {}", self.fast_space_len(), self.fspace_log_len);
|
||||||
// make sure we have fast space pages...
|
// make sure we have fast space pages...
|
||||||
if (self.fast_space_len() > pages)
|
if (self.fast_space_len() > pages + BUFFER)
|
||||||
// ..and make sure we have space for fast space log entries
|
// ..and make sure we have space for fast space log entries
|
||||||
&& (self.fspace_log_len < (FSCB_PAGES - FASTSPACE_PAGES - 1) * PAGE_SIZE / aes::BLOCK_SIZE) {
|
&& (self.fspace_log_len < (FSCB_PAGES - FASTSPACE_PAGES - 1) * PAGE_SIZE / aes::BLOCK_SIZE) {
|
||||||
true
|
true
|
||||||
} else {
|
} else {
|
||||||
// if we're really out of space, do an expensive full-space sweep
|
if self.fast_space_len() <= pages + BUFFER {
|
||||||
if let Some(used_pages) = self.pddb_generate_used_map(cache) {
|
log::trace!("alloc forced by lack of free space");
|
||||||
let free_pool = self.fast_space_generate(used_pages);
|
// if we're really out of space, do an expensive full-space sweep
|
||||||
if free_pool.len() == 0 {
|
if let Some(used_pages) = self.pddb_generate_used_map(cache) {
|
||||||
// we're out of free space
|
let free_pool = self.fast_space_generate(used_pages);
|
||||||
false
|
if free_pool.len() == 0 {
|
||||||
} else {
|
// we're out of free space
|
||||||
let mut fast_space = FastSpace {
|
|
||||||
free_pool: [PhysPage(0); FASTSPACE_FREE_POOL_LEN],
|
|
||||||
};
|
|
||||||
for (&src, dst) in free_pool.iter().zip(fast_space.free_pool.iter_mut()) {
|
|
||||||
*dst = src;
|
|
||||||
}
|
|
||||||
// write just commits a new record to disk, but doesn't update our internal data cache
|
|
||||||
// this also clears the fast space log.
|
|
||||||
self.fast_space_write(&fast_space);
|
|
||||||
// this will ensure the data cache is fully in sync
|
|
||||||
self.fast_space_read();
|
|
||||||
|
|
||||||
// check that we have enough space now -- if not, we're just out of disk space!
|
|
||||||
if self.fast_space_len() > pages {
|
|
||||||
true
|
|
||||||
} else {
|
|
||||||
false
|
false
|
||||||
|
} else {
|
||||||
|
let mut fast_space = FastSpace {
|
||||||
|
free_pool: [PhysPage(0); FASTSPACE_FREE_POOL_LEN],
|
||||||
|
};
|
||||||
|
for (&src, dst) in free_pool.iter().zip(fast_space.free_pool.iter_mut()) {
|
||||||
|
*dst = src;
|
||||||
|
}
|
||||||
|
// write just commits a new record to disk, but doesn't update our internal data cache
|
||||||
|
// this also clears the fast space log.
|
||||||
|
self.fast_space_write(&fast_space);
|
||||||
|
// this will ensure the data cache is fully in sync
|
||||||
|
self.fast_space_read();
|
||||||
|
|
||||||
|
// check that we have enough space now -- if not, we're just out of disk space!
|
||||||
|
if self.fast_space_len() > pages {
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
false
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
false
|
// log regenration is faster & less intrusive than fastspace regeneration, and we would have
|
||||||
|
// to do this more often. So we have a separate path for this outcome.
|
||||||
|
log::trace!("alloc forced by lack of log space");
|
||||||
|
let mut fast_space = FastSpace {
|
||||||
|
free_pool: [PhysPage(0); FASTSPACE_FREE_POOL_LEN],
|
||||||
|
};
|
||||||
|
// regenerate from the existing fast space cache
|
||||||
|
for (&src, dst) in self.fspace_cache.iter().zip(fast_space.free_pool.iter_mut()) {
|
||||||
|
*dst = src;
|
||||||
|
}
|
||||||
|
// write just commits a new record to disk, but doesn't update our internal data cache
|
||||||
|
// this also clears the fast space log.
|
||||||
|
self.fast_space_write(&fast_space);
|
||||||
|
// this will re-read back in the data, shuffle the alloc order a bit, and ensure the data cache is fully in sync
|
||||||
|
self.fast_space_read();
|
||||||
|
// this will locate the next fast space log point.
|
||||||
|
self.fast_space_ensure_next_log();
|
||||||
|
true
|
||||||
}
|
}
|
||||||
/* -- note to self -- "to-do" optimization -- if just out of log pages, we can regenerate those only instead of doing an all-basis sweep
|
|
||||||
let mut fast_space = FastSpace {
|
|
||||||
free_pool: [PhysPage(0); FASTSPACE_FREE_POOL_LEN],
|
|
||||||
};
|
|
||||||
// regenerate from the existing fast space cache
|
|
||||||
for (&src, dst) in self.fspace_cache.iter().zip(fast_space.free_pool.iter_mut()) {
|
|
||||||
*dst = src;
|
|
||||||
}
|
|
||||||
// write just commits a new record to disk, but doesn't update our internal data cache
|
|
||||||
// this also clears the fast space log.
|
|
||||||
self.fast_space_write(&fast_space);
|
|
||||||
// this will re-read back in the data, shuffle the alloc order a bit, and ensure the data cache is fully in sync
|
|
||||||
self.fast_space_read();
|
|
||||||
true
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -204,6 +204,7 @@ def main():
|
||||||
print("All dicts were found.")
|
print("All dicts were found.")
|
||||||
else:
|
else:
|
||||||
print("Missing dictionaries, something is wrong.")
|
print("Missing dictionaries, something is wrong.")
|
||||||
|
print("Reminder to selF: revert fast space sizes to originals once debugging alloc issue")
|
||||||
|
|
||||||
except ValueError:
|
except ValueError:
|
||||||
print("couldn't decrypt basis root vpage @ {:x} ppage @ {:x}".format(VPAGE_SIZE, v2p_table[VPAGE_SIZE]))
|
print("couldn't decrypt basis root vpage @ {:x} ppage @ {:x}".format(VPAGE_SIZE, v2p_table[VPAGE_SIZE]))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue