Factor out Rust client library for VirtualizationService.
This reduces code duplication, and will also be useful for Rust tests.
Test: ComposHostTestCases compos_key_tests
Change-Id: I13c41d3b2bbe506495b723e7739f3181cb033f0f
diff --git a/vm/Android.bp b/vm/Android.bp
index d1d53d0..2b83ca7 100644
--- a/vm/Android.bp
+++ b/vm/Android.bp
@@ -20,6 +20,7 @@
"libserde",
"libstructopt",
"libvmconfig",
+ "libvmclient",
"libzip",
],
apex_available: [
diff --git a/vm/src/main.rs b/vm/src/main.rs
index 705e38f..8450b41 100644
--- a/vm/src/main.rs
+++ b/vm/src/main.rs
@@ -17,13 +17,12 @@
mod create_idsig;
mod create_partition;
mod run;
-mod sync;
use android_system_virtualizationservice::aidl::android::system::virtualizationservice::{
IVirtualizationService::IVirtualizationService, PartitionType::PartitionType,
VirtualMachineAppConfig::DebugLevel::DebugLevel,
};
-use android_system_virtualizationservice::binder::{wait_for_interface, ProcessState, Strong};
+use android_system_virtualizationservice::binder::ProcessState;
use anyhow::{Context, Error};
use create_idsig::command_create_idsig;
use create_partition::command_create_partition;
@@ -33,9 +32,6 @@
use structopt::clap::AppSettings;
use structopt::StructOpt;
-const VIRTUALIZATION_SERVICE_BINDER_SERVICE_IDENTIFIER: &str =
- "android.system.virtualizationservice";
-
#[derive(Debug)]
struct Idsigs(Vec<PathBuf>);
@@ -191,9 +187,7 @@
// We need to start the thread pool for Binder to work properly, especially link_to_death.
ProcessState::start_thread_pool();
- let service: Strong<dyn IVirtualizationService> =
- wait_for_interface(VIRTUALIZATION_SERVICE_BINDER_SERVICE_IDENTIFIER)
- .context("Failed to find VirtualizationService")?;
+ let service = vmclient::connect().context("Failed to find VirtualizationService")?;
match opt {
Opt::RunApp {
diff --git a/vm/src/run.rs b/vm/src/run.rs
index 2ae2c95..ca71665 100644
--- a/vm/src/run.rs
+++ b/vm/src/run.rs
@@ -15,19 +15,18 @@
//! Command to run a VM.
use crate::create_partition::command_create_partition;
-use crate::sync::AtomicFlag;
use android_system_virtualizationservice::aidl::android::system::virtualizationservice::{
- DeathReason::DeathReason, IVirtualMachine::IVirtualMachine,
- IVirtualMachineCallback::BnVirtualMachineCallback,
- IVirtualMachineCallback::IVirtualMachineCallback,
- IVirtualizationService::IVirtualizationService, PartitionType::PartitionType,
+ DeathReason::DeathReason,
+ IVirtualMachineCallback::{BnVirtualMachineCallback, IVirtualMachineCallback},
+ IVirtualizationService::IVirtualizationService,
+ PartitionType::PartitionType,
VirtualMachineAppConfig::DebugLevel::DebugLevel,
- VirtualMachineAppConfig::VirtualMachineAppConfig, VirtualMachineConfig::VirtualMachineConfig,
+ VirtualMachineAppConfig::VirtualMachineAppConfig,
+ VirtualMachineConfig::VirtualMachineConfig,
VirtualMachineState::VirtualMachineState,
};
use android_system_virtualizationservice::binder::{
- BinderFeatures, DeathRecipient, IBinder, Interface, ParcelFileDescriptor,
- Result as BinderResult,
+ BinderFeatures, Interface, ParcelFileDescriptor, Result as BinderResult,
};
use anyhow::{bail, Context, Error};
use microdroid_payload_config::VmPayloadConfig;
@@ -35,6 +34,7 @@
use std::io::{self, BufRead, BufReader};
use std::os::unix::io::{AsRawFd, FromRawFd};
use std::path::{Path, PathBuf};
+use vmclient::VmInstance;
use vmconfig::{open_parcel_file, VmConfig};
use zip::ZipArchive;
@@ -173,78 +173,53 @@
log_path: Option<&Path>,
) -> Result<(), Error> {
let console = if let Some(console_path) = console_path {
- Some(ParcelFileDescriptor::new(
+ Some(
File::create(console_path)
.with_context(|| format!("Failed to open console file {:?}", console_path))?,
- ))
+ )
} else if daemonize {
None
} else {
- Some(ParcelFileDescriptor::new(duplicate_stdout()?))
+ Some(duplicate_stdout()?)
};
let log = if let Some(log_path) = log_path {
- Some(ParcelFileDescriptor::new(
+ Some(
File::create(log_path)
.with_context(|| format!("Failed to open log file {:?}", log_path))?,
- ))
+ )
} else if daemonize {
None
} else {
- Some(ParcelFileDescriptor::new(duplicate_stdout()?))
+ Some(duplicate_stdout()?)
};
- let vm =
- service.createVm(config, console.as_ref(), log.as_ref()).context("Failed to create VM")?;
+ let vm = VmInstance::create(service, config, console, log).context("Failed to create VM")?;
+ let callback =
+ BnVirtualMachineCallback::new_binder(VirtualMachineCallback {}, BinderFeatures::default());
+ vm.vm.registerCallback(&callback)?;
+ vm.start().context("Failed to start VM")?;
- let cid = vm.getCid().context("Failed to get CID")?;
println!(
"Created VM from {} with CID {}, state is {}.",
config_path,
- cid,
- state_to_str(vm.getState()?)
+ vm.cid(),
+ state_to_str(vm.state()?)
);
- vm.start()?;
- println!("Started VM, state now {}.", state_to_str(vm.getState()?));
if daemonize {
// Pass the VM reference back to VirtualizationService and have it hold it in the
// background.
- service.debugHoldVmRef(&vm).context("Failed to pass VM to VirtualizationService")
+ service.debugHoldVmRef(&vm.vm).context("Failed to pass VM to VirtualizationService")?;
} else {
// Wait until the VM or VirtualizationService dies. If we just returned immediately then the
// IVirtualMachine Binder object would be dropped and the VM would be killed.
- wait_for_vm(vm.as_ref())
+ let death_reason = vm.wait_for_death();
+ println!("{}", death_reason);
}
-}
-/// Wait until the given VM or the VirtualizationService itself dies.
-fn wait_for_vm(vm: &dyn IVirtualMachine) -> Result<(), Error> {
- let dead = AtomicFlag::default();
- let callback = BnVirtualMachineCallback::new_binder(
- VirtualMachineCallback { dead: dead.clone() },
- BinderFeatures::default(),
- );
- vm.registerCallback(&callback)?;
- let death_recipient = wait_for_death(&mut vm.as_binder(), dead.clone())?;
- dead.wait();
- // Ensure that death_recipient isn't dropped before we wait on the flag, as it is removed
- // from the Binder when it's dropped.
- drop(death_recipient);
Ok(())
}
-/// Raise the given flag when the given Binder object dies.
-///
-/// If the returned DeathRecipient is dropped then this will no longer do anything.
-fn wait_for_death(binder: &mut impl IBinder, dead: AtomicFlag) -> Result<DeathRecipient, Error> {
- let mut death_recipient = DeathRecipient::new(move || {
- eprintln!("VirtualizationService unexpectedly died");
- dead.raise();
- });
- binder.link_to_death(&mut death_recipient)?;
- Ok(death_recipient)
-}
-
fn parse_extra_apk_list(apk: &Path, config_path: &str) -> Result<Vec<String>, Error> {
let mut archive = ZipArchive::new(File::open(apk)?)?;
let config_file = archive.by_name(config_path)?;
@@ -253,9 +228,7 @@
}
#[derive(Debug)]
-struct VirtualMachineCallback {
- dead: AtomicFlag,
-}
+struct VirtualMachineCallback {}
impl Interface for VirtualMachineCallback {}
@@ -295,31 +268,7 @@
Ok(())
}
- fn onDied(&self, _cid: i32, reason: DeathReason) -> BinderResult<()> {
- self.dead.raise();
-
- match reason {
- DeathReason::INFRASTRUCTURE_ERROR => println!("Error waiting for VM to finish."),
- DeathReason::KILLED => println!("VM was killed."),
- DeathReason::UNKNOWN => println!("VM died for an unknown reason."),
- DeathReason::SHUTDOWN => println!("VM shutdown cleanly."),
- DeathReason::ERROR => println!("Error starting VM."),
- DeathReason::REBOOT => println!("VM tried to reboot, possibly due to a kernel panic."),
- DeathReason::CRASH => println!("VM crashed."),
- DeathReason::PVM_FIRMWARE_PUBLIC_KEY_MISMATCH => println!(
- "pVM firmware failed to verify the VM because the public key doesn't match."
- ),
- DeathReason::PVM_FIRMWARE_INSTANCE_IMAGE_CHANGED => {
- println!("pVM firmware failed to verify the VM because the instance image changed.")
- }
- DeathReason::BOOTLOADER_PUBLIC_KEY_MISMATCH => {
- println!("Bootloader failed to verify the VM because the public key doesn't match.")
- }
- DeathReason::BOOTLOADER_INSTANCE_IMAGE_CHANGED => {
- println!("Bootloader failed to verify the VM because the instance image changed.")
- }
- _ => println!("VM died for an unrecognised reason."),
- }
+ fn onDied(&self, _cid: i32, _reason: DeathReason) -> BinderResult<()> {
Ok(())
}
}
diff --git a/vm/src/sync.rs b/vm/src/sync.rs
deleted file mode 100644
index 82839b3..0000000
--- a/vm/src/sync.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2021, The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Synchronisation utilities.
-
-use std::sync::{Arc, Condvar, Mutex};
-
-/// A flag which one thread can use to notify other threads when a condition becomes true. This is
-/// something like a single-use binary semaphore.
-#[derive(Clone, Debug)]
-pub struct AtomicFlag {
- state: Arc<(Mutex<bool>, Condvar)>,
-}
-
-impl Default for AtomicFlag {
- #[allow(clippy::mutex_atomic)]
- fn default() -> Self {
- Self { state: Arc::new((Mutex::new(false), Condvar::new())) }
- }
-}
-
-#[allow(clippy::mutex_atomic)]
-impl AtomicFlag {
- /// Wait until the flag is set.
- pub fn wait(&self) {
- let _flag = self.state.1.wait_while(self.state.0.lock().unwrap(), |flag| !*flag).unwrap();
- }
-
- /// Set the flag, and notify all waiting threads.
- pub fn raise(&self) {
- let mut flag = self.state.0.lock().unwrap();
- *flag = true;
- self.state.1.notify_all();
- }
-}