Commit graph

323 commits

Author SHA1 Message Date
Tatsuyuki Ishi
24fa5c10b5 Remove redundant run state change for RTC wakes
Previously, RTC wake would cause a synchronous run state change and also
asynchronously trigger wakeup through suspend_pipe. The first one is
redundant, so remove it.

BUG=b:345278018
TEST=rtcwake -m standby --seconds 10 wakes up Ubuntu VM.

Change-Id: I8ce78e3f286052bd683adfaa233eebfaa4824b86
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5834902
Commit-Queue: Tatsuyuki Ishi <ishitatsuyuki@google.com>
Reviewed-by: David Stevens <stevensd@chromium.org>
2024-09-06 05:10:09 +00:00
Tatsuyuki Ishi
0c68184d2c Use blocking calls for run state changes
There were two ways to handle a VM request that involves run state
change:
1. By executing it immediately through kick_vcpus.
2. By returning the desired state which will be then transitioned to by
   the caller.
Using #1 has the advantage that operations that needs to be done *after*
the run state change can be described in the function that performs the
run state change. In particular, pvclock's suspend callback needs to be
invoked after the VCPUs are stopped, but currently it happens *before*,
leading to b/345278018 (negative time overflow on ARM64 with pvclock).

This change converts all run state changes to #1 except for exits
(which can't be done by kick_vcpus).

The resume_imminent handling, previously handled by
linux::process_vm_control_event, is moved into kick_vcpus to preserve
behavior. Note that resume_imminent is currently called even if the
suspension is initiated by the host, but we keep bug-to-bug
compatibility for now and leave this to be fixed later.

Suspend responses for force_s2idle is now omitted by returning None
from process_vm_request. This avoids plumbing suspend_requested further
down the chain.

BUG=b:345278018
TEST=None (see next CL)

Change-Id: I2f63c3888715a5b612d1201481ce29677b94e884
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5823029
Reviewed-by: Noah Gold <nkgold@google.com>
Reviewed-by: David Stevens <stevensd@chromium.org>
Commit-Queue: Tatsuyuki Ishi <ishitatsuyuki@google.com>
2024-09-06 05:07:22 +00:00
Elie Kheirallah
1bae5dbf6b devices: Vmwdt: get vcpu pid/tid mapping from VM
Vmwdt is getting the pid/tid of vCPUs whenever a write happens. Instead,
get the Vcpu PID/TID on VM startup.

BUG=b:274145255
TEST=presubmit

Change-Id: I4f41dd20b807b320b6202d36061b18d4c9aa77df
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5703919
Commit-Queue: Elie Kheirallah <khei@google.com>
Reviewed-by: Frederick Mayle <fmayle@google.com>
Auto-Submit: Elie Kheirallah <khei@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
2024-07-25 00:38:15 +00:00
Frederick Mayle
a5d9270892 hypervisor: save/load pvclock closer to vCPU suspend/resume
The kvmclock keeps ticking even when vcpus are stopped, so right now the
guest perceives a big clock jump (10-20s for 8GB CF on a workstation)
that matches the time taken to perform the expensive parts of the
restore, like copying the RAM. As an improvement, move the clock restore
as close as possible to the vCPU start/stop. Even with this, there is
still a 3-4 second jump, but I don't yet know where it is coming from.

Note that only x86 KVM advertises `VmCap::PvClock`. This is a noop for
all else.

BUG=b:340216366

Change-Id: Ib4d870db5b31adb9c82076018035a842052d7cb8
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5617778
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Noah Gold <nkgold@google.com>
Commit-Queue: Frederick Mayle <fmayle@google.com>
2024-07-11 17:07:53 +00:00
Dennis Kempin
33d5aa219a Enable clippy for android code
This change enables clippy builds of android specific code.

Doing so without adding the full Android SDK into our container
is a bit hacky. The CL https://crrev.com/c/5671653 adds env variables
to the minijail build.rs to allow us to skip building the library, and
generate bindings for linux instead of android.

This allow us to build all non-gpu related features of the
android build. It will not link, but it will run clippy.

This CL fixes various clippy issues that come up in this new
configuration

BUG=b:349907813
TEST=tools/clippy -p android
TEST=tools/presubmit clippy_android

Change-Id: I1f51d383051bbeeeff55d716feb7b56c3e24588b
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5672567
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Dennis Kempin <denniskempin@google.com>
2024-07-09 20:43:44 +00:00
Elie Kheirallah
a2b17d323c vm_control: complete chopped comment
A comment describing state in get_vcpu_state was chopped off and merged.
Completed the comment.

BUG=N/A
TEST=presubmit

Change-Id: I1e635fb2b90232869632f1349c46d5a5012190a0
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5683683
Commit-Queue: Elie Kheirallah <khei@google.com>
Auto-Submit: Elie Kheirallah <khei@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
2024-07-08 17:24:17 +00:00
Ryan Neph
4d3a90a9a5 vm_control: track iommu dmabuf maps by VmMemoryRegionId
Previously these were tracked by MemSlot (hypervisor id assigned to a
dynamically mapped hostVA), since every dmabuf had its own.

With the recent support for "fixed" virtgpu blob resource mapping
(contrasting the earlier per-blob "dynamic" mapping), every mapped
dmabuf now shares a single MemSlot, which is configured at VM boot for
the entire device BAR.

Obviously, to support "fixed" blob mapping + virtio-iommu dmabuf
mapping, the latter needs to be tracked at the mapped dmabuf
granularity, not the hypervisor memslot granularity. We already have a
VmMemoryRegionId, which is a unique u64 derived from the guest physical
address for a blob resource to serve this purpose.

BUG=b:323368701
TEST=tools/dev_container tools/presubmit

Change-Id: I2340db38df3a4a885031521ded66a82ef78236e6
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5542922
Reviewed-by: David Stevens <stevensd@chromium.org>
Commit-Queue: Ryan Neph <ryanneph@google.com>
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
2024-06-25 18:52:13 +00:00
Ryan Neph
134be1ecd2 vm_control: wrap gfn+slot as VmMappedMemoryRegion; rename tracking structures
Refactor and rename tracking structures for guest physical memory
mappings (hypervisor user memory regions) and registered memory (either
a dynamic memory region mapping or a sub-mapping of existing fixed user
memory region).

BUG=b:323368701
TEST=tools/dev_container tools/presubmit

Change-Id: I328aba53c5e6cc4e1dbdfe000c7e75931dfe3969
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5542921
Commit-Queue: Ryan Neph <ryanneph@google.com>
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
2024-06-25 18:31:53 +00:00
Ryan Neph
6489a17fb7 devices: iommu: register dmabuf map as aligned guest physical address
Just use the gpa directly, instead of masking to gfn then back.

Retain the same guarantees as with gfn-based tracking by validating
page-alignment at registration-time. Except this is validated against
the virtio-iommu devices _actual_ pagesize, rather than an assumed one
placed elsewhere in the source.

Also adds validation of the requested mapping range.

BUG=b:323368701
TEST=tools/dev_container tools/presubmit

Change-Id: Ib0f52ae18d06f8d2489f2229488dc6fc1932dba4
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5542920
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Commit-Queue: Ryan Neph <ryanneph@google.com>
Reviewed-by: David Stevens <stevensd@chromium.org>
2024-06-25 18:27:13 +00:00
Ryan Neph
a24d4c0b63 vm_control: rename offset -> dest_offset for readability
Disambiguate this "offset" from others in the same procedure.

BUG=b:323368701
TEST=tools/dev_container tools/presubmit

Change-Id: I363e93cd0ddfc3c69f840c2ac7852f830b833ca7
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5542919
Reviewed-by: Takaya Saeki <takayas@chromium.org>
Reviewed-by: David Stevens <stevensd@chromium.org>
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Commit-Queue: Ryan Neph <ryanneph@google.com>
2024-06-25 18:21:59 +00:00
Ryan Neph
075e3ce1e7 vm_control: describe mapping type with new RegisteredMemory enum
More clearly distinguishes between ::FixedMapping and ::DynamicMapping
and their associated tracking data.

BUG=b:323368701
TEST=tools/dev_container tools/presubmit

Change-Id: Ie6079a8d6a77b136fc2c3011e88a0764e9c5cce0
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5541247
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Reviewed-by: David Stevens <stevensd@chromium.org>
Reviewed-by: Junichi Uekawa <uekawa@chromium.org>
Commit-Queue: Ryan Neph <ryanneph@google.com>
2024-06-25 18:19:45 +00:00
Daniel Verkamp
ba06509a5c vm_control: fix more wildcard re-exports
Import balloon_control items directly from that crate rather than via
re-exports from vm_control.

This fixes the fuzzer build, which depended on an implicitly imported
type via one of the conditional wildcard imports.

BUG=chromium:69590
TEST=(cd fuzz; cargo build)

Change-Id: I97d5df66741cfb64f600bebd503b73d779888440
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5630345
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-06-14 22:38:27 +00:00
Daniel Verkamp
247ed73ed1 crosvm_control: remove all conditional compilation
The crosvm_control library's API and ABI should not depend on crosvm
configuration options. If functionality is not available in a particular
build, the library should just provide a stub version of the function
that returns an error, rather than changing the exported symbols or
function prototypes.

BUG=None
TEST=tools/dev_container tools/presubmit
TEST=cargo build --no-default-features -p crosvm_control

Change-Id: I4428d3efe8d52a16ec78998fd83cd7d16b6b7773
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5623295
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Frederick Mayle <fmayle@google.com>
2024-06-11 22:28:40 +00:00
Daniel Verkamp
041266d12a vm_control: fix client build without gpu feature
The vm_control client depends on crate imports that were implicitly
getting pulled in by a wildcard pub re-export. Remove the wildcard
import and import only the required types.

BUG=b:344974550
TEST=cargo build -p vm_control
TEST=cargo build -p vm_control --features=gpu
TEST=tools/clippy

Fixes: df8168ad25 ("Remove unused pub re-exports")
Change-Id: I83461203482d0174b8ca85c1cb1aadeb9afd2097
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5623434
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-06-11 21:23:00 +00:00
Daniel Verkamp
df8168ad25 Remove unused pub re-exports
Fixes new clippy warnings about dead code.

BUG=b:344974550
TEST=tools/clippy

Change-Id: If5dc935542db3f39e918845b5864c46dad4a902c
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5604661
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-06-10 19:39:54 +00:00
Richard Zhang
ef9c7c6345 virtio-snd: windows: Pass audio_client_guid to IAudioClient::Initialize
Virtio-snd on Windows will take a audio_client_guid on initialization.

A device index is also added so that logs can be differentiated between
multiple audio devices

TEST=ran emulator downstream
BUG=b:342181161

Change-Id: Ia156b3ad2a9cc447a7e350a1915762f23e25f9cb
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5563959
Commit-Queue: Richard Zhang <rizhang@google.com>
Reviewed-by: Noah Gold <nkgold@google.com>
Reviewed-by: Chih-Yang Hsia <paulhsia@chromium.org>
2024-05-29 16:27:49 +00:00
Richard Zhang
efbd44580d crosvm: Assign audio_client_guid and device index to each audio device
BUG=b:342181161
BUG=b:340945837
TEST=tested downstream by running emulator

Change-Id: I4a0025b990c3c1afe282a70bc7de052bdd6c4259
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5560444
Reviewed-by: Idan Raiter <idanr@google.com>
Commit-Queue: Richard Zhang <rizhang@google.com>
Reviewed-by: Noah Gold <nkgold@google.com>
Reviewed-by: Doug Horn <doughorn@google.com>
2024-05-29 14:02:48 +00:00
Daniel Verkamp
52b8e42869 Cargo.toml: avoid "*" versions for external crates
Ensure that every Cargo.toml dependency on a third-party crates.io crate
specifies at least a major version, or a minor version for 0.x crates,
to ensure that if a new major version is published, it cannot cause API
breaks.

The versions are selected to match the ones already in Cargo.lock, so
this should have no functional change, but it will help prevent new "*"
versions from being introduced via copy-and-paste.

For rationale, see the Cargo FAQ:
<https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies>

`minijail`, `audio_streams`, and `cras` are left as "*" for now, since
they have unusual situations (imported from a submodule and/or replaced
at build time with ebuild magic).

BUG=None
TEST=tools/dev_container tools/presubmit
TEST=verify Cargo.lock is unchanged

Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656
Reviewed-by: Frederick Mayle <fmayle@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-22 01:01:42 +00:00
Hung Nguyen
65cf129e27 devices: pmem: Add discard command support
Design doc: go/arcvm-virtual-swap-impl

BUG=b:329310285
TEST=./tools/dev_container ./tools/presubmit
TEST=crosvm run with virtual swap options, set up the pmem device as an
swap area, verify the swapped in memory from guest are released from the
host swap.
TEST=crosvm run --pmem file.img, verify file size is 0 with
blkdiscard(8) from the guest that discards the whole file

Change-Id: Ie8f2910886ea754b9490fe5e762b578ca9d20a24
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5531228
Reviewed-by: Takaya Saeki <takayas@chromium.org>
Commit-Queue: Hung Nguyen <hungmn@google.com>
2024-05-20 19:02:43 +00:00
Hung Nguyen
070a316a8b devices: pmem: Add new virtual swap options
The new options will allow a virtio-pmem to be created based on an
anonymous memory mapping, and can be paged out at the specified
interval. The created virtio-pmem device can be used as a swap area in
the guest, where the guest swapped out memory will be paged out to the
host swap area.

Design doc: go/arcvm-virtual-swap-impl

BUG=b:329310285
TEST=./tools/dev_container ./tools/presubmit
TEST=tested seccomp policy with armv7-unknown-linux-gnueabihf and
aarch64-unknown-linux-gnu targets running on 32 bit (hana) and 64 bit
(kukui) ARM devices
TEST=crosvm run with new pmem options

Change-Id: Icd261bf94ba9c8168b9274b8e56fe352f153b9e6
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5529961
Reviewed-by: Takaya Saeki <takayas@chromium.org>
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
Commit-Queue: Hung Nguyen <hungmn@google.com>
2024-05-17 17:45:43 +00:00
Tatsuyuki Ishi
c2bad2ed99 Implement virtio-pvclock for arm64
BUG=b:333815324
TEST=tast run arc.Suspend.* (with https://crrev.com/c/5529202)

Co-authored-by: Suleiman Souhlal <suleiman@google.com>
Change-Id: I991192b42419d5aef488ffc625eb28ef4931124c
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5487336
Commit-Queue: Tatsuyuki Ishi <ishitatsuyuki@google.com>
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
2024-05-14 04:04:52 +00:00
Frederick Mayle
e56e7c40e8 crosvm: snapshot-restore support for kvm clock
When kvm clock is available, Linux (6.1 at least) uses it for the
scheduling clock (among other things) even when the TSC is configured as
the primary clock source. When restoring a VM, if we don't make a
KVM_SET_CLOCK call, kvm clock's value will rollback to zero and cause
trouble.

`ClockState::flags` was deleted because it had no existing uses, it
isn't useable in any hypervisor generic way, and because it will result
in incorrect behavior for snapshotting. The set of valid flags returned
by KVM_GET_CLOCK is not the same as the set of valid flags that can be
passed to KVM_SET_CLOCK.

Bug: 339527192
Change-Id: I57503e72499a44e98e0c6ca93eb8cb01cb21c16d
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5530677
Reviewed-by: Elie Kheirallah <khei@google.com>
Commit-Queue: Frederick Mayle <fmayle@google.com>
2024-05-10 21:15:27 +00:00
Frederick Mayle
ba273ae8c1 crosvm: delete crosvm snapshot apply command
We decided long ago to only support restoring a snapshot to a new VM,
using `crosvm run --restore`, this command is just a vestige.

Change-Id: I14bb20e3b89c41b277b11fe672d3ce21322cf656
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5530862
Reviewed-by: Noah Gold <nkgold@google.com>
Reviewed-by: Elie Kheirallah <khei@google.com>
Commit-Queue: Frederick Mayle <fmayle@google.com>
2024-05-10 20:18:49 +00:00
David Stevens
8b2fdd034b cmos: Extend sci resampling to rtc
Allow the RTC to re-assert the SCI when it is resampled, to
make sure that wakeup events which occur during suspend actually wake up
the guest. Similar to GPEs, cmos passes an Event that will be
signaled when the RTC is cleared.

BUG=b:301862490
TEST=Manual test with ArcS2Idle feature flag
TEST=manual tests with rtcwake

Change-Id: Ife667e46e6a89ea9dcb868696493f401758988a7
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5512664
Commit-Queue: David Stevens <stevensd@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
2024-05-03 00:36:47 +00:00
David Stevens
e91254024e devices: Extend sci resampling to virtio devices
Allow virtio devices to re-assert the SCI when it is resampled, to make
sure that wakeup events which occur during suspend actually wake the
guest up. This is done by passing an Event as part of the VmRequest::Gpe
message, and re-asserting the SCI until the virtio device signals the
Event.

BUG=b:301862490
TEST=Manual test with ArcS2Idle feature flag

Change-Id: Ib2067e2cb6c41e886f3414e9a8c4e7c61048dfb9
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5491344
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: David Stevens <stevensd@chromium.org>
2024-05-02 01:20:50 +00:00
Daniel Verkamp
1f2ed1055c vm_control: take &Path in snapshot restore
This avoids the need to clone the path when calling do_restore(). The
do_restore() function itself can convert the Path reference into an
owned PathBuf as needed, cleaning up the callers.

BUG=None
TEST=tools/dev_container tools/presubmit

Change-Id: Ie43813ee4299d44319bb907a645abc544c99dad4
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5506737
Reviewed-by: Frederick Mayle <fmayle@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-02 00:50:22 +00:00
David Stevens
e1ae4e90b3 vm_control: Allow the RTC to wake up VCPUs
Allow the RTC to un-suspend VCPUs, to wake the guest up from S3.

BUG=b:301862490
TEST=Manual test with ArcS2Idle feature flag

Change-Id: Ida9934d8c7caafc507dbadcc0c45ad5edbfd4b2d
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5491347
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: David Stevens <stevensd@chromium.org>
2024-05-01 15:22:21 +00:00
David Stevens
0aa3599265 vm_control: Don't dereference VmRequest
Don't dereference VmRequest when executing, to allow non-Copyable
message types.

BUG=b:301862490
TEST=Compiles

Change-Id: I5b7ec3f4ccec86ee152b1d2f28744948bbf37af4
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5491341
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
Commit-Queue: David Stevens <stevensd@chromium.org>
2024-05-01 13:35:59 +00:00
Pujun Lun
edb9f98394 vm_control: add more info to GpuControlResult::TooManyDisplays.
BUG=b:332910955

Change-Id: I94edbf73ff86ecfb9bbcc8faf6e5b740bf99ce79
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5457925
Reviewed-by: Jason Macnak <natsu@google.com>
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
Commit-Queue: Pujun Lun <lunpujun@google.com>
2024-04-17 17:21:54 +00:00
Noah Gold
b63c3f4d76 vm_control: add snapshot encryption.
Introduces a new switch/option on snapshot commands/IPCs that turns on
encryption using the crypto crate.

BUG=b:286345300
TEST=builds upstream; tested end to end downstream.

Change-Id: Ia04074bb23332274d4e6b99eb242c84b0af7a8a9
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5371444
Reviewed-by: Frederick Mayle <fmayle@google.com>
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Commit-Queue: Noah Gold <nkgold@google.com>
2024-03-18 17:33:29 +00:00
Federico 'Morg' Pareschi
10bc14b221 cmdline: Add security key attach command
BUG=b:297957754
TEST=presubmit

Change-Id: I41fb02a0f93635456428a5fbab187c7bb7738683
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4882198
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
2024-03-14 02:45:28 +00:00
Federico 'Morg' Pareschi
166dd8207c devices: usb: add security key backend provider
This CL introduces the USB backend device provider logic to handle
attaching security keys to the backend.

BUG=b:297957754
TEST=presubmit

Change-Id: I5849ad617b41a9d8ddb0127d9167ee02b27cd8da
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4945571
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
2024-03-14 02:45:28 +00:00
Daniel Verkamp
2c96bed807 Cargo.toml: Remove unused data_model deps
Several crates still declared a dependency on data_model despite not
using any imports from it.

BUG=b:312312646
TEST=tools/dev_container tools/presubmit

Change-Id: I63a67696c205f684b1e4ac8bdad4de5f294b63dc
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5370964
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-03-13 20:00:26 +00:00
Hikaru Nishida
80f14ee450 virtio/pvclock: Support Linux hosts
BUG=b:295256641
TEST=cargo build -F pvclock
TEST=cargo test -p devices -F pvclock -- pvclock
TEST=cargo test -p e2e_tests -- suspend
TEST=tools/dev_container tools/presubmit all
TEST=crrev/c/5151637

Change-Id: I57fe8ece5a205decb36ef7863d8e5c4f4f4c6bde
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4576848
Commit-Queue: Hikaru Nishida <hikalium@chromium.org>
Reviewed-by: David Stevens <stevensd@chromium.org>
2024-03-13 09:05:17 +00:00
Hikaru Nishida
0c5a475111 Respond to PvClockCommand even before the device activation
Spawn a stub_worker thread as a part of the device initialization to
avoid blocking PvClockCommand request when the device is not activated
yet. After this change, the requester of PvClockCommand can expect the
response from the device even if the device is not active. This can
happen when the guest kernel does not support the PvClock device and
because of that the device is not activated (from the virtio device
perspective).

BUG=b:295256641
TEST=cargo test -p devices -- pvclock
TEST=cargo test -p e2e_tests -- suspend

Change-Id: I0efc10bbf0e1125bf2df9208e1d6bcc341867a7e
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5312037
Auto-Submit: Hikaru Nishida <hikalium@chromium.org>
Commit-Queue: Hikaru Nishida <hikalium@chromium.org>
Reviewed-by: David Stevens <stevensd@chromium.org>
2024-03-13 09:05:17 +00:00
Frederick Mayle
7eb27dd45b vm_memory: support lz4 compression for RAM snapshot
RAM snapshot size and overall snapshot time for a basic ubuntu VM right
after login:

  * no compression:  619M 0.8s
  * lz4 compression: 175M 1.2s

BUG=b:320753724
TEST=crosvm snapshot take --compress-memory /tmp/crosvm-snapshot /tmp/crosvm-control

Change-Id: I5dff9fe8744847fea872ad78347ac5f7d8b957e3
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5190788
Reviewed-by: Elie Kheirallah <khei@google.com>
Commit-Queue: Frederick Mayle <fmayle@google.com>
Reviewed-by: Noah Gold <nkgold@google.com>
2024-03-08 22:51:26 +00:00
Pujun Lun
f1bcfe1475 everywhere: enable setting mouse mode thru CLI.
Example command:
crosvm gpu set-mouse-mode <control_socket_path> \
    --display-id=0 \
    --mouse-mode=relative

This enables the Windows implementation to toggle mouse capture
mode (touchscreen <-> relative). It will have no effect if the
specified "display-id" doesn't point to an existing guest display
associated with an in-use host display.

BUG=b:324087519
TEST=presubmit

Change-Id: I9e513eb692d4b9cba66eb1e629ab8f7018645059
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5319794
Reviewed-by: Noah Gold <nkgold@google.com>
Commit-Queue: Pujun Lun <lunpujun@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
2024-03-04 22:17:23 +00:00
Frederick Mayle
fc2cc0f521 add buffering to serde_json::from_reader/to_writer callers
Using serde_json on unbuffered readers/writers is slow.

Change-Id: Ie22f09e317d86d44263805e6f850ee96c0f0aa04
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5325901
Reviewed-by: Noah Gold <nkgold@google.com>
Commit-Queue: Frederick Mayle <fmayle@google.com>
2024-02-27 18:29:57 +00:00
Noah Gold
4b5f031e48 vm_control: switch to Boxed raw fragments.
Turns out impl Trait in return position means we only get *one* concrete
return type for all branches. In a future CL we'll have multiple return
types, so paradoxically, we'll have to think inside the Box.

BUG=b:326170473
TEST=builds

Change-Id: If759995d47e717adfeae6153f81f9940062e1e4e
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5320337
Reviewed-by: Frederick Mayle <fmayle@google.com>
Commit-Queue: Noah Gold <nkgold@google.com>
2024-02-23 01:04:58 +00:00
Noah Gold
cbf9381c58 vm_control: snapshot fragments use IO traits.
The current SnapshotReader/Writer interface returns Files for raw
fragments. When we add snapshot encryption, we will need to return an
encrypting or decrypting streaming wrapper, and this won't be a File.
This CL changes the interface to return impl Read or impl Write. As
part of that, we also had to make a significant safety change to
how memory snapshots are taken.

Memory snapshots used to be written with FileReadWriteVolatile. This is
because we assume GuestMemory is always mutably borrowed by the guest,
and it is UB to have aliased references in Rust. While formally
undefined, the rough reasoning for this is that LLVM optimizations
assume noalias on mutable references, and if that is violated at
runtime, optimizations can result in changed behavior. In the snapshot &
restore case though, we know the guest is not running because its VCPUs
are stopped, so its mutable reference can be ignored (temporal overlap
for aliasing is required for UB to occur). Luckily for us, the host code
will never alias guest memory because up until this CL, we assumed that
was never safe.

Credit: thanks to fmayle@, who originally proposed using Read/Write in this
manner in a CL that added snapshot compression.

BUG=b:326170473
TEST=builds

Change-Id: Iafd9175f684bc197329a0f5aae57685f5cfd677e
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5313630
Reviewed-by: Frederick Mayle <fmayle@google.com>
Commit-Queue: Noah Gold <nkgold@google.com>
2024-02-22 20:48:37 +00:00
Ryan Neph
d93be8c65f vm_control: enable fixed_blob_mapping + noncoherent-dma
Certain platforms use the noncoherent-dma feature to appropriately
consider the guest PAT's memory type (caching mode) when configuring the
effective memory type in SLAT, instead of simply ignoring it in favor of
the host PAT.

Dynamic blob mapping has already integrated support for noncoherent-dma
upon setting up each mapped blob's memory region (e.g. KVM memslot),
but fixed_blob_mapping merged while naively ignoring the feature.

Now, we respect the feature when setting up the shared/prepared memory
region (appropriately passing the new MemCacheType enum through to the
hypervisor).

BUG=b:246334944
TEST=tools/presubmit
TEST=(in venus-enabled VM w/ noncoherent-dma) `deqp-vk -n dEQP-VK.memory*` passing
TEST=(in venus-enabled VM w/ noncoherent-dma) Hollow Knight, Portal 2,
Valheim, CS:Source all look fine.

Change-Id: Ia31763c80765a42a1932bfb347ffa57a2faf6fab
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5285309
Commit-Queue: Ryan Neph <ryanneph@google.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
2024-02-16 00:09:55 +00:00
Ryan Neph
abcdbd3493 gpu: add fixed_blob_mapping to elide per-blob vMMU mapping setup
Before this change, each guest synchronous virtio-gpu
VIRTIO_GPU_CMD_RESOURCE_MAP_BLOB submission would provoke crosvm's
hypervisor thread to perform a costly vMMU guestPA->hostVA mapping
(configure a new kvm memslot).

With this change, the entire Virtio-GPU PCI BAR address space can
optionally be pre-configured to a single vMMU mapping. Then, subsequent
RESOURCE_MAP_BLOB requests are handled by mmap() of the blob's exported
fd (dma-buf, shmem, ...) in the hypervisor process to a fixed hostVA
within an unused portion of the vMMU's pre-mapped region corresponding
to the blob's guestPA in the virtio-gpu device's BAR.

The new option is disabled by default, since this is not yet compatible
with the exposure of host dma_bufs to a PCI-passthrough device via
virtio-iommu + vfio. Those features are currently mutually exclusive
(i.e. PCI-Passthrough GPU must continue to use per-blob vMMU mappings
for now).

BUG=b:246334944
TEST=tools/presubmit
TEST=(in linux VM + venus): vkcube
TEST=(in linux VM + virgl): apitrace replay <opengl-game-trace-file>

Change-Id: Ibdd9ad8c12651cb7d31dd8648be9da17cc01cba3
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5255761
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Ryan Neph <ryanneph@google.com>
2024-02-08 00:04:57 +00:00
Ryan Neph
b07b17ed71 vm_control: log an error when mapping incompatible VmMemorySource
Make this cause of a failed "fixed mapping" attempt obvious when
inspecting the logs. This shouldn't be seen in production and is here
for developers that attempt to enable an incompatible VmMemorySource
type before it can be supported.

BUG=b:246334944
TEST=tools/presubmit

Change-Id: Ief32abc85d0aa07d4507a1d53f0ba55becca5e0f
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5255759
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Ryan Neph <ryanneph@google.com>
Reviewed-by: Dennis Kempin <denniskempin@google.com>
2024-02-08 00:04:57 +00:00
Ryan Neph
b4a32656d9 vm_control: inline request_register_memory proc into register_memory
Inline a procedure that has only a single caller.

BUG=b:246334944
TEST=tools/presubmit

Change-Id: Ib727090c710162d16bdf4acf05e5b94c0e80e16a
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5255758
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Commit-Queue: Ryan Neph <ryanneph@google.com>
2024-02-08 00:04:57 +00:00
Noah Gold
87cfdaca23 devices: improve failure logging for snapshotting.
A device failing to wake up is a pretty generic error. This CL adds the
device's debug label so it's easier to understand which device is
failing.

BUG=None
TEST=builds

Change-Id: I35d67cd356b95f3b4875ae1fe3bf358c0cc329fe
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5271324
Reviewed-by: Elie Kheirallah <khei@google.com>
Commit-Queue: Noah Gold <nkgold@google.com>
2024-02-06 18:36:21 +00:00
Zhenyu Wang
53c8fb14bf devices: apply new noncoherent attribute for GPU mem's cache info
On Intel, new noncoherent DMA mem flag can be set to allow KVM to
recognize guest cache setting for EPT, which allows WC attribute to be
applied to ensure guest memory access is synchronized in noncoherent DMA.

Unlike previous POC for new device attribute, this uses new added flag
for mem slot.

BUG=b:316337317
TEST=cargo build and run GPU workload

Change-Id: If16d61031bdb2cf0252a57e99d4b6725a89dd38a
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5171312
Reviewed-by: Frederick Mayle <fmayle@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Stanisław Kardach <skardach@google.com>
2024-01-26 23:27:58 +00:00
Frederick Mayle
b488863647 devices: SnapshotReader/Writer abstraction + new snapshot format
Instead of building up one big json value, we pass around a "writer"
object that allows writing out fragments of the snapshot and nested
namespacing. The snapshot fragments can use different serialize formats
if desired, e.g. the RAM snapshot uses a raw binary file.

Snapshot directory contents:

     213 .../bus0/ACPIPMResource-0
     299 .../bus0/cmos-0
       2 .../bus0/i8042-0
     542 .../bus0/pci-config-io-port-0
     234 .../bus0/serial-0
     234 .../bus0/serial-1
     234 .../bus0/serial-2
     235 .../bus0/serial-3
     536 .../bus1/pci-config-mmio-0
    3.5K .../bus1/pcivirtio-balloon-0
    6.1K .../bus1/pcivirtio-block-0
    1.7K .../bus1/pcivirtio-rng-0
     536 .../bus1/pci-virtual-config-mmio-0
     569 .../bus1/PvPanic-0
    5.3K .../irqchip
    8.0G .../mem
      52 .../mem_metadata
    6.5K .../vcpu/vcpu0
    6.6K .../vcpu/vcpu1
    6.5K .../vcpu/vcpu2
    6.5K .../vcpu/vcpu3

For now, the new abstractions are not used in `BusDevice` or any layers
beyond `BusDevice`, so each device is still a monolithic JSON file.

`PciConfigIo::debug_label` was modified so that it can't change at
runtime.

Based on some light testing, this seems to reduce the snapshot time for
a particular ubuntu VM config from 14s to 13s.

BUG=b:268093674

Change-Id: Ic16980629ff9321bee19f56f6e8e50f214492a7d
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4739910
Commit-Queue: Frederick Mayle <fmayle@google.com>
Reviewed-by: Elie Kheirallah <khei@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Noah Gold <nkgold@google.com>
2024-01-16 21:42:29 +00:00
Ludovic Barman
cd04b6198d Upgrade gdbstub and gdbstub_arch.
gdbstub 0.6.3 -> 0.7.0
gdbstub_arch 0.2.4 -> 0.3.0

There is small change in API, see src/crosvm/gdb.rs. `read_addrs` now returns a `usize` instead of a `()`.

This change is needed to submit this AOSP topic: https://android-review.git.corp.google.com/c/platform/external/crosvm/+/2879249

BUG=b:286979636

TEST=tools/presubmit --all

Change-Id: I124d65e673c5943070c2bb5e39e3a7e5506e5528
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5146447
Commit-Queue: Frederick Mayle <fmayle@google.com>
Reviewed-by: Vikram Auradkar <auradkar@google.com>
Reviewed-by: Dennis Kempin <denniskempin@google.com>
2024-01-04 02:06:22 +00:00
Frederick Mayle
7005f04e34 vm_control: fix vcpu restore response check
In this case, `recv` returns `Result<Result<(), Error>, RecvError>` and
we only checked the `RecvError` error, actual vCPU restore errors were
ignored.

BUG=b:316912197
TEST=Added `anyhow::bail!` line to the vCPU restore and observed that restoring no longer gets stuck

Change-Id: I51a5e3ff90a9248a7eb5790394143fa0188b2955
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5146882
Reviewed-by: Elie Kheirallah <khei@google.com>
Reviewed-by: Noah Gold <nkgold@google.com>
Commit-Queue: Frederick Mayle <fmayle@google.com>
2024-01-02 21:26:18 +00:00
Vikram Auradkar
2768f223ee clippy: enforce safety block comments
BUG=b:316174930
TEST=none

Change-Id: I5c7811b2c548155aa003e4b71a54bbc16e2f2588
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5120567
Commit-Queue: Vikram Auradkar <auradkar@google.com>
Reviewed-by: Dennis Kempin <denniskempin@google.com>
2023-12-14 18:21:54 +00:00