retire debugging infos

This commit is contained in:
bunnie 2022-03-29 16:33:40 +08:00
parent c542807958
commit 0bdf21b3ac
2 changed files with 8 additions and 0 deletions

View file

@ -916,6 +916,7 @@ impl BasisCache {
for page in basis.v2p_map.values_mut() { for page in basis.v2p_map.values_mut() {
hw.trng_slice(&mut temp); hw.trng_slice(&mut temp);
hw.patch_data(&temp, page.page_number() * PAGE_SIZE as u32); hw.patch_data(&temp, page.page_number() * PAGE_SIZE as u32);
log::trace!("fast_space_free basis delete {} before", page.journal());
hw.fast_space_free(page); hw.fast_space_free(page);
} }
basis.pt_sync(hw); basis.pt_sync(hw);
@ -1182,10 +1183,14 @@ impl BasisCacheEntry {
hw.trng_slice(&mut random); hw.trng_slice(&mut random);
hw.patch_data(&random, pp.page_number() * PAGE_SIZE as u32); hw.patch_data(&random, pp.page_number() * PAGE_SIZE as u32);
} }
log::trace!("fast_space_free small page delete {} before", pp.journal());
hw.fast_space_free(pp); hw.fast_space_free(pp);
assert!(pp.valid() == false, "pp is still marked as valid!"); assert!(pp.valid() == false, "pp is still marked as valid!");
} }
} }
/* for pp in self.v2p_map.values() {
log::info!("v2p entry: {:x?}", pp);
} */
// erase the entire dictionary + key allocation area by writing over with random data. It's important to // erase the entire dictionary + key allocation area by writing over with random data. It's important to
// do a comprehensive erase, because if the dictionary slot is re-used, the previously allocated key entries // do a comprehensive erase, because if the dictionary slot is re-used, the previously allocated key entries
// decrypt correctly, are interpreted as valid keys, and thus cause consistency errors. // decrypt correctly, are interpreted as valid keys, and thus cause consistency errors.
@ -1199,6 +1204,7 @@ impl BasisCacheEntry {
let mut random = [0u8; PAGE_SIZE]; let mut random = [0u8; PAGE_SIZE];
hw.trng_slice(&mut random); hw.trng_slice(&mut random);
hw.patch_data(&random, pp.page_number() * PAGE_SIZE as u32); hw.patch_data(&random, pp.page_number() * PAGE_SIZE as u32);
log::trace!("fast_space_free dict_delete {} before", pp.journal());
hw.fast_space_free(pp); hw.fast_space_free(pp);
assert!(pp.valid() == false, "pp is still marked as valid!"); assert!(pp.valid() == false, "pp is still marked as valid!");
} else { } else {

View file

@ -536,6 +536,7 @@ impl DictCacheEntry {
for vpage in (vpage_end_offset.as_u64()..kcache.start + kcache.reserved).step_by(VPAGE_SIZE) { for vpage in (vpage_end_offset.as_u64()..kcache.start + kcache.reserved).step_by(VPAGE_SIZE) {
if let Some(pp) = v2p_map.get_mut(&VirtAddr::new(vpage).unwrap()) { if let Some(pp) = v2p_map.get_mut(&VirtAddr::new(vpage).unwrap()) {
assert!(pp.valid(), "v2p returned an invalid page"); assert!(pp.valid(), "v2p returned an invalid page");
log::trace!("fast_space_free key_update {} before", pp.journal());
hw.fast_space_free(pp); hw.fast_space_free(pp);
assert!(pp.valid() == false, "pp is still marked as valid!"); assert!(pp.valid() == false, "pp is still marked as valid!");
} }
@ -726,6 +727,7 @@ impl DictCacheEntry {
hw.trng_slice(&mut noise); hw.trng_slice(&mut noise);
hw.patch_data(&noise, pp.page_number() * PAGE_SIZE as u32); hw.patch_data(&noise, pp.page_number() * PAGE_SIZE as u32);
} }
log::trace!("fast_space_free key_remove {} before", pp.journal());
hw.fast_space_free(pp); hw.fast_space_free(pp);
assert!(pp.valid() == false, "pp is still marked as valid!"); assert!(pp.valid() == false, "pp is still marked as valid!");
} }