Repository navigation
Conversation
…#936 and PR google#1007 Bump `vhost_device_vsock_crates` in `vhost_device_vsock.MODULE.bazel` from `20fa14c4c56e40a12104794a934dd70dc7642ff2` to `c0bfee92d28ffa7199ebe894c16d877a6f216fc3`, which includes: - `b269fab` (`Update vhost-user-backend to 0.24.0`, `vhost 0.18.0`, containing `rust-vmm/vhost` PR google#374 `e45799931a9e` so device-state transfer returns `Option<File>`) - `c0bfee9` (`rust-vmm/vhost-device` PR google#992: `vsock: do forward-listen polling after guest accepts`) Refresh the four `vhost-device-vsock` patches against `c0bfee92d28f` to match upstream `rust-vmm/vhost-device` PR google#936 (`0848db4`..`f0c024d`) and PR google#1007 (`1268ac5`..`7d2775e`): 1. `vhost-device-vsock-backend-rxq-cleanup.patch` (PR google#1007 commit 1, `1268ac5`): - Add unit test in `test_vsock_thread_backend` verifying that stale `backend_rxq` keys are skipped and active keys with remaining `pending_rx()` ops are re-queued. 2. `vhost-device-vsock-handshake-cleanup.patch` (PR google#1007 commit 2, `a8ad7a6`): - Rebase onto `c0bfee92d28f` (PR google#992), adding unit tests for early pre-handshake host disconnects and `BrokenPipe` on `VSOCK_OP_RESPONSE`. 3. `vhost-device-vsock-snapshot.patch` (PR google#936 `0848db4`..`f0c024d`): - Persist 1-byte `driver_read_config` across `set_device_state_fd` and `check_device_state` so `VSOCK_EVENT_TRANSPORT_RESET` is only sent on restore if the guest driver had initialized the device before snapshot. - Replace `Mutex<bool>` with `AtomicBool` for `transport_reset_pending` and `driver_read_config`, lock threads before checking `transport_reset_pending` in `get_config()`, and check `queue.ready()` in `reset_transport()`. - Add `test_vsock_backend_save_restore` unit test. 4. `vhost-device-vsock-stream-io-error-reset.patch` (PR google#1007 commit 3, `7d2775e`): - Add unit tests for `WouldBlock` on nonblocking streams and `send_bytes` write errors on closed host peers. Bug: 483173919 Bug: 566997830 Test: bazel build //cuttlefish/package:common Test: 5-stage live Cuttlefish VM vsock stress & snapshot-restore test Assisted-by: Jetski:Gemini
jemoreira
approved these changes
Oct 27, 2026
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
vhost-device-vsock: Sync base rev and patches with upstream PR #936 and PR #1007
Bump
vhost_device_vsock_cratesinvhost_device_vsock.MODULE.bazelfrom
20fa14c4c56e40a12104794a934dd70dc7642ff2toc0bfee92d28ffa7199ebe894c16d877a6f216fc3, which includes:b269fab(Update vhost-user-backend to 0.24.0,vhost 0.18.0,containing
rust-vmm/vhostPR Build(deps): Bump google.golang.org/grpc from 1.40.0 to 1.56.3 in /frontend/src/liboperator #374e45799931a9eso device-statetransfer returns
Option<File>)c0bfee9(rust-vmm/vhost-devicePR Fix include paths and strip_include_prefix in//cuttlefish/host/commands/cvd#992:vsock: do forward-listen polling after guest accepts)Refresh the four
vhost-device-vsockpatches againstc0bfee92d28ftomatch upstream
rust-vmm/vhost-devicePR #936 (0848db4..f0c024d) andPR #1007 (
1268ac5..7d2775e):vhost-device-vsock-backend-rxq-cleanup.patch(PR Add missing include #1007 commit 1,1268ac5):test_vsock_thread_backendverifying that stalebackend_rxqkeys are skipped and active keys with remainingpending_rx()ops are re-queued.vhost-device-vsock-handshake-cleanup.patch(PR Add missing include #1007 commit 2,a8ad7a6):c0bfee92d28f(PR Fix include paths and strip_include_prefix in//cuttlefish/host/commands/cvd#992), adding unit tests forearly pre-handshake host disconnects and
BrokenPipeonVSOCK_OP_RESPONSE.vhost-device-vsock-snapshot.patch(PR Import libcuttlefish_host_config_adb #9360848db4..f0c024d):driver_read_configacrossset_device_state_fdand
check_device_statesoVSOCK_EVENT_TRANSPORT_RESETis onlysent on restore if the guest driver had initialized the device
before snapshot.
Mutex<bool>withAtomicBoolfortransport_reset_pendinganddriver_read_config, lock threadsbefore checking
transport_reset_pendinginget_config(), andcheck
queue.ready()inreset_transport().test_vsock_backend_save_restoreunit test.vhost-device-vsock-stream-io-error-reset.patch(PR Add missing include #1007 commit 3,7d2775e):WouldBlockon nonblocking streams andsend_byteswrite errors on closed host peers.Bug: 483173919
Bug: 566997830
Test: bazel build //cuttlefish/package:common
Test: 5-stage live Cuttlefish VM vsock stress & snapshot-restore test
Assisted-by: Jetski:Gemini