Merge "Add name for some VMs in MicrodroidHostTests" into main
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..a246e08
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,3 @@
+package {
+ default_team: "trendy_team_android_kvm",
+}
diff --git a/README.md b/README.md
index fc4d389..4a10c89 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,8 @@
AVF components:
* [pVM firmware](guest/pvmfw/README.md)
* [Android Boot Loader (ABL)](docs/abl.md)
-* [Microdroid](microdroid/README.md)
-* [Microdroid kernel](microdroid/kernel/README.md)
+* [Microdroid](build/microdroid/README.md)
+* [Microdroid kernel](guest/kernel/README.md)
* [Microdroid payload](libs/libmicrodroid_payload_metadata/README.md)
* [vmbase](libs/libvmbase/README.md)
* [Encrypted Storage](guest/encryptedstore/README.md)
diff --git a/TEST_MAPPING b/TEST_MAPPING
index fc88a59..2112125 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -144,7 +144,7 @@
"path": "packages/modules/Virtualization/android/vm"
},
{
- "path": "packages/modules/Virtualization/libs/libvmbase"
+ "path": "packages/modules/Virtualization/tests/vmbase_example"
},
{
"path": "packages/modules/Virtualization/guest/zipfuse"
diff --git a/android/TerminalApp/Android.bp b/android/TerminalApp/Android.bp
new file mode 100644
index 0000000..f5f39e3
--- /dev/null
+++ b/android/TerminalApp/Android.bp
@@ -0,0 +1,17 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_app {
+ name: "VmTerminalApp",
+ srcs: ["java/**/*.java"],
+ resource_dirs: ["res"],
+ static_libs: [
+ "vm_launcher_lib",
+ ],
+ sdk_version: "system_current",
+ product_specific: true,
+ optimize: {
+ shrink_resources: true,
+ },
+}
diff --git a/android/TerminalApp/AndroidManifest.xml b/android/TerminalApp/AndroidManifest.xml
new file mode 100644
index 0000000..07e6147
--- /dev/null
+++ b/android/TerminalApp/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.virtualization.terminal" >
+
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="com.android.virtualization.vmlauncher.permission.USE_VM_LAUNCHER"/>
+
+ <application
+ android:label="VmTerminalApp"
+ android:usesCleartextTraffic="true">
+ <activity android:name=".MainActivity"
+ android:screenOrientation="landscape"
+ android:configChanges="orientation|screenSize|keyboard|keyboardHidden|navigation|uiMode"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ </application>
+
+</manifest>
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
new file mode 100644
index 0000000..e6e56d9
--- /dev/null
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+package com.android.virtualization.terminal;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.webkit.WebChromeClient;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.TextView;
+
+import com.android.virtualization.vmlauncher.VmLauncherServices;
+
+public class MainActivity extends Activity implements VmLauncherServices.VmLauncherServiceCallback {
+ private static final String TAG = "VmTerminalApp";
+ private String mVmIpAddr;
+ private WebView mWebView;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ VmLauncherServices.startVmLauncherService(this, this);
+
+ setContentView(R.layout.activity_headless);
+ mWebView = (WebView) findViewById(R.id.webview);
+ mWebView.getSettings().setDatabaseEnabled(true);
+ mWebView.getSettings().setDomStorageEnabled(true);
+ mWebView.getSettings().setJavaScriptEnabled(true);
+ mWebView.setWebChromeClient(new WebChromeClient());
+ mWebView.setWebViewClient(
+ new WebViewClient() {
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, String url) {
+ view.loadUrl(url);
+ return true;
+ }
+ });
+ }
+
+ private void gotoURL(String url) {
+ runOnUiThread(() -> mWebView.loadUrl(url));
+ }
+
+ public void onVmStart() {
+ Log.i(TAG, "onVmStart()");
+ }
+
+ public void onVmStop() {
+ Log.i(TAG, "onVmStop()");
+ finish();
+ }
+
+ public void onVmError() {
+ Log.i(TAG, "onVmError()");
+ finish();
+ }
+
+ public void onIpAddrAvailable(String ipAddr) {
+ mVmIpAddr = ipAddr;
+ ((TextView) findViewById(R.id.ip_addr_textview)).setText(mVmIpAddr);
+
+ // TODO(b/359523803): Use AVF API to be notified when shell is ready instead of using dealy
+ new Handler(Looper.getMainLooper())
+ .postDelayed(() -> gotoURL("http://" + mVmIpAddr + ":7681"), 2000);
+ }
+}
diff --git a/android/TerminalApp/res/layout/activity_headless.xml b/android/TerminalApp/res/layout/activity_headless.xml
new file mode 100644
index 0000000..2a640f3
--- /dev/null
+++ b/android/TerminalApp/res/layout/activity_headless.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ tools:context=".MainActivity">
+ <TextView
+ android:id="@+id/ip_addr_textview"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <WebView
+ android:id="@+id/webview"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginBottom="5dp" />
+
+</LinearLayout>
diff --git a/android/VmLauncherApp/AndroidManifest.xml b/android/VmLauncherApp/AndroidManifest.xml
index 67b7a45..583fce7 100644
--- a/android/VmLauncherApp/AndroidManifest.xml
+++ b/android/VmLauncherApp/AndroidManifest.xml
@@ -6,6 +6,8 @@
<uses-permission android:name="android.permission.USE_CUSTOM_VIRTUAL_MACHINE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
<uses-feature android:name="android.software.virtualization_framework" android:required="true" />
<permission android:name="com.android.virtualization.vmlauncher.permission.USE_VM_LAUNCHER"
@@ -26,6 +28,21 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
+ <service
+ android:name=".VmLauncherService"
+ android:enabled="true"
+ android:exported="true"
+ android:permission="com.android.virtualization.vmlauncher.permission.USE_VM_LAUNCHER"
+ android:foregroundServiceType="specialUse">
+ <property
+ android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+ android:value="Run VM instances" />
+ <intent-filter>
+ <action android:name="android.virtualization.START_VM_LAUNCHER_SERVICE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </service>
+
</application>
</manifest>
diff --git a/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/Runner.java b/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/Runner.java
index f50ec86..a5f58fe 100644
--- a/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/Runner.java
+++ b/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/Runner.java
@@ -42,7 +42,10 @@
/** Create a virtual machine of the given config, under the given context. */
static Runner create(Context context, VirtualMachineConfig config)
throws VirtualMachineException {
- VirtualMachineManager vmm = context.getSystemService(VirtualMachineManager.class);
+ // context may already be the app context, but calling this again is not harmful.
+ // See b/359439878 on why vmm should be obtained from the app context.
+ Context appContext = context.getApplicationContext();
+ VirtualMachineManager vmm = appContext.getSystemService(VirtualMachineManager.class);
VirtualMachineCustomImageConfig customConfig = config.getCustomImageConfig();
if (customConfig == null) {
throw new RuntimeException("CustomImageConfig is missing");
diff --git a/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/VmLauncherService.java b/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/VmLauncherService.java
new file mode 100644
index 0000000..ec98f4c
--- /dev/null
+++ b/android/VmLauncherApp/java/com/android/virtualization/vmlauncher/VmLauncherService.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+
+package com.android.virtualization.vmlauncher;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.Service;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.ParcelFileDescriptor;
+import android.os.ResultReceiver;
+import android.system.virtualmachine.VirtualMachine;
+import android.system.virtualmachine.VirtualMachineConfig;
+import android.system.virtualmachine.VirtualMachineException;
+import android.util.Log;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Path;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class VmLauncherService extends Service {
+ private static final String TAG = "VmLauncherService";
+ // TODO: this path should be from outside of this service
+ private static final String VM_CONFIG_PATH = "/data/local/tmp/vm_config.json";
+
+ private static final int RESULT_START = 0;
+ private static final int RESULT_STOP = 1;
+ private static final int RESULT_ERROR = 2;
+ private static final int RESULT_IPADDR = 3;
+ private static final String KEY_VM_IP_ADDR = "ip_addr";
+
+ private ExecutorService mExecutorService;
+ private VirtualMachine mVirtualMachine;
+ private ResultReceiver mResultReceiver;
+
+ @Override
+ public IBinder onBind(Intent intent) {
+ return null;
+ }
+
+ private void startForeground() {
+ NotificationManager notificationManager = getSystemService(NotificationManager.class);
+ NotificationChannel notificationChannel =
+ new NotificationChannel(TAG, TAG, NotificationManager.IMPORTANCE_LOW);
+ notificationManager.createNotificationChannel(notificationChannel);
+ startForeground(
+ this.hashCode(),
+ new Notification.Builder(this, TAG)
+ .setChannelId(TAG)
+ .setSmallIcon(android.R.drawable.ic_dialog_info)
+ .setContentText("A VM " + mVirtualMachine.getName() + " is running")
+ .build());
+ }
+
+ @Override
+ public int onStartCommand(Intent intent, int flags, int startId) {
+ mExecutorService = Executors.newCachedThreadPool();
+
+ ConfigJson json = ConfigJson.from(VM_CONFIG_PATH);
+ VirtualMachineConfig config = json.toConfig(this);
+
+ Runner runner;
+ try {
+ runner = Runner.create(this, config);
+ } catch (VirtualMachineException e) {
+ throw new RuntimeException(e);
+ }
+ mVirtualMachine = runner.getVm();
+ mResultReceiver =
+ intent.getParcelableExtra(Intent.EXTRA_RESULT_RECEIVER, ResultReceiver.class);
+
+ runner.getExitStatus()
+ .thenAcceptAsync(
+ success -> {
+ if (mResultReceiver != null) {
+ mResultReceiver.send(success ? RESULT_STOP : RESULT_ERROR, null);
+ }
+ if (!success) {
+ stopSelf();
+ }
+ });
+ Path logPath = getFileStreamPath(mVirtualMachine.getName() + ".log").toPath();
+ Logger.setup(mVirtualMachine, logPath, mExecutorService);
+
+ startForeground();
+
+ mResultReceiver.send(RESULT_START, null);
+ if (config.getCustomImageConfig().useNetwork()) {
+ Handler handler = new Handler(Looper.getMainLooper());
+ gatherIpAddrFromVm(handler);
+ }
+ return START_NOT_STICKY;
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ mExecutorService.shutdownNow();
+ }
+
+ // TODO(b/359523803): Use AVF API to get ip addr when it exists
+ private void gatherIpAddrFromVm(Handler handler) {
+ handler.postDelayed(
+ () -> {
+ int INTERNAL_VSOCK_SERVER_PORT = 1024;
+ try (ParcelFileDescriptor pfd =
+ mVirtualMachine.connectVsock(INTERNAL_VSOCK_SERVER_PORT)) {
+ try (BufferedReader input =
+ new BufferedReader(
+ new InputStreamReader(
+ new FileInputStream(pfd.getFileDescriptor())))) {
+ String vmIpAddr = input.readLine().strip();
+ Bundle b = new Bundle();
+ b.putString(KEY_VM_IP_ADDR, vmIpAddr);
+ mResultReceiver.send(RESULT_IPADDR, b);
+ return;
+ } catch (IOException e) {
+ Log.e(TAG, e.toString());
+ }
+ } catch (Exception e) {
+ Log.e(TAG, e.toString());
+ }
+ gatherIpAddrFromVm(handler);
+ },
+ 1000);
+ }
+}
diff --git a/guest/rialto/idmap.S b/guest/rialto/idmap.S
index 9b5375a..eb4d823 100644
--- a/guest/rialto/idmap.S
+++ b/guest/rialto/idmap.S
@@ -28,8 +28,8 @@
.set .PAGE_SIZE, .SZ_4K
.set .ORIGIN_ADDR, 2 * .SZ_1G
-.set .TEXT_ADDR, .ORIGIN_ADDR + (1 * .SZ_2M)
-.set .DATA_ADDR, .ORIGIN_ADDR + (2 * .SZ_2M)
+.set .TEXT_ADDR, .ORIGIN_ADDR + (0 * .SZ_2M)
+.set .DATA_ADDR, .ORIGIN_ADDR + (1 * .SZ_2M)
.set .L_TT_TYPE_BLOCK, 0x1
.set .L_TT_TYPE_PAGE, 0x3
@@ -59,7 +59,7 @@
.balign .PAGE_SIZE, 0 // unmapped
/* level 2 */
-0: .quad 0x0 // 2 MiB unmapped
+0:
.quad .L_BLOCK_MEM_XIP | .TEXT_ADDR // 2 MiB of DRAM containing image
.quad .L_BLOCK_MEM | .DATA_ADDR // 2 MiB of writable DRAM
.balign .PAGE_SIZE, 0 // unmapped
diff --git a/guest/rialto/image.ld b/guest/rialto/image.ld
index 95ffdf8..3bf910c 100644
--- a/guest/rialto/image.ld
+++ b/guest/rialto/image.ld
@@ -16,6 +16,6 @@
MEMORY
{
- image : ORIGIN = 0x80200000, LENGTH = 2M
- writable_data : ORIGIN = 0x80400000, LENGTH = 2M
+ image : ORIGIN = 0x80000000, LENGTH = 2M
+ writable_data : ORIGIN = 0x80200000, LENGTH = 2M
}
diff --git a/guest/rialto/src/main.rs b/guest/rialto/src/main.rs
index 930f4e8..a98ec25 100644
--- a/guest/rialto/src/main.rs
+++ b/guest/rialto/src/main.rs
@@ -47,6 +47,7 @@
use vmbase::{
configure_heap,
fdt::SwiotlbInfo,
+ generate_image_header,
hyp::{get_mem_sharer, get_mmio_guard},
layout::{self, crosvm, UART_PAGE_ADDR},
main,
@@ -232,5 +233,6 @@
}
}
+generate_image_header!();
main!(main);
configure_heap!(SIZE_128KB * 2);
diff --git a/guest/rialto/tests/test.rs b/guest/rialto/tests/test.rs
index cf5630f..a90adea 100644
--- a/guest/rialto/tests/test.rs
+++ b/guest/rialto/tests/test.rs
@@ -34,7 +34,7 @@
use service_vm_fake_chain::client_vm::{
fake_client_vm_dice_artifacts, fake_sub_components, SubComponent,
};
-use service_vm_manager::ServiceVm;
+use service_vm_manager::{ServiceVm, VM_MEMORY_MB};
use std::fs;
use std::fs::File;
use std::panic;
@@ -59,7 +59,7 @@
// The test is skipped if the feature flag |dice_changes| is not enabled, because when
// the flag is off, the DICE chain is truncated in the pvmfw, and the service VM cannot
// verify the chain due to the missing entries in the chain.
- check_processing_requests(VmType::ProtectedVm)
+ check_processing_requests(VmType::ProtectedVm, None)
} else {
warn!("pVMs are not supported on device, skipping test");
Ok(())
@@ -68,11 +68,17 @@
#[test]
fn process_requests_in_non_protected_vm() -> Result<()> {
- check_processing_requests(VmType::NonProtectedVm)
+ check_processing_requests(VmType::NonProtectedVm, None)
}
-fn check_processing_requests(vm_type: VmType) -> Result<()> {
- let mut vm = start_service_vm(vm_type)?;
+#[test]
+fn process_requests_in_non_protected_vm_with_extra_ram() -> Result<()> {
+ const MEMORY_MB: i32 = 300;
+ check_processing_requests(VmType::NonProtectedVm, Some(MEMORY_MB))
+}
+
+fn check_processing_requests(vm_type: VmType, vm_memory_mb: Option<i32>) -> Result<()> {
+ let mut vm = start_service_vm(vm_type, vm_memory_mb)?;
check_processing_reverse_request(&mut vm)?;
let key_pair = check_processing_generating_key_pair_request(&mut vm)?;
@@ -285,7 +291,7 @@
Ok(())
}
-fn start_service_vm(vm_type: VmType) -> Result<ServiceVm> {
+fn start_service_vm(vm_type: VmType, vm_memory_mb: Option<i32>) -> Result<ServiceVm> {
android_logger::init_once(
android_logger::Config::default()
.with_tag("rialto")
@@ -297,19 +303,20 @@
}));
// We need to start the thread pool for Binder to work properly, especially link_to_death.
ProcessState::start_thread_pool();
- ServiceVm::start_vm(vm_instance(vm_type)?, vm_type)
+ ServiceVm::start_vm(vm_instance(vm_type, vm_memory_mb)?, vm_type)
}
-fn vm_instance(vm_type: VmType) -> Result<VmInstance> {
+fn vm_instance(vm_type: VmType, vm_memory_mb: Option<i32>) -> Result<VmInstance> {
match vm_type {
VmType::ProtectedVm => {
+ assert!(vm_memory_mb.is_none());
service_vm_manager::protected_vm_instance(PathBuf::from(INSTANCE_IMG_PATH))
}
- VmType::NonProtectedVm => nonprotected_vm_instance(),
+ VmType::NonProtectedVm => nonprotected_vm_instance(vm_memory_mb.unwrap_or(VM_MEMORY_MB)),
}
}
-fn nonprotected_vm_instance() -> Result<VmInstance> {
+fn nonprotected_vm_instance(memory_mib: i32) -> Result<VmInstance> {
let rialto = File::open(UNSIGNED_RIALTO_PATH).context("Failed to open Rialto kernel binary")?;
// Do not use `#allocateInstanceId` to generate the instance ID because the method
// also adds an instance ID to the database it manages.
@@ -317,10 +324,10 @@
let mut instance_id = [0u8; 64];
rand_bytes(&mut instance_id).unwrap();
let config = VirtualMachineConfig::RawConfig(VirtualMachineRawConfig {
- name: String::from("Non protected rialto"),
- bootloader: Some(ParcelFileDescriptor::new(rialto)),
+ name: format!("Non protected rialto ({memory_mib}MiB)"),
+ kernel: Some(ParcelFileDescriptor::new(rialto)),
protectedVm: false,
- memoryMib: 300,
+ memoryMib: memory_mib,
platformVersion: "~1.0".to_string(),
instanceId: instance_id,
..Default::default()
diff --git a/guest/vmbase_example/Android.bp b/guest/vmbase_example/Android.bp
new file mode 100644
index 0000000..ff7bd83
--- /dev/null
+++ b/guest/vmbase_example/Android.bp
@@ -0,0 +1,114 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+rust_ffi_static {
+ name: "libvmbase_example",
+ defaults: ["vmbase_ffi_defaults"],
+ crate_name: "vmbase_example",
+ srcs: ["src/main.rs"],
+ rustlibs: [
+ "libaarch64_paging",
+ "libcstr",
+ "libdiced_open_dice_nostd",
+ "libfdtpci",
+ "liblibfdt",
+ "liblog_rust_nostd",
+ "libvirtio_drivers",
+ "libvmbase",
+ ],
+}
+
+genrule {
+ name: "vmbase_image.ld.S.mm",
+ // Soong won't let us use cc_object to preprocess *.ld.S files because it
+ // can't resist feeding any and all *.S files to the assembler, which fails
+ // because linker scripts typically aren't valid assembly. Also, cc_object
+ // rejects inputs that don't end in one of .{s,S,c,cpp,cc,cxx,mm}. So keep
+ // the proper extension (.ld.S) for the file in VCS and use this convoluted
+ // extra step to please Soong by pretending that our linker script is in
+ // fact some Object C++ code, which fortunately it doesn't try to compile.
+ srcs: ["image.ld.S"],
+ out: ["image.ld.S.mm"],
+ cmd: "cp $(in) $(out)",
+ visibility: ["//visibility:private"],
+}
+
+cc_defaults {
+ name: "vmbase_example_ld_defaults",
+ defaults: ["vmbase_cc_defaults"],
+ cflags: [
+ "-E",
+ "-P",
+ "-xassembler-with-cpp", // allow C preprocessor directives
+ ],
+ srcs: [":vmbase_image.ld.S.mm"],
+ visibility: ["//visibility:private"],
+}
+
+cc_object {
+ name: "vmbase_example_bios.ld",
+ defaults: ["vmbase_example_ld_defaults"],
+ cflags: ["-DVMBASE_EXAMPLE_IS_BIOS"],
+}
+
+cc_object {
+ name: "vmbase_example_kernel.ld",
+ defaults: ["vmbase_example_ld_defaults"],
+ cflags: ["-DVMBASE_EXAMPLE_IS_KERNEL"],
+}
+
+cc_defaults {
+ name: "vmbase_example_elf_defaults",
+ defaults: ["vmbase_elf_defaults"],
+ srcs: [
+ "idmap.S",
+ ],
+ static_libs: [
+ "libvmbase_example",
+ ],
+}
+
+cc_binary {
+ name: "vmbase_example_bios",
+ defaults: ["vmbase_example_elf_defaults"],
+ asflags: ["-DVMBASE_EXAMPLE_IS_BIOS"],
+ linker_scripts: [
+ ":vmbase_example_bios.ld",
+ ":vmbase_sections",
+ ],
+}
+
+cc_binary {
+ name: "vmbase_example_kernel",
+ defaults: ["vmbase_example_elf_defaults"],
+ asflags: ["-DVMBASE_EXAMPLE_IS_KERNEL"],
+ linker_scripts: [
+ ":vmbase_example_kernel.ld",
+ ":vmbase_sections",
+ ],
+}
+
+raw_binary {
+ name: "vmbase_example_bios_bin",
+ stem: "vmbase_example_bios.bin",
+ src: ":vmbase_example_bios",
+ enabled: false,
+ target: {
+ android_arm64: {
+ enabled: true,
+ },
+ },
+}
+
+raw_binary {
+ name: "vmbase_example_kernel_bin",
+ stem: "vmbase_example_kernel.bin",
+ src: ":vmbase_example_kernel",
+ enabled: false,
+ target: {
+ android_arm64: {
+ enabled: true,
+ },
+ },
+}
diff --git a/libs/libvmbase/example/idmap.S b/guest/vmbase_example/idmap.S
similarity index 82%
rename from libs/libvmbase/example/idmap.S
rename to guest/vmbase_example/idmap.S
index 71a6ade..881850c 100644
--- a/libs/libvmbase/example/idmap.S
+++ b/guest/vmbase_example/idmap.S
@@ -43,8 +43,16 @@
.quad .L_TT_TYPE_TABLE + 0f // up to 1 GiB of DRAM
.fill 509, 8, 0x0 // 509 GiB of remaining VA space
- /* level 2 */
-0: .quad .L_BLOCK_MEM | 0x80000000 // DT provided by VMM
+0: /* level 2 */
+#if defined(VMBASE_EXAMPLE_IS_BIOS)
+ .quad 0 // 2 MiB not mapped (DT)
.quad .L_BLOCK_MEM_XIP | 0x80200000 // 2 MiB of DRAM containing image
.quad .L_BLOCK_MEM | 0x80400000 // 2 MiB of writable DRAM
.fill 509, 8, 0x0
+#elif defined(VMBASE_EXAMPLE_IS_KERNEL)
+ .quad .L_BLOCK_MEM_XIP | 0x80000000 // 2 MiB of DRAM containing image
+ .quad .L_BLOCK_MEM | 0x80200000 // 2 MiB of writable DRAM
+ .fill 510, 8, 0x0
+#else
+#error "Unexpected vmbase_example mode: failed to generate idmap"
+#endif
diff --git a/libs/libvmbase/example/image.ld b/guest/vmbase_example/image.ld.S
similarity index 73%
rename from libs/libvmbase/example/image.ld
rename to guest/vmbase_example/image.ld.S
index 95ffdf8..a5cd965 100644
--- a/libs/libvmbase/example/image.ld
+++ b/guest/vmbase_example/image.ld.S
@@ -16,6 +16,13 @@
MEMORY
{
+#if defined(VMBASE_EXAMPLE_IS_BIOS)
image : ORIGIN = 0x80200000, LENGTH = 2M
writable_data : ORIGIN = 0x80400000, LENGTH = 2M
+#elif defined(VMBASE_EXAMPLE_IS_KERNEL)
+ image : ORIGIN = 0x80000000, LENGTH = 2M
+ writable_data : ORIGIN = 0x80200000, LENGTH = 2M
+#else
+#error "Unexpected vmbase_example mode: failed to generate image layout"
+#endif
}
diff --git a/libs/libvmbase/example/src/exceptions.rs b/guest/vmbase_example/src/exceptions.rs
similarity index 100%
rename from libs/libvmbase/example/src/exceptions.rs
rename to guest/vmbase_example/src/exceptions.rs
diff --git a/libs/libvmbase/example/src/layout.rs b/guest/vmbase_example/src/layout.rs
similarity index 96%
rename from libs/libvmbase/example/src/layout.rs
rename to guest/vmbase_example/src/layout.rs
index 49e4aa7..50ecb7e 100644
--- a/libs/libvmbase/example/src/layout.rs
+++ b/guest/vmbase_example/src/layout.rs
@@ -17,14 +17,13 @@
use aarch64_paging::paging::{MemoryRegion, VirtualAddress};
use core::ops::Range;
use log::info;
-use vmbase::layout;
+use vmbase::{layout, memory::PAGE_SIZE};
/// The first 1 GiB of memory are used for MMIO.
pub const DEVICE_REGION: MemoryRegion = MemoryRegion::new(0, 0x40000000);
/// Writable data region for the stack.
pub fn boot_stack_range() -> Range<VirtualAddress> {
- const PAGE_SIZE: usize = 4 << 10;
layout::stack_range(40 * PAGE_SIZE)
}
diff --git a/libs/libvmbase/example/src/main.rs b/guest/vmbase_example/src/main.rs
similarity index 90%
rename from libs/libvmbase/example/src/main.rs
rename to guest/vmbase_example/src/main.rs
index a01f619..7a3f427 100644
--- a/libs/libvmbase/example/src/main.rs
+++ b/guest/vmbase_example/src/main.rs
@@ -25,42 +25,37 @@
use crate::layout::{boot_stack_range, print_addresses, DEVICE_REGION};
use crate::pci::{check_pci, get_bar_region};
-use aarch64_paging::paging::MemoryRegion;
use aarch64_paging::paging::VirtualAddress;
use aarch64_paging::MapError;
use alloc::{vec, vec::Vec};
+use core::mem;
use core::ptr::addr_of_mut;
use cstr::cstr;
use fdtpci::PciInfo;
use libfdt::Fdt;
use log::{debug, error, info, trace, warn, LevelFilter};
use vmbase::{
- bionic, configure_heap,
- layout::{
- crosvm::{FDT_MAX_SIZE, MEM_START},
- rodata_range, scratch_range, text_range,
- },
+ bionic, configure_heap, generate_image_header,
+ layout::{crosvm::FDT_MAX_SIZE, rodata_range, scratch_range, text_range},
linker, logger, main,
memory::{PageTable, SIZE_64KB},
+ util::RangeExt as _,
};
static INITIALISED_DATA: [u32; 4] = [1, 2, 3, 4];
static mut ZEROED_DATA: [u32; 10] = [0; 10];
static mut MUTABLE_DATA: [u32; 4] = [1, 2, 3, 4];
+generate_image_header!();
main!(main);
configure_heap!(SIZE_64KB);
-fn init_page_table(dtb: &MemoryRegion, pci_bar_range: &MemoryRegion) -> Result<(), MapError> {
- let mut page_table = PageTable::default();
-
+fn init_page_table(page_table: &mut PageTable) -> Result<(), MapError> {
page_table.map_device(&DEVICE_REGION)?;
page_table.map_code(&text_range().into())?;
page_table.map_rodata(&rodata_range().into())?;
page_table.map_data(&scratch_range().into())?;
page_table.map_data(&boot_stack_range().into())?;
- page_table.map_rodata(dtb)?;
- page_table.map_device(pci_bar_range)?;
info!("Activating IdMap...");
// SAFETY: page_table duplicates the static mappings for everything that the Rust code is
@@ -83,13 +78,15 @@
check_data();
check_stack_guard();
+ let mut page_table = PageTable::default();
+ init_page_table(&mut page_table).unwrap();
+
info!("Checking FDT...");
let fdt_addr = usize::try_from(arg0).unwrap();
- // We are about to access the region so check that it matches our page tables in idmap.S.
- assert_eq!(fdt_addr, MEM_START);
// SAFETY: The DTB range is valid, writable memory, and we don't construct any aliases to it.
let fdt = unsafe { core::slice::from_raw_parts_mut(fdt_addr as *mut u8, FDT_MAX_SIZE) };
let fdt_region = (VirtualAddress(fdt_addr)..VirtualAddress(fdt_addr + fdt.len())).into();
+ page_table.map_data(&fdt_region).unwrap();
let fdt = Fdt::from_mut_slice(fdt).unwrap();
info!("FDT passed verification.");
check_fdt(fdt);
@@ -101,7 +98,13 @@
check_alloc();
- init_page_table(&fdt_region, &get_bar_region(&pci_info)).unwrap();
+ let bar_region = get_bar_region(&pci_info);
+ if bar_region.is_within(&DEVICE_REGION) {
+ // Avoid a MapError::BreakBeforeMakeViolation.
+ info!("BAR region is within already mapped device region: skipping page table ops.");
+ } else {
+ page_table.map_device(&bar_region).unwrap();
+ }
check_data();
check_dice();
@@ -111,6 +114,10 @@
check_pci(&mut pci_root);
emit_suppressed_log();
+
+ info!("De-activating IdMap...");
+ mem::drop(page_table); // Release PageTable and switch back to idmap.S
+ info!("De-activated.");
}
fn check_stack_guard() {
diff --git a/libs/libvmbase/example/src/pci.rs b/guest/vmbase_example/src/pci.rs
similarity index 100%
rename from libs/libvmbase/example/src/pci.rs
rename to guest/vmbase_example/src/pci.rs
diff --git a/libs/libservice_vm_manager/src/lib.rs b/libs/libservice_vm_manager/src/lib.rs
index 78ed85b..8564c51 100644
--- a/libs/libservice_vm_manager/src/lib.rs
+++ b/libs/libservice_vm_manager/src/lib.rs
@@ -37,12 +37,14 @@
use vmclient::{DeathReason, VmInstance};
use vsock::{VsockListener, VsockStream, VMADDR_CID_HOST};
+/// Size of virtual memory allocated to the Service VM.
+pub const VM_MEMORY_MB: i32 = 8;
+
const VIRT_DATA_DIR: &str = "/data/misc/apexdata/com.android.virt";
const RIALTO_PATH: &str = "/apex/com.android.virt/etc/rialto.bin";
const INSTANCE_IMG_NAME: &str = "service_vm_instance.img";
const INSTANCE_ID_FILENAME: &str = "service_vm_instance_id";
const INSTANCE_IMG_SIZE_BYTES: i64 = 1 << 20; // 1MB
-const MEMORY_MB: i32 = 300;
const WRITE_BUFFER_CAPACITY: usize = 512;
const READ_TIMEOUT: Duration = Duration::from_secs(10);
const WRITE_TIMEOUT: Duration = Duration::from_secs(10);
@@ -227,11 +229,11 @@
let instance_id = get_or_allocate_instance_id(service.as_ref(), instance_id_file)?;
let config = VirtualMachineConfig::RawConfig(VirtualMachineRawConfig {
name: String::from("Service VM"),
- bootloader: Some(ParcelFileDescriptor::new(rialto)),
+ kernel: Some(ParcelFileDescriptor::new(rialto)),
disks: vec![DiskImage { image: None, partitions: writable_partitions, writable: true }],
instanceId: instance_id,
protectedVm: true,
- memoryMib: MEMORY_MB,
+ memoryMib: VM_MEMORY_MB,
cpuTopology: CpuTopology::ONE_CPU,
platformVersion: "~1.0".to_string(),
gdbPort: 0, // No gdb
diff --git a/libs/libvmbase/example/Android.bp b/libs/libvmbase/example/Android.bp
deleted file mode 100644
index fe9de44..0000000
--- a/libs/libvmbase/example/Android.bp
+++ /dev/null
@@ -1,74 +0,0 @@
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-rust_ffi_static {
- name: "libvmbase_example",
- defaults: ["vmbase_ffi_defaults"],
- crate_name: "vmbase_example",
- srcs: ["src/main.rs"],
- rustlibs: [
- "libaarch64_paging",
- "libcstr",
- "libdiced_open_dice_nostd",
- "libfdtpci",
- "liblibfdt",
- "liblog_rust_nostd",
- "libvirtio_drivers",
- "libvmbase",
- ],
-}
-
-cc_binary {
- name: "vmbase_example",
- defaults: ["vmbase_elf_defaults"],
- srcs: [
- "idmap.S",
- ],
- static_libs: [
- "libvmbase_example",
- ],
- linker_scripts: [
- "image.ld",
- ":vmbase_sections",
- ],
-}
-
-raw_binary {
- name: "vmbase_example_bin",
- stem: "vmbase_example.bin",
- src: ":vmbase_example",
- enabled: false,
- target: {
- android_arm64: {
- enabled: true,
- },
- },
-}
-
-rust_test {
- name: "vmbase_example.integration_test",
- crate_name: "vmbase_example_test",
- srcs: ["tests/test.rs"],
- prefer_rlib: true,
- edition: "2021",
- rustlibs: [
- "android.system.virtualizationservice-rust",
- "libandroid_logger",
- "libanyhow",
- "liblibc",
- "liblog_rust",
- "libnix",
- "libvmclient",
- ],
- data: [
- ":vmbase_example_bin",
- ],
- test_suites: ["general-tests"],
- enabled: false,
- target: {
- android_arm64: {
- enabled: true,
- },
- },
-}
diff --git a/libs/libvmbase/sections.ld b/libs/libvmbase/sections.ld
index 01b7e39..7d464bc 100644
--- a/libs/libvmbase/sections.ld
+++ b/libs/libvmbase/sections.ld
@@ -34,6 +34,8 @@
* as executable-only.
*/
.text : ALIGN(4096) {
+ KEEP(*(.init.head));
+ *(.init.head)
text_begin = .;
*(.init.entry)
*(.init.*)
diff --git a/libs/libvmbase/src/entry.rs b/libs/libvmbase/src/entry.rs
index ad633ed..99f28fc 100644
--- a/libs/libvmbase/src/entry.rs
+++ b/libs/libvmbase/src/entry.rs
@@ -18,7 +18,7 @@
bionic, console, heap, hyp,
layout::{UART_ADDRESSES, UART_PAGE_ADDR},
logger,
- memory::{SIZE_16KB, SIZE_4KB},
+ memory::{PAGE_SIZE, SIZE_16KB, SIZE_4KB},
power::{reboot, shutdown},
rand,
};
@@ -129,3 +129,37 @@
}
};
}
+
+/// Prepends a Linux kernel header to the generated binary image.
+///
+/// See https://docs.kernel.org/arch/arm64/booting.html
+/// ```
+#[macro_export]
+macro_rules! generate_image_header {
+ () => {
+ #[cfg(not(target_endian = "little"))]
+ compile_error!("Image header uses wrong endianness: bootloaders expect LE!");
+
+ core::arch::global_asm!(
+ // This section gets linked at the start of the image.
+ ".section .init.head, \"ax\"",
+ // This prevents the macro from being called more than once.
+ ".global image_header",
+ "image_header:",
+ // Linux uses a special NOP to be ELF-compatible; we're not.
+ "nop", // code0
+ "b entry", // code1
+ ".quad 0", // text_offset
+ ".quad bin_end - image_header", // image_size
+ ".quad (1 << 1)", // flags (PAGE_SIZE=4KiB)
+ ".quad 0", // res2
+ ".quad 0", // res3
+ ".quad 0", // res4
+ ".ascii \"ARM\x64\"", // magic
+ ".long 0", // res5
+ );
+ };
+}
+
+// If this fails, the image header flags are out-of-sync with PAGE_SIZE!
+static_assertions::const_assert_eq!(PAGE_SIZE, SIZE_4KB);
diff --git a/libs/libvmbase/src/util.rs b/libs/libvmbase/src/util.rs
index 8c230a1..e52ac8e 100644
--- a/libs/libvmbase/src/util.rs
+++ b/libs/libvmbase/src/util.rs
@@ -14,6 +14,7 @@
//! Utility functions.
+use aarch64_paging::paging::MemoryRegion;
use core::ops::Range;
/// Flatten [[T; N]] into &[T]
@@ -91,3 +92,13 @@
self.start < other.end && other.start < self.end
}
}
+
+impl RangeExt for MemoryRegion {
+ fn is_within(&self, other: &Self) -> bool {
+ self.start() >= other.start() && self.end() <= other.end()
+ }
+
+ fn overlaps(&self, other: &Self) -> bool {
+ self.start() < other.end() && other.start() < self.end()
+ }
+}
diff --git a/libs/vm_launcher_lib/Android.bp b/libs/vm_launcher_lib/Android.bp
new file mode 100644
index 0000000..8591c8d
--- /dev/null
+++ b/libs/vm_launcher_lib/Android.bp
@@ -0,0 +1,13 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_library {
+ name: "vm_launcher_lib",
+ srcs: ["java/**/*.java"],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
+ sdk_version: "system_current",
+}
diff --git a/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/VmLauncherServices.java b/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/VmLauncherServices.java
new file mode 100644
index 0000000..c5bc5fb
--- /dev/null
+++ b/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/VmLauncherServices.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+
+package com.android.virtualization.vmlauncher;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Parcel;
+import android.os.ResultReceiver;
+import android.util.Log;
+
+import java.util.List;
+
+public class VmLauncherServices {
+ private static final String TAG = "VmLauncherServices";
+
+ private static final String ACTION_START_VM_LAUNCHER_SERVICE =
+ "android.virtualization.START_VM_LAUNCHER_SERVICE";
+
+ private static final int RESULT_START = 0;
+ private static final int RESULT_STOP = 1;
+ private static final int RESULT_ERROR = 2;
+ private static final int RESULT_IPADDR = 3;
+ private static final String KEY_VM_IP_ADDR = "ip_addr";
+
+ private static Intent buildVmLauncherServiceIntent(Context context) {
+ Intent i = new Intent();
+ i.setAction(ACTION_START_VM_LAUNCHER_SERVICE);
+
+ Intent intent = new Intent(ACTION_START_VM_LAUNCHER_SERVICE);
+ PackageManager pm = context.getPackageManager();
+ List<ResolveInfo> resolveInfos =
+ pm.queryIntentServices(intent, PackageManager.MATCH_DEFAULT_ONLY);
+ if (resolveInfos == null || resolveInfos.size() != 1) {
+ Log.e(TAG, "cannot find a service to handle ACTION_START_VM_LAUNCHER_SERVICE");
+ return null;
+ }
+ String packageName = resolveInfos.get(0).serviceInfo.packageName;
+
+ i.setPackage(packageName);
+ return i;
+ }
+
+ public static void startVmLauncherService(Context context, VmLauncherServiceCallback callback) {
+ Intent i = buildVmLauncherServiceIntent(context);
+ if (i == null) {
+ return;
+ }
+ ResultReceiver resultReceiver =
+ new ResultReceiver(new Handler(Looper.myLooper())) {
+ @Override
+ protected void onReceiveResult(int resultCode, Bundle resultData) {
+ if (callback == null) {
+ return;
+ }
+ switch (resultCode) {
+ case RESULT_START:
+ callback.onVmStart();
+ return;
+ case RESULT_STOP:
+ callback.onVmStop();
+ return;
+ case RESULT_ERROR:
+ callback.onVmError();
+ return;
+ case RESULT_IPADDR:
+ callback.onIpAddrAvailable(resultData.getString(KEY_VM_IP_ADDR));
+ return;
+ }
+ }
+ };
+ i.putExtra(Intent.EXTRA_RESULT_RECEIVER, getResultReceiverForIntent(resultReceiver));
+ context.startForegroundService(i);
+ }
+
+ public interface VmLauncherServiceCallback {
+ void onVmStart();
+
+ void onVmStop();
+
+ void onVmError();
+
+ void onIpAddrAvailable(String ipAddr);
+ }
+
+ private static ResultReceiver getResultReceiverForIntent(ResultReceiver r) {
+ Parcel parcel = Parcel.obtain();
+ r.writeToParcel(parcel, 0);
+ parcel.setDataPosition(0);
+ r = ResultReceiver.CREATOR.createFromParcel(parcel);
+ parcel.recycle();
+ return r;
+ }
+}
diff --git a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
index ec1a553..0e59a01 100644
--- a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
+++ b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
@@ -268,6 +268,7 @@
/* fullDebug */ false,
(builder) -> builder.setCpuTopology(CPU_TOPOLOGY_ONE_CPU));
}
+
@Test
public void testMicrodroidHostCpuTopologyBootTime()
throws VirtualMachineException, InterruptedException, IOException {
@@ -280,10 +281,7 @@
@Test
public void testMicrodroidDebugBootTime()
throws VirtualMachineException, InterruptedException, IOException {
- runBootTimeTest(
- "test_vm_boot_time_debug",
- /* fullDebug */ true,
- (builder) -> builder);
+ runBootTimeTest("test_vm_boot_time_debug", /* fullDebug */ true, (builder) -> builder);
}
private void testMicrodroidDebugBootTime_withVendorBase(File vendorDiskImage) throws Exception {
@@ -366,12 +364,12 @@
@Test
public void testVirtioBlkSeqReadRate() throws Exception {
- testVirtioBlkReadRate(/*isRand=*/ false);
+ testVirtioBlkReadRate(/* isRand= */ false);
}
@Test
public void testVirtioBlkRandReadRate() throws Exception {
- testVirtioBlkReadRate(/*isRand=*/ true);
+ testVirtioBlkReadRate(/* isRand= */ true);
}
private void testVirtioBlkReadRate(boolean isRand) throws Exception {
diff --git a/tests/benchmark_hostside/java/android/avf/test/AVFHostTestCase.java b/tests/benchmark_hostside/java/android/avf/test/AVFHostTestCase.java
index 4a61016..e2956f2 100644
--- a/tests/benchmark_hostside/java/android/avf/test/AVFHostTestCase.java
+++ b/tests/benchmark_hostside/java/android/avf/test/AVFHostTestCase.java
@@ -69,6 +69,7 @@
/** Boot time test related variables */
private static final int REINSTALL_APEX_RETRY_INTERVAL_MS = 5 * 1000;
+
private static final int REINSTALL_APEX_TIMEOUT_SEC = 15;
private static final int COMPILE_STAGED_APEX_RETRY_INTERVAL_MS = 10 * 1000;
private static final int COMPILE_STAGED_APEX_TIMEOUT_SEC = 540;
@@ -122,17 +123,18 @@
@Test
public void testNoLongHypSections() throws Exception {
- String[] hypEvents = {
- "hyp_enter", "hyp_exit"
- };
+ String[] hypEvents = {"hyp_enter", "hyp_exit"};
- assumeTrue("Skip without hypervisor tracing",
- KvmHypTracer.isSupported(getDevice(), hypEvents));
+ assumeTrue(
+ "Skip without hypervisor tracing",
+ KvmHypTracer.isSupported(getDevice(), hypEvents));
KvmHypTracer tracer = new KvmHypTracer(getDevice(), hypEvents);
String result = tracer.run(COMPOSD_CMD_BIN + " test-compile");
assertWithMessage("Failed to test compilation VM.")
- .that(result).ignoringCase().contains("all ok");
+ .that(result)
+ .ignoringCase()
+ .contains("all ok");
SimpleStats stats = tracer.getDurationStats();
reportMetric(stats.getData(), "hyp_sections", "s");
@@ -141,32 +143,37 @@
@Test
public void testPsciMemProtect() throws Exception {
- String[] hypEvents = {
- "psci_mem_protect"
- };
+ String[] hypEvents = {"psci_mem_protect"};
- assumeTrue("Skip without hypervisor tracing",
- KvmHypTracer.isSupported(getDevice(), hypEvents));
+ assumeTrue(
+ "Skip without hypervisor tracing",
+ KvmHypTracer.isSupported(getDevice(), hypEvents));
KvmHypTracer tracer = new KvmHypTracer(getDevice(), hypEvents);
/* We need to wait for crosvm to die so all the VM pages are reclaimed */
String result = tracer.run(COMPOSD_CMD_BIN + " test-compile && killall -w crosvm || true");
assertWithMessage("Failed to test compilation VM.")
- .that(result).ignoringCase().contains("all ok");
+ .that(result)
+ .ignoringCase()
+ .contains("all ok");
List<Integer> values = tracer.getPsciMemProtect();
assertWithMessage("PSCI MEM_PROTECT events not recorded")
- .that(values.size()).isGreaterThan(2);
+ .that(values.size())
+ .isGreaterThan(2);
assertWithMessage("PSCI MEM_PROTECT counter not starting from 0")
- .that(values.get(0)).isEqualTo(0);
+ .that(values.get(0))
+ .isEqualTo(0);
assertWithMessage("PSCI MEM_PROTECT counter not ending with 0")
- .that(values.get(values.size() - 1)).isEqualTo(0);
+ .that(values.get(values.size() - 1))
+ .isEqualTo(0);
assertWithMessage("PSCI MEM_PROTECT counter didn't increment")
- .that(Collections.max(values)).isGreaterThan(0);
+ .that(Collections.max(values))
+ .isGreaterThan(0);
}
@Test
@@ -182,9 +189,7 @@
@Test
public void testSettingsAppStartupTime() throws Exception {
- String[] launchIntentPackages = {
- "com.android.settings"
- };
+ String[] launchIntentPackages = {"com.android.settings"};
String launchIntentPackage = findSupportedPackage(launchIntentPackages);
assume().withMessage("No supported settings package").that(launchIntentPackage).isNotNull();
appStartupHelper(launchIntentPackage);
@@ -193,28 +198,34 @@
private void appStartupHelper(String launchIntentPackage) throws Exception {
assumeTrue(
"Skip on non-protected VMs",
- ((TestDevice) getDevice()).supportsMicrodroid(/*protectedVm=*/ true));
+ ((TestDevice) getDevice()).supportsMicrodroid(/* protectedVm= */ true));
StartupTimeMetricCollection mCollection =
new StartupTimeMetricCollection(getPackageName(launchIntentPackage), ROUND_COUNT);
getAppStartupTime(launchIntentPackage, mCollection);
- reportMetric(mCollection.mAppBeforeVmRunTotalTime,
+ reportMetric(
+ mCollection.mAppBeforeVmRunTotalTime,
"app_startup/" + mCollection.getPkgName() + "/total_time/before_vm",
"ms");
- reportMetric(mCollection.mAppBeforeVmRunWaitTime,
+ reportMetric(
+ mCollection.mAppBeforeVmRunWaitTime,
"app_startup/" + mCollection.getPkgName() + "/wait_time/before_vm",
"ms");
- reportMetric(mCollection.mAppDuringVmRunTotalTime,
+ reportMetric(
+ mCollection.mAppDuringVmRunTotalTime,
"app_startup/" + mCollection.getPkgName() + "/total_time/during_vm",
"ms");
- reportMetric(mCollection.mAppDuringVmRunWaitTime,
+ reportMetric(
+ mCollection.mAppDuringVmRunWaitTime,
"app_startup/" + mCollection.getPkgName() + "/wait_time/during_vm",
"ms");
- reportMetric(mCollection.mAppAfterVmRunTotalTime,
+ reportMetric(
+ mCollection.mAppAfterVmRunTotalTime,
"app_startup/" + mCollection.getPkgName() + "/total_time/after_vm",
"ms");
- reportMetric(mCollection.mAppAfterVmRunWaitTime,
+ reportMetric(
+ mCollection.mAppAfterVmRunWaitTime,
"app_startup/" + mCollection.getPkgName() + "/wait_time/after_vm",
"ms");
}
@@ -234,8 +245,9 @@
for (String pkgName : pkgNameList) {
String appPkg = getPackageName(pkgName);
- String hasPackage = android.run("pm list package | grep -w " + appPkg + " 1> /dev/null"
- + "; echo $?");
+ String hasPackage =
+ android.run(
+ "pm list package | grep -w " + appPkg + " 1> /dev/null" + "; echo $?");
assertNotNull(hasPackage);
if (hasPackage.equals("0")) {
@@ -390,8 +402,8 @@
}
}
- private int getFreeMemoryInfoMb(CommandRunner android) throws DeviceNotAvailableException,
- IllegalArgumentException {
+ private int getFreeMemoryInfoMb(CommandRunner android)
+ throws DeviceNotAvailableException, IllegalArgumentException {
int freeMemory = 0;
String content = android.runForResult("cat /proc/meminfo").getStdout().trim();
String[] lines = content.split("[\r\n]+");
@@ -410,8 +422,8 @@
throws DeviceNotAvailableException, InterruptedException {
android.run("input keyevent", "KEYCODE_WAKEUP");
Thread.sleep(500);
- final String ret = android.runForResult("dumpsys nfc | grep 'mScreenState='")
- .getStdout().trim();
+ final String ret =
+ android.runForResult("dumpsys nfc | grep 'mScreenState='").getStdout().trim();
if (ret != null && ret.contains("ON_LOCKED")) {
android.run("input keyevent", "KEYCODE_MENU");
}
@@ -429,8 +441,9 @@
String[] bootKeyVal = bootLoaderPhase.split(":");
String key = String.format("%s%s", BOOTLOADER_PREFIX, bootKeyVal[0]);
- bootloaderTime.computeIfAbsent(key,
- k -> new ArrayList<>()).add(Double.parseDouble(bootKeyVal[1]));
+ bootloaderTime
+ .computeIfAbsent(key, k -> new ArrayList<>())
+ .add(Double.parseDouble(bootKeyVal[1]));
// SW is the time spent on the warning screen. So ignore it in
// final boot time calculation.
if (BOOTLOADER_PHASE_SW.equalsIgnoreCase(bootKeyVal[0])) {
@@ -438,8 +451,9 @@
}
bootLoaderTotalTime += Double.parseDouble(bootKeyVal[1]);
}
- bootloaderTime.computeIfAbsent(BOOTLOADER_TIME,
- k -> new ArrayList<>()).add(bootLoaderTotalTime);
+ bootloaderTime
+ .computeIfAbsent(BOOTLOADER_TIME, k -> new ArrayList<>())
+ .add(bootLoaderTotalTime);
}
}
@@ -518,7 +532,9 @@
android.runWithTimeout(
3 * 60 * 1000, COMPOSD_CMD_BIN + " staged-apex-compile");
assertWithMessage("Failed to compile staged APEX. Reason: " + result)
- .that(result).ignoringCase().contains("all ok");
+ .that(result)
+ .ignoringCase()
+ .contains("all ok");
CLog.i("Success to compile staged APEX. Result: " + result);
@@ -546,22 +562,23 @@
try {
CommandRunner android = new CommandRunner(getDevice());
- String packagesOutput =
- android.run("pm list packages -f --apex-only");
+ String packagesOutput = android.run("pm list packages -f --apex-only");
- Pattern p = Pattern.compile(
- "package:(.*)=(com(?:\\.google)?\\.android\\.art)$", Pattern.MULTILINE);
+ Pattern p =
+ Pattern.compile(
+ "package:(.*)=(com(?:\\.google)?\\.android\\.art)$",
+ Pattern.MULTILINE);
Matcher m = p.matcher(packagesOutput);
assertWithMessage("ART module not found. Packages are:\n" + packagesOutput)
- .that(m.find())
- .isTrue();
+ .that(m.find())
+ .isTrue();
String artApexPath = m.group(1);
- CommandResult result = android.runForResult(
- "pm install --apex " + artApexPath);
+ CommandResult result = android.runForResult("pm install --apex " + artApexPath);
assertWithMessage("Failed to install APEX. Reason: " + result)
- .that(result.getExitCode()).isEqualTo(0);
+ .that(result.getExitCode())
+ .isEqualTo(0);
CLog.i("Success to install APEX. Result: " + result);
diff --git a/tests/helper/src/java/com/android/microdroid/test/common/MetricsProcessor.java b/tests/helper/src/java/com/android/microdroid/test/common/MetricsProcessor.java
index dd68d6a..8f93d1e 100644
--- a/tests/helper/src/java/com/android/microdroid/test/common/MetricsProcessor.java
+++ b/tests/helper/src/java/com/android/microdroid/test/common/MetricsProcessor.java
@@ -28,8 +28,8 @@
public static String getMetricPrefix(String debugTag) {
return "avf_perf"
- + ((debugTag != null && !debugTag.isEmpty()) ? "[" + debugTag + "]" : "")
- + "/";
+ + ((debugTag != null && !debugTag.isEmpty()) ? "[" + debugTag + "]" : "")
+ + "/";
}
public MetricsProcessor(String prefix) {
@@ -41,8 +41,8 @@
* a {@link Map} with the corresponding keys equal to [mPrefix + name +
* _[min|max|average|stdev]_ + unit].
*/
- public Map<String, Double> computeStats(List<? extends Number> metrics, String name,
- String unit) {
+ public Map<String, Double> computeStats(
+ List<? extends Number> metrics, String name, String unit) {
List<Double> values = new ArrayList<>(metrics.size());
for (Number metric : metrics) {
values.add(metric.doubleValue());
diff --git a/tests/helper/src/java/com/android/microdroid/test/common/ProcessUtil.java b/tests/helper/src/java/com/android/microdroid/test/common/ProcessUtil.java
index e058674..c4aba81 100644
--- a/tests/helper/src/java/com/android/microdroid/test/common/ProcessUtil.java
+++ b/tests/helper/src/java/com/android/microdroid/test/common/ProcessUtil.java
@@ -69,13 +69,13 @@
}
/** Gets global memory metrics key and values mapping */
- public static Map<String, Long> getProcessMemoryMap(
- Function<String, String> shellExecutor) throws IOException {
+ public static Map<String, Long> getProcessMemoryMap(Function<String, String> shellExecutor)
+ throws IOException {
// The input file of parseMemoryInfo need a header string as the key of output entries.
// /proc/meminfo doesn't have this line so add one as the key.
String header = "device memory info\n";
- List<SMapEntry> entries = parseMemoryInfo(header
- + shellExecutor.apply("cat /proc/meminfo"));
+ List<SMapEntry> entries =
+ parseMemoryInfo(header + shellExecutor.apply("cat /proc/meminfo"));
if (entries.size() != 1) {
throw new RuntimeException(
"expected one entry in /proc/meminfo, got " + entries.size());
diff --git a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
index 8169376..135d947 100644
--- a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
+++ b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
@@ -108,15 +108,15 @@
protected final void grantPermission(String permission) {
Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
UiAutomation uiAutomation = instrumentation.getUiAutomation();
- uiAutomation.grantRuntimePermission(instrumentation.getContext().getPackageName(),
- permission);
+ uiAutomation.grantRuntimePermission(
+ instrumentation.getContext().getPackageName(), permission);
}
protected final void revokePermission(String permission) {
Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
UiAutomation uiAutomation = instrumentation.getUiAutomation();
- uiAutomation.revokeRuntimePermission(instrumentation.getContext().getPackageName(),
- permission);
+ uiAutomation.revokeRuntimePermission(
+ instrumentation.getContext().getPackageName(), permission);
}
protected final void setMaxPerformanceTaskProfile() throws IOException {
@@ -233,12 +233,11 @@
}
protected void assumeVsrCompliant() {
- boolean featureCheck = mCtx.getPackageManager().hasSystemFeature(FEATURE_WATCH) ||
- mCtx.getPackageManager().hasSystemFeature(FEATURE_AUTOMOTIVE) ||
- mCtx.getPackageManager().hasSystemFeature(FEATURE_LEANBACK);
- assume().withMessage("This device is not VSR compliant")
- .that(featureCheck)
- .isFalse();
+ boolean featureCheck =
+ mCtx.getPackageManager().hasSystemFeature(FEATURE_WATCH)
+ || mCtx.getPackageManager().hasSystemFeature(FEATURE_AUTOMOTIVE)
+ || mCtx.getPackageManager().hasSystemFeature(FEATURE_LEANBACK);
+ assume().withMessage("This device is not VSR compliant").that(featureCheck).isFalse();
}
protected boolean isGsi() {
@@ -256,8 +255,9 @@
// Cuttlefish/Goldfish on Arm 64 doesn't and cannot support any form of virtualization,
// so there's no point running any of these tests.
- assume().withMessage("Virtualization not supported on Arm64 Cuttlefish/Goldfish."
- + " b/341889915")
+ assume().withMessage(
+ "Virtualization not supported on Arm64 Cuttlefish/Goldfish."
+ + " b/341889915")
.that(isCuttlefishArm64() || isGoldfishArm64())
.isFalse();
}
@@ -288,7 +288,8 @@
if (log.contains("Run /init as init process") && !mInitStartedNanoTime.isPresent()) {
mInitStartedNanoTime = OptionalLong.of(System.nanoTime());
}
- if (log.contains("microdroid_manager") && log.contains("executing main task")
+ if (log.contains("microdroid_manager")
+ && log.contains("executing main task")
&& !mPayloadStartedNanoTime.isPresent()) {
mPayloadStartedNanoTime = OptionalLong.of(System.nanoTime());
}
diff --git a/tests/hostside/helper/java/com/android/microdroid/test/host/CommandResultSubject.java b/tests/hostside/helper/java/com/android/microdroid/test/host/CommandResultSubject.java
index 2e9d078..1d292eb 100644
--- a/tests/hostside/helper/java/com/android/microdroid/test/host/CommandResultSubject.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/host/CommandResultSubject.java
@@ -25,9 +25,7 @@
import com.google.common.truth.StringSubject;
import com.google.common.truth.Subject;
-/**
- * A <a href="https://github.com/google/truth">Truth</a> subject for {@link CommandResult}.
- */
+/** A <a href="https://github.com/google/truth">Truth</a> subject for {@link CommandResult}. */
public class CommandResultSubject extends Subject {
private final CommandResult mActual;
diff --git a/tests/hostside/helper/java/com/android/microdroid/test/host/KvmHypTracer.java b/tests/hostside/helper/java/com/android/microdroid/test/host/KvmHypTracer.java
index 5c72358..3814cdd 100644
--- a/tests/hostside/helper/java/com/android/microdroid/test/host/KvmHypTracer.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/host/KvmHypTracer.java
@@ -17,22 +17,23 @@
package com.android.microdroid.test.host;
import static com.google.common.truth.Truth.assertWithMessage;
+
import static org.junit.Assert.assertNotNull;
-import com.android.microdroid.test.host.CommandRunner;
import com.android.tradefed.device.ITestDevice;
import com.android.tradefed.log.LogUtil.CLog;
import com.android.tradefed.util.SimpleStats;
+import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
-import java.io.BufferedReader;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
import javax.annotation.Nonnull;
class KvmHypEvent {
@@ -42,16 +43,14 @@
public final String args;
public final boolean valid;
- private static final Pattern LOST_EVENT_PATTERN = Pattern.compile(
- "^CPU:[0-9]* \\[LOST ([0-9]*) EVENTS\\]");
+ private static final Pattern LOST_EVENT_PATTERN =
+ Pattern.compile("^CPU:[0-9]* \\[LOST ([0-9]*) EVENTS\\]");
public KvmHypEvent(String str) {
Matcher matcher = LOST_EVENT_PATTERN.matcher(str);
- if (matcher.find())
- throw new OutOfMemoryError("Lost " + matcher.group(1) + " events");
+ if (matcher.find()) throw new OutOfMemoryError("Lost " + matcher.group(1) + " events");
- Pattern pattern = Pattern.compile(
- "^\\[([0-9]*)\\][ \t]*([0-9]*\\.[0-9]*): (\\S+) (.*)");
+ Pattern pattern = Pattern.compile("^\\[([0-9]*)\\][ \t]*([0-9]*\\.[0-9]*): (\\S+) (.*)");
matcher = pattern.matcher(str);
if (!matcher.find()) {
@@ -72,8 +71,7 @@
}
public String toString() {
- return String.format(
- "[%03d]\t%f: %s %s", cpu, timestamp, name, args);
+ return String.format("[%03d]\t%f: %s %s", cpu, timestamp, name, args);
}
}
@@ -99,16 +97,16 @@
}
public static boolean isSupported(ITestDevice device, String[] events) throws Exception {
- for (String event: events) {
- if (!device.doesFileExist(HYP_TRACING_ROOT + eventDir(event) + "/enable"))
- return false;
+ for (String event : events) {
+ if (!device.doesFileExist(HYP_TRACING_ROOT + eventDir(event) + "/enable")) return false;
}
return true;
}
public KvmHypTracer(@Nonnull ITestDevice device, String[] events) throws Exception {
assertWithMessage("Hypervisor events " + String.join(",", events) + " not supported")
- .that(isSupported(device, events)).isTrue();
+ .that(isSupported(device, events))
+ .isTrue();
mDevice = device;
mRunner = new CommandRunner(mDevice);
@@ -123,8 +121,7 @@
setNode("tracing_on", 0);
mRunner.run("echo 0 | tee " + HYP_TRACING_ROOT + "events/*/*/enable");
setNode("buffer_size_kb", DEFAULT_BUF_SIZE_KB);
- for (String event: mHypEvents)
- setNode(eventDir(event) + "/enable", 1);
+ for (String event : mHypEvents) setNode(eventDir(event) + "/enable", 1);
setNode("trace", 0);
/* Cat each per-cpu trace_pipe in its own tmp file in the background */
@@ -147,8 +144,10 @@
/* Wait for cat to finish reading the pipe interface before killing it */
for (int i = 0; i < mNrCpus; i++) {
- cmd += "while $(test '$(ps -o S -p $CPU" + i
- + "_TRACE_PIPE_PID | tail -n 1)' = 'R'); do sleep 1; done;";
+ cmd +=
+ "while $(test '$(ps -o S -p $CPU"
+ + i
+ + "_TRACE_PIPE_PID | tail -n 1)' = 'R'); do sleep 1; done;";
cmd += "kill -9 $CPU" + i + "_TRACE_PIPE_PID;";
}
cmd += "wait";
@@ -164,7 +163,7 @@
mRunner.run("rm -f " + cmd_script);
- for (String t: trace_pipes) {
+ for (String t : trace_pipes) {
File trace = mDevice.pullFile(t);
assertNotNull(trace);
mTraces.add(trace);
@@ -190,12 +189,10 @@
KvmHypEvent event;
String l;
- if ((l = br.readLine()) == null)
- return null;
+ if ((l = br.readLine()) == null) return null;
event = new KvmHypEvent(l);
- if (!event.valid)
- return null;
+ if (!event.valid) return null;
return event;
}
@@ -205,9 +202,10 @@
SimpleStats stats = new SimpleStats();
assertWithMessage("KvmHypTracer() is missing events " + String.join(",", reqEvents))
- .that(hasEvents(reqEvents)).isTrue();
+ .that(hasEvents(reqEvents))
+ .isTrue();
- for (File trace: mTraces) {
+ for (File trace : mTraces) {
BufferedReader br = new BufferedReader(new FileReader(trace));
double last = 0.0, hyp_enter = 0.0;
String prev_event = "";
@@ -219,20 +217,18 @@
throw new ParseException("Incorrect CPU number: " + cpu, 0);
double cur = hypEvent.timestamp;
- if (cur < last)
- throw new ParseException("Time must not go backward: " + cur, 0);
+ if (cur < last) throw new ParseException("Time must not go backward: " + cur, 0);
last = cur;
String event = hypEvent.name;
if (event.equals(prev_event)) {
- throw new ParseException("Hyp event found twice in a row: " +
- trace + " - " + hypEvent, 0);
+ throw new ParseException(
+ "Hyp event found twice in a row: " + trace + " - " + hypEvent, 0);
}
switch (event) {
case "hyp_exit":
- if (prev_event.equals("hyp_enter"))
- stats.add(cur - hyp_enter);
+ if (prev_event.equals("hyp_enter")) stats.add(cur - hyp_enter);
break;
case "hyp_enter":
hyp_enter = cur;
@@ -252,7 +248,8 @@
List<Integer> psciMemProtect = new ArrayList<>();
assertWithMessage("KvmHypTracer() is missing events " + String.join(",", reqEvents))
- .that(hasEvents(reqEvents)).isTrue();
+ .that(hasEvents(reqEvents))
+ .isTrue();
BufferedReader[] brs = new BufferedReader[mTraces.size()];
KvmHypEvent[] next = new KvmHypEvent[mTraces.size()];
@@ -266,22 +263,20 @@
double oldest = Double.MAX_VALUE;
int oldestIdx = -1;
- for (int i = 0; i < mTraces.size(); i ++) {
+ for (int i = 0; i < mTraces.size(); i++) {
if ((next[i] != null) && (next[i].timestamp < oldest)) {
oldest = next[i].timestamp;
oldestIdx = i;
}
}
- if (oldestIdx < 0)
- break;
+ if (oldestIdx < 0) break;
- Pattern pattern = Pattern.compile(
- "count=([0-9]*) was=([0-9]*)");
+ Pattern pattern = Pattern.compile("count=([0-9]*) was=([0-9]*)");
Matcher matcher = pattern.matcher(next[oldestIdx].args);
if (!matcher.find()) {
- throw new ParseException("Unexpected psci_mem_protect event: " +
- next[oldestIdx], 0);
+ throw new ParseException(
+ "Unexpected psci_mem_protect event: " + next[oldestIdx], 0);
}
int count = Integer.parseInt(matcher.group(1));
diff --git a/tests/hostside/helper/java/com/android/microdroid/test/host/LogArchiver.java b/tests/hostside/helper/java/com/android/microdroid/test/host/LogArchiver.java
index 96ab543..ed753d0 100644
--- a/tests/hostside/helper/java/com/android/microdroid/test/host/LogArchiver.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/host/LogArchiver.java
@@ -27,15 +27,17 @@
/** A helper class for archiving device log files to the host's tradefed output directory. */
public abstract class LogArchiver {
- /** Copy device log (then delete) to a tradefed output directory on the host.
+ /**
+ * Copy device log (then delete) to a tradefed output directory on the host.
*
* @param logs A {@link TestLogData} that needs to be owned by the actual test case.
* @param device The device to pull the log file from.
* @param remotePath The path on the device.
* @param localName Local file name to be copied to.
*/
- public static void archiveLogThenDelete(TestLogData logs, ITestDevice device, String remotePath,
- String localName) throws DeviceNotAvailableException {
+ public static void archiveLogThenDelete(
+ TestLogData logs, ITestDevice device, String remotePath, String localName)
+ throws DeviceNotAvailableException {
File logFile = device.pullFile(remotePath);
if (logFile != null) {
logs.addTestLog(localName, LogDataType.TEXT, new FileInputStreamSource(logFile));
diff --git a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
index cd90fbe..974a58c 100644
--- a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
@@ -67,8 +67,11 @@
protected static final long MICRODROID_COMMAND_TIMEOUT_MILLIS = 30000;
private static final long MICRODROID_COMMAND_RETRY_INTERVAL_MILLIS = 500;
protected static final int MICRODROID_ADB_CONNECT_MAX_ATTEMPTS =
- (int) (MICRODROID_ADB_CONNECT_TIMEOUT_MINUTES * 60 * 1000
- / MICRODROID_COMMAND_RETRY_INTERVAL_MILLIS);
+ (int)
+ (MICRODROID_ADB_CONNECT_TIMEOUT_MINUTES
+ * 60
+ * 1000
+ / MICRODROID_COMMAND_RETRY_INTERVAL_MILLIS);
protected static final Set<String> SUPPORTED_GKI_VERSIONS =
Collections.unmodifiableSet(new HashSet(Arrays.asList("android15-6.6")));
@@ -148,8 +151,9 @@
isGsi && vendorApiLevel < 202404);
}
- public static void archiveLogThenDelete(TestLogData logs, ITestDevice device, String remotePath,
- String localName) throws DeviceNotAvailableException {
+ public static void archiveLogThenDelete(
+ TestLogData logs, ITestDevice device, String remotePath, String localName)
+ throws DeviceNotAvailableException {
LogArchiver.archiveLogThenDelete(logs, device, remotePath, localName);
}
@@ -167,6 +171,7 @@
CommandResult result = RunUtil.getDefault().runTimedCmd(timeout, cmd);
return result.getStdout().trim();
}
+
private static String join(String... strs) {
return String.join(" ", Arrays.asList(strs));
}
@@ -197,8 +202,7 @@
throw new AssertionError("Failed to find test file " + name + " for module " + moduleName);
}
- public String getPathForPackage(String packageName)
- throws DeviceNotAvailableException {
+ public String getPathForPackage(String packageName) throws DeviceNotAvailableException {
return getPathForPackage(getDevice(), packageName);
}
@@ -210,7 +214,8 @@
CommandRunner android = new CommandRunner(device);
String pathLine = android.run("pm", "path", packageName);
assertWithMessage("Package " + packageName + " not found")
- .that(pathLine).startsWith("package:");
+ .that(pathLine)
+ .startsWith("package:");
return pathLine.substring("package:".length());
}
diff --git a/tests/pvmfw/helper/java/com/android/pvmfw/test/host/Pvmfw.java b/tests/pvmfw/helper/java/com/android/pvmfw/test/host/Pvmfw.java
index a77ba40..5ae5186 100644
--- a/tests/pvmfw/helper/java/com/android/pvmfw/test/host/Pvmfw.java
+++ b/tests/pvmfw/helper/java/com/android/pvmfw/test/host/Pvmfw.java
@@ -27,8 +27,8 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.util.Objects;
import java.nio.ByteBuffer;
+import java.util.Objects;
/** pvmfw.bin with custom config payloads on host. */
public final class Pvmfw {
diff --git a/tests/pvmfw/java/com/android/pvmfw/test/DebugPolicyHostTests.java b/tests/pvmfw/java/com/android/pvmfw/test/DebugPolicyHostTests.java
index 2a6ab2d..7efbbc7 100644
--- a/tests/pvmfw/java/com/android/pvmfw/test/DebugPolicyHostTests.java
+++ b/tests/pvmfw/java/com/android/pvmfw/test/DebugPolicyHostTests.java
@@ -30,8 +30,8 @@
import com.android.tradefed.device.DeviceRuntimeException;
import com.android.tradefed.device.ITestDevice;
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-import com.android.tradefed.util.CommandStatus;
import com.android.tradefed.util.CommandResult;
+import com.android.tradefed.util.CommandStatus;
import org.junit.After;
import org.junit.Before;
diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
index 1465e73..7089b33 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -335,6 +335,7 @@
testResults.assertNoException();
assertThat(testResults.mAddInteger).isEqualTo(37 + 73);
}
+
@Test
@CddTest(requirements = {"9.17/C-1-1"})
public void autoCloseVm() throws Exception {
@@ -737,7 +738,6 @@
VirtualMachineConfig.Builder otherOsBuilder =
newBaselineBuilder().setOs("microdroid_gki-android14-6.1");
assertConfigCompatible(microdroidOsConfig, otherOsBuilder).isFalse();
-
}
private VirtualMachineConfig.Builder newBaselineBuilder() {
@@ -870,11 +870,12 @@
}
@Test
- @CddTest(requirements = {
- "9.17/C-1-1",
- "9.17/C-1-2",
- "9.17/C-1-4",
- })
+ @CddTest(
+ requirements = {
+ "9.17/C-1-1",
+ "9.17/C-1-2",
+ "9.17/C-1-4",
+ })
public void createVmWithConfigRequiresPermission() throws Exception {
assumeSupportedDevice();
revokePermission(VirtualMachine.USE_CUSTOM_VIRTUAL_MACHINE_PERMISSION);
@@ -890,14 +891,16 @@
SecurityException e =
assertThrows(
SecurityException.class, () -> runVmTestService(TAG, vm, (ts, tr) -> {}));
- assertThat(e).hasMessageThat()
+ assertThat(e)
+ .hasMessageThat()
.contains("android.permission.USE_CUSTOM_VIRTUAL_MACHINE permission");
}
@Test
- @CddTest(requirements = {
- "9.17/C-1-1",
- })
+ @CddTest(
+ requirements = {
+ "9.17/C-1-1",
+ })
public void deleteVm() throws Exception {
assumeSupportedDevice();
@@ -954,9 +957,10 @@
}
@Test
- @CddTest(requirements = {
- "9.17/C-1-1",
- })
+ @CddTest(
+ requirements = {
+ "9.17/C-1-1",
+ })
public void validApkPathIsAccepted() throws Exception {
assumeSupportedDevice();
@@ -989,10 +993,7 @@
}
@Test
- @CddTest(requirements = {
- "9.17/C-1-1",
- "9.17/C-2-1"
- })
+ @CddTest(requirements = {"9.17/C-1-1", "9.17/C-2-1"})
public void extraApk() throws Exception {
assumeSupportedDevice();
@@ -1044,7 +1045,7 @@
@Test
public void bootFailsWhenLowMem() throws Exception {
- for (int memMib : new int[]{ 10, 20, 40 }) {
+ for (int memMib : new int[] {10, 20, 40}) {
VirtualMachineConfig lowMemConfig =
newVmConfigBuilderWithPayloadBinary("MicrodroidTestNativeLib.so")
.setMemoryBytes(memMib)
@@ -1061,8 +1062,9 @@
onPayloadReadyExecuted.complete(true);
super.onPayloadReady(vm);
}
+
@Override
- public void onStopped(VirtualMachine vm, int reason) {
+ public void onStopped(VirtualMachine vm, int reason) {
onStoppedExecuted.complete(true);
super.onStopped(vm, reason);
}
@@ -1210,10 +1212,7 @@
}
@Test
- @CddTest(requirements = {
- "9.17/C-1-1",
- "9.17/C-2-7"
- })
+ @CddTest(requirements = {"9.17/C-1-1", "9.17/C-2-7"})
public void instancesOfSameVmHaveDifferentCdis() throws Exception {
assumeSupportedDevice();
// TODO(b/325094712): VMs on CF with same payload have the same secret. This is because
@@ -1240,10 +1239,7 @@
}
@Test
- @CddTest(requirements = {
- "9.17/C-1-1",
- "9.17/C-2-7"
- })
+ @CddTest(requirements = {"9.17/C-1-1", "9.17/C-2-7"})
public void sameInstanceKeepsSameCdis() throws Exception {
assumeSupportedDevice();
assume().withMessage("Skip on CF. Too Slow. b/257270529").that(isCuttlefish()).isFalse();
@@ -1298,7 +1294,7 @@
// then pvmfw, vm_entry (Microdroid kernel) and Microdroid payload entries.
// Before Android V we did not require that vendor code contain any DICE entries
// preceding pvmfw, so the minimum is one less.
- int minDiceChainSize = getVendorApiLevel() >= 202404 ? 5 : 4;
+ int minDiceChainSize = getVendorApiLevel() > 202404 ? 5 : 4;
assertThat(diceChainSize).isAtLeast(minDiceChainSize);
} else {
// pvmfw truncates the DICE chain it gets, so we expect exactly entries for
@@ -1339,10 +1335,7 @@
}
@Test
- @CddTest(requirements = {
- "9.17/C-1-1",
- "9.17/C-1-2"
- })
+ @CddTest(requirements = {"9.17/C-1-1", "9.17/C-1-2"})
public void accessToCdisIsRestricted() throws Exception {
assumeSupportedDevice();
@@ -1399,8 +1392,7 @@
private void assertThatPartitionIsMissing(UUID partitionUuid) throws Exception {
RandomAccessFile instanceFile = prepareInstanceImage("test_vm_integrity");
- assertThat(findPartitionDataOffset(instanceFile, partitionUuid).isPresent())
- .isFalse();
+ assertThat(findPartitionDataOffset(instanceFile, partitionUuid).isPresent()).isFalse();
}
// Flips a bit of given partition, and then see if boot fails.
@@ -1420,10 +1412,7 @@
}
@Test
- @CddTest(requirements = {
- "9.17/C-1-1",
- "9.17/C-2-7"
- })
+ @CddTest(requirements = {"9.17/C-1-1", "9.17/C-2-7"})
public void bootFailsWhenMicrodroidDataIsCompromised() throws Exception {
// If Updatable VM is supported => No instance.img required
assumeNoUpdatableVmSupport();
@@ -1431,10 +1420,7 @@
}
@Test
- @CddTest(requirements = {
- "9.17/C-1-1",
- "9.17/C-2-7"
- })
+ @CddTest(requirements = {"9.17/C-1-1", "9.17/C-2-7"})
public void bootFailsWhenPvmFwDataIsCompromised() throws Exception {
// If Updatable VM is supported => No instance.img required
assumeNoUpdatableVmSupport();
@@ -1456,8 +1442,8 @@
BootResult bootResult = tryBootVmWithConfig(config, "test_vm_invalid_config");
assertThat(bootResult.payloadStarted).isFalse();
- assertThat(bootResult.deathReason).isEqualTo(
- VirtualMachineCallback.STOP_REASON_MICRODROID_INVALID_PAYLOAD_CONFIG);
+ assertThat(bootResult.deathReason)
+ .isEqualTo(VirtualMachineCallback.STOP_REASON_MICRODROID_INVALID_PAYLOAD_CONFIG);
}
@Test
@@ -2143,7 +2129,6 @@
IVmShareTestService service = connection.waitForService();
assertWithMessage("Timed out connecting to " + serviceIntent).that(service).isNotNull();
-
try {
ITestService testServiceProxy = transferAndStartVm(service, vmDesc, "vm_to_share");
@@ -2627,16 +2612,15 @@
}
private long minMemoryRequired() {
- assertThat(Build.SUPPORTED_ABIS).isNotEmpty();
- String primaryAbi = Build.SUPPORTED_ABIS[0];
- switch (primaryAbi) {
- case "x86_64":
- return MIN_MEM_X86_64;
- case "arm64-v8a":
- case "arm64-v8a-hwasan":
- return MIN_MEM_ARM64;
- }
- throw new AssertionError("Unsupported ABI: " + primaryAbi);
+ assertThat(Build.SUPPORTED_ABIS).isNotEmpty();
+ String primaryAbi = Build.SUPPORTED_ABIS[0];
+ switch (primaryAbi) {
+ case "x86_64":
+ return MIN_MEM_X86_64;
+ case "arm64-v8a":
+ case "arm64-v8a-hwasan":
+ return MIN_MEM_ARM64;
+ }
+ throw new AssertionError("Unsupported ABI: " + primaryAbi);
}
-
}
diff --git a/tests/testapk_no_perm/src/java/com/android/microdroid/test/MicrodroidTestAppNoPerm.java b/tests/testapk_no_perm/src/java/com/android/microdroid/test/MicrodroidTestAppNoPerm.java
index 1772e6b..27e26e5 100644
--- a/tests/testapk_no_perm/src/java/com/android/microdroid/test/MicrodroidTestAppNoPerm.java
+++ b/tests/testapk_no_perm/src/java/com/android/microdroid/test/MicrodroidTestAppNoPerm.java
@@ -16,18 +16,19 @@
package com.android.microdroid.test;
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
import android.system.virtualmachine.VirtualMachineConfig;
import com.android.compatibility.common.util.CddTest;
import com.android.microdroid.test.device.MicrodroidDeviceTestBase;
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertThrows;
-
import org.junit.Before;
-import org.junit.runners.Parameterized;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
/**
* Test that the android.permission.MANAGE_VIRTUAL_MACHINE is enforced and that an app cannot launch
diff --git a/tests/vmbase_example/Android.bp b/tests/vmbase_example/Android.bp
new file mode 100644
index 0000000..4c1aa30
--- /dev/null
+++ b/tests/vmbase_example/Android.bp
@@ -0,0 +1,31 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+rust_test {
+ name: "vmbase_example.integration_test",
+ crate_name: "vmbase_example_test",
+ srcs: ["src/main.rs"],
+ prefer_rlib: true,
+ edition: "2021",
+ rustlibs: [
+ "android.system.virtualizationservice-rust",
+ "libandroid_logger",
+ "libanyhow",
+ "liblibc",
+ "liblog_rust",
+ "libnix",
+ "libvmclient",
+ ],
+ data: [
+ ":vmbase_example_bios_bin",
+ ":vmbase_example_kernel_bin",
+ ],
+ test_suites: ["general-tests"],
+ enabled: false,
+ target: {
+ android_arm64: {
+ enabled: true,
+ },
+ },
+}
diff --git a/libs/libvmbase/example/tests/test.rs b/tests/vmbase_example/src/main.rs
similarity index 86%
rename from libs/libvmbase/example/tests/test.rs
rename to tests/vmbase_example/src/main.rs
index 8f9fafc..e0563b7 100644
--- a/libs/libvmbase/example/tests/test.rs
+++ b/tests/vmbase_example/src/main.rs
@@ -31,13 +31,27 @@
};
use vmclient::{DeathReason, VmInstance};
-const VMBASE_EXAMPLE_PATH: &str = "vmbase_example.bin";
+const VMBASE_EXAMPLE_KERNEL_PATH: &str = "vmbase_example_kernel.bin";
+const VMBASE_EXAMPLE_BIOS_PATH: &str = "vmbase_example_bios.bin";
const TEST_DISK_IMAGE_PATH: &str = "test_disk.img";
const EMPTY_DISK_IMAGE_PATH: &str = "empty_disk.img";
-/// Runs the vmbase_example VM as an unprotected VM via VirtualizationService.
+/// Runs the vmbase_example VM as an unprotected VM kernel via VirtualizationService.
#[test]
-fn test_run_example_vm() -> Result<(), Error> {
+fn test_run_example_kernel_vm() -> Result<(), Error> {
+ run_test(Some(open_payload(VMBASE_EXAMPLE_KERNEL_PATH)?), None)
+}
+
+/// Runs the vmbase_example VM as an unprotected VM BIOS via VirtualizationService.
+#[test]
+fn test_run_example_bios_vm() -> Result<(), Error> {
+ run_test(None, Some(open_payload(VMBASE_EXAMPLE_BIOS_PATH)?))
+}
+
+fn run_test(
+ kernel: Option<ParcelFileDescriptor>,
+ bootloader: Option<ParcelFileDescriptor>,
+) -> Result<(), Error> {
android_logger::init_once(
android_logger::Config::default()
.with_tag("vmbase")
@@ -56,12 +70,6 @@
vmclient::VirtualizationService::new().context("Failed to spawn VirtualizationService")?;
let service = virtmgr.connect().context("Failed to connect to VirtualizationService")?;
- // Start example VM.
- let bootloader = ParcelFileDescriptor::new(
- File::open(VMBASE_EXAMPLE_PATH)
- .with_context(|| format!("Failed to open VM image {}", VMBASE_EXAMPLE_PATH))?,
- );
-
// Make file for test disk image.
let mut test_image = File::options()
.create(true)
@@ -91,10 +99,10 @@
let config = VirtualMachineConfig::RawConfig(VirtualMachineRawConfig {
name: String::from("VmBaseTest"),
- kernel: None,
+ kernel,
initrd: None,
params: None,
- bootloader: Some(bootloader),
+ bootloader,
disks: vec![disk_image, empty_disk_image],
protectedVm: false,
memoryMib: 300,
@@ -142,6 +150,11 @@
Ok((reader_fd.into(), writer_fd.into()))
}
+fn open_payload(path: &str) -> Result<ParcelFileDescriptor, Error> {
+ let file = File::open(path).with_context(|| format!("Failed to open VM image {path}"))?;
+ Ok(ParcelFileDescriptor::new(file))
+}
+
struct VmLogProcessor {
reader: Option<File>,
expected: VecDeque<String>,
diff --git a/tests/vmshareapp/src/java/com/android/microdroid/test/sharevm/VmShareServiceImpl.java b/tests/vmshareapp/src/java/com/android/microdroid/test/sharevm/VmShareServiceImpl.java
index 109486c..9f606e5 100644
--- a/tests/vmshareapp/src/java/com/android/microdroid/test/sharevm/VmShareServiceImpl.java
+++ b/tests/vmshareapp/src/java/com/android/microdroid/test/sharevm/VmShareServiceImpl.java
@@ -28,8 +28,8 @@
import android.util.Log;
import com.android.microdroid.test.vmshare.IVmShareTestService;
-import com.android.microdroid.testservice.ITestService;
import com.android.microdroid.testservice.IAppCallback;
+import com.android.microdroid.testservice.ITestService;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;