mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-24 20:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
crosvm/swap/Cargo.toml

46 lines
1.1 KiB
TOML
Raw Normal View History

Reland "swap: add userfaultfd wrapper" origin: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3895235 userfaultfd enables applications to handle page faults on designated memory area. vmm-swap feature uses userfaultfd to catch page fault event and swap in the guest memory from the swap file. design document: go/tanooki-phase1-dd BUG=b:215093219 TEST=cargo build --features=swap Change-Id: I36ecfe9be988a4bc451f8edaf2ab48e25c6600f4 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4016142 Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: David Stevens <stevensd@chromium.org> Reviewed-by: Dennis Kempin <denniskempin@google.com>
2022-09-14 05:18:14 +00:00
[package]
name = "swap"
version = "0.1.0"
Fix remaining Chrome/Chromium OS instances These should be written as ChromeOS and ChromiumOS (without the space) to match the updated branding. The copyright headers were already migrated to the new style (https://crrev.com/c/3894243), but there were some more instances left over. BUG=None TEST=tools/cargo-doc Change-Id: I8c76aea2eb33b2e370ab71ee9b5cc0a4cfd00585 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4129934 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2022-12-29 21:24:33 +00:00
authors = ["The ChromiumOS Authors"]
Reland "swap: add userfaultfd wrapper" origin: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3895235 userfaultfd enables applications to handle page faults on designated memory area. vmm-swap feature uses userfaultfd to catch page fault event and swap in the guest memory from the swap file. design document: go/tanooki-phase1-dd BUG=b:215093219 TEST=cargo build --features=swap Change-Id: I36ecfe9be988a4bc451f8edaf2ab48e25c6600f4 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4016142 Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: David Stevens <stevensd@chromium.org> Reviewed-by: Dennis Kempin <denniskempin@google.com>
2022-09-14 05:18:14 +00:00
edition = "2021"
Use custom test harness for tests using fork forking a process with multiple threads will lead to undefined behavior. Unfortunately, newer versions of libtest will spawn multiple threads even when running a with --test-threads=1. This change implements a custom, test harness using libtest-mimic. It mimics the libtest CLI but enforces a single threaded test process. BUG=b:270167741 BUG=b:268496046 TEST=tools/run_tests --dut=host Change-Id: Icef6a1b65bab7f5cd5021c01fbd94487fa0ca5fb Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4295157 Reviewed-by: George Burgess <gbiv@chromium.org> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Dennis Kempin <denniskempin@google.com> Reviewed-by: Frederick Mayle <fmayle@google.com>
2023-02-28 19:01:18 +00:00
# The process tests will use fork, which requires a custom test harness to enforce single threaded
# execution.
[[test]]
name = "main"
path = "tests/main.rs"
harness = false
cros_trace: Add initial trace_marker backend This CL adds a new backend for the cros_tracing crate. This backend can be enabled by building crosvm with the trace_marker feature enabled. When the feature is not enabled, no extra overhead incurs as the default NOOP cros_tracing crate will be compiled in instead. BUG=b:259501910 TEST=compiled and ran crosvm with and without `--features trace_marker` Change-Id: Ia4b929b042712a458b7d54c0362d6fda90db9e9f Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4075413 Reviewed-by: Christian Blichmann <cblichmann@google.com> Auto-Submit: Morg <morg@chromium.org> Commit-Queue: Morg <morg@chromium.org> Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
2022-12-05 06:27:06 +00:00
[features]
trace_marker = ["cros_tracing/trace_marker"]
swap: switch page fault logger with compiler feature flag page fault logger is only for debugging purpose. It has a security concern about exposing the trigger to enable the logger. The logger will make the page fault handling slower and consumes disk resources. Instead, the page fault logger is only enabled by compiler feature flag like: ``` cargo build --features=swap,swap/log_page_fault ``` Opening a file on the monitor process is blocking the upcoming minijail migration. Open the log file on the main process and pass the file descriptor to the monitor process. BUG=b:269372016 TEST=manual test Change-Id: I5df2a32da7fb149680fa24617ffd905b2483108b Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4253287 Reviewed-by: David Stevens <stevensd@chromium.org> Commit-Queue: Shin Kawamura <kawasin@google.com>
2023-02-15 06:08:48 +00:00
log_page_fault = []
swap: expose Status interface to all variants Status does not depend on any swap related feature. Exposing Status to all variants is easy to implement swap status FFI at crosvm_control. The new "swap/enable" feature switches the actual vmm-swap functionality to be compiled. The feature is enabled by default on "swap" crate but disabled on the root package for test dependency. Vmm-swap feature is enabled by `--features=swap` flag on cargo build as before. swap/src/controller.rs is copied from swap/src/lib.rs. BUG=b:265386761 TEST=tools/dev_container tools/run_tests2 Change-Id: Ifc2539a62d0f594fd5bbb41623c735ea2621f7b6 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4486546 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: David Stevens <stevensd@chromium.org>
2023-04-28 06:09:25 +00:00
enable = ["userfaultfd", "userfaultfd-sys"]
cros_trace: Add initial trace_marker backend This CL adds a new backend for the cros_tracing crate. This backend can be enabled by building crosvm with the trace_marker feature enabled. When the feature is not enabled, no extra overhead incurs as the default NOOP cros_tracing crate will be compiled in instead. BUG=b:259501910 TEST=compiled and ran crosvm with and without `--features trace_marker` Change-Id: Ia4b929b042712a458b7d54c0362d6fda90db9e9f Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4075413 Reviewed-by: Christian Blichmann <cblichmann@google.com> Auto-Submit: Morg <morg@chromium.org> Commit-Queue: Morg <morg@chromium.org> Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
2022-12-05 06:27:06 +00:00
swap: expose Status interface to all variants Status does not depend on any swap related feature. Exposing Status to all variants is easy to implement swap status FFI at crosvm_control. The new "swap/enable" feature switches the actual vmm-swap functionality to be compiled. The feature is enabled by default on "swap" crate but disabled on the root package for test dependency. Vmm-swap feature is enabled by `--features=swap` flag on cargo build as before. swap/src/controller.rs is copied from swap/src/lib.rs. BUG=b:265386761 TEST=tools/dev_container tools/run_tests2 Change-Id: Ifc2539a62d0f594fd5bbb41623c735ea2621f7b6 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4486546 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: David Stevens <stevensd@chromium.org>
2023-04-28 06:09:25 +00:00
[dependencies]
Reland "swap: suspend device processes using SIGSTOP signal" origin: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3932497 ProcessesGuard stops all the crosvm processes except the caller process using SIGSTOP signal because we must guarantee that no one changes the guest memory contents while vmm-swap out. This is a short term solution and will be replaced with device suspension feature later. See the "Write back atomicity" section in go/tanooki-phase1-dd BUG=b:215093219 TEST=cargo build --features=swap Change-Id: I34e528bf318e5ff9277048f3daf8608e7b09ddc7 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4016145 Reviewed-by: David Stevens <stevensd@chromium.org> Commit-Queue: Shin Kawamura <kawasin@google.com>
2022-10-03 07:53:15 +00:00
anyhow = "*"
Reland "swap: add userfaultfd wrapper" origin: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3895235 userfaultfd enables applications to handle page faults on designated memory area. vmm-swap feature uses userfaultfd to catch page fault event and swap in the guest memory from the swap file. design document: go/tanooki-phase1-dd BUG=b:215093219 TEST=cargo build --features=swap Change-Id: I36ecfe9be988a4bc451f8edaf2ab48e25c6600f4 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4016142 Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: David Stevens <stevensd@chromium.org> Reviewed-by: Dennis Kempin <denniskempin@google.com>
2022-09-14 05:18:14 +00:00
base = { path = "../base" }
swap: expose Status interface to all variants Status does not depend on any swap related feature. Exposing Status to all variants is easy to implement swap status FFI at crosvm_control. The new "swap/enable" feature switches the actual vmm-swap functionality to be compiled. The feature is enabled by default on "swap" crate but disabled on the root package for test dependency. Vmm-swap feature is enabled by `--features=swap` flag on cargo build as before. swap/src/controller.rs is copied from swap/src/lib.rs. BUG=b:265386761 TEST=tools/dev_container tools/run_tests2 Change-Id: Ifc2539a62d0f594fd5bbb41623c735ea2621f7b6 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4486546 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: David Stevens <stevensd@chromium.org>
2023-04-28 06:09:25 +00:00
cfg-if = "*"
cros_trace: Add initial trace_marker backend This CL adds a new backend for the cros_tracing crate. This backend can be enabled by building crosvm with the trace_marker feature enabled. When the feature is not enabled, no extra overhead incurs as the default NOOP cros_tracing crate will be compiled in instead. BUG=b:259501910 TEST=compiled and ran crosvm with and without `--features trace_marker` Change-Id: Ia4b929b042712a458b7d54c0362d6fda90db9e9f Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4075413 Reviewed-by: Christian Blichmann <cblichmann@google.com> Auto-Submit: Morg <morg@chromium.org> Commit-Queue: Morg <morg@chromium.org> Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
2022-12-05 06:27:06 +00:00
cros_tracing = { path = "../cros_tracing" }
crosvm: pre-release alpha for data_model data_model is probably going away in the future, but until we can release it as pre-release alpha for internal efforts. (context: https://fxbug.dev/114169) BUG=b:173630595 TEST=compile Change-Id: Ie13ec3ab9083d315c78a035b532132296a8fb651 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4082333 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
2022-12-06 20:38:11 +00:00
data_model = { path = "../common/data_model" }
swap: use create_sandbox_minijail for the monitor process The monitor process uses the `jail` crate which devices use to create sandbox. The syscalls listed in the seccomp filter policy file is originally generated from a profile by strace. Also there are additional syscalls from common_device.policy: * another variant of syscalls in the profile * clone, dup, readlinkat * the basic set which will be added by minijail compiler anyway. * restart_syscall, exit, exit_group, rt_sigreturn * syscalls appears only on DUT (not workstation). * set_robust_list, sigaltstack, rseq Used `common_device.policy` as a reference for syscalls which require detailed conditions (e.g. clone, mmap, openat, etc). This adds seccomp filter policy only for x86_64. The policy files for other architectures will be added later. BUG=b:258351526 TEST=manually tested Change-Id: I3e584449ed9330a57ae1d2bd6c56a7554b6584ef Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4253073 Reviewed-by: Dennis Kempin <denniskempin@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: David Stevens <stevensd@chromium.org> Commit-Queue: Shin Kawamura <kawasin@google.com>
2023-02-15 03:42:51 +00:00
jail = { path = "../jail"}
swap: move guest memory to staging memory on multi thread Enabling vmm-swap copies all the guest memory to the staging memory while freezing whole the crosvm. Reducing the latency of it is important. The most time consuming part of enabing vmm-swap is pure memory copy which easily can be executed on the multi-thread. BUG=b:263830401 TEST=cargo test -p swap Change-Id: I307ad1c459158113cc654e7ba1541381a38b65bb Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4142083 Reviewed-by: David Stevens <stevensd@chromium.org> Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: Dennis Kempin <denniskempin@google.com>
2023-01-06 09:35:25 +00:00
num_cpus = "*"
swap: add helpers for pagesize Using the cached page size shift has several performance benefits listed at the comment of the file. BUG=b:260543132 TEST=cargo test -p swap Change-Id: Ic7a19135b7a2e29c032c73fa7dca1d853cdb5e48 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4125177 Reviewed-by: David Stevens <stevensd@chromium.org> Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Shin Kawamura <kawasin@google.com>
2022-12-26 04:18:33 +00:00
once_cell = "*"
swap: add commands for vmm-swap out Added new crosvm commands "crosvm swap enable" and "crosvm swap status". swap crate exposes SwapController to control the vmm-swap feature. When vmm-swap is enabled, all the pages on the GuestMemory are swapped out to a file and are freed to give a lot of memory back to OS. design document: go/tanooki-phase1-dd BUG=b:215093219 TEST=manually tested Change-Id: Ideb10b0119edd9f47b66c8ac61add21ac08181d4 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3871758 Reviewed-by: David Stevens <stevensd@chromium.org> Commit-Queue: Shin Kawamura <kawasin@google.com>
2022-09-02 15:49:50 +00:00
remain = "*"
serde = { version = "1", features = [ "derive" ] }
swap: log page fault event The new command "crosvm swap log_pagefault <socket>" starts logging page fault events. The log file "page_fault.log" will be located under the swap directory. Pagefault event log help up debugging the vmm-swap feature and understand the memory usage of the guest os. design document: go/tanooki-phase1-dd BUG=b:253555760 TEST=manually tested. this is debug feature. Change-Id: I13e36cef873cd83179032fe8a289c8df71384644 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3954806 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: David Stevens <stevensd@chromium.org> Commit-Queue: Shin Kawamura <kawasin@google.com>
2022-10-14 08:06:52 +00:00
serde_json = "*"
swap: add commands for vmm-swap out Added new crosvm commands "crosvm swap enable" and "crosvm swap status". swap crate exposes SwapController to control the vmm-swap feature. When vmm-swap is enabled, all the pages on the GuestMemory are swapped out to a file and are freed to give a lot of memory back to OS. design document: go/tanooki-phase1-dd BUG=b:215093219 TEST=manually tested Change-Id: Ideb10b0119edd9f47b66c8ac61add21ac08181d4 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3871758 Reviewed-by: David Stevens <stevensd@chromium.org> Commit-Queue: Shin Kawamura <kawasin@google.com>
2022-09-02 15:49:50 +00:00
sync = { path = "../common/sync" } # provided by ebuild
Reland "swap: add swap file" origin: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3930082 SwapFile saves the active pages in the memory region to a file. design document: go/tanooki-phase1-dd BUG=b:215093219 TEST=cargo test -p swap Change-Id: Idce637ed069665e174b36c21a32afdad2f00fea1 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4016143 Reviewed-by: David Stevens <stevensd@chromium.org> Commit-Queue: Shin Kawamura <kawasin@google.com>
2022-09-30 15:36:52 +00:00
thiserror = "*"
swap: add commands for vmm-swap out Added new crosvm commands "crosvm swap enable" and "crosvm swap status". swap crate exposes SwapController to control the vmm-swap feature. When vmm-swap is enabled, all the pages on the GuestMemory are swapped out to a file and are freed to give a lot of memory back to OS. design document: go/tanooki-phase1-dd BUG=b:215093219 TEST=manually tested Change-Id: Ideb10b0119edd9f47b66c8ac61add21ac08181d4 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3871758 Reviewed-by: David Stevens <stevensd@chromium.org> Commit-Queue: Shin Kawamura <kawasin@google.com>
2022-09-02 15:49:50 +00:00
vm_memory = { path = "../vm_memory"}
Use custom test harness for tests using fork forking a process with multiple threads will lead to undefined behavior. Unfortunately, newer versions of libtest will spawn multiple threads even when running a with --test-threads=1. This change implements a custom, test harness using libtest-mimic. It mimics the libtest CLI but enforces a single threaded test process. BUG=b:270167741 BUG=b:268496046 TEST=tools/run_tests --dut=host Change-Id: Icef6a1b65bab7f5cd5021c01fbd94487fa0ca5fb Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4295157 Reviewed-by: George Burgess <gbiv@chromium.org> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Dennis Kempin <denniskempin@google.com> Reviewed-by: Frederick Mayle <fmayle@google.com>
2023-02-28 19:01:18 +00:00
Replace #[cfg(unix)] with #[cfg(any(target_os = "android", target_os = "linux"))] Updates are made to source and documentation. This more accurately represents the currently supported platforms of Android/Linux and Windows, without unexpectedly including other unix-like operating systems. Command to reproduce: $ find . -type f -not -path '*/\.git/*' | xargs -I {} sed -i 's/cfg(unix)/cfg(any(target_os = "android", target_os = "linux"))/g' {} $ cargo fmt md files manually updated to fix line lengths. Renaming `unix` modules to `linux` will be done in a later CL. Test: ./tools/dev_container ./tools/presubmit Bug: b/298269162 Change-Id: I42c1bf0abf80b9a0df25551613910293217c7295 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4909059 Commit-Queue: Cody Schuffelen <schuffelen@google.com> Reviewed-by: Frederick Mayle <fmayle@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Noah Gold <nkgold@google.com>
2023-10-03 01:33:00 +00:00
[target.'cfg(any(target_os = "android", target_os = "linux"))'.dependencies]
swap: expose Status interface to all variants Status does not depend on any swap related feature. Exposing Status to all variants is easy to implement swap status FFI at crosvm_control. The new "swap/enable" feature switches the actual vmm-swap functionality to be compiled. The feature is enabled by default on "swap" crate but disabled on the root package for test dependency. Vmm-swap feature is enabled by `--features=swap` flag on cargo build as before. swap/src/controller.rs is copied from swap/src/lib.rs. BUG=b:265386761 TEST=tools/dev_container tools/run_tests2 Change-Id: Ifc2539a62d0f594fd5bbb41623c735ea2621f7b6 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4486546 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: David Stevens <stevensd@chromium.org>
2023-04-28 06:09:25 +00:00
libc = "*"
[target.'cfg(target_os="linux")'.dependencies]
userfaultfd = { version = "0.5.0", optional = true }
userfaultfd-sys = { version = "0.4.2", optional = true }
Use custom test harness for tests using fork forking a process with multiple threads will lead to undefined behavior. Unfortunately, newer versions of libtest will spawn multiple threads even when running a with --test-threads=1. This change implements a custom, test harness using libtest-mimic. It mimics the libtest CLI but enforces a single threaded test process. BUG=b:270167741 BUG=b:268496046 TEST=tools/run_tests --dut=host Change-Id: Icef6a1b65bab7f5cd5021c01fbd94487fa0ca5fb Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4295157 Reviewed-by: George Burgess <gbiv@chromium.org> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Dennis Kempin <denniskempin@google.com> Reviewed-by: Frederick Mayle <fmayle@google.com>
2023-02-28 19:01:18 +00:00
[dev_dependencies]
libtest-mimic = "0.6"
swap: expose Status interface to all variants Status does not depend on any swap related feature. Exposing Status to all variants is easy to implement swap status FFI at crosvm_control. The new "swap/enable" feature switches the actual vmm-swap functionality to be compiled. The feature is enabled by default on "swap" crate but disabled on the root package for test dependency. Vmm-swap feature is enabled by `--features=swap` flag on cargo build as before. swap/src/controller.rs is copied from swap/src/lib.rs. BUG=b:265386761 TEST=tools/dev_container tools/run_tests2 Change-Id: Ifc2539a62d0f594fd5bbb41623c735ea2621f7b6 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4486546 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: David Stevens <stevensd@chromium.org>
2023-04-28 06:09:25 +00:00
tempfile = "*"
Reference in a new issue Copy permalink