pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wait for tombstone_transmit to init before payload 

.. because otherwise early payload crash may not be reported.

Bug: 265594221
Test: atest MicrodroidHostTestCases
Test: see boot time
Change-Id: I1dc1f16b50a73f9ac24459e4250f7707f0911402
This commit is contained in:
Inseob Kim 2023-01-20 17:31:37 +09:00
parent 861c9de206
commit f44917cecd
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
microdroid_manager/src/main.rs
View File

@ -77,6 +77,7 @@ const DEBUG_MICRODROID_NO_VERIFIED_BOOT: &str =
"/sys/firmware/devicetree/base/virtualization/guest/debug-microdroid,no-verified-boot"; "/sys/firmware/devicetree/base/virtualization/guest/debug-microdroid,no-verified-boot";
const APEX_CONFIG_DONE_PROP: &str = "apex_config.done"; const APEX_CONFIG_DONE_PROP: &str = "apex_config.done";
const TOMBSTONE_TRANSMIT_DONE_PROP: &str = "tombstone_transmit.init_done";
const DEBUGGABLE_PROP: &str = "ro.boot.microdroid.debuggable"; const DEBUGGABLE_PROP: &str = "ro.boot.microdroid.debuggable";
// SYNC WITH virtualizationservice/src/crosvm.rs // SYNC WITH virtualizationservice/src/crosvm.rs
@ -435,6 +436,10 @@ fn try_run_payload(service: &Strong<dyn IVirtualMachineService>) -> Result<i32>
register_vm_payload_service(allow_restricted_apis, service.clone(), dice_context)?; register_vm_payload_service(allow_restricted_apis, service.clone(), dice_context)?;
if config.export_tombstones {
wait_for_tombstone_transmit_done()?;
}
// Wait for encryptedstore to finish mounting the storage (if enabled) before setting // Wait for encryptedstore to finish mounting the storage (if enabled) before setting
// microdroid_manager.init_done. Reason is init stops uneventd after that. // microdroid_manager.init_done. Reason is init stops uneventd after that.
// Encryptedstore, however requires ueventd // Encryptedstore, however requires ueventd
@ -723,6 +728,11 @@ fn wait_for_apex_config_done() -> Result<()> {
wait_for_property_true(APEX_CONFIG_DONE_PROP).context("Failed waiting for apex config done") wait_for_property_true(APEX_CONFIG_DONE_PROP).context("Failed waiting for apex config done")
} }
fn wait_for_tombstone_transmit_done() -> Result<()> {
wait_for_property_true(TOMBSTONE_TRANSMIT_DONE_PROP)
.context("Failed waiting for tombstone transmit done")
}
fn wait_for_property_true(property_name: &str) -> Result<()> { fn wait_for_property_true(property_name: &str) -> Result<()> {
let mut prop = PropertyWatcher::new(property_name)?; let mut prop = PropertyWatcher::new(property_name)?;
loop { loop {